From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794047100; b=g93z/7kTaGKnYp0GWKBFrwmhb2puHELdm5FI+g4gRIEIp2BEX0EOhlaTkeodzwPK73zO /Z15Tn3k4z1ZZYRYuZNMoHhAFbclHzkDXWnoP0ERjARdZVWN9adkAp72vscjlg9Qc1QNL hn2drxX3S9XDwLdsq+YWKCdyh5ieloezN/zImwTrtJCBe8j+eNzxJ5dusJ2O3ryiK8kkp 8AHaecZOp5LVoEdp3s4w9wDiwFTsNkY0wM/8ze9jp271asXXfR6oyGnvmSwf4H12V6bod 0UuTht9a5Yf/t7O58Bqt10KjBPHMChIUjAZHRvEG/Vd4/GcMWxGJFvpIRcOVpwSc29w== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794047100; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=z9R7/DD488Y++VanRvb1ykZuJf72MdP9JbZJhX2LsBs=; b=sNkGDer4ZTnTWGYjoggjk36d/z1fPzIi2gIRqGmAaYFyZ52kVLOcMFA2qDPbXg4/Q6Xe je1c5opZSZB9RPS5YBAQks2mhYR39/4xcvBbc0B85xTFPtAGU+064x50XI+w0Be2mBitB uyW0BdY9Al/9P2euJMaSymnwK0OEN66lws4TRzMEY8G2Rwm8vLftXksnXo2nXLHdJfTzv 4fejwY0Y7r8eEgNvlVXmntI1fpR8/1NRDAYnf2dfTikx3sjQawzrIoBfROFuZYVfqlEmJ c8jKdPP72hLhL4fngH8WDZ0VjzeORMMtts1JuopbTJ+duIKRD6jWtEarHx9Cx1I10Tg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b="VP0Edrz/"; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 900EF606A32E for ; Sat, 7 Nov 2026 10:25:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=VP0Edrz/ Received: by smtp.kernel.org (Postfix) with ESMTPSA id E70881F0089F; Sat, 7 Nov 2026 10:24:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794047100; bh=z9R7/DD488Y++VanRvb1ykZuJf72MdP9JbZJhX2LsBs=; h=From:To:Cc:Subject:Date; b=VP0Edrz/i5H1azSxH7zJ23vkkiWEYW+IhwKuQN8wveK0fdxmxah0QSMQ4ddA5gk4D PHRgOW1sTfp83oukS9i5o5JEhueUfCShAjurKVL2zEb26lh9zeHcnwbf8PWocg9HZI aZzfeE3lBn0cWHfv5/4kLc0ykgU8wW/mTJfMZmyKvtF2kPi6fsYdSjkPsWpsc+Xcfk P7WAFexYsC4oGYNSsq0xDF//A/vGlj1dPMaiNiazOriXzhrRi/cvAIC/7ecFH/jvHH X4heWHwGwUdjkKqVH0LMFpjx/h1wd3qb5CU7LYrlmSo8AYrgc7lB7zMF4sw4eD5d0A 7VQIv9xxcGarw== From: Sasha Levin To: daniel.phillips@amd.com, felix.kuehling@amd.com, alexander.deucher@amd.com Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] amdkfd: Fix memory availability double accounting of kfd pinned objects" failed to apply to 6.12-stable tree Date: Sat, 7 Nov 2026 05:24:58 -0500 Message-ID: <20261107052458-failed-6.12-16df12d7158f@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.12-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y git checkout FETCH_HEAD git cherry-pick -x 16df12d7158fb55f20d6e985abd1996cbabab9f8 # git commit -s git send-email --to '' --in-reply-to '20261107052458-failed-6.12-16df12d7158f@kernel.org' --subject-prefix 'PATCH 6.12.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 16df12d7158fb55f20d6e985abd1996cbabab9f8 Mon Sep 17 00:00:00 2001 From: Daniel Phillips Date: Sun, 5 Mar 2023 22:54:35 -0800 Subject: [PATCH] amdkfd: Fix memory availability double accounting of kfd pinned objects Pinned objects that are not kfd objects reduce the total vram available to kfd, so we subtract the total size of pinned objects from kdf vram availability. However this double counts objects pinned by kfd itself, because they are counted both as used and pinned. So track the total size of objects pinned by kfd and add it back to kfd availability to remove the double accounting. Signed-off-by: Daniel Phillips Reviewed-by: Felix Kuehling Signed-off-by: Alex Deucher (cherry picked from commit b8257bdb26ca5d9a75f4b81f629422f17afa221b) Cc: stable@vger.kernel.org --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h index e3da382ceb3c0..a53d7e4a1eb5c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h @@ -106,6 +106,7 @@ struct amdgpu_kfd_dev { struct kfd_dev *dev; int64_t vram_used[MAX_XCP]; uint64_t vram_used_aligned[MAX_XCP]; + atomic64_t vram_pinned; bool init_complete; struct work_struct reset_work; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c index 9a7e14a3c7197..129acb88dc11e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c @@ -1536,6 +1536,11 @@ static int amdgpu_amdkfd_gpuvm_pin_bo(struct amdgpu_bo *bo, u32 domain) pr_err("Error in Pinning BO to domain: %d\n", domain); amdgpu_bo_sync_wait(bo, AMDGPU_FENCE_OWNER_KFD, false); + + if (!ret && bo->tbo.resource->mem_type == TTM_PL_VRAM) + atomic64_add(amdgpu_bo_size(bo), + &amdgpu_ttm_adev(bo->tbo.bdev)->kfd.vram_pinned); + out: amdgpu_bo_unreserve(bo); return ret; @@ -1558,6 +1563,11 @@ static void amdgpu_amdkfd_gpuvm_unpin_bo(struct amdgpu_bo *bo) return; amdgpu_bo_unpin(bo); + + if (bo->tbo.resource->mem_type == TTM_PL_VRAM) + atomic64_sub(amdgpu_bo_size(bo), + &amdgpu_ttm_adev(bo->tbo.bdev)->kfd.vram_pinned); + amdgpu_bo_unreserve(bo); } @@ -1679,6 +1689,7 @@ size_t amdgpu_amdkfd_get_available_memory(struct amdgpu_device *adev, vram_available = KFD_XCP_MEMORY_SIZE(adev, xcp_id) - adev->kfd.vram_used_aligned[xcp_id] - atomic64_read(&adev->vram_pin_size) + + atomic64_read(&adev->kfd.vram_pinned) - reserved_for_pt - reserved_for_ras; -- 2.53.0