drm/xe/madvise: Accept canonical GPU addresses in xe_vm_madvise_ioctl

Userspace passes canonical (sign-extended) GPU addresses where bits 63:48
mirror bit 47. The internal GPUVM uses non-canonical form (upper bits
zeroed), so passing raw canonical addresses into GPUVM lookups causes
mismatches for addresses above 128TiB.

Strip the sign extension with xe_device_uncanonicalize_addr() at the
top of xe_vm_madvise_ioctl(). Non-canonical addresses are unaffected.

Fixes: ada7486c5668 ("drm/xe: Implement madvise ioctl for xe")
Suggested-by: Matthew Brost <matthew.brost@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Signed-off-by: Arvind Yadav <arvind.yadav@intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patch.msgid.link/20260326130843.3545241-13-arvind.yadav@intel.com
(cherry picked from commit 05c8b1cdc54036465ea457a0501a8c2f9409fce7)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_vm_madvise.c b/drivers/gpu/drm/xe/xe_vm_madvise.c
index bc39a9a9790c3c835dccd1502896e85a1bf98190..b4086129a3648c73e8682312329d232ad39a8614 100644 (file)
--- a/drivers/gpu/drm/xe/xe_vm_madvise.c
+++ b/drivers/gpu/drm/xe/xe_vm_madvise.c
@@ -408,8 +408,15 @@ int xe_vm_madvise_ioctl(struct drm_device *dev, void *data, struct drm_file *fil
        struct xe_device *xe = to_xe_device(dev);
        struct xe_file *xef = to_xe_file(file);
        struct drm_xe_madvise *args = data;
-       struct xe_vmas_in_madvise_range madvise_range = {.addr = args->start,
-                                                        .range =  args->range, };
+       struct xe_vmas_in_madvise_range madvise_range = {
+               /*
+                * Userspace may pass canonical (sign-extended) addresses.
+                * Strip the sign extension to get the internal non-canonical
+                * form used by the GPUVM, matching xe_vm_bind_ioctl() behavior.
+                */
+               .addr = xe_device_uncanonicalize_addr(xe, args->start),
+               .range = args->range,
+       };
        struct xe_madvise_details details;
        struct xe_vm *vm;
        struct drm_exec exec;
@@ -439,7 +446,7 @@ int xe_vm_madvise_ioctl(struct drm_device *dev, void *data, struct drm_file *fil
        if (err)
                goto unlock_vm;
 
-       err = xe_vm_alloc_madvise_vma(vm, args->start, args->range);
+       err = xe_vm_alloc_madvise_vma(vm, madvise_range.addr, args->range);
        if (err)
                goto madv_fini;
 
@@ -482,7 +489,8 @@ int xe_vm_madvise_ioctl(struct drm_device *dev, void *data, struct drm_file *fil
        madvise_funcs[attr_type](xe, vm, madvise_range.vmas, madvise_range.num_vmas, args,
                                 &details);
 
-       err = xe_vm_invalidate_madvise_range(vm, args->start, args->start + args->range);
+       err = xe_vm_invalidate_madvise_range(vm, madvise_range.addr,
+                                            madvise_range.addr + args->range);
 
        if (madvise_range.has_svm_userptr_vmas)
                xe_svm_notifier_unlock(vm);