Commit 773ac53b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_urgent_for_v5.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Borislav Petkov:
 "A bunch of x86/urgent stuff accumulated for the last two weeks so
  lemme unload it to you.

  It should be all totally risk-free, of course. :-)

   - Fix out-of-spec hardware (1st gen Hygon) which does not implement
     MSR_AMD64_SEV even though the spec clearly states so, and check
     CPUID bits first.

   - Send only one signal to a task when it is a SEGV_PKUERR si_code
     type.

   - Do away with all the wankery of reserving X amount of memory in the
     first megabyte to prevent BIOS corrupting it and simply and
     unconditionally reserve the whole first megabyte.

   - Make alternatives NOP optimization work at an arbitrary position
     within the patched sequence because the compiler can put
     single-byte NOPs for alignment anywhere in the sequence (32-bit
     retpoline), vs our previous assumption that the NOPs are only
     appended.

   - Force-disable ENQCMD[S] instructions support and remove
     update_pasid() because of insufficient protection against FPU state
     modification in an interrupt context, among other xstate horrors
     which are being addressed at the moment. This one limits the
     fallout until proper enablement.

   - Use cpu_feature_enabled() in the idxd driver so that it can be
     build-time disabled through the defines in disabled-features.h.

   - Fix LVT thermal setup for SMI delivery mode by making sure the APIC
     LVT value is read before APIC initialization so that softlockups
     during boot do not happen at least on one machine.

   - Mark all legacy interrupts as legacy vectors when the IO-APIC is
     disabled and when all legacy interrupts are routed through the PIC"

* tag 'x86_urgent_for_v5.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/sev: Check SME/SEV support in CPUID first
  x86/fault: Don't send SIGSEGV twice on SEGV_PKUERR
  x86/setup: Always reserve the first 1M of RAM
  x86/alternative: Optimize single-byte NOPs at an arbitrary position
  x86/cpufeatures: Force disable X86_FEATURE_ENQCMD and remove update_pasid()
  dmaengine: idxd: Use cpu_feature_enabled()
  x86/thermal: Fix LVT thermal setup for SMI delivery mode
  x86/apic: Mark _all_ legacy interrupts when IO/APIC is missing
parents f5b6eb1e 009767db

arch/x86/include/asm/apic.h

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ static inline int apic_is_clustered_box(void) 
extern int setup_APIC_eilvt(u8 lvt_off, u8 vector, u8 msg_type, u8 mask);

extern void lapic_assign_system_vectors(void);

extern void lapic_assign_legacy_vector(unsigned int isairq, bool replace);

extern void lapic_update_legacy_vectors(void);

extern void lapic_online(void);

extern void lapic_offline(void);

extern bool apic_needs_pit(void);

arch/x86/include/asm/disabled-features.h

+2 −5
Original line number Diff line number Diff line
@@ -56,11 +56,8 @@ 
# define DISABLE_PTI		(1 << (X86_FEATURE_PTI & 31))

#endif



#ifdef CONFIG_IOMMU_SUPPORT

# define DISABLE_ENQCMD	0

#else

/* Force disable because it's broken beyond repair */

#define DISABLE_ENQCMD		(1 << (X86_FEATURE_ENQCMD & 31))

#endif



#ifdef CONFIG_X86_SGX

# define DISABLE_SGX	0

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

+1 −5
Original line number Diff line number Diff line
@@ -106,10 +106,6 @@ extern int cpu_has_xfeatures(u64 xfeatures_mask, const char **feature_name); 
 */

#define PASID_DISABLED	0



#ifdef CONFIG_IOMMU_SUPPORT

/* Update current's PASID MSR/state by mm's PASID. */

void update_pasid(void);

#else

static inline void update_pasid(void) { }

#endif



#endif /* _ASM_X86_FPU_API_H */

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

+0 −7
Original line number Diff line number Diff line
@@ -584,13 +584,6 @@ static inline void switch_fpu_finish(struct fpu *new_fpu) 
			pkru_val = pk->pkru;

	}

	__write_pkru(pkru_val);



	/*

	 * Expensive PASID MSR write will be avoided in update_pasid() because

	 * TIF_NEED_FPU_LOAD was set. And the PASID state won't be updated

	 * unless it's different from mm->pasid to reduce overhead.

	 */

	update_pasid();

}



#endif /* _ASM_X86_FPU_INTERNAL_H */

arch/x86/include/asm/thermal.h

+3 −1
Original line number Diff line number Diff line
@@ -3,10 +3,12 @@ 
#define _ASM_X86_THERMAL_H



#ifdef CONFIG_X86_THERMAL_VECTOR

void therm_lvt_init(void);

void intel_init_thermal(struct cpuinfo_x86 *c);

bool x86_thermal_enabled(void);

void intel_thermal_interrupt(void);

#else

static inline void therm_lvt_init(void)				{ }

static inline void intel_init_thermal(struct cpuinfo_x86 *c)	{ }

#endif