Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp2353936pxb; Mon, 20 Sep 2021 19:52:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrl58ydWca4HaEmZ+sHliiNPeqMSzhirVniB0FwzTNEEIQd+U1zQCefEFjLkgUKzad8GVg X-Received: by 2002:a50:da49:: with SMTP id a9mr33503064edk.281.1632192772068; Mon, 20 Sep 2021 19:52:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632192772; cv=none; d=google.com; s=arc-20160816; b=D1WgnmtcGsPuYpqbDwdQgyl8hJROXkr5gekVb3DkCm/2+C8ToFtO4X68kUVNCb9JsP h03H2b/Ji0+X2txOUzyIDvfeku+AWtMqDnu4oCMqKuqtr/fohjmR8WrVyApSDQu+sIXV UYjuIG2XYgrjVr43LUYVKPY/Y5v6BJULPt3xr0PSWY2TIFfFnZEUzsaTfNeIrj8OVVzR zjF4sRX46VdjaD0RQLE1biFS4jXXr4uuMgi9Exkfo3epogfBZWWjk4mx1IAaRWBiSL4l m435nmTFuEidDlo5jL8PEFtMFNXQzQVYDuxpjeV7PO/cHpPWOMF55lsWy+z0Oh4e2NeZ pFkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=SbdH8tirSYnSdqJMRjC+xfDVsFPwr4DDrLQhU0xp80w=; b=BjKbJR8V3laNT8sTVcbsPX61Ut66o5cZV7mJsbprkLBUaP5xOd9frzqmn1ippusYJQ 8wFIGjmHVs4UQIqHeFtUxmIP5YQbH0jTdWwPi6Js+I3tjyZRLIFZJ0JjuWMBNc5D92wu m2DHdYEM0ExOaYxp+SCgB/VkEwFwtNy51Nh327tKE++WprfDe0fHHfzyD0eSer4XEk7Q hBmOTbCAcqMfCMcQuh/4CfNlGhmNEAQTytTYvUQwZAc9HNSHiA7QS9G430eUs0ImT5Xd FGzY94stoty9TDBYaKoV97PKiFAL9UbrKLg66/v8YRs4UcBwfPAf//9xAcw1OEl+Jggn 9gWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=dw4qCLxM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x11si18138740eds.131.2021.09.20.19.52.28; Mon, 20 Sep 2021 19:52:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=dw4qCLxM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1383602AbhITSoq (ORCPT + 99 others); Mon, 20 Sep 2021 14:44:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:56452 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1382337AbhITSkT (ORCPT ); Mon, 20 Sep 2021 14:40:19 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D5C3E63333; Mon, 20 Sep 2021 17:31:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632159068; bh=/YhzPuWJIkCArIATZHznT6wa6phJu78QNPO4qrXyVw4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dw4qCLxMDoA5j1E/esqTUSbo0pyMfrjDDugHzhpAMOlbgzL5yyHOzQXb3HPQL0F/y pRdgLp+fJbNgfMGRVyIvqbyjgQormgc03Ao0LI0j2T1IP2HmoXrbmeEjoTmzsB9Xwf m0NgyLowMKpRoGZ76+GPkpHyX0bmMtELxKjW1R8Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michael Walle , Lucas Stach , Marek Vasut , Christian Gmeiner Subject: [PATCH 5.14 029/168] drm/etnaviv: fix MMU context leak on GPU reset Date: Mon, 20 Sep 2021 18:42:47 +0200 Message-Id: <20210920163922.605288738@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210920163921.633181900@linuxfoundation.org> References: <20210920163921.633181900@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lucas Stach commit f978a5302f5566480c58ffae64a16d34456801bd upstream. After a reset the GPU is no longer using the MMU context and may be restarted with a different context. While the mmu_state proeprly was cleared, the context wasn't unreferenced, leading to a memory leak. Cc: stable@vger.kernel.org # 5.4 Reported-by: Michael Walle Signed-off-by: Lucas Stach Tested-by: Michael Walle Tested-by: Marek Vasut Reviewed-by: Christian Gmeiner Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -571,6 +571,8 @@ static int etnaviv_hw_reset(struct etnav gpu->fe_running = false; gpu->exec_state = -1; + if (gpu->mmu_context) + etnaviv_iommu_context_put(gpu->mmu_context); gpu->mmu_context = NULL; return 0;