[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20251112072910.3716944-6-honglei1.huang@amd.com>
Date: Wed, 12 Nov 2025 15:29:10 +0800
From: Honglei Huang <honglei1.huang@....com>
To: <Felix.Kuehling@....com>, <alexander.deucher@....com>,
<christian.koenig@....com>, <Ray.Huang@....com>
CC: <dmitry.osipenko@...labora.com>, <Xinhui.Pan@....com>,
<airlied@...il.com>, <daniel@...ll.ch>, <amd-gfx@...ts.freedesktop.org>,
<dri-devel@...ts.freedesktop.org>, <linux-kernel@...r.kernel.org>,
<linux-mm@...ck.org>, <akpm@...ux-foundation.org>, <honghuang@....com>,
Honglei Huang <Honglei1.Huang@....com>
Subject: [PATCH 5/5] drm/amdkfd: Wire up SVM ranges ioctl handler
From: Honglei Huang <Honglei1.Huang@....com>
Implement the kfd_ioctl_svm_ranges() handler that integrates the
SVM ranges functionality:
1. kfd_ioctl_svm_ranges() implementation:
- Validate input parameters (ranges, attributes, addresses)
- Copy range descriptors and attributes from userspace
- Call svm_pin_user_ranges() to pin the specified memory ranges
- Construct kfd_ioctl_svm_args and invoke existing kfd_ioctl_svm()
- Properly handle memory allocation and cleanup on error paths
2. Extend attribute handling:
- svm_range_check_attr(): Accept KFD_IOCTL_SVM_ATTR_MAPPED attribute
- svm_range_apply_attrs(): Set prange->is_map when MAPPED attr present
- svm_range_is_same_attrs(): Force update when MAPPED attribute used
- svm_range_has_mapped_attr(): Helper to detect MAPPED in attr list
3. Register ioctl in amdkfd_ioctls table:
- Add AMDKFD_IOC_SVM_RANGES entry with kfd_ioctl_svm_ranges handler
- No special flags required (use default permissions)
This completes the implementation of batch SVM range registration,
allowing userspace to efficiently register multiple non-contiguous
memory buffers with a single ioctl call.
The implementation reuses existing SVM infrastructure while adding
the ability to handle pre-pinned memory pages, reducing overhead
for applications that need to register many scattered allocations.
Signed-off-by: Honglei Huang <Honglei1.Huang@....com>
---
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 67 ++++++++++++++++++++++++
1 file changed, 67 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index fdf171ad4a3c..7e7e00d3f873 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -1739,6 +1739,70 @@ static int kfd_ioctl_svm(struct file *filep, struct kfd_process *p, void *data)
return r;
}
+
+static int kfd_ioctl_svm_ranges(struct file *filep, struct kfd_process *p,
+ void *data)
+{
+ struct kfd_ioctl_svm_ranges_args *args = data;
+ struct kfd_ioctl_svm_args *svm_args;
+ int r = 0, err;
+ struct kfd_ioctl_svm_range *ranges;
+ size_t sattr;
+
+ if (!args->nranges || !args->ranges_ptr)
+ return -EINVAL;
+ if (!args->start_addr || !args->size)
+ return -EINVAL;
+
+ pr_debug("start 0x%llx size 0x%llx op 0x%x nattr 0x%x nranges 0x%x\n",
+ args->start_addr, args->size, args->op, args->nattr, args->nranges);
+
+ if (args->nranges && args->ranges_ptr) {
+ ranges = kvmalloc_array(args->nranges, sizeof(*ranges),
+ GFP_KERNEL);
+ if (!ranges)
+ return -ENOMEM;
+
+ err = copy_from_user(ranges, (void __user *)args->ranges_ptr,
+ args->nranges * sizeof(*ranges));
+ if (err != 0) {
+ kvfree(ranges);
+ return -EFAULT;
+ }
+
+ r = svm_pin_user_ranges(p, args->start_addr, args->size, ranges,
+ args->nranges);
+
+ kvfree(ranges);
+
+ if (r)
+ return r;
+ }
+
+ sattr = args->nattr * sizeof(struct kfd_ioctl_svm_attribute);
+
+ svm_args = kvmalloc(sizeof(*svm_args) + sattr, GFP_KERNEL);
+ if (!svm_args)
+ return -ENOMEM;
+
+ svm_args->start_addr = args->start_addr;
+ svm_args->size = args->size;
+ svm_args->nattr = args->nattr;
+ svm_args->op = args->op;
+
+ err = copy_from_user(&svm_args->attrs[0], (void __user *)args->attrs_ptr,
+ sattr);
+ if (err != 0) {
+ kvfree(svm_args);
+ return -EFAULT;
+ }
+
+ r = kfd_ioctl_svm(filep, p, svm_args);
+
+ kvfree(svm_args);
+ return r;
+}
+
#else
static int kfd_ioctl_set_xnack_mode(struct file *filep,
struct kfd_process *p, void *data)
@@ -3226,6 +3290,9 @@ static const struct amdkfd_ioctl_desc amdkfd_ioctls[] = {
AMDKFD_IOCTL_DEF(AMDKFD_IOC_DBG_TRAP,
kfd_ioctl_set_debug_trap, 0),
+
+ AMDKFD_IOCTL_DEF(AMDKFD_IOC_SVM_RANGES,
+ kfd_ioctl_svm_ranges, 0),
};
#define AMDKFD_CORE_IOCTL_COUNT ARRAY_SIZE(amdkfd_ioctls)
--
2.34.1
Powered by blists - more mailing lists