Commit 0cd01ac5 authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Thomas Gleixner
Browse files

x86/bugs: Change commas to semicolons in 'spectre_v2' sysfs file 



Change the format of the 'spectre_v2' vulnerabilities sysfs file
slightly by converting the commas to semicolons, so that mitigations for
future variants can be grouped together and separated by commas.

Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: default avatarDaniel Sneddon <daniel.sneddon@linux.intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 39cd87c4

arch/x86/kernel/cpu/bugs.c

+12 −12
Original line number Diff line number Diff line
@@ -2695,15 +2695,15 @@ static char *stibp_state(void) 


	switch (spectre_v2_user_stibp) {

	case SPECTRE_V2_USER_NONE:

		return ", STIBP: disabled";

		return "; STIBP: disabled";

	case SPECTRE_V2_USER_STRICT:

		return ", STIBP: forced";

		return "; STIBP: forced";

	case SPECTRE_V2_USER_STRICT_PREFERRED:

		return ", STIBP: always-on";

		return "; STIBP: always-on";

	case SPECTRE_V2_USER_PRCTL:

	case SPECTRE_V2_USER_SECCOMP:

		if (static_key_enabled(&switch_to_cond_stibp))

			return ", STIBP: conditional";

			return "; STIBP: conditional";

	}

	return "";

}
@@ -2712,10 +2712,10 @@ static char *ibpb_state(void) 
{

	if (boot_cpu_has(X86_FEATURE_IBPB)) {

		if (static_key_enabled(&switch_mm_always_ibpb))

			return ", IBPB: always-on";

			return "; IBPB: always-on";

		if (static_key_enabled(&switch_mm_cond_ibpb))

			return ", IBPB: conditional";

		return ", IBPB: disabled";

			return "; IBPB: conditional";

		return "; IBPB: disabled";

	}

	return "";

}
@@ -2725,11 +2725,11 @@ static char *pbrsb_eibrs_state(void) 
	if (boot_cpu_has_bug(X86_BUG_EIBRS_PBRSB)) {

		if (boot_cpu_has(X86_FEATURE_RSB_VMEXIT_LITE) ||

		    boot_cpu_has(X86_FEATURE_RSB_VMEXIT))

			return ", PBRSB-eIBRS: SW sequence";

			return "; PBRSB-eIBRS: SW sequence";

		else

			return ", PBRSB-eIBRS: Vulnerable";

			return "; PBRSB-eIBRS: Vulnerable";

	} else {

		return ", PBRSB-eIBRS: Not affected";

		return "; PBRSB-eIBRS: Not affected";

	}

}
@@ -2748,9 +2748,9 @@ static ssize_t spectre_v2_show_state(char *buf) 
	return sysfs_emit(buf, "%s%s%s%s%s%s%s\n",

			  spectre_v2_strings[spectre_v2_enabled],

			  ibpb_state(),

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

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

			  stibp_state(),

			  boot_cpu_has(X86_FEATURE_RSB_CTXSW) ? ", RSB filling" : "",

			  boot_cpu_has(X86_FEATURE_RSB_CTXSW) ? "; RSB filling" : "",

			  pbrsb_eibrs_state(),

			  spectre_v2_module_string());

}