[MODERATED] Re: [PATCH] NX documentation

[Paolo Bonzini <pbonzini@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 2536 bytes --]

Thanks, queued with these fixes on top.  I'll be sending v9 shortly.

diff --git a/Documentation/admin-guide/hw-vuln/multihit.rst b/Documentation/admin-guide/hw-vuln/multihit.rst
index c2c9cef23e20..26e478a3570f 100644
--- a/Documentation/admin-guide/hw-vuln/multihit.rst
+++ b/Documentation/admin-guide/hw-vuln/multihit.rst
@@ -1,8 +1,9 @@
 iTLB multihit
 =============
+
 iTLB multihit is an erratum where some processors may incur a machine check
-error possibly resulting in an unrecoverable cpu hang when an instruction fetch
-encounters a TLB multi-hit in the instruction TLB. This can occur when the page
+error, possibly resulting in an unrecoverable CPU hang, when an instruction fetch
+hits multiple entries in the instruction TLB. This can occur when the page
 size is changed along with either the physical address or cache type. A
 malicious guest running on a virtualized system can exploit this erratum to
 perform a denial of service attack.
@@ -14,6 +15,8 @@ Affected processors
 Variations of this erratum are present on most Intel Core and Xeon processor
 models. The erratum is not present on:
 
+   - non-Intel processors
+
    - Some Atoms (Airmont, Bonnell, Goldmont, GoldmontPlus, Saltwell, Silvermont)
 
    - Intel processors that have the PSCHANGE_MC_NO bit set in the
@@ -97,7 +100,8 @@ and will be set on CPU's which are mitigated against this issue.
 Mitigation mechanism
 -------------------------
 
-This erratum can be mitigated by restricting the use of large pages.
+This erratum can be mitigated by restricting the use of large page sizes to
+non-executable pages.
 
 
 Mitigation control on the kernel command line and KVM - module parameter
@@ -120,7 +124,8 @@ The valid arguments for these options are:
 
   off	      Mitigation is disabled.
 
-  auto        Enable mitigation only if the platform is affected.
+  auto        Enable mitigation only if the platform is affected and the kernel
+              was not booted with the "mitigations=off" command line parameter.
   ==========  ================================================================
 
 
@@ -143,5 +148,5 @@ Mitigation selection guide
 3. Virtualization with untrusted guests
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    If the guest comes from an untrusted source, the guest host kernel will need
-   to apply the iTLB multihit mitigation via the kernel command line or kvm
+   to apply iTLB multihit mitigation via the kernel command line or kvm
    module parameter.