Commit da23ea19 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-stable-2025-08-03-12-35' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm 

Pull more MM updates from Andrew Morton:
 "Significant patch series in this pull request:

   - "mseal cleanups" (Lorenzo Stoakes)

     Some mseal cleaning with no intended functional change.

   - "Optimizations for khugepaged" (David Hildenbrand)

     Improve khugepaged throughput by batching PTE operations for large
     folios. This gain is mainly for arm64.

   - "x86: enable EXECMEM_ROX_CACHE for ftrace and kprobes" (Mike Rapoport)

     A bugfix, additional debug code and cleanups to the execmem code.

   - "mm/shmem, swap: bugfix and improvement of mTHP swap in" (Kairui Song)

     Bugfixes, cleanups and performance improvememnts to the mTHP swapin
     code"

* tag 'mm-stable-2025-08-03-12-35' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (38 commits)
  mm: mempool: fix crash in mempool_free() for zero-minimum pools
  mm: correct type for vmalloc vm_flags fields
  mm/shmem, swap: fix major fault counting
  mm/shmem, swap: rework swap entry and index calculation for large swapin
  mm/shmem, swap: simplify swapin path and result handling
  mm/shmem, swap: never use swap cache and readahead for SWP_SYNCHRONOUS_IO
  mm/shmem, swap: tidy up swap entry splitting
  mm/shmem, swap: tidy up THP swapin checks
  mm/shmem, swap: avoid redundant Xarray lookup during swapin
  x86/ftrace: enable EXECMEM_ROX_CACHE for ftrace allocations
  x86/kprobes: enable EXECMEM_ROX_CACHE for kprobes allocations
  execmem: drop writable parameter from execmem_fill_trapping_insns()
  execmem: add fallback for failures in vmalloc(VM_ALLOW_HUGE_VMAP)
  execmem: move execmem_force_rw() and execmem_restore_rox() before use
  execmem: rework execmem_cache_free()
  execmem: introduce execmem_alloc_rw()
  execmem: drop unused execmem_update_copy()
  mm: fix a UAF when vma->mm is freed after vma->vm_refcnt got dropped
  mm/rmap: add anon_vma lifetime debug check
  mm: remove mm/io-mapping.c
  ...
parents 7e161a99 a2152fef

Documentation/core-api/mm-api.rst

+0 −1
Original line number Diff line number Diff line
@@ -133,4 +133,3 @@ More Memory Management Functions 
.. kernel-doc:: mm/mmu_notifier.c

.. kernel-doc:: mm/balloon_compaction.c

.. kernel-doc:: mm/huge_memory.c
 
.. kernel-doc:: mm/io-mapping.c

arch/arm64/mm/mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ void mark_rodata_ro(void) 


static void __init declare_vma(struct vm_struct *vma,

			       void *va_start, void *va_end,

			       vm_flags_t vm_flags)

			       unsigned long vm_flags)

{

	phys_addr_t pa_start = __pa_symbol(va_start);

	unsigned long size = va_end - va_start;
@@ -1528,7 +1528,7 @@ early_initcall(prevent_bootmem_remove_init); 
pte_t modify_prot_start_ptes(struct vm_area_struct *vma, unsigned long addr,

			     pte_t *ptep, unsigned int nr)

{

	pte_t pte = get_and_clear_full_ptes(vma->vm_mm, addr, ptep, nr, /* full = */ 0);

	pte_t pte = get_and_clear_ptes(vma->vm_mm, addr, ptep, nr);



	if (alternative_has_cap_unlikely(ARM64_WORKAROUND_2645198)) {

		/*

arch/x86/kernel/alternative.c

+1 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ struct its_array its_pages; 


static void *__its_alloc(struct its_array *pages)

{

	void *page __free(execmem) = execmem_alloc(EXECMEM_MODULE_TEXT, PAGE_SIZE);

	void *page __free(execmem) = execmem_alloc_rw(EXECMEM_MODULE_TEXT, PAGE_SIZE);

	if (!page)

		return NULL;
@@ -237,7 +237,6 @@ static void *its_alloc(void) 
	if (!page)

		return NULL;



	execmem_make_temp_rw(page, PAGE_SIZE);

	if (pages == &its_pages)

		set_memory_x((unsigned long)page, 1);

arch/x86/kernel/ftrace.c

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ void arch_ftrace_update_code(int command) 


static inline void *alloc_tramp(unsigned long size)

{

	return execmem_alloc(EXECMEM_FTRACE, size);

	return execmem_alloc_rw(EXECMEM_FTRACE, size);

}

static inline void tramp_free(void *tramp)

{

arch/x86/kernel/kprobes/core.c

+0 −18
Original line number Diff line number Diff line
@@ -481,24 +481,6 @@ static int prepare_singlestep(kprobe_opcode_t *buf, struct kprobe *p, 
	return len;

}



/* Make page to RO mode when allocate it */

void *alloc_insn_page(void)

{

	void *page;



	page = execmem_alloc(EXECMEM_KPROBES, PAGE_SIZE);

	if (!page)

		return NULL;



	/*

	 * TODO: Once additional kernel code protection mechanisms are set, ensure

	 * that the page was not maliciously altered and it is still zeroed.

	 */

	set_memory_rox((unsigned long)page, 1);



	return page;

}



/* Kprobe x86 instruction emulation - only regs->ip or IF flag modifiers */



static void kprobe_emulate_ifmodifiers(struct kprobe *p, struct pt_regs *regs)