Skip to content

drm/i915: Replace kmap_atomic() with kmap_local_page()

Zhao Liu dri-devel intel-gfx lkml 3 versions – Applied

Status from this message: Pushed to drm-intel-gt-next, thanks again!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest9 patches 5 repliesApplied
  2. v29 patches 19 repliesSuperseded
  3. v19 patches 16 repliesSuperseded

Changes in v3 from the cover letter

* Rebased on 968f35f4ab1c ("Merge tag 'v6.7-rc3-smb3-client-fixes' of
git://git.samba.org/sfrench/cifs-2.6").
* Removed changelog (of v2) in commit message.
* Fixed typo in cover letter (Fabio).
* Added Reviewed-by tags from Ira and Fabio.

Patches in v3 Applied

#Subject and filesSizeRepliesApplied
1/9drm/i915: Use kmap_local_page() in gem/i915_gem_object.cdrivers/gpu/drm/i915/gem/i915_gem_object.c+3 -50 replies
2/9drm/i915: Use memcpy_[from/to]_page() in gem/i915_gem_pyhs.cdrivers/gpu/drm/i915/gem/i915_gem_phys.c+2 -80 replies
3/9drm/i915: Use kmap_local_page() in gem/i915_gem_shmem.cdrivers/gpu/drm/i915/gem/i915_gem_shmem.c+4 -20 replies
4/9drm/i915: Use kmap_local_page() in gem/selftests/huge_pages.cdrivers/gpu/drm/i915/gem/selftests/huge_pages.c+3 -30 replies
5/9drm/i915: Use kmap_local_page() in gem/selftests/i915_gem_coherency.cdrivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c+4 -80 replies
6/9drm/i915: Use kmap_local_page() in gem/selftests/i915_gem_context.cdrivers/gpu/drm/i915/gem/selftests/i915_gem_context.c+4 -40 replies
7/9drm/i915: Use memcpy_from_page() in gt/uc/intel_uc_fw.cdrivers/gpu/drm/i915/gt/uc/intel_uc_fw.c+1 -40 replies
8/9drm/i915: Use kmap_local_page() in i915_cmd_parser.cdrivers/gpu/drm/i915/i915_cmd_parser.c+2 -20 replies
9/9drm/i915: Use kmap_local_page() in gem/i915_gem_execbuffer.cdrivers/gpu/drm/i915/gem/i915_gem_execbuffer.c+5 -50 replies

Reviews trailers per patch

All 9 patches have a Reviewed-by or Acked-by.

PatchIra WeinyFabio M. De Francesco
1/9R-b R-b
2/9R-b R-b
3/9R-b R-b
4/9R-b R-b
5/9R-b R-b
6/9R-b R-b
7/9R-b R-b
8/9R-b R-b
9/9R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH v3 0/9] drm/i915: Replace kmap_atomic() with kmap_local_page()

From: Zhao Liu <[email protected]>

Hi all,

I refreshed this v3 by rebasing v2 [1] on the commit 968f35f4ab1c ("Merge tag 'v6.7-rc3-smb3-client-fixes' of git://git.samba.org/sfrench/
cifs-2.6").

Based on the current code, I rechecked the substitutions in v2 and they still stand and are valid, so no code change in v3.

Thanks for all the review! And sorry v2 was missed, I'll pay more attention to this v3.

Purpose of This Patchset
========================

The purpose of this pacthset is to replace all uses of kmap_atomic() in i915 with kmap_local_page() because the use of kmap_atomic() is being deprecated in favor of kmap_local_page()[2]. And 92b64bd (mm/highmem:
add notes about conversions from kmap{,_atomic}()) has declared the deprecation of kmap_atomic().

Motivation for Deprecating kmap_atomic() and Using 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.

Patch summary
=============

Patch 1, 4-6 and 8-9 replace kmap_atomic()/kunmap_atomic() with
kmap_local_page()/kunmap_local() directly. With these local mappings, the page faults and preemption are allowed.

Patch 2 and 7 use memcpy_from_page() and memcpy_to_page() to replace
kmap_atomic()/kunmap_atomic(). These two variants of memcpy() are based on the local mapping, so page faults and preemption are also allowed in these two interfaces.

Patch 3 replaces kmap_atomic()/kunmap_atomic() with kmap_local_page()/
kunmap_local() and also disable page fault since the for special handling (pls see the commit message).

Reference
=========

[1]: https://lore.kernel.org/all/[email protected]/
[2]: https://lore.kernel.org/all/[email protected]

Thanks and Best Regards,
Zhao

---
Changlog:

Changes since v2:
* Rebased on 968f35f4ab1c ("Merge tag 'v6.7-rc3-smb3-client-fixes' of
git://git.samba.org/sfrench/cifs-2.6").
* Removed changelog (of v2) in commit message.
* Fixed typo in cover letter (Fabio).
* Added Reviewed-by tags from Ira and Fabio.

Changes since v1:
* Dropped hot plug related description in commit message since it has nothing to do with kmap_local_page().
* Emphasized the motivation for using kmap_local_page() in commit message.
* Rebased patch 1 on f47e630 (drm/i915/gem: Typecheck page lookups) to keep the "idx" variable of type pgoff_t here.
* Used memcpy_from_page() and memcpy_to_page() to replace kmap_local_page() + memcpy() in patch 2.

---
Zhao Liu (9):
drm/i915: Use kmap_local_page() in gem/i915_gem_object.c drm/i915: Use memcpy_[from/to]_page() in gem/i915_gem_pyhs.c drm/i915: Use kmap_local_page() in gem/i915_gem_shmem.c drm/i915: Use kmap_local_page() in gem/selftests/huge_pages.c drm/i915: Use kmap_local_page() in gem/selftests/i915_gem_coherency.c drm/i915: Use kmap_local_page() in gem/selftests/i915_gem_context.c drm/i915: Use memcpy_from_page() in gt/uc/intel_uc_fw.c drm/i915: Use kmap_local_page() in i915_cmd_parser.c drm/i915: Use kmap_local_page() in gem/i915_gem_execbuffer.c

 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c       | 10 +++++-----
 drivers/gpu/drm/i915/gem/i915_gem_object.c           |  8 +++-----
 drivers/gpu/drm/i915/gem/i915_gem_phys.c             | 10 ++--------
 drivers/gpu/drm/i915/gem/i915_gem_shmem.c            |  6 ++++--
 drivers/gpu/drm/i915/gem/selftests/huge_pages.c      |  6 +++---
 .../gpu/drm/i915/gem/selftests/i915_gem_coherency.c  | 12 ++++--------
 .../gpu/drm/i915/gem/selftests/i915_gem_context.c    |  8 ++++----
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c             |  5 +----
 drivers/gpu/drm/i915/i915_cmd_parser.c               |  4 ++--
 9 files changed, 28 insertions(+), 41 deletions(-)
Signature · 1 line
2.34.1