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.
Showing the changes to include/linux (1 of 3 files). Show all
Unified · Split
| @@ -187,4 +187,28 @@ static inline void cpu_smt_disable(bool force) { } · 186 unmodified lines | |||
| 187 | static inline void cpu_smt_check_topology(void) { } | 187 | static inline void cpu_smt_check_topology(void) { } |
| 188 | #endif | 188 | #endif |
| 189 | 189 | ||
| 190 | /* | ||
| 191 | * These are used for a global "mitigations=" cmdline option for toggling | ||
| 192 | * optional CPU mitigations. | ||
| 193 | */ | ||
| 194 | enum cpu_mitigations { | ||
| 195 | CPU_MITIGATIONS_OFF, | ||
| 196 | CPU_MITIGATIONS_AUTO, | ||
| 197 | CPU_MITIGATIONS_AUTO_NOSMT, | ||
| 198 | }; | ||
| 199 | |||
| 200 | extern enum cpu_mitigations cpu_mitigations; | ||
| 201 | |||
| 202 | /* mitigations=off */ | ||
| 203 | static inline bool cpu_mitigations_off(void) | ||
| 204 | { | ||
| 205 | return cpu_mitigations == CPU_MITIGATIONS_OFF; | ||
| 206 | } | ||
| 207 | |||
| 208 | /* mitigations=auto,nosmt */ | ||
| 209 | static 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_ */ |