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=1795060050; b=lmXpKGqVqltSmt6y7ADS9/VM/tWYXXPjpbEOWy/+YuK0w3TKs1iCbBL6T6fXPzLbi3hG opba+KDnpCGo6rI8BD8hE4cFHI3FVXJWDIQzVjlzFD3kLhe80e5wnnwq8M9cLLEKJlmbt KaETB04ksx8g0dyQjLkgsxnxYWgSn5BaLfQHFUGIXpLhHOfuHx3VBUK+ZoPy1SxdZtqV1 zYCa1y9hsXQzuf0mYTOOg2Z6omPicKfVhZOg5MCyG/uBYEYCtwLUtjslQv0Ux/X8zonRX 3YdoVMR8wCxuT4CbzT5HeNOenafuq9wydiCrciieuyIcNOFPCnhIxQV8aYxkAuxDRsg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795060050; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=eA7b5F/eEi4QDtRSeOQ4v+efLqyaaUy9tZWDItYhZNA=; b=lrhyoUDBzp8z+Z8BZuGQ+QHRKhc3H/6uHRfktyuug9Y2gAfqzPhCfnZIWp8y2HD2JKaA fPme0kOWiQJgtoA0iyo7dXxCihjYE/UtlFVckWACvXLu4aR5q10dc2otui3zMnPuSx3Mj +Re33RMcCqlrLUDDbys6oscHbxx4r195xkmGMPZ6k+1ajmjQGLQWXzRF2VQsZQ1WHEkQm /lSK4pUZ6viC7lOA5z6SfTiAs6KbYfvynY2ihr+QupuyUcGBm6/jksGkaFzbIyqjbH6f5 uJ2XonslOLshyqx+LLfqfCpULMNuGsXBVMYtTBKFTBRoRFFmK9vC8mgVStb5LnnF2DQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=bqQQA9vk; 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 34FFF606A320; Thu, 19 Nov 2026 03:47:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=bqQQA9vk Received: by smtp.kernel.org (Postfix) with ESMTPSA id 56BAF1F000C4; Thu, 19 Nov 2026 03:47:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795060049; bh=eA7b5F/eEi4QDtRSeOQ4v+efLqyaaUy9tZWDItYhZNA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bqQQA9vkcnYftnmAk74UB8ocIT+CG4+nb0+vZa8NpP8tPDoOqb3J+7lbXxC8gRzO5 XrwUCwHwhtOdr9fpqGscdW5uwtDNZ7iT7+fZ6vPdQOi8S426anTOZwJkxEwOgdDoo8 EmpHquG5sT/2sIGS8PQVmlCHMo7X0gfoJ1HyqFbY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Christian=20K=C3=B6nig?= , Jesse Zhang , Alex Deucher , Sasha Levin Subject: [PATCH 5.10 1058/1848] drm/amdgpu: keep the CS user fence BO in GTT Date: Wed, 18 Nov 2026 15:51:36 +0100 Message-ID: <20261118150001.746545159@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev 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 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jesse Zhang [ Upstream commit 7a56d929dc2304edaa6231e1eb5eb82b7e8b74a9 ] The CS ioctl hands the GPU the GART address of the user fence BO, but since the BO keeps its own preferred and allowed domains, it no longer makes sure the BO is in GTT. A user fence in a VRAM BO, which only needs to be a page in size, gets its address from amdgpu_bo_gpu_offset(), which warns about non-contiguous VRAM. On navi31, a CS with a user fence in a 4K VRAM BO, or in one created with AMDGPU_GEM_CREATE_VM_ALWAYS_VALID: WARNING: amdgpu_object.c:1531 at amdgpu_bo_gpu_offset+0x86/0xb0 [amdgpu], CPU#11: cs_gem_checks/18393 RIP: 0010:amdgpu_bo_gpu_offset+0x86/0xb0 [amdgpu] Call Trace: amdgpu_cs_parser_bos.isra.0+0x4eb/0x850 [amdgpu] amdgpu_cs_ioctl+0x97e/0x2510 [amdgpu] drm_ioctl_kernel+0xac/0x110 [drm] drm_ioctl+0x2c6/0x5b0 [drm] __x64_sys_ioctl+0xa0/0xf0 do_syscall_64+0xa3/0x4d0 entry_SYSCALL_64_after_hwframe+0x76/0x7e and BOs which can't be in GTT at all, like GWS or OA ones of a page in size, pass the checks as well. Only take BOs which can't be anywhere else than in GTT as user fence, which the CS then validates there along with its other BOs. While at it, detect userptrs with amdgpu_ttm_tt_is_userptr(); amdgpu_ttm_tt_get_usermm() returns NULL once the task which created the userptr is gone. v2: only take BOs which can only be in GTT instead of special casing the user fence BO in the validation, use amdgpu_ttm_tt_is_userptr() (Christian) Reviewed-by: Christian König Signed-off-by: Jesse Zhang Signed-off-by: Alex Deucher (cherry picked from commit f16989def9561d04d0f2e77216f5319112d29bf1) Cc: stable@vger.kernel.org [ sashal: adapted p->uf_bo accesses to the local bo variable in amdgpu_cs_user_fence_chunk() ] Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 40146957996f0..38491f05c9d39 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -62,7 +62,12 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p, if (size != PAGE_SIZE || data->offset > (size - 8)) return -EINVAL; - if (amdgpu_ttm_tt_get_usermm(bo->tbo.ttm)) + if (amdgpu_ttm_tt_is_userptr(bo->tbo.ttm)) + return -EINVAL; + + /* The GPU writes the user fence through the GART */ + if (bo->preferred_domains != AMDGPU_GEM_DOMAIN_GTT && + bo->allowed_domains != AMDGPU_GEM_DOMAIN_GTT) return -EINVAL; *offset = data->offset; -- 2.53.0