Skip to content

Commit e6174e8

Browse files
trueptolemytursulin
authored andcommitted
drm/i915: Use kmap_local_page() in gem/i915_gem_object.c
The use of kmap_atomic() is being deprecated in favor of kmap_local_page()[1], and this patch converts the call from kmap_atomic() to kmap_local_page(). 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 and preemption disables. There're 2 reasons why i915_gem_object_read_from_page_kmap() doesn't need to disable pagefaults and preemption for mapping: 1. The flush operation is safe. In drm/i915/gem/i915_gem_object.c, i915_gem_object_read_from_page_kmap() calls drm_clflush_virt_range() to use CLFLUSHOPT or WBINVD to flush. Since CLFLUSHOPT is global on x86 and WBINVD is called on each cpu in drm_clflush_virt_range(), the flush operation is global. 2. Any context switch caused by preemption or page faults (page fault may cause sleep) doesn't affect the validity of local mapping. Therefore, i915_gem_object_read_from_page_kmap() is a function where the use of kmap_local_page() in place of kmap_atomic() is correctly suited. Convert the calls of kmap_atomic() / kunmap_atomic() to kmap_local_page() / kunmap_local(). And remove the redundant variable that stores the address of the mapped page since kunmap_local() can accept any pointer within the page. [1]: https://lore.kernel.org/all/20220813220034.806698-1-ira.weiny@intel.com Suggested-by: Dave Hansen <dave.hansen@intel.com> 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-2-zhao1.liu@linux.intel.com
1 parent 97bb5e6 commit e6174e8

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -500,17 +500,15 @@ static void
500500
i915_gem_object_read_from_page_kmap(struct drm_i915_gem_object *obj, u64 offset, void *dst, int size)
501501
{
502502
pgoff_t idx = offset >> PAGE_SHIFT;
503-
void *src_map;
504503
void *src_ptr;
505504

506-
src_map = kmap_atomic(i915_gem_object_get_page(obj, idx));
507-
508-
src_ptr = src_map + offset_in_page(offset);
505+
src_ptr = kmap_local_page(i915_gem_object_get_page(obj, idx))
506+
+ offset_in_page(offset);
509507
if (!(obj->cache_coherent & I915_BO_CACHE_COHERENT_FOR_READ))
510508
drm_clflush_virt_range(src_ptr, size);
511509
memcpy(dst, src_ptr, size);
512510

513-
kunmap_atomic(src_map);
511+
kunmap_local(src_ptr);
514512
}
515513

516514
static void

0 commit comments

Comments
 (0)