diff mbox series

[SRU,K,7/7] UBUNTU: [Config] Set CONFIG_KFENCE_SAMPLE_INTERVAL=0 on riscv64

Message ID 20220712160812.435824-8-emil.renner.berthing@canonical.com
State New
Headers show
Series Align more RISC-V config with other archs | expand

Commit Message

Emil Renner Berthing July 12, 2022, 4:08 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1981437

Disable KFENCE by default like all other architectures.

Signed-off-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 1 -
 debian.master/config/annotations                   | 2 +-
 debian.master/config/arm64/config.common.arm64     | 1 -
 debian.master/config/armhf/config.common.armhf     | 1 -
 debian.master/config/config.common.ubuntu          | 1 +
 debian.master/config/riscv64/config.common.riscv64 | 1 -
 debian.master/config/s390x/config.common.s390x     | 1 -
 7 files changed, 2 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 5689cddc6654..7996b9fb2a37 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -297,7 +297,6 @@  CONFIG_JUMP_LABEL=y
 CONFIG_KARMA_PARTITION=y
 # CONFIG_KERNEL_GZIP is not set
 CONFIG_KEXEC_FILE=y
-CONFIG_KFENCE_SAMPLE_INTERVAL=0
 CONFIG_KVM=m
 CONFIG_LAPB=m
 CONFIG_LCD_CLASS_DEVICE=m
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index c84bc3f218dc..e935700c3be7 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -11824,7 +11824,7 @@  CONFIG_KASAN                                    policy<{'amd64': 'n', 'arm64': '
 CONFIG_KFENCE                                   policy<{'amd64': 'y', 'arm64': 'y', 'riscv64': 'y', 's390x': 'y', 'armhf': 'y'}>
 CONFIG_KFENCE_STATIC_KEYS                       policy<{'amd64': 'n', 'arm64': 'n', 'riscv64': 'n', 's390x': 'n'}>
 CONFIG_KFENCE_DEFERRABLE                        policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'riscv64': 'n', 's390x': 'n'}>
-CONFIG_KFENCE_SAMPLE_INTERVAL                   policy<{'amd64': '0', 'arm64': '0', 'riscv64': '100', 's390x': '0', 'armhf': '0'}>
+CONFIG_KFENCE_SAMPLE_INTERVAL                   policy<{'amd64': '0', 'arm64': '0', 'riscv64': '0', 's390x': '0', 'armhf': '0'}>
 CONFIG_KFENCE_NUM_OBJECTS                       policy<{'amd64': '255', 'arm64': '255', 'riscv64': '255', 's390x': '255', 'armhf': '255'}>
 CONFIG_KFENCE_STRESS_TEST_FAULTS                policy<{'amd64': '0', 'arm64': '0', 'riscv64': '0', 's390x': '0', 'armhf': '0'}>
 
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 0ff49b1344fc..688b271f6c6e 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -312,7 +312,6 @@  CONFIG_JME=m
 CONFIG_JUMP_LABEL=y
 CONFIG_KARMA_PARTITION=y
 CONFIG_KEXEC_FILE=y
-CONFIG_KFENCE_SAMPLE_INTERVAL=0
 CONFIG_KVM=y
 CONFIG_LAPB=m
 CONFIG_LCD_CLASS_DEVICE=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 1b4c87609c7f..d28529e32219 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -301,7 +301,6 @@  CONFIG_JME=m
 # CONFIG_JUMP_LABEL is not set
 CONFIG_KARMA_PARTITION=y
 CONFIG_KERNEL_GZIP=y
-CONFIG_KFENCE_SAMPLE_INTERVAL=0
 CONFIG_LAPB=m
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LDM_PARTITION=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 9ea00db7da9e..8915270c9a27 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5741,6 +5741,7 @@  CONFIG_KEY_NOTIFICATIONS=y
 CONFIG_KFENCE=y
 # CONFIG_KFENCE_DEFERRABLE is not set
 CONFIG_KFENCE_NUM_OBJECTS=255
+CONFIG_KFENCE_SAMPLE_INTERVAL=0
 # CONFIG_KFENCE_STATIC_KEYS is not set
 CONFIG_KFENCE_STRESS_TEST_FAULTS=0
 CONFIG_KGDB=y
diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64
index d98a1ff41441..506adb2d512b 100644
--- a/debian.master/config/riscv64/config.common.riscv64
+++ b/debian.master/config/riscv64/config.common.riscv64
@@ -296,7 +296,6 @@  CONFIG_JME=m
 CONFIG_JUMP_LABEL=y
 CONFIG_KARMA_PARTITION=y
 CONFIG_KEXEC_FILE=y
-CONFIG_KFENCE_SAMPLE_INTERVAL=100
 CONFIG_KVM=m
 CONFIG_LAPB=m
 CONFIG_LCD_CLASS_DEVICE=m
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index ce3886f01a27..17a03f998477 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -278,7 +278,6 @@  CONFIG_JUMP_LABEL=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_KERNEL_GZIP is not set
 # CONFIG_KEXEC_FILE is not set
-CONFIG_KFENCE_SAMPLE_INTERVAL=0
 CONFIG_KVM=y
 # CONFIG_LAPB is not set
 # CONFIG_LCD_CLASS_DEVICE is not set