Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE741411FB2; Mon, 17 Aug 2026 14:28:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786976926; cv=none; b=meiNCEaosCM4h1gKI0CrJXWoWFpQEcMFmY1uuOFyUN9QUxYhBbPR3FPqSLVAr/pSgzMc38y1wLVwwrijCdjnCyviaRFQIIWRliiT+SIHShEgUEUtO/5WnlDekJWu4GONcgCEeCu25vL/9PeGN7Tz2QihavN/JUBq72LlehoR/1Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786976926; c=relaxed/simple; bh=8ZXHWS+5ZR5rFn3UpoXAzr90etpbyM46B0ptf+45EZY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=mIhoa7aLwcSgkIK6r5CmXgz5TgofqoZ6tU7IrRQ0JB8fR+YGU1HeDOz2yaC2Zwr7TsB/PDJnAd/22GCgZx0ZM5a6zBjA8O1oAnCbdbaZ83KOazPS92KEXzz72SFPeIOynWpKds/COW815Bwt0g04kBme0iXxEk1w9nMDMoiQ83Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Y3l/99oi; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Y3l/99oi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13D771F000E9; Mon, 17 Aug 2026 14:28:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1786976925; bh=ldaAoXdG+ol+Fc57tXCH2BsDFo8f3EU4icLNtbeKCpI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Y3l/99oiUgzwTh9UuXyQ20ZqrJuHp3awjdKPWXs6shKcdC2I95M69PvtEY8RDaRe5 LEu5bFl7zpBcENypEXrlu0KtTcj8lpSNhuRmzMbMVApi78cDb4vUdKLulwkD/oNHff 7y2oDvgddDYBRYU6mMmzT0Y3m2xz8n7ZQVup7CSU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zhu Lingshan , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 5.15 153/456] drm/amdgpu: fix bo->pin leaking in amdgpu_bo_create_reserved Date: Mon, 17 Aug 2026 15:29:03 +0200 Message-ID: <20260817132546.069890046@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260817132539.792407575@linuxfoundation.org> References: <20260817132539.792407575@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhu Lingshan commit a2f895f3c852063258d62e9f74b081de07ca95df upstream. amdgpu_bo_create_reserved() only allocates a new BO when *bo_ptr (struct amdgpu_bo **bo_ptr as input parameter) is NULL, it simply skips creation when *bo_ptr is non-NULL. But it unconditionally reserves, pins, gart allocates and maps the BO afterwards. When the same non-NULL BO pointer is passed in again, for example firmware buffers that live in adev and are re-loaded on every resume / cp_resume / start under AMDGPU_FW_LOAD_DIRECT, amdgpu_bo_pin() just increases pin_count unconditionally, however the matching teardown only unpins once, so pin_count never drops to zero, so TTM is not able to move, swap or evict a BO, causing BO leaks. This commit fixes this issue by only pinning the bo once at creation, and repeated calls no longer take additional pin references. Signed-off-by: Zhu Lingshan Reviewed-by: Alex Deucher Reviewed-by: Christian König Signed-off-by: Alex Deucher (cherry picked from commit 3ddc0ae76202c447b6aec61e907b852bc94671cf) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -266,10 +266,12 @@ int amdgpu_bo_create_reserved(struct amd goto error_free; } - r = amdgpu_bo_pin(*bo_ptr, domain); - if (r) { - dev_err(adev->dev, "(%d) kernel bo pin failed\n", r); - goto error_unreserve; + if (free) { + r = amdgpu_bo_pin(*bo_ptr, domain); + if (r) { + dev_err(adev->dev, "(%d) kernel bo pin failed\n", r); + goto error_unreserve; + } } r = amdgpu_ttm_alloc_gart(&(*bo_ptr)->tbo); @@ -292,7 +294,8 @@ int amdgpu_bo_create_reserved(struct amd return 0; error_unpin: - amdgpu_bo_unpin(*bo_ptr); + if (free) + amdgpu_bo_unpin(*bo_ptr); error_unreserve: amdgpu_bo_unreserve(*bo_ptr);