Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3674771pxb; Mon, 24 Jan 2022 15:04:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJxAD99z8cP1Xjczc8cukKs65xhxxkHv0DuvOPZkwPrYMwWv25OwqxHlaQqhhLa/8vd1huYA X-Received: by 2002:a17:902:7609:b0:148:daa5:8133 with SMTP id k9-20020a170902760900b00148daa58133mr16030566pll.48.1643065460800; Mon, 24 Jan 2022 15:04:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643065460; cv=none; d=google.com; s=arc-20160816; b=mgrTtMPu6XCXTpJACt4/Oo75V+qjvQ56deXNYrzCswkFkj9dqv9w61y15vJkZ/efDN rZEF88UPHPzmb+Kx8M0bacdCUcG1YA3MZSXqw+gA6fQquOXQWAxzjd+eHIBadllyd2iS XOscJlvhnLnzbCbScLXnoAf/iyrZgN3JzPbtDmnY4mzHvipNoPZ5Ue3Q2uH3571LXDIN RpZa5ZOePRTIrAgZSaRi5+gTvqP1Qnv6cv9xRaoY6DPiljAiQER7tPKwsI245JnM+bTd n7Gfstk+ZbFaHztUSLBeTny80pnukPBclfobevxqDUMHWD4YLZjy0ABZ5NQetwn/ki6W qTdA== 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=nkI8Jh5QJtQyVmA1kTWw07PuuTPyQFWnl8eahj8q+Tg=; b=Uac0FUBv3DNcWajzJbT1xl7+fJSY1H88szPL49LzovfM9zH75E4tFwY010022BuHzi u6lz/STiuZFxuqE6JSf3msObst9bkr+U6/y3k+eGig2ngfkoG0rCj5/HUzG6zoxrmi+W qvnoc/qqUQPe1ZwBS+/VQF/lxS5+mdX9ZOW3uBZXciHbinA7ff5buloTKsIO4zVUH47x 4b0hQtjWnVlJxMhdL+O6EUx6soOgjVPXeqb3/8KiQJhozDwFmS/JkatQfR5XRdEMj8X4 yxFc0uwuKBNFsSQe+BtOz/a4dXweUpZwTer1WXY1Fx/1K8wovLFE5zoQh2yZRi1Ah8rc Rm3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yOtVvsXF; 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 p12si12481672pla.537.2022.01.24.15.04.08; Mon, 24 Jan 2022 15:04:20 -0800 (PST) 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=yOtVvsXF; 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 S1841035AbiAXW5Y (ORCPT + 99 others); Mon, 24 Jan 2022 17:57:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1458137AbiAXVzI (ORCPT ); Mon, 24 Jan 2022 16:55:08 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2EF70C07E2AE; Mon, 24 Jan 2022 12:37:42 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BA5376154F; Mon, 24 Jan 2022 20:37:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A52AC340E5; Mon, 24 Jan 2022 20:37:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643056661; bh=LSCFijlqwDVH3dQEdv7hVOW/AfBT0FrxVmDG8/uNt/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yOtVvsXFkBlXMTQS6hX6Pm/wENA3aLGJlq9Ves5YBhfcjTbdYw6Ld/GnGKtgLmSpi mUSYCB38X+R8dswh2tyvsmdJtLcHQGhc3gc99pEqX3AiXhp7pokYe/lk2vRnLcMOAN MVyqRJQEYBvc3Ba2kQLbyJ3P1jMpbF+90vqAmSOI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jingwen Chen , Horace Chen , Alex Deucher , Sasha Levin Subject: [PATCH 5.15 558/846] drm/amd/amdgpu: fix gmc bo pin count leak in SRIOV Date: Mon, 24 Jan 2022 19:41:15 +0100 Message-Id: <20220124184120.277980117@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184100.867127425@linuxfoundation.org> References: <20220124184100.867127425@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: Jingwen Chen [ Upstream commit 948e7ce01413b71395723aaf846015062aea3a43 ] [Why] gmc bo will be pinned during loading amdgpu and reset in SRIOV while only unpinned in unload amdgpu [How] add amdgpu_in_reset and sriov judgement to skip pin bo v2: fix wrong judgement Signed-off-by: Jingwen Chen Reviewed-by: Horace Chen Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 4 ++++ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c index e47104a1f5596..3c01be6610144 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c @@ -1021,10 +1021,14 @@ static int gmc_v10_0_gart_enable(struct amdgpu_device *adev) return -EINVAL; } + if (amdgpu_sriov_vf(adev) && amdgpu_in_reset(adev)) + goto skip_pin_bo; + r = amdgpu_gart_table_vram_pin(adev); if (r) return r; +skip_pin_bo: r = adev->gfxhub.funcs->gart_enable(adev); if (r) return r; diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c index 5551359d5dfdc..b5d93247237b1 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c @@ -1708,10 +1708,14 @@ static int gmc_v9_0_gart_enable(struct amdgpu_device *adev) return -EINVAL; } + if (amdgpu_sriov_vf(adev) && amdgpu_in_reset(adev)) + goto skip_pin_bo; + r = amdgpu_gart_table_vram_pin(adev); if (r) return r; +skip_pin_bo: r = adev->gfxhub.funcs->gart_enable(adev); if (r) return r; -- 2.34.1