History

cpu/speculation: Add 'mitigations=' cmdline option

Keeping track of the number of mitigations for all the CPU speculation bugs has become overwhelming for many users. It's getting more and more complicated to decide which mitigations are needed for a given architecture. Complicating matters is the fact that each arch tends to have its own custom way to mitigate the same vulnerability. Most users fall into a few basic categories: a) they want all mitigations off; b) they want all reasonable mitigations on, with SMT enabled even if it's vulnerable; or c) they want all reasonable mitigations on, with SMT disabled if vulnerable. Define a set of curated, arch-independent options, each of which is an aggregation of existing options: - mitigations=off: Disable all mitigations. - mitigations=auto: [default] Enable all the default mitigations, but leave SMT enabled, even if it's vulnerable. - mitigations=auto,nosmt: Enable all the default mitigations, disabling SMT if needed by a mitigation. Currently, these options are placeholders which don't actually do anything. They will be fleshed out in upcoming patches.

Josh Poimboeuf committed 7 years ago

Commit 98af8451 parent 1c163f43 files · +63 −0Browse files

Unified · Split

3 files
  1. Documentation/admin-guide/kernel-parameters.txt +24 −0
  2. include/linux/cpu.h +24 −0
  3. kernel/cpu.c +15 −0
Documentation/admin-guide/kernel-parameters.txt+24−0
@@ -2513,6 +2513,30 @@ · 2512 unmodified lines
2513 in the "bleeding edge" mini2440 support kernel at2513 in the "bleeding edge" mini2440 support kernel at
2514 http://repo.or.cz/w/linux-2.6/mini2440.git2514 http://repo.or.cz/w/linux-2.6/mini2440.git
2515 2515
2516 mitigations=
2517 Control optional mitigations for CPU vulnerabilities.
2518 This is a set of curated, arch-independent options, each
2519 of which is an aggregation of existing arch-specific
2520 options.
2521
2522 off
2523 Disable all optional CPU mitigations. This
2524 improves system performance, but it may also
2525 expose users to several CPU vulnerabilities.
2526
2527 auto (default)
2528 Mitigate all CPU vulnerabilities, but leave SMT
2529 enabled, even if it's vulnerable. This is for
2530 users who don't want to be surprised by SMT
2531 getting disabled across kernel upgrades, or who
2532 have other ways of avoiding SMT-based attacks.
2533 This is the default behavior.
2534
2535 auto,nosmt
2536 Mitigate all CPU vulnerabilities, disabling SMT
2537 if needed. This is for users who always want to
2538 be fully mitigated, even if it means losing SMT.
2539
2516 mminit_loglevel=2540 mminit_loglevel=
2517 [KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this2541 [KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this
2518 parameter allows control of the logging verbosity for2542 parameter allows control of the logging verbosity for
include/linux/cpu.h+24−0
@@ -187,4 +187,28 @@ static inline void cpu_smt_disable(bool force) { } · 186 unmodified lines
187static inline void cpu_smt_check_topology(void) { }187static inline void cpu_smt_check_topology(void) { }
188#endif188#endif
189 189
190/*
191 * These are used for a global "mitigations=" cmdline option for toggling
192 * optional CPU mitigations.
193 */
194enum cpu_mitigations {
195 CPU_MITIGATIONS_OFF,
196 CPU_MITIGATIONS_AUTO,
197 CPU_MITIGATIONS_AUTO_NOSMT,
198};
199
200extern enum cpu_mitigations cpu_mitigations;
201
202/* mitigations=off */
203static inline bool cpu_mitigations_off(void)
204{
205 return cpu_mitigations == CPU_MITIGATIONS_OFF;
206}
207
208/* mitigations=auto,nosmt */
209static inline bool cpu_mitigations_auto_nosmt(void)
210{
211 return cpu_mitigations == CPU_MITIGATIONS_AUTO_NOSMT;
212}
213
190#endif /* _LINUX_CPU_H_ */214#endif /* _LINUX_CPU_H_ */
kernel/cpu.c+15−0
@@ -2279,3 +2279,18 @@ void __init boot_cpu_hotplug_init(void) · 2278 unmodified lines
2279#endif2279#endif
2280 this_cpu_write(cpuhp_state.state, CPUHP_ONLINE);2280 this_cpu_write(cpuhp_state.state, CPUHP_ONLINE);
2281}2281}
2282
2283enum cpu_mitigations cpu_mitigations __ro_after_init = CPU_MITIGATIONS_AUTO;
2284
2285static int __init mitigations_parse_cmdline(char *arg)
2286{
2287 if (!strcmp(arg, "off"))
2288 cpu_mitigations = CPU_MITIGATIONS_OFF;
2289 else if (!strcmp(arg, "auto"))
2290 cpu_mitigations = CPU_MITIGATIONS_AUTO;
2291 else if (!strcmp(arg, "auto,nosmt"))
2292 cpu_mitigations = CPU_MITIGATIONS_AUTO_NOSMT;
2293
2294 return 0;
2295}
2296early_param("mitigations", mitigations_parse_cmdline);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t