Merge tag 'pm-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

[linux.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 8dee8f68fe15cfd99278ac91ed8775462b828060..a0a4732eedbbea5154f96d5d62f0820d0d8dd0c7 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -2473,6 +2473,12 @@
                                     SMT on vulnerable CPUs
                        off        - Unconditionally disable MDS mitigation
 
+                       On TAA-affected machines, mds=off can be prevented by
+                       an active TAA mitigation as both vulnerabilities are
+                       mitigated with the same mechanism so in order to disable
+                       this mitigation, you need to specify tsx_async_abort=off
+                       too.
+
                        Not specifying this option is equivalent to
                        mds=full.
 
@@ -3110,9 +3116,9 @@
                        [X86,PV_OPS] Disable paravirtualized VMware scheduler
                        clock and use the default one.
 
-       no-steal-acc    [X86,KVM] Disable paravirtualized steal time accounting.
-                       steal time is computed, but won't influence scheduler
-                       behaviour
+       no-steal-acc    [X86,KVM,ARM64] Disable paravirtualized steal time
+                       accounting. steal time is computed, but won't
+                       influence scheduler behaviour
 
        nolapic         [X86-32,APIC] Do not enable or use the local APIC.
 
@@ -4931,6 +4937,11 @@
                                     vulnerable to cross-thread TAA attacks.
                        off        - Unconditionally disable TAA mitigation
 
+                       On MDS-affected machines, tsx_async_abort=off can be
+                       prevented by an active MDS mitigation as both vulnerabilities
+                       are mitigated with the same mechanism so in order to disable
+                       this mitigation, you need to specify mds=off too.
+
                        Not specifying this option is equivalent to
                        tsx_async_abort=full.  On CPUs which are MDS affected
                        and deploy MDS mitigation, TAA mitigation is not