Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fd91d71 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Ingo Molnar:
 "Misc fixes all over the place: a console spam fix, section attributes
  fixes, a KASLR fix, a TLB stack-variable alignment fix, a reboot
  quirk, boot options related warnings fix, an LTO fix, a deadlock fix
  and an RDT fix"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu/intel: Lower the "ENERGY_PERF_BIAS: Set to normal" message's log priority
  x86/cpu/bugs: Use __initconst for 'const' init data
  x86/mm/KASLR: Fix the size of the direct mapping section
  x86/Kconfig: Fix spelling mistake "effectivness" -> "effectiveness"
  x86/mm/tlb: Revert "x86/mm: Align TLB invalidation info"
  x86/reboot, efi: Use EFI reboot for Acer TravelMate X514-51T
  x86/mm: Prevent bogus warnings with "noexec=off"
  x86/build/lto: Fix truncated .bss with -fdata-sections
  x86/speculation: Prevent deadlock on ssb_state::lock
  x86/resctrl: Do not repeat rdtgroup mode initialization
parents 2b4cf585 2ee27796

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1499,7 +1499,7 @@ config X86_CPA_STATISTICS 
	depends on DEBUG_FS

	---help---

	  Expose statistics about the Change Page Attribute mechanims, which

	  helps to determine the effectivness of preserving large and huge

	  helps to determine the effectiveness of preserving large and huge

	  page mappings when mapping protections are changed.



config ARCH_HAS_MEM_ENCRYPT

arch/x86/kernel/cpu/bugs.c

+3 −3
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static const struct { 
	const char			*option;

	enum spectre_v2_user_cmd	cmd;

	bool				secure;

} v2_user_options[] __initdata = {

} v2_user_options[] __initconst = {

	{ "auto",		SPECTRE_V2_USER_CMD_AUTO,		false },

	{ "off",		SPECTRE_V2_USER_CMD_NONE,		false },

	{ "on",			SPECTRE_V2_USER_CMD_FORCE,		true  },
@@ -419,7 +419,7 @@ static const struct { 
	const char *option;

	enum spectre_v2_mitigation_cmd cmd;

	bool secure;

} mitigation_options[] __initdata = {

} mitigation_options[] __initconst = {

	{ "off",		SPECTRE_V2_CMD_NONE,		  false },

	{ "on",			SPECTRE_V2_CMD_FORCE,		  true  },

	{ "retpoline",		SPECTRE_V2_CMD_RETPOLINE,	  false },
@@ -658,7 +658,7 @@ static const char * const ssb_strings[] = { 
static const struct {

	const char *option;

	enum ssb_mitigation_cmd cmd;

} ssb_mitigation_options[]  __initdata = {

} ssb_mitigation_options[]  __initconst = {

	{ "auto",	SPEC_STORE_BYPASS_CMD_AUTO },    /* Platform decides */

	{ "on",		SPEC_STORE_BYPASS_CMD_ON },      /* Disable Speculative Store Bypass */

	{ "off",	SPEC_STORE_BYPASS_CMD_NONE },    /* Don't touch Speculative Store Bypass */

arch/x86/kernel/cpu/intel.c

+2 −2
Original line number Diff line number Diff line
@@ -611,8 +611,8 @@ static void init_intel_energy_perf(struct cpuinfo_x86 *c) 
	if ((epb & 0xF) != ENERGY_PERF_BIAS_PERFORMANCE)

		return;



	pr_warn_once("ENERGY_PERF_BIAS: Set to 'normal', was 'performance'\n");

	pr_warn_once("ENERGY_PERF_BIAS: View and update with x86_energy_perf_policy(8)\n");

	pr_info_once("ENERGY_PERF_BIAS: Set to 'normal', was 'performance'\n");

	pr_info_once("ENERGY_PERF_BIAS: View and update with x86_energy_perf_policy(8)\n");

	epb = (epb & ~0xF) | ENERGY_PERF_BIAS_NORMAL;

	wrmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);

}

arch/x86/kernel/cpu/resctrl/rdtgroup.c

+2 −1
Original line number Diff line number Diff line
@@ -2610,9 +2610,10 @@ static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp) 
			rdt_last_cmd_puts("Failed to initialize allocations\n");

			return ret;

		}

		rdtgrp->mode = RDT_MODE_SHAREABLE;

	}



	rdtgrp->mode = RDT_MODE_SHAREABLE;



	return 0;

}

arch/x86/kernel/process.c

+6 −2
Original line number Diff line number Diff line
@@ -426,6 +426,8 @@ static __always_inline void __speculation_ctrl_update(unsigned long tifp, 
	u64 msr = x86_spec_ctrl_base;

	bool updmsr = false;



	lockdep_assert_irqs_disabled();



	/*

	 * If TIF_SSBD is different, select the proper mitigation

	 * method. Note that if SSBD mitigation is disabled or permanentely
@@ -477,10 +479,12 @@ static unsigned long speculation_ctrl_update_tif(struct task_struct *tsk) 


void speculation_ctrl_update(unsigned long tif)

{

	unsigned long flags;



	/* Forced update. Make sure all relevant TIF flags are different */

	preempt_disable();

	local_irq_save(flags);

	__speculation_ctrl_update(~tif, tif);

	preempt_enable();

	local_irq_restore(flags);

}



/* Called from seccomp/prctl update */