diff --git a/etc/default/grub.d/40_cpu_mitigations.cfg b/etc/default/grub.d/40_cpu_mitigations.cfg index 9bd9fc51..dfd275ee 100644 --- a/etc/default/grub.d/40_cpu_mitigations.cfg +++ b/etc/default/grub.d/40_cpu_mitigations.cfg @@ -18,23 +18,11 @@ GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX spectre_v2=on" ## Disable Speculative Store Bypass. GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX spec_store_bypass_disable=on" -## Enable mitigations for the L1TF vulnerability through disabling SMT -## and L1D flush runtime control. -## -## https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/l1tf.html -GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX l1tf=full,force" - -## Enable mitigations for the MDS vulnerability through clearing buffer cache -## and disabling SMT. -## -## https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/mds.html -GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX mds=full,nosmt" - ## Patches the TAA vulnerability by disabling TSX and enables mitigations using ## TSX Async Abort along with disabling SMT. ## ## https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/tsx_async_abort.html -GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX tsx=off tsx_async_abort=full,nosmt" +GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX tsx=off" ## Mark all huge pages in the EPT as non-executable to mitigate iTLB multihit. ## @@ -59,16 +47,6 @@ GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX nosmt=force" ## https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/l1d_flush.html GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX l1d_flush=on" -## Mitigates numerous MMIO Stale Data vulnerabilities and disables SMT. -## -## https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/processor_mmio_stale_data.html -GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX mmio_stale_data=full,nosmt" - -## Enable mitigations for RETBleed (Arbitrary Speculative Code Execution with -## Return Instructions) vulnerability and disable SMT. -## -GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX retbleed=auto,nosmt" - ## Control RAS overflow mitigation on AMD Zen CPUs. ## The current default kernel parameter is 'spec_rstack_overflow=safe-ret' ## This default will used until provided sufficient evidence to modify.