Skip to content

Remove duplicated kmap code

[email protected] dri-devel linux-arm-kernel linux-csky linux-mips linux-parisc linux-snps-arc linuxppc-dev lkml oe-kbuild-all sparclinux 3 versions – Applied

Status from this message: [merged] kmap-consolidate-kmap_prot-definitions.patch removed from -mm tree

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest15 patches 14 repliesApplied 15/15
  2. v211 patches 16 repliesSuperseded
  3. v110 patches 24 repliesSuperseded

Changes in v3 from the cover letter

Collect review/acks
Add kmap_prot consolidation patch from Christoph Add 3 suggested patches from Al Viro Fix include for microblaze
Fix static inline for microblaze

Patches in v3 All 15 applied

#Subject and filesSizeRepliesApplied
1/15arch/kmap: Remove BUG_ON()arch/arc/include/asm/highmem.h arch/arc/mm/highmem.c arch/arm/mm/highmem.c +8 more+13 -140 repliesApplied
2/15arch/xtensa: Move kmap build bug out of the wayarch/xtensa/include/asm/highmem.h arch/xtensa/mm/highmem.c+4 -50 repliesApplied
3/15arch/kmap: Remove redundant arch specific kmapsarch/arc/include/asm/highmem.h arch/arc/mm/highmem.c arch/arm/include/asm/highmem.h +14 more+29 -1090 repliesApplied
4/15arch/kunmap: Remove duplicate kunmap implementationsarch/arc/include/asm/highmem.h arch/arm/include/asm/highmem.h arch/arm/mm/highmem.c +13 more+9 -1100 repliesApplied
5/15{x86,powerpc,microblaze}/kmap: Move preempt disablearch/microblaze/include/asm/highmem.h arch/microblaze/mm/highmem.c arch/powerpc/include/asm/highmem.h +3 more+36 -260 repliesApplied
6/15arch/kmap_atomic: Consolidate duplicate codearch/arc/include/asm/highmem.h arch/arc/mm/highmem.c arch/arm/include/asm/highmem.h +18 more+46 -910 repliesApplied
7/15arch/kunmap_atomic: Consolidate duplicate codearch/arc/include/asm/highmem.h arch/arc/mm/highmem.c arch/arm/include/asm/highmem.h +20 more+31 -6738 repliesApplied
8/15arch/kmap: Ensure kmap_prot visibilityarch/microblaze/include/asm/highmem.h arch/microblaze/mm/init.c arch/powerpc/include/asm/highmem.h +2 more+3 -80 repliesApplied
9/15arch/kmap: Don't hard code kmap_prot valuesarch/csky/mm/highmem.c arch/mips/mm/highmem.c arch/nds32/mm/highmem.c +1 more+4 -40 repliesApplied
10/15arch/kmap: Define kmap_atomic_prot() for all arch'sarch/arc/mm/highmem.c arch/arm/mm/highmem.c arch/csky/mm/highmem.c +8 more+25 -712 repliesApplied
11/15drm: Remove drm specific kmap_atomic codedrivers/gpu/drm/ttm/ttm_bo_util.c drivers/gpu/drm/vmwgfx/vmwgfx_blit.c include/drm/ttm/ttm_bo_api.h+12 -640 repliesApplied
12/15kmap: Remove kmap_atomic_to_page()arch/csky/include/asm/highmem.h arch/csky/mm/highmem.c arch/nds32/include/asm/highmem.h+0 -150 repliesApplied
13/15parisc/kmap: Remove duplicate kmap codearch/parisc/include/asm/cacheflush.h include/linux/highmem.h+9 -292 repliesApplied
14/15sparc: Remove unnecessary includesarch/sparc/mm/io-unit.c arch/sparc/mm/iommu.c+0 -20 repliesApplied
15/15kmap: Consolidate kmap_prot definitionsarch/arc/include/asm/highmem.h arch/arm/include/asm/highmem.h arch/csky/include/asm/highmem.h +8 more+6 -183 repliesApplied

Reviews trailers per patch

11 of 15 patches have a Reviewed-by or Acked-by.

PatchDan WilliamsChristoph HellwigDaniel VetterChristian König
1/15R-b R-b
2/15R-b
3/15R-b
4/15R-b
5/15R-b
6/15R-b
7/15R-b R-b
8/15R-b
9/15R-b
10/15R-b
11/15R-b A-b R-b
12/15
13/15
14/15
15/15

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v3 thread

Cover letter [PATCH V3 00/15] Remove duplicated kmap code

From: Ira Weiny <[email protected]>

The kmap infrastructure has been copied almost verbatim to every architecture. This series consolidates obvious duplicated code by defining core functions which call into the architectures only when needed.

Some of the k[un]map_atomic() implementations have some similarities but the similarities were not sufficient to warrant further changes.

In addition we remove a duplicate implementation of kmap() in DRM.

Testing was done by 0day to cover all the architectures I can't readily build/test.

---
Changes from V2:
Collect review/acks
Add kmap_prot consolidation patch from Christoph Add 3 suggested patches from Al Viro Fix include for microblaze
Fix static inline for microblaze

Changes from V1:
Fix bisect-ability
Update commit message and fix line lengths Remove unneded kunmap_atomic_high() declarations Remove unneded kmap_atomic_high() declarations collect reviews
rebase to 5.7-rc4

Changes from V0:
Define kmap_flush_tlb() and make kmap() truely arch independent. Redefine the k[un]map_atomic_* code to call into the architectures for
high mem pages
Ensure all architectures define kmap_prot, use it appropriately, and
define kmap_atomic_prot()
Remove drm implementation of kmap_atomic()

Ira Weiny (15):
arch/kmap: Remove BUG_ON()
arch/xtensa: Move kmap build bug out of the way arch/kmap: Remove redundant arch specific kmaps arch/kunmap: Remove duplicate kunmap implementations {x86,powerpc,microblaze}/kmap: Move preempt disable arch/kmap_atomic: Consolidate duplicate code arch/kunmap_atomic: Consolidate duplicate code arch/kmap: Ensure kmap_prot visibility arch/kmap: Don't hard code kmap_prot values arch/kmap: Define kmap_atomic_prot() for all arch's
drm: Remove drm specific kmap_atomic code
kmap: Remove kmap_atomic_to_page() parisc/kmap: Remove duplicate kmap code
sparc: Remove unnecessary includes
kmap: Consolidate kmap_prot definitions

 arch/arc/include/asm/highmem.h        | 18 -------
 arch/arc/mm/highmem.c                 | 28 ++--------
 arch/arm/include/asm/highmem.h        |  9 ----
 arch/arm/mm/highmem.c                 | 35 ++-----------
 arch/csky/include/asm/highmem.h       | 12 +----
 arch/csky/mm/highmem.c                | 56 ++++----------------
 arch/microblaze/include/asm/highmem.h | 27 ----------
 arch/microblaze/mm/highmem.c          | 16 ++----
 arch/microblaze/mm/init.c             |  3 --
 arch/mips/include/asm/highmem.h       | 11 +---
 arch/mips/mm/cache.c                  |  6 +--
 arch/mips/mm/highmem.c                | 49 +++---------------
 arch/nds32/include/asm/highmem.h      |  9 ----
 arch/nds32/mm/highmem.c               | 39 ++------------
 arch/parisc/include/asm/cacheflush.h  | 30 +----------
 arch/powerpc/include/asm/highmem.h    | 28 ----------
 arch/powerpc/mm/highmem.c             | 21 ++------
 arch/powerpc/mm/mem.c                 |  3 --
 arch/sparc/include/asm/highmem.h      | 25 +--------
 arch/sparc/mm/highmem.c               | 20 ++------
 arch/sparc/mm/io-unit.c               |  1 -
 arch/sparc/mm/iommu.c                 |  1 -
 arch/x86/include/asm/fixmap.h         |  1 -
 arch/x86/include/asm/highmem.h        |  9 ----
 arch/x86/mm/highmem_32.c              | 50 ++----------------
 arch/xtensa/include/asm/highmem.h     | 27 ----------
 arch/xtensa/mm/highmem.c              | 22 ++++----
 drivers/gpu/drm/ttm/ttm_bo_util.c     | 56 ++------------------
 drivers/gpu/drm/vmwgfx/vmwgfx_blit.c  | 16 +++---
 include/drm/ttm/ttm_bo_api.h          |  4 --
 include/linux/highmem.h               | 74 ++++++++++++++++++++++++---
 31 files changed, 150 insertions(+), 556 deletions(-)
Signature · 1 line
2.25.1