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

Merge tag 'x86-mm-2025-01-31' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 mm updates from Ingo Molnar:

 - The biggest changes are the TLB flushing scalability optimizations,
   to update the mm_cpumask lazily and related changes.

   This feature has both a track record and a continued risk of
   performance regressions, so it was already delayed by a cycle - but
   it's all 100% perfect now™ (Rik van Riel)

 - Also miscellaneous fixes and cleanups. (Gautam Somani, Kirill
   Shutemov, Sebastian Andrzej Siewior)

* tag 'x86-mm-2025-01-31' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Remove unnecessary include of <linux/extable.h>
  x86/mtrr: Rename mtrr_overwrite_state() to guest_force_mtrr_state()
  x86/mm/selftests: Fix typo in lam.c
  x86/mm/tlb: Only trim the mm_cpumask once a second
  x86/mm/tlb: Also remove local CPU from mm_cpumask if stale
  x86/mm/tlb: Add tracepoint for TLB flush IPI to stale CPU
  x86/mm/tlb: Update mm_cpumask lazily
parents 626d1a1e aa135d1d

arch/x86/include/asm/mmu.h

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ typedef struct { 
	 */

	atomic64_t tlb_gen;



	unsigned long next_trim_cpumask;



#ifdef CONFIG_MODIFY_LDT_SYSCALL

	struct rw_semaphore	ldt_usr_sem;

	struct ldt_struct	*ldt;

arch/x86/include/asm/mmu_context.h

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ static inline int init_new_context(struct task_struct *tsk, 


	mm->context.ctx_id = atomic64_inc_return(&last_mm_ctx_id);

	atomic64_set(&mm->context.tlb_gen, 0);

	mm->context.next_trim_cpumask = jiffies + HZ;



#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS

	if (cpu_feature_enabled(X86_FEATURE_OSPKE)) {

arch/x86/include/asm/tlbflush.h

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ struct flush_tlb_info { 
	unsigned int		initiating_cpu;

	u8			stride_shift;

	u8			freed_tables;

	u8			trim_cpumask;

};



void flush_tlb_local(void);

arch/x86/kernel/alternative.c

+7 −3
Original line number Diff line number Diff line
@@ -1854,11 +1854,18 @@ static inline temp_mm_state_t use_temporary_mm(struct mm_struct *mm) 
	return temp_state;

}



__ro_after_init struct mm_struct *poking_mm;

__ro_after_init unsigned long poking_addr;



static inline void unuse_temporary_mm(temp_mm_state_t prev_state)

{

	lockdep_assert_irqs_disabled();



	switch_mm_irqs_off(NULL, prev_state.mm, current);



	/* Clear the cpumask, to indicate no TLB flushing is needed anywhere */

	cpumask_clear_cpu(raw_smp_processor_id(), mm_cpumask(poking_mm));



	/*

	 * Restore the breakpoints if they were disabled before the temporary mm

	 * was loaded.
@@ -1867,9 +1874,6 @@ static inline void unuse_temporary_mm(temp_mm_state_t prev_state) 
		hw_breakpoint_restore();

}



__ro_after_init struct mm_struct *poking_mm;

__ro_after_init unsigned long poking_addr;



static void text_poke_memcpy(void *dst, const void *src, size_t len)

{

	memcpy(dst, src, len);

arch/x86/mm/fault.c

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <linux/sched.h>		/* test_thread_flag(), ...	*/

#include <linux/sched/task_stack.h>	/* task_stack_*(), ...		*/

#include <linux/kdebug.h>		/* oops_begin/end, ...		*/

#include <linux/extable.h>		/* search_exception_tables	*/

#include <linux/memblock.h>		/* max_low_pfn			*/

#include <linux/kfence.h>		/* kfence_handle_page_fault	*/

#include <linux/kprobes.h>		/* NOKPROBE_SYMBOL, ...		*/