Commit 17b6c49d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_urgent_for_v5.11_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Borislav Petkov:

 - Add a new Intel model number for Alder Lake

 - Differentiate which aspects of the FPU state get saved/restored when
   the FPU is used in-kernel and fix a boot crash on K7 due to early
   MXCSR access before CR4.OSFXSR is even set.

 - A couple of noinstr annotation fixes

 - Correct die ID setting on AMD for users of topology information which
   need the correct die ID

 - A SEV-ES fix to handle string port IO to/from kernel memory properly

* tag 'x86_urgent_for_v5.11_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu: Add another Alder Lake CPU to the Intel family
  x86/mmx: Use KFPU_387 for MMX string operations
  x86/fpu: Add kernel_fpu_begin_mask() to selectively initialize state
  x86/topology: Make __max_die_per_package available unconditionally
  x86: __always_inline __{rd,wr}msr()
  x86/mce: Remove explicit/superfluous tracing
  locking/lockdep: Avoid noinstr warning for DEBUG_LOCKDEP
  locking/lockdep: Cure noinstr fail
  x86/sev: Fix nonistr violation
  x86/entry: Fix noinstr fail
  x86/cpu/amd: Set __max_die_per_package on AMD
  x86/sev-es: Handle string port IO to kernel memory properly
parents 14c50a66 6e1239c1

arch/x86/entry/common.c

+7 −3
Original line number Diff line number Diff line
@@ -73,10 +73,8 @@ static __always_inline void do_syscall_32_irqs_on(struct pt_regs *regs, 
						  unsigned int nr)

{

	if (likely(nr < IA32_NR_syscalls)) {

		instrumentation_begin();

		nr = array_index_nospec(nr, IA32_NR_syscalls);

		regs->ax = ia32_sys_call_table[nr](regs);

		instrumentation_end();

	}

}
@@ -91,8 +89,11 @@ __visible noinstr void do_int80_syscall_32(struct pt_regs *regs) 
	 * or may not be necessary, but it matches the old asm behavior.

	 */

	nr = (unsigned int)syscall_enter_from_user_mode(regs, nr);

	instrumentation_begin();



	do_syscall_32_irqs_on(regs, nr);



	instrumentation_end();

	syscall_exit_to_user_mode(regs);

}
@@ -121,11 +122,12 @@ static noinstr bool __do_fast_syscall_32(struct pt_regs *regs) 
		res = get_user(*(u32 *)&regs->bp,

		       (u32 __user __force *)(unsigned long)(u32)regs->sp);

	}

	instrumentation_end();



	if (res) {

		/* User code screwed up. */

		regs->ax = -EFAULT;



		instrumentation_end();

		syscall_exit_to_user_mode(regs);

		return false;

	}
@@ -135,6 +137,8 @@ static noinstr bool __do_fast_syscall_32(struct pt_regs *regs) 


	/* Now this is just like a normal syscall. */

	do_syscall_32_irqs_on(regs, nr);



	instrumentation_end();

	syscall_exit_to_user_mode(regs);

	return true;

}

arch/x86/include/asm/fpu/api.h

+13 −2
Original line number Diff line number Diff line
@@ -16,14 +16,25 @@ 
 * Use kernel_fpu_begin/end() if you intend to use FPU in kernel context. It

 * disables preemption so be careful if you intend to use it for long periods

 * of time.

 * If you intend to use the FPU in softirq you need to check first with

 * If you intend to use the FPU in irq/softirq you need to check first with

 * irq_fpu_usable() if it is possible.

 */

extern void kernel_fpu_begin(void);



/* Kernel FPU states to initialize in kernel_fpu_begin_mask() */

#define KFPU_387	_BITUL(0)	/* 387 state will be initialized */

#define KFPU_MXCSR	_BITUL(1)	/* MXCSR will be initialized */



extern void kernel_fpu_begin_mask(unsigned int kfpu_mask);

extern void kernel_fpu_end(void);

extern bool irq_fpu_usable(void);

extern void fpregs_mark_activate(void);



/* Code that is unaware of kernel_fpu_begin_mask() can use this */

static inline void kernel_fpu_begin(void)

{

	kernel_fpu_begin_mask(KFPU_387 | KFPU_MXCSR);

}



/*

 * Use fpregs_lock() while editing CPU's FPU registers or fpu->state.

 * A context switch will (and softirq might) save CPU's FPU registers to

arch/x86/include/asm/intel-family.h

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ 


#define	INTEL_FAM6_LAKEFIELD		0x8A

#define INTEL_FAM6_ALDERLAKE		0x97

#define INTEL_FAM6_ALDERLAKE_L		0x9A



/* "Small Core" Processors (Atom) */

arch/x86/include/asm/msr.h

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static inline void do_trace_rdpmc(unsigned int msr, u64 val, int failed) {} 
 * think of extending them - you will be slapped with a stinking trout or a frozen

 * shark will reach you, wherever you are! You've been warned.

 */

static inline unsigned long long notrace __rdmsr(unsigned int msr)

static __always_inline unsigned long long __rdmsr(unsigned int msr)

{

	DECLARE_ARGS(val, low, high);
@@ -98,7 +98,7 @@ static inline unsigned long long notrace __rdmsr(unsigned int msr) 
	return EAX_EDX_VAL(val, low, high);

}



static inline void notrace __wrmsr(unsigned int msr, u32 low, u32 high)

static __always_inline void __wrmsr(unsigned int msr, u32 low, u32 high)

{

	asm volatile("1: wrmsr\n"

		     "2:\n"

arch/x86/include/asm/topology.h

+2 −2
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ extern const struct cpumask *cpu_coregroup_mask(int cpu); 
#define topology_die_id(cpu)			(cpu_data(cpu).cpu_die_id)

#define topology_core_id(cpu)			(cpu_data(cpu).cpu_core_id)



extern unsigned int __max_die_per_package;



#ifdef CONFIG_SMP

#define topology_die_cpumask(cpu)		(per_cpu(cpu_die_map, cpu))

#define topology_core_cpumask(cpu)		(per_cpu(cpu_core_map, cpu))
@@ -118,8 +120,6 @@ extern const struct cpumask *cpu_coregroup_mask(int cpu); 
extern unsigned int __max_logical_packages;

#define topology_max_packages()			(__max_logical_packages)



extern unsigned int __max_die_per_package;



static inline int topology_max_die_per_package(void)

{

	return __max_die_per_package;