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

Commit f44ed2c9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.140 into android-4.9 



Changes in 4.9.140
	Revert "x86/speculation: Enable cross-hyperthread spectre v2 STIBP mitigation"
	Revert "ipv6: set rt6i_protocol properly in the route when it is installed"
	Linux 4.9.140

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 6e556478 e1864131

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 139

SUBLEVEL = 140

EXTRAVERSION =

NAME = Roaring Lionus

arch/x86/kernel/cpu/bugs.c

+6 −51
Original line number Diff line number Diff line
@@ -33,10 +33,12 @@ static void __init spectre_v2_select_mitigation(void); 
static void __init ssb_select_mitigation(void);

static void __init l1tf_select_mitigation(void);



/* The base value of the SPEC_CTRL MSR that always has to be preserved. */

u64 x86_spec_ctrl_base;

/*

 * Our boot-time value of the SPEC_CTRL MSR. We read it once so that any

 * writes to SPEC_CTRL contain whatever reserved bits have been set.

 */

u64 __ro_after_init x86_spec_ctrl_base;

EXPORT_SYMBOL_GPL(x86_spec_ctrl_base);

static DEFINE_MUTEX(spec_ctrl_mutex);



/*

 * The vendor and possibly platform specific bits which can be modified in
@@ -320,46 +322,6 @@ static enum spectre_v2_mitigation_cmd __init spectre_v2_parse_cmdline(void) 
	return cmd;

}



static bool stibp_needed(void)

{

	if (spectre_v2_enabled == SPECTRE_V2_NONE)

		return false;



	if (!boot_cpu_has(X86_FEATURE_STIBP))

		return false;



	return true;

}



static void update_stibp_msr(void *info)

{

	wrmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_base);

}



void arch_smt_update(void)

{

	u64 mask;



	if (!stibp_needed())

		return;



	mutex_lock(&spec_ctrl_mutex);

	mask = x86_spec_ctrl_base;

	if (cpu_smt_control == CPU_SMT_ENABLED)

		mask |= SPEC_CTRL_STIBP;

	else

		mask &= ~SPEC_CTRL_STIBP;



	if (mask != x86_spec_ctrl_base) {

		pr_info("Spectre v2 cross-process SMT mitigation: %s STIBP\n",

				cpu_smt_control == CPU_SMT_ENABLED ?

				"Enabling" : "Disabling");

		x86_spec_ctrl_base = mask;

		on_each_cpu(update_stibp_msr, NULL, 1);

	}

	mutex_unlock(&spec_ctrl_mutex);

}



static void __init spectre_v2_select_mitigation(void)

{

	enum spectre_v2_mitigation_cmd cmd = spectre_v2_parse_cmdline();
@@ -459,9 +421,6 @@ static void __init spectre_v2_select_mitigation(void) 
		setup_force_cpu_cap(X86_FEATURE_USE_IBRS_FW);

		pr_info("Enabling Restricted Speculation for firmware calls\n");

	}



	/* Enable STIBP if appropriate */

	arch_smt_update();

}



#undef pr_fmt
@@ -854,8 +813,6 @@ static ssize_t l1tf_show_state(char *buf) 
static ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr,

			       char *buf, unsigned int bug)

{

	int ret;



	if (!boot_cpu_has_bug(bug))

		return sprintf(buf, "Not affected\n");
@@ -870,12 +827,10 @@ static ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr 
		return sprintf(buf, "Mitigation: __user pointer sanitization\n");



	case X86_BUG_SPECTRE_V2:

		ret = sprintf(buf, "%s%s%s%s%s\n", spectre_v2_strings[spectre_v2_enabled],

		return sprintf(buf, "%s%s%s%s\n", spectre_v2_strings[spectre_v2_enabled],

			       boot_cpu_has(X86_FEATURE_USE_IBPB) ? ", IBPB" : "",

			       boot_cpu_has(X86_FEATURE_USE_IBRS_FW) ? ", IBRS_FW" : "",

			       (x86_spec_ctrl_base & SPEC_CTRL_STIBP) ? ", STIBP" : "",

			       spectre_v2_module_string());

		return ret;



	case X86_BUG_SPEC_STORE_BYPASS:

		return sprintf(buf, "%s\n", ssb_strings[ssb_mode]);

kernel/cpu.c

+1 −10
Original line number Diff line number Diff line
@@ -1977,12 +1977,6 @@ static void cpuhp_online_cpu_device(unsigned int cpu) 
	kobject_uevent(&dev->kobj, KOBJ_ONLINE);

}



/*

 * Architectures that need SMT-specific errata handling during SMT hotplug

 * should override this.

 */

void __weak arch_smt_update(void) { };



static int cpuhp_smt_disable(enum cpuhp_smt_control ctrlval)

{

	int cpu, ret = 0;
@@ -2009,10 +2003,8 @@ static int cpuhp_smt_disable(enum cpuhp_smt_control ctrlval) 
		 */

		cpuhp_offline_cpu_device(cpu);

	}

	if (!ret) {

	if (!ret)

		cpu_smt_control = ctrlval;

		arch_smt_update();

	}

	cpu_maps_update_done();

	return ret;

}
@@ -2023,7 +2015,6 @@ static int cpuhp_smt_enable(void) 


	cpu_maps_update_begin();

	cpu_smt_control = CPU_SMT_ENABLED;

	arch_smt_update();

	for_each_present_cpu(cpu) {

		/* Skip online CPUs and CPUs on offline nodes */

		if (cpu_online(cpu) || !node_online(cpu_to_node(cpu)))