Skip to content

Commit 475d06e

Browse files
matt-auldrodrigovivi
authored andcommitted
drm/xe/userptr: properly setup pfn_flags_mask
Currently we just leave it uninitialised, which at first looks harmless, however we also don't zero out the pfn array, and with pfn_flags_mask the idea is to be able set individual flags for a given range of pfn or completely ignore them, outside of default_flags. So here we end up with pfn[i] & pfn_flags_mask, and if both are uninitialised we might get back an unexpected flags value, like asking for read only with default_flags, but getting back write on top, leading to potentially bogus behaviour. To fix this ensure we zero the pfn_flags_mask, such that hmm only considers the default_flags and not also the initial pfn[i] value. v2 (Thomas): - Prefer proper initializer. Fixes: 81e058a ("drm/xe: Introduce helper to populate userptr") Signed-off-by: Matthew Auld <matthew.auld@intel.com> Cc: Matthew Brost <matthew.brost@intel.com> Cc: Thomas Hellström <thomas.hellstrom@intel.com> Cc: <stable@vger.kernel.org> # v6.10+ Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> Reviewed-by: Tejas Upadhyay <tejas.upadhyay@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20250226174748.294285-2-matthew.auld@intel.com (cherry picked from commit dd8c01e) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1 parent 30bfc15 commit 475d06e

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

drivers/gpu/drm/xe/xe_hmm.c

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -166,13 +166,20 @@ int xe_hmm_userptr_populate_range(struct xe_userptr_vma *uvma,
166166
{
167167
unsigned long timeout =
168168
jiffies + msecs_to_jiffies(HMM_RANGE_DEFAULT_TIMEOUT);
169-
unsigned long *pfns, flags = HMM_PFN_REQ_FAULT;
169+
unsigned long *pfns;
170170
struct xe_userptr *userptr;
171171
struct xe_vma *vma = &uvma->vma;
172172
u64 userptr_start = xe_vma_userptr(vma);
173173
u64 userptr_end = userptr_start + xe_vma_size(vma);
174174
struct xe_vm *vm = xe_vma_vm(vma);
175-
struct hmm_range hmm_range;
175+
struct hmm_range hmm_range = {
176+
.pfn_flags_mask = 0, /* ignore pfns */
177+
.default_flags = HMM_PFN_REQ_FAULT,
178+
.start = userptr_start,
179+
.end = userptr_end,
180+
.notifier = &uvma->userptr.notifier,
181+
.dev_private_owner = vm->xe,
182+
};
176183
bool write = !xe_vma_read_only(vma);
177184
unsigned long notifier_seq;
178185
u64 npages;
@@ -199,19 +206,14 @@ int xe_hmm_userptr_populate_range(struct xe_userptr_vma *uvma,
199206
return -ENOMEM;
200207

201208
if (write)
202-
flags |= HMM_PFN_REQ_WRITE;
209+
hmm_range.default_flags |= HMM_PFN_REQ_WRITE;
203210

204211
if (!mmget_not_zero(userptr->notifier.mm)) {
205212
ret = -EFAULT;
206213
goto free_pfns;
207214
}
208215

209-
hmm_range.default_flags = flags;
210216
hmm_range.hmm_pfns = pfns;
211-
hmm_range.notifier = &userptr->notifier;
212-
hmm_range.start = userptr_start;
213-
hmm_range.end = userptr_end;
214-
hmm_range.dev_private_owner = vm->xe;
215217

216218
while (true) {
217219
hmm_range.notifier_seq = mmu_interval_read_begin(&userptr->notifier);

0 commit comments

Comments
 (0)