[PATCH] Documentation: Unify format for vulnerability sysfs

[Takahiro Itazuri]

The format for vulnerability sysfs files was diverge across pages.

Unifies the format as follows:

* Use list table for possible values for the sysfs files, because simple
  table does not allow line breaks for the first column; otherwise
  recognized as multiple different rows

* Insert 2-spaces indentation before a sysfs path

* Wrap each possible value with single quotes

* End description with a full stop

* Apply 80 columns rule

Signed-off-by: Takahiro Itazuri <zulinx86@xxxxxxxxx>
---
Changes in v4:
- Rename vuln to vulnerability in commit message
- Apply 80 columns rule
- Link to v3: https://lore.kernel.org/all/20240908172341.571476-1-zulinx86@xxxxxxxxx/

Changes in v3:
- Return to list table in favor of presevation of the existing HTML appearance
  and readability/editability in plain text format.
- Link to v2: https://lore.kernel.org/all/20240906104936.15558-1-itazur@xxxxxxxxxx/

Changes in v2:
- Use grid table over list table (applying to not only GDS but also
  other vulnerabilities)
- Link to v1: https://lore.kernel.org/all/20240903132533.26458-1-itazur@xxxxxxxxxx/

---
 .../hw-vuln/gather_data_sampling.rst          |  44 +++---
 Documentation/admin-guide/hw-vuln/l1tf.rst    |  37 +++--
 Documentation/admin-guide/hw-vuln/mds.rst     |  69 ++++----
 .../admin-guide/hw-vuln/multihit.rst          |  28 ++--
 .../hw-vuln/processor_mmio_stale_data.rst     |  72 +++++----
 .../hw-vuln/reg-file-data-sampling.rst        |  27 ++--
 .../special-register-buffer-data-sampling.rst |  39 +++--
 Documentation/admin-guide/hw-vuln/spectre.rst | 149 +++++++++++-------
 Documentation/admin-guide/hw-vuln/srso.rst    |  81 +++++-----
 .../admin-guide/hw-vuln/tsx_async_abort.rst   |  52 +++---
 10 files changed, 343 insertions(+), 255 deletions(-)

diff --git a/Documentation/admin-guide/hw-vuln/gather_data_sampling.rst b/Documentation/admin-guide/hw-vuln/gather_data_sampling.rst
index 264bfa937f7d..815c78acc4be 100644
--- a/Documentation/admin-guide/hw-vuln/gather_data_sampling.rst
+++ b/Documentation/admin-guide/hw-vuln/gather_data_sampling.rst
@@ -81,27 +81,35 @@ GDS System Information
 The kernel provides vulnerability status information through sysfs. For
 GDS this can be accessed by the following sysfs file:

-/sys/devices/system/cpu/vulnerabilities/gather_data_sampling
+  /sys/devices/system/cpu/vulnerabilities/gather_data_sampling

 The possible values contained in this file are:

- ============================== =============================================
- Not affected                   Processor not vulnerable.
- Vulnerable                     Processor vulnerable and mitigation disabled.
- Vulnerable: No microcode       Processor vulnerable and microcode is missing
-                                mitigation.
- Mitigation: AVX disabled,
- no microcode                   Processor is vulnerable and microcode is missing
-                                mitigation. AVX disabled as mitigation.
- Mitigation: Microcode          Processor is vulnerable and mitigation is in
-                                effect.
- Mitigation: Microcode (locked) Processor is vulnerable and mitigation is in
-                                effect and cannot be disabled.
- Unknown: Dependent on
- hypervisor status              Running on a virtual guest processor that is
-                                affected but with no way to know if host
-                                processor is mitigated or vulnerable.
- ============================== =============================================
+.. list-table::
+
+  * - 'Not affected'
+    - Processor not vulnerable.
+
+  * - 'Vulnerable'
+    - Processor vulnerable and mitigation disabled.
+
+  * - 'Vulnerable: No microcode'
+    - Processor vulnerable and microcode is missing migitation.
+
+  * - 'Mitigation: AVX disabled, no microcode'
+    - Processor is vulnerable and microcode is missing mitigation. AVX disabled
+      as mitigation.
+
+  * - 'Mitigation: Microcode'
+    - Processor is vulnerable and mitigation is in effect.
+
+  * - 'Mitigation: Microcode (locked)'
+    - Processor is vulnerable and mitigation is in effect and cannot be
+      disabled.
+
+  * - 'Unknown: Dependent on hypervisor status'
+    - Running on a virtual guest processor that is affected but with no way to
+      know if host processor is mitigated or vulnerable.

 GDS Default mitigation
 ----------------------
diff --git a/Documentation/admin-guide/hw-vuln/l1tf.rst b/Documentation/admin-guide/hw-vuln/l1tf.rst
index 3eeeb488d955..a049e1ab935c 100644
--- a/Documentation/admin-guide/hw-vuln/l1tf.rst
+++ b/Documentation/admin-guide/hw-vuln/l1tf.rst
@@ -123,34 +123,43 @@ The Linux kernel provides a sysfs interface to enumerate the current L1TF
 status of the system: whether the system is vulnerable, and which
 mitigations are active. The relevant sysfs file is:

-/sys/devices/system/cpu/vulnerabilities/l1tf
+  /sys/devices/system/cpu/vulnerabilities/l1tf

 The possible values in this file are:

-  ===========================   ===============================
-  'Not affected'		The processor is not vulnerable
-  'Mitigation: PTE Inversion'	The host protection is active
-  ===========================   ===============================
+.. list-table::
+
+  * - 'Not affected'
+    - The processor is not vulnerable.
+
+  * - 'Mitigation: PTE Inversion'
+    - The host protection is active.

 If KVM/VMX is enabled and the processor is vulnerable then the following
 information is appended to the 'Mitigation: PTE Inversion' part:

   - SMT status:

-    =====================  ================
-    'VMX: SMT vulnerable'  SMT is enabled
-    'VMX: SMT disabled'    SMT is disabled
-    =====================  ================
+    .. list-table::
+
+      * - 'VMX: SMT vulnerable'
+        - SMT is enabled.
+
+      * - 'VMX: SMT disabled'
+        - SMT is disabled.

   - L1D Flush mode:

-    ================================  ====================================
-    'L1D vulnerable'		      L1D flushing is disabled
+    .. list-table::
+
+      * - 'L1D vulnerable'
+        - L1D flushing is disabled.

-    'L1D conditional cache flushes'   L1D flush is conditionally enabled
+      * - 'L1D conditional cache flushes'
+        - L1D flush is conditionally enabled.

-    'L1D cache flushes'		      L1D flush is unconditionally enabled
-    ================================  ====================================
+      * - 'L1D cache flushes'
+        - L1D flush is unconditionally enabled.

 The resulting grade of protection is discussed in the following sections.

diff --git a/Documentation/admin-guide/hw-vuln/mds.rst b/Documentation/admin-guide/hw-vuln/mds.rst
index 48c7b0b72aed..a31b44716937 100644
--- a/Documentation/admin-guide/hw-vuln/mds.rst
+++ b/Documentation/admin-guide/hw-vuln/mds.rst
@@ -91,43 +91,52 @@ The Linux kernel provides a sysfs interface to enumerate the current MDS
 status of the system: whether the system is vulnerable, and which
 mitigations are active. The relevant sysfs file is:

-/sys/devices/system/cpu/vulnerabilities/mds
+  /sys/devices/system/cpu/vulnerabilities/mds

 The possible values in this file are:

-  .. list-table::
-
-     * - 'Not affected'
-       - The processor is not vulnerable
-     * - 'Vulnerable'
-       - The processor is vulnerable, but no mitigation enabled
-     * - 'Vulnerable: Clear CPU buffers attempted, no microcode'
-       - The processor is vulnerable but microcode is not updated. The
-         mitigation is enabled on a best effort basis.
-
-         If the processor is vulnerable but the availability of the microcode
-         based mitigation mechanism is not advertised via CPUID, the kernel
-         selects a best effort mitigation mode. This mode invokes the mitigation
-         instructions without a guarantee that they clear the CPU buffers.
-
-         This is done to address virtualization scenarios where the host has the
-         microcode update applied, but the hypervisor is not yet updated to
-         expose the CPUID to the guest. If the host has updated microcode the
-         protection takes effect; otherwise a few CPU cycles are wasted
-         pointlessly.
-     * - 'Mitigation: Clear CPU buffers'
-       - The processor is vulnerable and the CPU buffer clearing mitigation is
-         enabled.
+.. list-table::
+
+  * - 'Not affected'
+    - The processor is not vulnerable.
+
+  * - 'Vulnerable'
+    - The processor is vulnerable, but no mitigation enabled.
+
+  * - 'Vulnerable: Clear CPU buffers attempted, no microcode'
+    - The processor is vulnerable but microcode is not updated. The mitigation
+      is enabled on a best effort basis.
+
+      If the processor is vulnerable but the availability of the microcode
+      based mitigation mechanism is not advertised via CPUID, the kernel
+      selects a best effort mitigation mode. This mode invokes the mitigation
+      instructions without a guarantee that they clear the CPU buffers.
+
+      This is done to address virtualization scenarios where the host has the
+      microcode update applied, but the hypervisor is not yet updated to expose
+      the CPUID to the guest. If the host has updated microcode the protection
+      takes effect; otherwise a few CPU cycles are wasted pointlessly.
+
+  * - 'Mitigation: Clear CPU buffers'
+    - The processor is vulnerable and the CPU buffer clearing mitigation is
+      enabled.

 If the processor is vulnerable then the following information is appended
 to the above information:

-    ========================  ============================================
-    'SMT vulnerable'          SMT is enabled
-    'SMT mitigated'           SMT is enabled and mitigated
-    'SMT disabled'            SMT is disabled
-    'SMT Host state unknown'  Kernel runs in a VM, Host SMT state unknown
-    ========================  ============================================
+.. list-table::
+
+  * - 'SMT vulnerable'
+    - SMT is enabled.
+
+  * - 'SMT mitigated'
+    - SMT is enabled and mitigated.
+
+  * - 'SMT disabled'
+    - SMT is disabled.
+
+  * - 'SMT Host state unknown'
+    - Kernel runs in a VM, Host SMT state unknown.

 Mitigation mechanism
 -------------------------
diff --git a/Documentation/admin-guide/hw-vuln/multihit.rst b/Documentation/admin-guide/hw-vuln/multihit.rst
index 140e4cec38c3..618552fb7149 100644
--- a/Documentation/admin-guide/hw-vuln/multihit.rst
+++ b/Documentation/admin-guide/hw-vuln/multihit.rst
@@ -70,22 +70,28 @@ The Linux kernel provides a sysfs interface to enumerate the current iTLB
 multihit status of the system:whether the system is vulnerable and which
 mitigations are active. The relevant sysfs file is:

-/sys/devices/system/cpu/vulnerabilities/itlb_multihit
+  /sys/devices/system/cpu/vulnerabilities/itlb_multihit

 The possible values in this file are:

 .. list-table::

-     * - Not affected
-       - The processor is not vulnerable.
-     * - KVM: Mitigation: Split huge pages
-       - Software changes mitigate this issue.
-     * - KVM: Mitigation: VMX unsupported
-       - KVM is not vulnerable because Virtual Machine Extensions (VMX) is not supported.
-     * - KVM: Mitigation: VMX disabled
-       - KVM is not vulnerable because Virtual Machine Extensions (VMX) is disabled.
-     * - KVM: Vulnerable
-       - The processor is vulnerable, but no mitigation enabled
+  * - 'Not affected'
+    - The processor is not vulnerable.
+
+  * - 'KVM: Mitigation: Split huge pages'
+    - Software changes mitigate this issue.
+
+  * - 'KVM: Mitigation: VMX unsupported'
+    - KVM is not vulnerable because Virtual Machine Extensions (VMX) is not
+      supported.
+
+  * - 'KVM: Mitigation: VMX disabled'
+    - KVM is not vulnerable because Virtual Machine Extensions (VMX) is
+      disabled.
+
+  * - 'KVM: Vulnerable'
+    - The processor is vulnerable, but no mitigation enabled.


 Enumeration of the erratum
diff --git a/Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst b/Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst
index 1302fd1b55e8..e86188ae107c 100644
--- a/Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst
+++ b/Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst
@@ -214,36 +214,39 @@ The Linux kernel provides a sysfs interface to enumerate the current
 vulnerability status of the system: whether the system is vulnerable, and
 which mitigations are active. The relevant sysfs file is:

-	/sys/devices/system/cpu/vulnerabilities/mmio_stale_data
+  /sys/devices/system/cpu/vulnerabilities/mmio_stale_data

 The possible values in this file are:

-  .. list-table::
-
-     * - 'Not affected'
-       - The processor is not vulnerable
-     * - 'Vulnerable'
-       - The processor is vulnerable, but no mitigation enabled
-     * - 'Vulnerable: Clear CPU buffers attempted, no microcode'
-       - The processor is vulnerable but microcode is not updated. The
-         mitigation is enabled on a best effort basis.
-
-         If the processor is vulnerable but the availability of the microcode
-         based mitigation mechanism is not advertised via CPUID, the kernel
-         selects a best effort mitigation mode. This mode invokes the mitigation
-         instructions without a guarantee that they clear the CPU buffers.
-
-         This is done to address virtualization scenarios where the host has the
-         microcode update applied, but the hypervisor is not yet updated to
-         expose the CPUID to the guest. If the host has updated microcode the
-         protection takes effect; otherwise a few CPU cycles are wasted
-         pointlessly.
-     * - 'Mitigation: Clear CPU buffers'
-       - The processor is vulnerable and the CPU buffer clearing mitigation is
-         enabled.
-     * - 'Unknown: No mitigations'
-       - The processor vulnerability status is unknown because it is
-	 out of Servicing period. Mitigation is not attempted.
+.. list-table::
+
+  * - 'Not affected'
+    - The processor is not vulnerable.
+
+  * - 'Vulnerable'
+    - The processor is vulnerable, but no mitigation enabled.
+
+  * - 'Vulnerable: Clear CPU buffers attempted, no microcode'
+    - The processor is vulnerable but microcode is not updated. The mitigation
+      is enabled on a best effort basis.
+
+      If the processor is vulnerable but the availability of the microcode
+      based mitigation mechanism is not advertised via CPUID, the kernel
+      selects a best effort mitigation mode. This mode invokes the mitigation
+      instructions without a guarantee that they clear the CPU buffers.
+
+      This is done to address virtualization scenarios where the host has the
+      microcode update applied, but the hypervisor is not yet updated to expose
+      the CPUID to the guest. If the host has updated microcode the protection
+      takes effect; otherwise a few CPU cycles are wasted pointlessly.
+
+  * - 'Mitigation: Clear CPU buffers'
+    - The processor is vulnerable and the CPU buffer clearing mitigation is
+      enabled.
+
+  * - 'Unknown: No mitigations'
+    - The processor vulnerability status is unknown because it is out of
+      Servicing period. Mitigation is not attempted.

 Definitions:
 ------------
@@ -259,11 +262,16 @@ processes. ESU dates will typically be aligned to end of quarter.
 If the processor is vulnerable then the following information is appended to
 the above information:

-  ========================  ===========================================
-  'SMT vulnerable'          SMT is enabled
-  'SMT disabled'            SMT is disabled
-  'SMT Host state unknown'  Kernel runs in a VM, Host SMT state unknown
-  ========================  ===========================================
+.. list-table::
+
+  * - 'SMT vulnerable'
+    - SMT is enabled.
+
+  * - 'SMT disabled'
+    - SMT is disabled.
+
+  * - 'SMT Host state unknown'
+    - Kernel runs in a VM, Host SMT state unknown.

 References
 ----------
diff --git a/Documentation/admin-guide/hw-vuln/reg-file-data-sampling.rst b/Documentation/admin-guide/hw-vuln/reg-file-data-sampling.rst
index 0585d02b9a6c..00bcc0424980 100644
--- a/Documentation/admin-guide/hw-vuln/reg-file-data-sampling.rst
+++ b/Documentation/admin-guide/hw-vuln/reg-file-data-sampling.rst
@@ -82,21 +82,24 @@ The Linux kernel provides a sysfs interface to enumerate the current
 vulnerability status of the system: whether the system is vulnerable, and
 which mitigations are active. The relevant sysfs file is:

-	/sys/devices/system/cpu/vulnerabilities/reg_file_data_sampling
+  /sys/devices/system/cpu/vulnerabilities/reg_file_data_sampling

 The possible values in this file are:

-  .. list-table::
-
-     * - 'Not affected'
-       - The processor is not vulnerable
-     * - 'Vulnerable'
-       - The processor is vulnerable, but no mitigation enabled
-     * - 'Vulnerable: No microcode'
-       - The processor is vulnerable but microcode is not updated.
-     * - 'Mitigation: Clear Register File'
-       - The processor is vulnerable and the CPU buffer clearing mitigation is
-	 enabled.
+.. list-table::
+
+  * - 'Not affected'
+    - The processor is not vulnerable.
+
+  * - 'Vulnerable'
+    - The processor is vulnerable, but no mitigation enabled.
+
+  * - 'Vulnerable: No microcode'
+    - The processor is vulnerable but microcode is not updated.
+
+  * - 'Mitigation: Clear Register File'
+    - The processor is vulnerable and the CPU buffer clearing mitigation is
+      enabled.

 References
 ----------
diff --git a/Documentation/admin-guide/hw-vuln/special-register-buffer-data-sampling.rst b/Documentation/admin-guide/hw-vuln/special-register-buffer-data-sampling.rst
index 966c9b3296ea..5b8c4e816e9e 100644
--- a/Documentation/admin-guide/hw-vuln/special-register-buffer-data-sampling.rst
+++ b/Documentation/admin-guide/hw-vuln/special-register-buffer-data-sampling.rst
@@ -122,25 +122,32 @@ SRBDS System Information
 ------------------------
 The Linux kernel provides vulnerability status information through sysfs.  For
 SRBDS this can be accessed by the following sysfs file:
-/sys/devices/system/cpu/vulnerabilities/srbds
+
+  /sys/devices/system/cpu/vulnerabilities/srbds

 The possible values contained in this file are:

- ============================== =============================================
- Not affected                   Processor not vulnerable
- Vulnerable                     Processor vulnerable and mitigation disabled
- Vulnerable: No microcode       Processor vulnerable and microcode is missing
-                                mitigation
- Mitigation: Microcode          Processor is vulnerable and mitigation is in
-                                effect.
- Mitigation: TSX disabled       Processor is only vulnerable when TSX is
-                                enabled while this system was booted with TSX
-                                disabled.
- Unknown: Dependent on
- hypervisor status              Running on virtual guest processor that is
-                                affected but with no way to know if host
-                                processor is mitigated or vulnerable.
- ============================== =============================================
+.. list-table::
+
+  * - 'Not affected'
+    - Processor not vulnerable.
+
+  * - 'Vulnerable'
+    - Processor vulnerable and mitigation disabled.
+
+  * - 'Vulnerable: No microcode'
+    - Processor vulnerable and microcode is missing mitigation.
+
+  * - 'Mitigation: Microcode'
+    - Processor is vulnerable and mitigation is in effect.
+
+  * - 'Mitigation: TSX disabled'
+    - Processor is only vulnerable when TSX is enabled while this system was
+      booted with TSX disabled.
+
+  * - 'Unknown: Dependent on hypervisor status'
+    - Running on virtual guest processor that is affected but with no way to
+      know if host processor is mitigated or vulnerable.

 SRBDS Default mitigation
 ------------------------
diff --git a/Documentation/admin-guide/hw-vuln/spectre.rst b/Documentation/admin-guide/hw-vuln/spectre.rst
index 132e0bc6007e..f8d5e3c10fdd 100644
--- a/Documentation/admin-guide/hw-vuln/spectre.rst
+++ b/Documentation/admin-guide/hw-vuln/spectre.rst
@@ -332,22 +332,24 @@ vulnerable, and which mitigations are active.

 The sysfs file showing Spectre variant 1 mitigation status is:

-   /sys/devices/system/cpu/vulnerabilities/spectre_v1
+  /sys/devices/system/cpu/vulnerabilities/spectre_v1

 The possible values in this file are:

-  .. list-table::
+.. list-table::
+
+  * - 'Not affected'
+    - The processor is not vulnerable.

-     * - 'Not affected'
-       - The processor is not vulnerable.
-     * - 'Vulnerable: __user pointer sanitization and usercopy barriers only; no swapgs barriers'
-       - The swapgs protections are disabled; otherwise it has
-         protection in the kernel on a case by case base with explicit
-         pointer sanitation and usercopy LFENCE barriers.
-     * - 'Mitigation: usercopy/swapgs barriers and __user pointer sanitization'
-       - Protection in the kernel on a case by case base with explicit
-         pointer sanitation, usercopy LFENCE barriers, and swapgs LFENCE
-         barriers.
+  * - 'Vulnerable: __user pointer sanitization and usercopy barriers only; no
+      swapgs barriers'
+    - The swapgs protections are disabled; otherwise it has protection in the
+      kernel on a case by case base with explicit pointer sanitation and
+      usercopy LFENCE barriers.
+
+  * - 'Mitigation: usercopy/swapgs barriers and __user pointer sanitization'
+    - Protection in the kernel on a case by case base with explicit pointer
+      sanitation, usercopy LFENCE barriers, and swapgs LFENCE barriers.

 However, the protections are put in place on a case by case basis,
 and there is no guarantee that all possible attack vectors for Spectre
@@ -370,81 +372,116 @@ per process on a case-by-case base.

 The sysfs file showing Spectre variant 2 mitigation status is:

-   /sys/devices/system/cpu/vulnerabilities/spectre_v2
+  /sys/devices/system/cpu/vulnerabilities/spectre_v2

 The possible values in this file are:

   - Kernel status:

-  ========================================  =================================
-  'Not affected'                            The processor is not vulnerable
-  'Mitigation: None'                        Vulnerable, no mitigation
-  'Mitigation: Retpolines'                  Use Retpoline thunks
-  'Mitigation: LFENCE'                      Use LFENCE instructions
-  'Mitigation: Enhanced IBRS'               Hardware-focused mitigation
-  'Mitigation: Enhanced IBRS + Retpolines'  Hardware-focused + Retpolines
-  'Mitigation: Enhanced IBRS + LFENCE'      Hardware-focused + LFENCE
-  ========================================  =================================
+    .. list-table::
+
+      * - 'Not affected'
+        - The processor is not vulnerable.
+
+      * - 'Mitigation: None'
+        - Vulnerable, no mitigation.
+
+      * - 'Mitigation: Retpolines'
+        - Use Retpoline thunks.
+
+      * - 'Mitigation: LFENCE'
+        - Use LFENCE instructions.
+
+      * - 'Mitigation: Enhanced IBRS'
+        - Hardware-focused mitigation.
+
+      * - 'Mitigation: Enhanced IBRS + Retpolines'
+        - Hardware-focused + Retpolines.
+
+      * - 'Mitigation: Enhanced IBRS + LFENCE'
+        - Hardware-focused + LFENCE.

   - Firmware status: Show if Indirect Branch Restricted Speculation (IBRS) is
     used to protect against Spectre variant 2 attacks when calling firmware (x86 only).

-  ========== =============================================================
-  'IBRS_FW'  Protection against user program attacks when calling firmware
-  ========== =============================================================
+    .. list-table::
+
+      * - 'IBRS_FW'
+        - Protection against user program attacks when calling firmware.

   - Indirect branch prediction barrier (IBPB) status for protection between
     processes of different users. This feature can be controlled through
     prctl() per process, or through kernel command line options. This is
     an x86 only feature. For more details see below.

-  ===================   ========================================================
-  'IBPB: disabled'      IBPB unused
-  'IBPB: always-on'     Use IBPB on all tasks
-  'IBPB: conditional'   Use IBPB on SECCOMP or indirect branch restricted tasks
-  ===================   ========================================================
+    .. list-table::
+
+      * - 'IBPB: disabled'
+        - IBPB unused.
+
+      * - 'IBPB: always-on'
+        - Use IBPB on all tasks.
+
+      * - 'IBPB: conditional'
+        - Use IBPB on SECCOMP or indirect branch restricted tasks.

   - Single threaded indirect branch prediction (STIBP) status for protection
     between different hyper threads. This feature can be controlled through
     prctl per process, or through kernel command line options. This is x86
     only feature. For more details see below.

-  ====================  ========================================================
-  'STIBP: disabled'     STIBP unused
-  'STIBP: forced'       Use STIBP on all tasks
-  'STIBP: conditional'  Use STIBP on SECCOMP or indirect branch restricted tasks
-  ====================  ========================================================
+    .. list-table::
+
+      * - 'STIBP: disabled'
+        - STIBP unused.
+
+      * - 'STIBP: forced'
+        - Use STIBP on all tasks.
+
+      * - 'STIBP: conditional'
+        - Use STIBP on SECCOMP or indirect branch restricted tasks.

   - Return stack buffer (RSB) protection status:

-  =============   ===========================================
-  'RSB filling'   Protection of RSB on context switch enabled
-  =============   ===========================================
+    .. list-table::
+
+      * - 'RSB filling'
+        - Protection of RSB on context switch enabled.

   - EIBRS Post-barrier Return Stack Buffer (PBRSB) protection status:

-  ===========================  =======================================================
-  'PBRSB-eIBRS: SW sequence'   CPU is affected and protection of RSB on VMEXIT enabled
-  'PBRSB-eIBRS: Vulnerable'    CPU is vulnerable
-  'PBRSB-eIBRS: Not affected'  CPU is not affected by PBRSB
-  ===========================  =======================================================
+    .. list-table::
+
+      * - 'PBRSB-eIBRS: SW sequence'
+        - CPU is affected and protection of RSB on VMEXIT enabled.
+
+      * - 'PBRSB-eIBRS: Vulnerable'
+        - CPU is vulnerable.
+
+      * - 'PBRSB-eIBRS: Not affected'
+        - CPU is not affected by PBRSB.

   - Branch History Injection (BHI) protection status:

-.. list-table::
+    .. list-table::
+
+      * - 'BHI: Not affected'
+        - System is not affected.
+
+      * - 'BHI: Retpoline'
+        - System is protected by retpoline.
+
+      * - 'BHI: BHI_DIS_S'
+        - System is protected by BHI_DIS_S.
+
+      * - 'BHI: SW loop, KVM SW loop'
+        - System is protected by software clearing sequence.
+
+      * - 'BHI: Vulnerable'
+        - System is vulnerable to BHI.

- * - BHI: Not affected
-   - System is not affected
- * - BHI: Retpoline
-   - System is protected by retpoline
- * - BHI: BHI_DIS_S
-   - System is protected by BHI_DIS_S
- * - BHI: SW loop, KVM SW loop
-   - System is protected by software clearing sequence
- * - BHI: Vulnerable
-   - System is vulnerable to BHI
- * - BHI: Vulnerable, KVM: SW loop
-   - System is vulnerable; KVM is protected by software clearing sequence
+      * - 'BHI: Vulnerable, KVM: SW loop'
+        - System is vulnerable; KVM is protected by software clearing sequence.

 Full mitigation might require a microcode update from the CPU
 vendor. When the necessary microcode is not available, the kernel will
diff --git a/Documentation/admin-guide/hw-vuln/srso.rst b/Documentation/admin-guide/hw-vuln/srso.rst
index 4bd3ce3ba171..63343e3a04fd 100644
--- a/Documentation/admin-guide/hw-vuln/srso.rst
+++ b/Documentation/admin-guide/hw-vuln/srso.rst
@@ -42,67 +42,62 @@ The sysfs file showing SRSO mitigation status is:

 The possible values in this file are:

- * 'Not affected':
+.. list-table::

-   The processor is not vulnerable
+  * - 'Not affected'
+    - The processor is not vulnerable.

-* 'Vulnerable':
+  * - 'Vulnerable'
+    - The processor is vulnerable and no mitigations have been applied.

-   The processor is vulnerable and no mitigations have been applied.
+  * - 'Vulnerable: No microcode'
+    - The processor is vulnerable, no microcode extending IBPB functionality to
+      address the vulnerability has been applied.

- * 'Vulnerable: No microcode':
+  * - 'Vulnerable: Safe RET, no microcode'
+    - The "Safe RET" mitigation (see below) has been applied to protect the
+      kernel, but the IBPB-extending microcode has not been applied. User space
+      tasks may still be vulnerable.

-   The processor is vulnerable, no microcode extending IBPB
-   functionality to address the vulnerability has been applied.
+  * - 'Vulnerable: Microcode, no safe RET'
+    - Extended IBPB functionality microcode patch has been applied. It does not
+      address User->Kernel and Guest->Host transitions protection but it does
+      address User->User and VM->VM attack vectors.

- * 'Vulnerable: Safe RET, no microcode':
+      Note that User->User mitigation is controlled by how the IBPB aspect in
+      the Spectre v2 mitigation is selected:

-   The "Safe RET" mitigation (see below) has been applied to protect the
-   kernel, but the IBPB-extending microcode has not been applied.  User
-   space tasks may still be vulnerable.
+      * 'conditional IBPB'

- * 'Vulnerable: Microcode, no safe RET':
+        where each process can select whether it needs an IBPB issued around it
+        PR_SPEC_DISABLE/_ENABLE etc, see :doc:`spectre`

-   Extended IBPB functionality microcode patch has been applied. It does
-   not address User->Kernel and Guest->Host transitions protection but it
-   does address User->User and VM->VM attack vectors.
+      * 'strict'

-   Note that User->User mitigation is controlled by how the IBPB aspect in
-   the Spectre v2 mitigation is selected:
+        i.e., always on - by supplying spectre_v2_user=on on the kernel command
+        line

-    * conditional IBPB:
+      (spec_rstack_overflow=microcode)

-      where each process can select whether it needs an IBPB issued
-      around it PR_SPEC_DISABLE/_ENABLE etc, see :doc:`spectre`
+  * - 'Mitigation: Safe RET'
+    - Combined microcode/software mitigation. It complements the extended IBPB
+      microcode patch functionality by addressing User->Kernel and Guest->Host
+      transitions protection.

-    * strict:
+      Selected by default or by spec_rstack_overflow=safe-ret

-      i.e., always on - by supplying spectre_v2_user=on on the kernel
-      command line
+  * - 'Mitigation: IBPB'
+    - Similar protection as "safe RET" above but employs an IBPB barrier on
+      privilege domain crossings (User->Kernel, Guest->Host).

-   (spec_rstack_overflow=microcode)
+      (spec_rstack_overflow=ibpb)

- * 'Mitigation: Safe RET':
+  * - 'Mitigation: IBPB on VMEXIT'

-   Combined microcode/software mitigation. It complements the
-   extended IBPB microcode patch functionality by addressing
-   User->Kernel and Guest->Host transitions protection.
+    - Mitigation addressing the cloud provider scenario - the Guest->Host
+      transitions only.

-   Selected by default or by spec_rstack_overflow=safe-ret
-
- * 'Mitigation: IBPB':
-
-   Similar protection as "safe RET" above but employs an IBPB barrier on
-   privilege domain crossings (User->Kernel, Guest->Host).
-
-  (spec_rstack_overflow=ibpb)
-
- * 'Mitigation: IBPB on VMEXIT':
-
-   Mitigation addressing the cloud provider scenario - the Guest->Host
-   transitions only.
-
-   (spec_rstack_overflow=ibpb-vmexit)
+      (spec_rstack_overflow=ibpb-vmexit)



diff --git a/Documentation/admin-guide/hw-vuln/tsx_async_abort.rst b/Documentation/admin-guide/hw-vuln/tsx_async_abort.rst
index 444f84e22a91..478590e8a419 100644
--- a/Documentation/admin-guide/hw-vuln/tsx_async_abort.rst
+++ b/Documentation/admin-guide/hw-vuln/tsx_async_abort.rst
@@ -89,34 +89,40 @@ TAA system information
 The Linux kernel provides a sysfs interface to enumerate the current TAA status
 of mitigated systems. The relevant sysfs file is:

-/sys/devices/system/cpu/vulnerabilities/tsx_async_abort
+  /sys/devices/system/cpu/vulnerabilities/tsx_async_abort

 The possible values in this file are:

 .. list-table::

-   * - 'Vulnerable'
-     - The CPU is affected by this vulnerability and the microcode and kernel mitigation are not applied.
-   * - 'Vulnerable: Clear CPU buffers attempted, no microcode'
-     - The processor is vulnerable but microcode is not updated. The
-       mitigation is enabled on a best effort basis.
-
-       If the processor is vulnerable but the availability of the microcode
-       based mitigation mechanism is not advertised via CPUID, the kernel
-       selects a best effort mitigation mode. This mode invokes the mitigation
-       instructions without a guarantee that they clear the CPU buffers.
-
-       This is done to address virtualization scenarios where the host has the
-       microcode update applied, but the hypervisor is not yet updated to
-       expose the CPUID to the guest. If the host has updated microcode the
-       protection takes effect; otherwise a few CPU cycles are wasted
-       pointlessly.
-   * - 'Mitigation: Clear CPU buffers'
-     - The microcode has been updated to clear the buffers. TSX is still enabled.
-   * - 'Mitigation: TSX disabled'
-     - TSX is disabled.
-   * - 'Not affected'
-     - The CPU is not affected by this issue.
+  * - 'Vulnerable'
+    - The CPU is affected by this vulnerability and the microcode and kernel
+      mitigation are not applied.
+
+  * - 'Vulnerable: Clear CPU buffers attempted, no microcode'
+    - The processor is vulnerable but microcode is not updated. The mitigation
+      is enabled on a best effort basis.
+
+      If the processor is vulnerable but the availability of the microcode
+      based mitigation mechanism is not advertised via CPUID, the kernel
+      selects a best effort mitigation mode. This mode invokes the mitigation
+      instructions without a guarantee that they clear the CPU buffers.
+
+      This is done to address virtualization scenarios where the host has the
+      microcode update applied, but the hypervisor is not yet updated to
+      expose the CPUID to the guest. If the host has updated microcode the
+      protection takes effect; otherwise a few CPU cycles are wasted
+      pointlessly.
+
+  * - 'Mitigation: Clear CPU buffers'
+    - The microcode has been updated to clear the buffers. TSX is still
+      enabled.
+
+  * - 'Mitigation: TSX disabled'
+    - TSX is disabled.
+
+  * - 'Not affected'
+    - The CPU is not affected by this issue.

 Mitigation mechanism
 --------------------
--
2.34.1