From: Zhu Lingshan <lingshan.zhu@amd.com>
To: <Alexander.Deucher@amd.com>, <Christian.Koenig@amd.com>
Cc: <Ray.Huang@amd.com>, <amd-gfx@lists.freedesktop.org>,
Zhu Lingshan <lingshan.zhu@amd.com>
Subject: [PATCH] drm/amdgpu: fix userq page count in input_validate
Date: Fri, 17 Jul 2026 10:25:50 +0800 [thread overview]
Message-ID: <20260717022550.6549-1-lingshan.zhu@amd.com> (raw)
amdgpu_userq_input_va_validate() converts userq
expected_size to page count by right shift.
This undercounts va buffers that less than a page.
For example, in the AMDGPU_HW_IP_COMPUTE userq
creation case, the expected_size 2048,
so size(page count) becomes zero page and the
"va_map->last - user_addr + 1 >= size" is always true
once the start addr locates in the va_map mapping.
A similar case is AMDGPU_HW_IP_DMA, where expected_size is 32.
This commit calculates a proper page count by subtracting
the start_addr and end_addr in pages.
Signed-off-by: Zhu Lingshan <lingshan.zhu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
index 969f49592450..f9f11bdf2cef 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
@@ -25,6 +25,7 @@
#include <drm/drm_auth.h>
#include <drm/drm_exec.h>
#include <linux/pm_runtime.h>
+#include <linux/overflow.h>
#include <drm/drm_drv.h>
#include "amdgpu.h"
@@ -238,14 +239,21 @@ int amdgpu_userq_input_va_validate(struct amdgpu_device *adev,
{
struct amdgpu_bo_va_mapping *va_map;
struct amdgpu_vm *vm = queue->vm;
- u64 user_addr;
+ u64 user_addr, end;
u64 size;
/* Caller must hold vm->root.bo reservation */
dma_resv_assert_held(queue->vm->root.bo->tbo.base.resv);
- user_addr = (addr & AMDGPU_GMC_HOLE_MASK) >> AMDGPU_GPU_PAGE_SHIFT;
- size = expected_size >> AMDGPU_GPU_PAGE_SHIFT;
+ if (!expected_size)
+ return -EINVAL;
+
+ user_addr = addr & AMDGPU_GMC_HOLE_MASK;
+ if (check_add_overflow(user_addr, expected_size - 1, &end))
+ return -EINVAL;
+
+ user_addr >>= AMDGPU_GPU_PAGE_SHIFT;
+ size = (end >> AMDGPU_GPU_PAGE_SHIFT) - user_addr + 1;
va_map = amdgpu_vm_bo_lookup_mapping(vm, user_addr);
if (!va_map)
--
2.53.0
next reply other threads:[~2026-07-17 2:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-17 2:25 Zhu Lingshan [this message]
2026-07-17 8:06 ` [PATCH] drm/amdgpu: fix userq page count in input_validate Christian König
2026-07-20 7:49 ` Zhu, Lingshan
2026-08-06 7:28 ` Zhu, Lingshan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260717022550.6549-1-lingshan.zhu@amd.com \
--to=lingshan.zhu@amd.com \
--cc=Alexander.Deucher@amd.com \
--cc=Christian.Koenig@amd.com \
--cc=Ray.Huang@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox