Skip to content

Commit 756eed0

Browse files
trueptolemytursulin
authored andcommitted
drm/i915: Use kmap_local_page() in gem/i915_gem_shmem.c
The use of kmap_atomic() is being deprecated in favor of kmap_local_page()[1]. The main difference between atomic and local mappings is that local mappings doesn't disable page faults or preemption (the preemption is disabled for !PREEMPT_RT case, otherwise it only disables migration). With kmap_local_page(), we can avoid the often unwanted side effect of unnecessary page faults or preemption disables. In drm/i915/gem/i915_gem_shmem.c, the function shmem_pwrite() need to disable pagefault to eliminate the potential recursion fault[2]. But here __copy_from_user_inatomic() doesn't need to disable preemption and local mapping is valid for sched in/out. So it can use kmap_local_page() / kunmap_local() with pagefault_disable() / pagefault_enable() to replace atomic mapping. [1]: https://lore.kernel.org/all/20220813220034.806698-1-ira.weiny@intel.com [2]: https://patchwork.freedesktop.org/patch/295840/ Suggested-by: Ira Weiny <ira.weiny@intel.com> Suggested-by: Fabio M. De Francesco <fmdefrancesco@gmail.com> Signed-off-by: Zhao Liu <zhao1.liu@intel.com> Reviewed-by: Ira Weiny <ira.weiny@intel.com> Reviewed-by: Fabio M. De Francesco <fmdefrancesco@gmail.com> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231203132947.2328805-4-zhao1.liu@linux.intel.com
1 parent f4d8890 commit 756eed0

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/gpu/drm/i915/gem/i915_gem_shmem.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,11 +485,13 @@ shmem_pwrite(struct drm_i915_gem_object *obj,
485485
if (err < 0)
486486
return err;
487487

488-
vaddr = kmap_atomic(page);
488+
vaddr = kmap_local_page(page);
489+
pagefault_disable();
489490
unwritten = __copy_from_user_inatomic(vaddr + pg,
490491
user_data,
491492
len);
492-
kunmap_atomic(vaddr);
493+
pagefault_enable();
494+
kunmap_local(vaddr);
493495

494496
err = aops->write_end(obj->base.filp, mapping, offset, len,
495497
len - unwritten, page, data);

0 commit comments

Comments
 (0)