Skip to content

x86/module: rework ROX cache to avoid writable copy

Mike Rapoport linux-kselftest linux-mm linux-modules linux-trace-kernel linux-um live-patching lkml 3 versions – Applied

Status from this message: The following commit has been merged into the x86/mm branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest9 patches 8 repliesApplied
  2. v210 patches 6 repliesSuperseded
  3. v18 patches 14 repliesSuperseded

Changes in v3 from the cover letter

* instead of adding a new module state handle ROX restoration locally in load_module() as Petr suggested

Patches in v3 Applied

#Subject and filesSizeRepliesApplied
1/9x86/mm/pat: cpa-test: fix length for CPA_ARRAY testarch/x86/mm/pat/cpa-test.c+1 -10 replies
2/9x86/mm/pat: drop duplicate variable in cpa_flush()arch/x86/mm/pat/set_memory.c+1 -20 replies
3/9x86/mm/pat: restore large ROX pages after fragmentationarch/x86/include/asm/pgtable_types.h arch/x86/mm/pat/set_memory.c include/linux/vm_event_item.h +1 more+219 -40 replies
4/9execmem: don't remove ROX cache from the direct mapmm/execmem.c+4 -130 replies
5/9execmem: add API for temporal remapping as RW and restoring ROX afterwardsinclude/linux/execmem.h mm/execmem.c+53 -00 replies
6/9module: switch to execmem API for remapping as RW and restoring ROXinclude/linux/module.h include/linux/moduleloader.h kernel/module/main.c +1 more+27 -723 replies
7/9Revert "x86/module: prepare module loading for ROX allocations of text"arch/um/kernel/um_arch.c arch/x86/entry/vdso/vma.c arch/x86/include/asm/alternative.h +3 more+117 -1670 replies
8/9module: drop unused module_writable_address()include/linux/module.h+0 -100 replies
9/9x86: re-enable EXECMEM_ROX supportarch/x86/Kconfig+1 -03 replies

Reviews trailers per patch

1 of 9 patches has a Reviewed-by or Acked-by.

PatchPetr PavluLorenzo Stoakes
SeriesT-b
1/9
2/9
3/9
4/9
5/9
6/9A-b
7/9
8/9
9/9

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] x86/module: rework ROX cache to avoid writable copy

From: "Mike Rapoport (Microsoft)" <[email protected]>

Hi,

Following Peter's comments [1] these patches rework handling of ROX caches for module text allocations.

Instead of using a writable copy that really complicates alternatives patching, temporarily remap parts of a large ROX page as RW for the time of module formation and then restore it's ROX protections when the module is ready.

To keep the ROX memory mapped with large pages, make set_memory_rox() capable of restoring large pages (more details are in patch 3).

Since this is really about x86, I believe this should go in via tip tree.

The patches also available in git
https://git.kernel.org/rppt/h/execmem/x86-rox/v10

v3 changes:
* instead of adding a new module state handle ROX restoration locally in load_module() as Petr suggested

v2: https://lore.kernel.org/all/[email protected]
* only collapse large mappings in set_memory_rox()
* simplify RW <-> ROX remapping
* don't remove ROX cache pages from the direct map (patch 4)

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

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

Kirill A. Shutemov (1):
x86/mm/pat: restore large ROX pages after fragmentation

Mike Rapoport (Microsoft) (8):
x86/mm/pat: cpa-test: fix length for CPA_ARRAY test x86/mm/pat: drop duplicate variable in cpa_flush()
execmem: don't remove ROX cache from the direct map
execmem: add API for temporal remapping as RW and restoring ROX afterwards
module: switch to execmem API for remapping as RW and restoring ROX Revert "x86/module: prepare module loading for ROX allocations of text"
module: drop unused module_writable_address()
x86: re-enable EXECMEM_ROX support

 arch/um/kernel/um_arch.c             |  11 +-
 arch/x86/Kconfig                     |   1 +
 arch/x86/entry/vdso/vma.c            |   3 +-
 arch/x86/include/asm/alternative.h   |  14 +-
 arch/x86/include/asm/pgtable_types.h |   2 +
 arch/x86/kernel/alternative.c        | 181 +++++++++-------------
 arch/x86/kernel/ftrace.c             |  30 ++--
 arch/x86/kernel/module.c             |  45 ++----
 arch/x86/mm/pat/cpa-test.c           |   2 +-
 arch/x86/mm/pat/set_memory.c         | 220 ++++++++++++++++++++++++++-
 include/linux/execmem.h              |  31 ++++
 include/linux/module.h               |  16 --
 include/linux/moduleloader.h         |   4 -
 include/linux/vm_event_item.h        |   2 +
 kernel/module/main.c                 |  78 +++-------
 kernel/module/strict_rwx.c           |   9 +-
 mm/execmem.c                         |  39 +++--
 mm/vmstat.c                          |   2 +
 18 files changed, 422 insertions(+), 268 deletions(-)

base-commit: ffd294d346d185b70e28b1a28abe367bbfe53c04

Signature · 1 line
2.45.2