Skip to content

Commit b1c51b0

Browse files
trueptolemytursulin
authored andcommitted
drm/i915: Use kmap_local_page() in gem/selftests/i915_gem_context.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. With kmap_local_page(), we can avoid the often unwanted side effect of unnecessary page faults or preemption disables. In drm/i915/gem/selftests/i915_gem_context.c, functions cpu_fill() and cpu_check() mainly uses mapping to flush cache and check/assign the value. There're 2 reasons why cpu_fill() and cpu_check() don't need to disable pagefaults and preemption for mapping: 1. The flush operation is safe. cpu_fill() and cpu_check() call 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, cpu_fill() and cpu_check() are functions 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(). [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-7-zhao1.liu@linux.intel.com
1 parent 40b3990 commit b1c51b0

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -489,12 +489,12 @@ static int cpu_fill(struct drm_i915_gem_object *obj, u32 value)
489489
for (n = 0; n < real_page_count(obj); n++) {
490490
u32 *map;
491491

492-
map = kmap_atomic(i915_gem_object_get_page(obj, n));
492+
map = kmap_local_page(i915_gem_object_get_page(obj, n));
493493
for (m = 0; m < DW_PER_PAGE; m++)
494494
map[m] = value;
495495
if (!has_llc)
496496
drm_clflush_virt_range(map, PAGE_SIZE);
497-
kunmap_atomic(map);
497+
kunmap_local(map);
498498
}
499499

500500
i915_gem_object_finish_access(obj);
@@ -520,7 +520,7 @@ static noinline int cpu_check(struct drm_i915_gem_object *obj,
520520
for (n = 0; n < real_page_count(obj); n++) {
521521
u32 *map, m;
522522

523-
map = kmap_atomic(i915_gem_object_get_page(obj, n));
523+
map = kmap_local_page(i915_gem_object_get_page(obj, n));
524524
if (needs_flush & CLFLUSH_BEFORE)
525525
drm_clflush_virt_range(map, PAGE_SIZE);
526526

@@ -546,7 +546,7 @@ static noinline int cpu_check(struct drm_i915_gem_object *obj,
546546
}
547547

548548
out_unmap:
549-
kunmap_atomic(map);
549+
kunmap_local(map);
550550
if (err)
551551
break;
552552
}

0 commit comments

Comments
 (0)