From: Natalie Vock <nat@pixelcluster.dev>
To: "Felix Kuehling" <Felix.Kuehling@amd.com>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"David Airlie" <airlied@gmail.com>,
"Simona Vetter" <simona@ffwll.ch>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"Timur Kristóf" <timur.kristof@gmail.com>
Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org,
Natalie Vock <nat@pixelcluster.dev>
Subject: [PATCH v2 07/10] drm/amdgpu: Move some VA op validation to a helper
Date: Tue, 17 Nov 2026 13:50:13 +0100 [thread overview]
Message-ID: <20261117-prt-explicit-sync-v2-7-bb3851cb6a0c@pixelcluster.dev> (raw)
In-Reply-To: <20261117-prt-explicit-sync-v2-0-bb3851cb6a0c@pixelcluster.dev>
To be reused in a new VA ioctl in a subsequent patch.
Signed-off-by: Natalie Vock <nat@pixelcluster.dev>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 71 +++++++++++++++++++--------------
1 file changed, 40 insertions(+), 31 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 39c72bfb73e71..fb7abb095b8ec 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -878,9 +878,11 @@ amdgpu_gem_va_update_vm(struct amdgpu_vm_update_ctx *ctx,
return fence;
}
-int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
- struct drm_file *filp)
+static int amdgpu_gem_va_validate_args(struct amdgpu_device *adev, uint64_t va,
+ uint64_t size, uint32_t flags)
{
+ uint64_t vm_size, map_end;
+
const uint32_t valid_flags = AMDGPU_VM_DELAY_UPDATE |
AMDGPU_VM_PAGE_READABLE | AMDGPU_VM_PAGE_WRITEABLE |
AMDGPU_VM_PAGE_EXECUTABLE | AMDGPU_VM_MTYPE_MASK |
@@ -888,53 +890,60 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
const uint32_t prt_flags = AMDGPU_VM_DELAY_UPDATE |
AMDGPU_VM_PAGE_PRT;
- struct drm_amdgpu_gem_va *args = data;
- struct drm_gem_object *gobj;
- struct amdgpu_device *adev = drm_to_adev(dev);
- struct amdgpu_fpriv *fpriv = filp->driver_priv;
- struct amdgpu_bo *abo;
- struct amdgpu_bo_va *bo_va;
- struct drm_syncobj *timeline_syncobj = NULL;
- struct dma_fence_chain *timeline_chain = NULL;
- struct amdgpu_vm_update_ctx update_ctx;
- struct drm_exec exec;
- uint64_t vm_size, tmp;
- int r = 0;
-
- /* Validate virtual address range against reserved regions. */
- if (args->va_address < AMDGPU_VA_RESERVED_BOTTOM) {
- dev_dbg(dev->dev,
+ if (va < AMDGPU_VA_RESERVED_BOTTOM) {
+ dev_dbg(adev_to_drm(adev)->dev,
"va_address 0x%llx is in reserved area 0x%llx\n",
- args->va_address, AMDGPU_VA_RESERVED_BOTTOM);
+ va, AMDGPU_VA_RESERVED_BOTTOM);
return -EINVAL;
}
- if (args->va_address >= AMDGPU_GMC_HOLE_START &&
- args->va_address < AMDGPU_GMC_HOLE_END) {
- dev_dbg(dev->dev,
+ if (va >= AMDGPU_GMC_HOLE_START && va < AMDGPU_GMC_HOLE_END) {
+ dev_dbg(adev_to_drm(adev)->dev,
"va_address 0x%llx is in VA hole 0x%llx-0x%llx\n",
- args->va_address, AMDGPU_GMC_HOLE_START,
+ va, AMDGPU_GMC_HOLE_START,
AMDGPU_GMC_HOLE_END);
return -EINVAL;
}
- args->va_address &= AMDGPU_GMC_HOLE_MASK;
-
vm_size = adev->vm_manager.max_pfn * AMDGPU_GPU_PAGE_SIZE;
vm_size -= AMDGPU_VA_RESERVED_TOP;
- if (check_add_overflow(args->va_address, args->map_size, &tmp) || tmp > vm_size) {
- dev_dbg(dev->dev,
+ if (check_add_overflow(va & AMDGPU_GMC_HOLE_MASK, size, &map_end) || map_end > vm_size) {
+ dev_dbg(adev_to_drm(adev)->dev,
"va_address 0x%llx is in top reserved area 0x%llx\n",
- args->va_address + args->map_size, vm_size);
+ va + size, vm_size);
return -EINVAL;
}
- if ((args->flags & ~valid_flags) && (args->flags & ~prt_flags)) {
- dev_dbg(dev->dev, "invalid flags combination 0x%08X\n",
- args->flags);
+ if ((flags & ~valid_flags) && (flags & ~prt_flags)) {
+ dev_dbg(adev_to_drm(adev)->dev, "invalid flags combination 0x%08X\n",
+ flags);
return -EINVAL;
}
+ return 0;
+}
+
+int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *filp)
+{
+ struct drm_amdgpu_gem_va *args = data;
+ struct drm_gem_object *gobj;
+ struct amdgpu_device *adev = drm_to_adev(dev);
+ struct amdgpu_fpriv *fpriv = filp->driver_priv;
+ struct amdgpu_bo *abo;
+ struct amdgpu_bo_va *bo_va;
+ struct drm_syncobj *timeline_syncobj = NULL;
+ struct dma_fence_chain *timeline_chain = NULL;
+ struct amdgpu_vm_update_ctx update_ctx;
+ struct drm_exec exec;
+ int r = 0;
+
+ r = amdgpu_gem_va_validate_args(adev, args->va_address, args->map_size, args->flags);
+ if (r)
+ return r;
+
+ args->va_address &= AMDGPU_GMC_HOLE_MASK;
+
/* Validate operation type. */
switch (args->operation) {
case AMDGPU_VA_OP_MAP:
--
2.56.1
next prev parent reply other threads:[~2026-11-17 12:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 12:50 [PATCH v2 00/10] drm/amdgpu: Rework VM update ops for batching and explicit sync Natalie Vock
2026-11-17 12:50 ` [PATCH v2 01/10] drm/amdgpu: Remove unused parameter from amdgpu_vm_pte_fragment Natalie Vock
2026-11-17 12:50 ` [PATCH v2 02/10] drm/amdgpu: Add and use vm_update_ctx struct Natalie Vock
2026-11-17 13:26 ` sashiko-bot
2026-11-17 12:50 ` [PATCH v2 03/10] drm/amdgpu: Make VM maps pending per update context Natalie Vock
2026-11-17 13:43 ` sashiko-bot
2026-11-17 12:50 ` [PATCH v2 04/10] drm/amdgpu: Make removed/cleared mappings " Natalie Vock
2026-11-17 14:05 ` sashiko-bot
2026-11-17 12:50 ` [PATCH v2 05/10] drm/amdgpu: Track dirty bo_va structures in update ctx Natalie Vock
2026-11-17 14:28 ` sashiko-bot
2026-11-17 12:50 ` [PATCH v2 06/10] drm/amdgpu: Add function to roll back a VM " Natalie Vock
2026-11-17 14:40 ` sashiko-bot
2026-11-17 12:50 ` Natalie Vock [this message]
2026-11-17 12:50 ` [PATCH v2 08/10] drm/amdgpu: Only reject conflicting mappings if they are not cleared Natalie Vock
2026-11-17 15:06 ` sashiko-bot
2026-11-17 12:50 ` [PATCH v2 09/10] drm/amdgpu: Add new AMDGPU_GEM_VA2 ioctl Natalie Vock
2026-11-17 15:34 ` sashiko-bot
2026-11-17 22:46 ` Dave Airlie
2026-11-17 12:50 ` [PATCH v2 10/10] drm/amdgpu: Bump minor version Natalie Vock
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=20261117-prt-explicit-sync-v2-7-bb3851cb6a0c@pixelcluster.dev \
--to=nat@pixelcluster.dev \
--cc=Felix.Kuehling@amd.com \
--cc=airlied@gmail.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=simona@ffwll.ch \
--cc=timur.kristof@gmail.com \
--cc=tzimmermann@suse.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.