Skip to content

arch, mm: improve robustness of direct map manipulation

Mike Rapoport linux-arm-kernel linux-mm linux-pm linux-riscv linux-s390 linuxppc-dev lkml sparclinux 7 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v7 Latest4 patches 1 replyIn review 3 of 4 applied
  2. v64 patches 1 replySuperseded
  3. v55 patches 2 repliesSuperseded
Earlier versions · 4
VersionPostedPatchesRepliesStatus
v44 patches6 repliesSuperseded
v34 patches11 repliesSuperseded
v24 patches1 replySuperseded
v14 patches33 repliesSuperseded

Changes in v7 from the cover letter

* fix a rebase error that sneaked into v6 after removal of slab changes

Patches in v7 3 of 4 applied

#Subject and filesSizeRepliesApplied
1/4mm: introduce debug_pagealloc_{map,unmap}_pages() helpersinclude/linux/mm.h mm/memory_hotplug.c mm/page_alloc.c +1 more+19 -70 replies
2/4PM: hibernate: make direct map manipulations more explicitinclude/linux/mm.h kernel/power/snapshot.c+36 -140 repliesApplied
3/4arch, mm: restore dependency of __kernel_map_pages() on DEBUG_PAGEALLOCarch/Kconfig arch/arm64/Kconfig arch/arm64/mm/pageattr.c +9 more+26 -260 repliesApplied
4/4arch, mm: make kernel_page_present() always availablearch/arm64/include/asm/cacheflush.h arch/arm64/mm/pageattr.c arch/riscv/include/asm/set_memory.h +5 more+39 -131 replyApplied

Reviews trailers per patch

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

PatchDavid HildenbrandKirill A. ShutemovVlastimil BabkaRafael J. Wysocki
1/4R-b A-b A-b
2/4R-b A-b A-b A-b
3/4A-b A-b
4/4A-b A-b

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 v7 thread

Cover letter [PATCH v7 0/4] arch, mm: improve robustness of direct map manipulation

From: Mike Rapoport <[email protected]>

Hi,

During recent discussion about KVM protected memory, David raised a concern about usage of __kernel_map_pages() outside of DEBUG_PAGEALLOC scope [1].

Indeed, for architectures that define CONFIG_ARCH_HAS_SET_DIRECT_MAP it is possible that __kernel_map_pages() would fail, but since this function is void, the failure will go unnoticed.

Moreover, there's lack of consistency of __kernel_map_pages() semantics across architectures as some guard this function with
#ifdef DEBUG_PAGEALLOC, some refuse to update the direct map if page allocation debugging is disabled at run time and some allow modifying the direct map regardless of DEBUG_PAGEALLOC settings.

This set straightens this out by restoring dependency of __kernel_map_pages() on DEBUG_PAGEALLOC and updating the call sites accordingly.

Since currently the only user of __kernel_map_pages() outside DEBUG_PAGEALLOC is hibernation, it is updated to make direct map accesses there more explicit.

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

v7 changes:
* fix a rebase error that sneaked into v6 after removal of slab changes

v6 changes:
* revert slab changes to avoid redundant check of static key
https://lore.kernel.org/lkml/[email protected]

v5 changes:
* use pairs of _map()/_unmap() functions instead of _map(..., int enable) as Vlastimil suggested
https://lore.kernel.org/lkml/[email protected]

v4 changes:
* s/WARN_ON/pr_warn_once/ per David and Kirill
* rebase on v5.10-rc2
* add Acked/Reviewed tags
https://lore.kernel.org/lkml/[email protected]

v3 changes:
* update arm64 changes to avoid regression, per Rick's comments
* fix bisectability
https://lore.kernel.org/lkml/[email protected]

v2 changes:
* Rephrase patch 2 changelog to better describe the change intentions and implications
* Move removal of kernel_map_pages() from patch 1 to patch 2, per David
https://lore.kernel.org/lkml/[email protected]

v1:
https://lore.kernel.org/lkml/[email protected]

Mike Rapoport (4):
mm: introduce debug_pagealloc_{map,unmap}_pages() helpers
PM: hibernate: make direct map manipulations more explicit arch, mm: restore dependency of __kernel_map_pages() on DEBUG_PAGEALLOC arch, mm: make kernel_page_present() always available

 arch/Kconfig                        |  3 +++
 arch/arm64/Kconfig                  |  4 +--
 arch/arm64/include/asm/cacheflush.h |  1 +
 arch/arm64/mm/pageattr.c            |  6 +++--
 arch/powerpc/Kconfig                |  5 +---
 arch/riscv/Kconfig                  |  4 +--
 arch/riscv/include/asm/pgtable.h    |  2 --
 arch/riscv/include/asm/set_memory.h |  1 +
 arch/riscv/mm/pageattr.c            | 31 ++++++++++++++++++++++
 arch/s390/Kconfig                   |  4 +--
 arch/sparc/Kconfig                  |  4 +--
 arch/x86/Kconfig                    |  4 +--
 arch/x86/include/asm/set_memory.h   |  1 +
 arch/x86/mm/pat/set_memory.c        |  4 +--
 include/linux/mm.h                  | 40 ++++++++++++++---------------
 include/linux/set_memory.h          |  5 ++++
 kernel/power/snapshot.c             | 38 +++++++++++++++++++++++++--
 mm/memory_hotplug.c                 |  3 +--
 mm/page_alloc.c                     |  6 ++---
 19 files changed, 113 insertions(+), 53 deletions(-)
Signature · 35 lines
2.28.0

*** BLURB HERE ***

Mike Rapoport (4):
  mm: introduce debug_pagealloc_{map,unmap}_pages() helpers
  PM: hibernate: make direct map manipulations more explicit
  arch, mm: restore dependency of __kernel_map_pages() on
    DEBUG_PAGEALLOC
  arch, mm: make kernel_page_present() always available

 arch/Kconfig                        |  3 +++
 arch/arm64/Kconfig                  |  4 +--
 arch/arm64/include/asm/cacheflush.h |  1 +
 arch/arm64/mm/pageattr.c            |  6 +++--
 arch/powerpc/Kconfig                |  5 +---
 arch/riscv/Kconfig                  |  4 +--
 arch/riscv/include/asm/pgtable.h    |  2 --
 arch/riscv/include/asm/set_memory.h |  1 +
 arch/riscv/mm/pageattr.c            | 31 ++++++++++++++++++++++
 arch/s390/Kconfig                   |  4 +--
 arch/sparc/Kconfig                  |  4 +--
 arch/x86/Kconfig                    |  4 +--
 arch/x86/include/asm/set_memory.h   |  1 +
 arch/x86/mm/pat/set_memory.c        |  4 +--
 include/linux/mm.h                  | 40 ++++++++++++++---------------
 include/linux/set_memory.h          |  5 ++++
 kernel/power/snapshot.c             | 38 +++++++++++++++++++++++++--
 mm/memory_hotplug.c                 |  3 +--
 mm/page_alloc.c                     |  6 ++---
 mm/slab.c                           |  2 +-
 20 files changed, 114 insertions(+), 54 deletions(-)

-- 
2.28.0