From: Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx>
[redhat] New configs in arch/x86
Hi,
As part of the ongoing rebase effort, the following configuration
options need to be reviewed.
As a reminder, the ARK configuration flow involves moving unreviewed
configuration options from the pending directory to the ark directory.
In the diff below, options are removed from the pending directory and
added to the ark hierarchy. The final options that need to be ACKed
are the files that are being added to the ark hierarchy.
If the value for a file that is added should be changed, please reply
with a better option.
Symbol: MITIGATION_GDS [=y]
Type : bool
Defined at arch/x86/Kconfig:2617
Prompt: Mitigate Gather Data Sampling
Depends on: CPU_MITIGATIONS [=y] && CPU_SUP_INTEL [=y]
Location:
-> Mitigations for CPU vulnerabilities (CPU_MITIGATIONS [=y])
-> Mitigate Gather Data Sampling (MITIGATION_GDS [=y])
Commit: 225f2bd064c3 (x86/bugs: Add a separate config for GDS)
---
Symbol: MITIGATION_L1TF [=y]
Type : bool
Defined at arch/x86/Kconfig:2681
Prompt: Mitigate L1 Terminal Fault (L1TF) hardware bug
Depends on: CPU_MITIGATIONS [=y] && CPU_SUP_INTEL [=y]
Location:
-> Mitigations for CPU vulnerabilities (CPU_MITIGATIONS [=y])
-> Mitigate L1 Terminal Fault (L1TF) hardware bug (MITIGATION_L1TF [=y])
Commit: 3a4ee4ff819b (x86/bugs: Add a separate config for L1TF)
---
Symbol: MITIGATION_MDS [=y]
Type : bool
Defined at arch/x86/Kconfig:2648
Prompt: Mitigate Microarchitectural Data Sampling (MDS) hardware bug
Depends on: CPU_MITIGATIONS [=y] && CPU_SUP_INTEL [=y]
Location:
-> Mitigations for CPU vulnerabilities (CPU_MITIGATIONS [=y])
-> Mitigate Microarchitectural Data Sampling (MDS) hardware bug (MITIGATION_MDS [=y])
Commit: 940455681d94 (x86/bugs: Add a separate config for MDS)
---
Symbol: MITIGATION_MMIO_STALE_DATA [=y]
Type : bool
Defined at arch/x86/Kconfig:2669
Prompt: Mitigate MMIO Stale Data hardware bug
Depends on: CPU_MITIGATIONS [=y] && CPU_SUP_INTEL [=y]
Location:
-> Mitigations for CPU vulnerabilities (CPU_MITIGATIONS [=y])
-> Mitigate MMIO Stale Data hardware bug (MITIGATION_MMIO_STALE_DATA [=y])
Commit: 163f9fe6b625 (x86/bugs: Add a separate config for MMIO Stable Data)
---
Symbol: MITIGATION_RETBLEED [=y]
Type : bool
Defined at arch/x86/Kconfig:2691
Prompt: Mitigate RETBleed hardware bug
Depends on: CPU_MITIGATIONS [=y] && (CPU_SUP_INTEL [=y] && MITIGATION_SPECTRE_V2 [=y] || MITIGATION_UNRET_ENTRY [=y] || MITIGATION_IBPB_ENTRY [=y])
Location:
-> Mitigations for CPU vulnerabilities (CPU_MITIGATIONS [=y])
-> Mitigate RETBleed hardware bug (MITIGATION_RETBLEED [=y])
Commit: 894e28857c11 (x86/bugs: Add a separate config for RETBLEED)
---
Symbol: MITIGATION_SPECTRE_V1 [=y]
Type : bool
Defined at arch/x86/Kconfig:2704
Prompt: Mitigate SPECTRE V1 hardware bug
Depends on: CPU_MITIGATIONS [=y]
Location:
-> Mitigations for CPU vulnerabilities (CPU_MITIGATIONS [=y])
-> Mitigate SPECTRE V1 hardware bug (MITIGATION_SPECTRE_V1 [=y])
Commit: ca01c0d8d030 (x86/bugs: Add a separate config for Spectre v1)
---
Symbol: MITIGATION_SPECTRE_V2 [=y]
Type : bool
Defined at arch/x86/Kconfig:2714
Prompt: Mitigate SPECTRE V2 hardware bug
Depends on: CPU_MITIGATIONS [=y]
Location:
-> Mitigations for CPU vulnerabilities (CPU_MITIGATIONS [=y])
-> Mitigate SPECTRE V2 hardware bug (MITIGATION_SPECTRE_V2 [=y])
Commit: 72c70f480a70 (x86/bugs: Add a separate config for Spectre V2)
---
Symbol: MITIGATION_SRBDS [=y]
Type : bool
Defined at arch/x86/Kconfig:2726
Prompt: Mitigate Special Register Buffer Data Sampling (SRBDS) hardware bug
Depends on: CPU_MITIGATIONS [=y] && CPU_SUP_INTEL [=y]
Location:
-> Mitigations for CPU vulnerabilities (CPU_MITIGATIONS [=y])
-> Mitigate Special Register Buffer Data Sampling (SRBDS) hardware bug (MITIGATION_SRBDS [=y])
Commit: a0b02e3fe366 (x86/bugs: Add a separate config for SRBDS)
---
Symbol: MITIGATION_SSB [=y]
Type : bool
Defined at arch/x86/Kconfig:2740
Prompt: Mitigate Speculative Store Bypass (SSB) hardware bug
Depends on: CPU_MITIGATIONS [=y]
Location:
-> Mitigations for CPU vulnerabilities (CPU_MITIGATIONS [=y])
-> Mitigate Speculative Store Bypass (SSB) hardware bug (MITIGATION_SSB [=y])
Commit: b908cdab061a (x86/bugs: Add a separate config for SSB)
---
Symbol: MITIGATION_TAA [=y]
Type : bool
Defined at arch/x86/Kconfig:2658
Prompt: Mitigate TSX Asynchronous Abort (TAA) hardware bug
Depends on: CPU_MITIGATIONS [=y] && CPU_SUP_INTEL [=y]
Location:
-> Mitigations for CPU vulnerabilities (CPU_MITIGATIONS [=y])
-> Mitigate TSX Asynchronous Abort (TAA) hardware bug (MITIGATION_TAA [=y])
Commit: b8da0b33d389 (x86/bugs: Add a separate config for TAA)
---
Signed-off-by: Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx>
v2:
- CONFIG_MITIGATION_* enabled in common/generic/x86/.
Signed-off-by: Patrick Talbert <ptalbert@xxxxxxxxxx>
diff --git a/redhat/configs/common/generic/x86/CONFIG_MITIGATION_GDS b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_GDS
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_GDS
@@ -0,0 +1 @@
+CONFIG_MITIGATION_GDS=y
diff --git a/redhat/configs/common/generic/x86/CONFIG_MITIGATION_L1TF b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_L1TF
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_L1TF
@@ -0,0 +1 @@
+CONFIG_MITIGATION_L1TF=y
diff --git a/redhat/configs/common/generic/x86/CONFIG_MITIGATION_MDS b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_MDS
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_MDS
@@ -0,0 +1 @@
+CONFIG_MITIGATION_MDS=y
diff --git a/redhat/configs/common/generic/x86/CONFIG_MITIGATION_MMIO_STALE_DATA b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_MMIO_STALE_DATA
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_MMIO_STALE_DATA
@@ -0,0 +1 @@
+CONFIG_MITIGATION_MMIO_STALE_DATA=y
diff --git a/redhat/configs/common/generic/x86/CONFIG_MITIGATION_RETBLEED b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_RETBLEED
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_RETBLEED
@@ -0,0 +1 @@
+CONFIG_MITIGATION_RETBLEED=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_MITIGATION_RFDS b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_RFDS
rename from redhat/configs/fedora/generic/x86/CONFIG_MITIGATION_RFDS
rename to redhat/configs/common/generic/x86/CONFIG_MITIGATION_RFDS
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/x86/CONFIG_MITIGATION_RFDS
+++ b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_RFDS
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_MITIGATION_SLS b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_SLS
rename from redhat/configs/fedora/generic/x86/CONFIG_MITIGATION_SLS
rename to redhat/configs/common/generic/x86/CONFIG_MITIGATION_SLS
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/x86/CONFIG_MITIGATION_SLS
+++ b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_SLS
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_MITIGATION_SPECTRE_BHI b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_SPECTRE_BHI
rename from redhat/configs/fedora/generic/x86/CONFIG_MITIGATION_SPECTRE_BHI
rename to redhat/configs/common/generic/x86/CONFIG_MITIGATION_SPECTRE_BHI
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/x86/CONFIG_MITIGATION_SPECTRE_BHI
+++ b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_SPECTRE_BHI
diff --git a/redhat/configs/common/generic/x86/CONFIG_MITIGATION_SPECTRE_V1 b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_SPECTRE_V1
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_SPECTRE_V1
@@ -0,0 +1 @@
+CONFIG_MITIGATION_SPECTRE_V1=y
diff --git a/redhat/configs/common/generic/x86/CONFIG_MITIGATION_SPECTRE_V2 b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_SPECTRE_V2
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_SPECTRE_V2
@@ -0,0 +1 @@
+CONFIG_MITIGATION_SPECTRE_V2=y
diff --git a/redhat/configs/common/generic/x86/CONFIG_MITIGATION_SRBDS b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_SRBDS
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_SRBDS
@@ -0,0 +1 @@
+CONFIG_MITIGATION_SRBDS=y
diff --git a/redhat/configs/common/generic/x86/CONFIG_MITIGATION_SSB b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_SSB
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_SSB
@@ -0,0 +1 @@
+CONFIG_MITIGATION_SSB=y
diff --git a/redhat/configs/common/generic/x86/CONFIG_MITIGATION_TAA b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_TAA
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_TAA
@@ -0,0 +1 @@
+CONFIG_MITIGATION_TAA=y
diff --git a/redhat/configs/pending-fedora/generic/CONFIG_MITIGATION_GDS b/redhat/configs/pending-fedora/generic/CONFIG_MITIGATION_GDS
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-fedora/generic/CONFIG_MITIGATION_GDS
+++ /dev/null
@@ -1,13 +0,0 @@
-# Symbol: MITIGATION_GDS [=y]
-# Type : bool
-# Defined at arch/x86/Kconfig:2617
-# Prompt: Mitigate Gather Data Sampling
-# Depends on: CPU_MITIGATIONS [=y] && CPU_SUP_INTEL [=y]
-# Location:
-# -> Mitigations for CPU vulnerabilities (CPU_MITIGATIONS [=y])
-# -> Mitigate Gather Data Sampling (MITIGATION_GDS [=y])
-#
-#
-#
-# Commit: 225f2bd064c3 (x86/bugs: Add a separate config for GDS)
-CONFIG_MITIGATION_GDS=y
diff --git a/redhat/configs/pending-fedora/generic/CONFIG_MITIGATION_L1TF b/redhat/configs/pending-fedora/generic/CONFIG_MITIGATION_L1TF
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-fedora/generic/CONFIG_MITIGATION_L1TF
+++ /dev/null
@@ -1,13 +0,0 @@
-# Symbol: MITIGATION_L1TF [=y]
-# Type : bool
-# Defined at arch/x86/Kconfig:2681
-# Prompt: Mitigate L1 Terminal Fault (L1TF) hardware bug
-# Depends on: CPU_MITIGATIONS [=y] && CPU_SUP_INTEL [=y]
-# Location:
-# -> Mitigations for CPU vulnerabilities (CPU_MITIGATIONS [=y])
-# -> Mitigate L1 Terminal Fault (L1TF) hardware bug (MITIGATION_L1TF [=y])
-#
-#
-#
-# Commit: 3a4ee4ff819b (x86/bugs: Add a separate config for L1TF)
-CONFIG_MITIGATION_L1TF=y
diff --git a/redhat/configs/pending-fedora/generic/CONFIG_MITIGATION_MDS b/redhat/configs/pending-fedora/generic/CONFIG_MITIGATION_MDS
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-fedora/generic/CONFIG_MITIGATION_MDS
+++ /dev/null
@@ -1,13 +0,0 @@
-# Symbol: MITIGATION_MDS [=y]
-# Type : bool
-# Defined at arch/x86/Kconfig:2648
-# Prompt: Mitigate Microarchitectural Data Sampling (MDS) hardware bug
-# Depends on: CPU_MITIGATIONS [=y] && CPU_SUP_INTEL [=y]
-# Location:
-# -> Mitigations for CPU vulnerabilities (CPU_MITIGATIONS [=y])
-# -> Mitigate Microarchitectural Data Sampling (MDS) hardware bug (MITIGATION_MDS [=y])
-#
-#
-#
-# Commit: 940455681d94 (x86/bugs: Add a separate config for MDS)
-CONFIG_MITIGATION_MDS=y
diff --git a/redhat/configs/pending-fedora/generic/CONFIG_MITIGATION_MMIO_STALE_DATA b/redhat/configs/pending-fedora/generic/CONFIG_MITIGATION_MMIO_STALE_DATA
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-fedora/generic/CONFIG_MITIGATION_MMIO_STALE_DATA
+++ /dev/null
@@ -1,13 +0,0 @@
-# Symbol: MITIGATION_MMIO_STALE_DATA [=y]
-# Type : bool
-# Defined at arch/x86/Kconfig:2669
-# Prompt: Mitigate MMIO Stale Data hardware bug
-# Depends on: CPU_MITIGATIONS [=y] && CPU_SUP_INTEL [=y]
-# Location:
-# -> Mitigations for CPU vulnerabilities (CPU_MITIGATIONS [=y])
-# -> Mitigate MMIO Stale Data hardware bug (MITIGATION_MMIO_STALE_DATA [=y])
-#
-#
-#
-# Commit: 163f9fe6b625 (x86/bugs: Add a separate config for MMIO Stable Data)
-CONFIG_MITIGATION_MMIO_STALE_DATA=y
diff --git a/redhat/configs/pending-fedora/generic/CONFIG_MITIGATION_RETBLEED b/redhat/configs/pending-fedora/generic/CONFIG_MITIGATION_RETBLEED
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-fedora/generic/CONFIG_MITIGATION_RETBLEED
+++ /dev/null
@@ -1,13 +0,0 @@
-# Symbol: MITIGATION_RETBLEED [=y]
-# Type : bool
-# Defined at arch/x86/Kconfig:2691
-# Prompt: Mitigate RETBleed hardware bug
-# Depends on: CPU_MITIGATIONS [=y] && (CPU_SUP_INTEL [=y] && MITIGATION_SPECTRE_V2 [=y] || MITIGATION_UNRET_ENTRY [=y] || MITIGATION_IBPB_ENTRY [=y])
-# Location:
-# -> Mitigations for CPU vulnerabilities (CPU_MITIGATIONS [=y])
-# -> Mitigate RETBleed hardware bug (MITIGATION_RETBLEED [=y])
-#
-#
-#
-# Commit: 894e28857c11 (x86/bugs: Add a separate config for RETBLEED)
-CONFIG_MITIGATION_RETBLEED=y
diff --git a/redhat/configs/pending-fedora/generic/CONFIG_MITIGATION_SPECTRE_V1 b/redhat/configs/pending-fedora/generic/CONFIG_MITIGATION_SPECTRE_V1
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-fedora/generic/CONFIG_MITIGATION_SPECTRE_V1
+++ /dev/null
@@ -1,13 +0,0 @@
-# Symbol: MITIGATION_SPECTRE_V1 [=y]
-# Type : bool
-# Defined at arch/x86/Kconfig:2704
-# Prompt: Mitigate SPECTRE V1 hardware bug
-# Depends on: CPU_MITIGATIONS [=y]
-# Location:
-# -> Mitigations for CPU vulnerabilities (CPU_MITIGATIONS [=y])
-# -> Mitigate SPECTRE V1 hardware bug (MITIGATION_SPECTRE_V1 [=y])
-#
-#
-#
-# Commit: ca01c0d8d030 (x86/bugs: Add a separate config for Spectre v1)
-CONFIG_MITIGATION_SPECTRE_V1=y
diff --git a/redhat/configs/pending-fedora/generic/CONFIG_MITIGATION_SPECTRE_V2 b/redhat/configs/pending-fedora/generic/CONFIG_MITIGATION_SPECTRE_V2
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-fedora/generic/CONFIG_MITIGATION_SPECTRE_V2
+++ /dev/null
@@ -1,13 +0,0 @@
-# Symbol: MITIGATION_SPECTRE_V2 [=y]
-# Type : bool
-# Defined at arch/x86/Kconfig:2714
-# Prompt: Mitigate SPECTRE V2 hardware bug
-# Depends on: CPU_MITIGATIONS [=y]
-# Location:
-# -> Mitigations for CPU vulnerabilities (CPU_MITIGATIONS [=y])
-# -> Mitigate SPECTRE V2 hardware bug (MITIGATION_SPECTRE_V2 [=y])
-#
-#
-#
-# Commit: 72c70f480a70 (x86/bugs: Add a separate config for Spectre V2)
-CONFIG_MITIGATION_SPECTRE_V2=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3351
--
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
