From: Waiman Long <longman(a)redhat.com>
redhat/configs: Move CONFIG_MITIGATION_ITS to common/generic/x86
CONFIG_MITIGATION_ITS is specific to x86 only. Move this config file to
common/generic/x86 to be with the other x86 MITIGATION config files.
Signed-off-by: Waiman Long <longman(a)redhat.com>
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_MITIGATION_ITS b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_ITS
rename from redhat/configs/fedora/generic/x86/CONFIG_MITIGATION_ITS
rename to redhat/configs/common/generic/x86/CONFIG_MITIGATION_ITS
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/x86/CONFIG_MITIGATION_ITS
+++ b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_ITS
diff --git a/redhat/configs/rhel/generic/CONFIG_MITIGATION_ITS b/redhat/configs/rhel/generic/CONFIG_MITIGATION_ITS
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/generic/CONFIG_MITIGATION_ITS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MITIGATION_ITS=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3965
From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[redhat] New configs in crypto/Kconfig
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: CRYPTO_SELFTESTS_FULL [=n]
Type : bool
Defined at crypto/Kconfig:196
Prompt: Enable the full set of cryptographic self-tests
Depends on: CRYPTO [=y] && CRYPTO_SELFTESTS [=y]
Location:
-> Cryptographic API (CRYPTO [=y])
-> Crypto core or helper
-> Enable cryptographic self-tests (CRYPTO_SELFTESTS [=y])
-> Enable the full set of cryptographic self-tests (CRYPTO_SELFTESTS_FULL [=n])
~~~
Commit: ac90aad0e9bf (crypto: testmgr - reinstate kconfig control over full self-tests)
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
diff --git a/redhat/configs/pending-rhel/generic/CONFIG_CRYPTO_SELFTESTS_FULL b/redhat/configs/pending-rhel/generic/CONFIG_CRYPTO_SELFTESTS_FULL
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/CONFIG_CRYPTO_SELFTESTS_FULL
+++ /dev/null
@@ -1,17 +0,0 @@
-# ~~~
-# Symbol: CRYPTO_SELFTESTS_FULL [=n]
-# Type : bool
-# Defined at crypto/Kconfig:196
-# Prompt: Enable the full set of cryptographic self-tests
-# Depends on: CRYPTO [=y] && CRYPTO_SELFTESTS [=y]
-# Location:
-# -> Cryptographic API (CRYPTO [=y])
-# -> Crypto core or helper
-# -> Enable cryptographic self-tests (CRYPTO_SELFTESTS [=y])
-# -> Enable the full set of cryptographic self-tests (CRYPTO_SELFTESTS_FULL [=n])
-#
-#
-#
-# ~~~
-# Commit: ac90aad0e9bf (crypto: testmgr - reinstate kconfig control over full self-tests)
-# CONFIG_CRYPTO_SELFTESTS_FULL is not set
diff --git a/redhat/configs/rhel/generic/CONFIG_CRYPTO_SELFTESTS_FULL b/redhat/configs/rhel/generic/CONFIG_CRYPTO_SELFTESTS_FULL
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_CRYPTO_SELFTESTS_FULL
@@ -0,0 +1 @@
+# CONFIG_CRYPTO_SELFTESTS_FULL is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3963
From: Mamatha Inamdar <minamdar(a)redhat.com>
redhat/configs: Update powerpc BPF configs
Description: redhat/configs: Update powerpc BPF configs
BPF trampoline feature support needs DYNAMIC_FTRACE_WITH_DIRECT_CALLS.
DYNAMIC_FTRACE_WITH_DIRECT_CALLS on powerpc is implemented with
DYNAMIC_FTRACE_WITH_ARGS & DYNAMIC_FTRACE_WITH_CALL_OPS.
DYNAMIC_FTRACE_WITH_CALL_OPS is based on out of line ftrace
stubs support (CONFIG_PPC_FTRACE_OUT_OF_LINE), which in turn
depends on ARCH_USING_PATCHABLE_FUNCITON_ENTRY. Some of the out
of line ftrace stubs are preallocated with the config option
CONFIG_PPC_FTRACE_OUT_OF_LINE_NUM_RESERVE. While this option is
configurable, it defaults to 32768, preallocating as many out of
line ftrace stubs at the start of .text section while the remaining
stubs will be allocated at the end of .text section. To set up the
out of line stubs for ftrace, CONFIG_ARCH_WANTS_PRE_LINK_VMLINUX
is needed. Additionally, to leverage trampoline support with
fprobe (fentry/fexit), the kernel needs to be built with
RETHOOK support. Overall, the below config options are enabled
for BPF trampoline support on powerpc:
Tested: make dist-configs
Signed-off-by: Mamatha Inamdar <minamdar(a)redhat.com>
diff --git a/CONFIG_HAVE_RETHOOK b/CONFIG_HAVE_RETHOOK
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/CONFIG_HAVE_RETHOOK
@@ -0,0 +1 @@
+CONFIG_HAVE_RETHOOK=y
diff --git a/redhat/configs/rhel/generic/powerpc/CONFIG_ARCH_USING_PATCHABLE_FUNCTION_ENTRY b/redhat/configs/rhel/generic/powerpc/CONFIG_ARCH_USING_PATCHABLE_FUNCTION_ENTRY
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/powerpc/CONFIG_ARCH_USING_PATCHABLE_FUNCTION_ENTRY
@@ -0,0 +1 @@
+CONFIG_ARCH_USING_PATCHABLE_FUNCTION_ENTRY=y
diff --git a/redhat/configs/rhel/generic/powerpc/CONFIG_ARCH_WANTS_PRE_LINK_VMLINUX b/redhat/configs/rhel/generic/powerpc/CONFIG_ARCH_WANTS_PRE_LINK_VMLINUX
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/powerpc/CONFIG_ARCH_WANTS_PRE_LINK_VMLINUX
@@ -0,0 +1 @@
+CONFIG_ARCH_WANTS_PRE_LINK_VMLINUX=y
diff --git a/redhat/configs/rhel/generic/powerpc/CONFIG_DYNAMIC_FTRACE_WITH_ARGS b/redhat/configs/rhel/generic/powerpc/CONFIG_DYNAMIC_FTRACE_WITH_ARGS
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/powerpc/CONFIG_DYNAMIC_FTRACE_WITH_ARGS
@@ -0,0 +1 @@
+CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
diff --git a/redhat/configs/rhel/generic/powerpc/CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS b/redhat/configs/rhel/generic/powerpc/CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/powerpc/CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS
@@ -0,0 +1 @@
+CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS=y
diff --git a/redhat/configs/rhel/generic/powerpc/CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS b/redhat/configs/rhel/generic/powerpc/CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/powerpc/CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
@@ -0,0 +1 @@
+CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
diff --git a/redhat/configs/rhel/generic/powerpc/CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS b/redhat/configs/rhel/generic/powerpc/CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/powerpc/CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS
@@ -0,0 +1 @@
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
diff --git a/redhat/configs/rhel/generic/powerpc/CONFIG_HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS b/redhat/configs/rhel/generic/powerpc/CONFIG_HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/powerpc/CONFIG_HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS
@@ -0,0 +1 @@
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS=y
diff --git a/redhat/configs/rhel/generic/powerpc/CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS b/redhat/configs/rhel/generic/powerpc/CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/powerpc/CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
@@ -0,0 +1 @@
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
diff --git a/redhat/configs/rhel/generic/powerpc/CONFIG_HAVE_RETHOOK b/redhat/configs/rhel/generic/powerpc/CONFIG_HAVE_RETHOOK
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/powerpc/CONFIG_HAVE_RETHOOK
@@ -0,0 +1 @@
+CONFIG_HAVE_RETHOOK=y
diff --git a/redhat/configs/rhel/generic/powerpc/CONFIG_KRETPROBE_ON_RETHOOK b/redhat/configs/rhel/generic/powerpc/CONFIG_KRETPROBE_ON_RETHOOK
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/powerpc/CONFIG_KRETPROBE_ON_RETHOOK
@@ -0,0 +1 @@
+CONFIG_KRETPROBE_ON_RETHOOK=y
diff --git a/redhat/configs/rhel/generic/powerpc/CONFIG_PPC_FTRACE_OUT_OF_LINE b/redhat/configs/rhel/generic/powerpc/CONFIG_PPC_FTRACE_OUT_OF_LINE
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/powerpc/CONFIG_PPC_FTRACE_OUT_OF_LINE
@@ -0,0 +1 @@
+CONFIG_PPC_FTRACE_OUT_OF_LINE=y
diff --git a/redhat/configs/rhel/generic/powerpc/CONFIG_RETHOOK b/redhat/configs/rhel/generic/powerpc/CONFIG_RETHOOK
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/powerpc/CONFIG_RETHOOK
@@ -0,0 +1 @@
+CONFIG_RETHOOK=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3964
From: Justin M. Forbes <jforbes(a)fedoraproject.org>
[redhat] New configs in mm/Kconfig
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: PAGE_BLOCK_ORDER [=10]
Type : integer
Range : [1 10]
Defined at mm/Kconfig:1008
Prompt: Page Block Order
Location:
-> Memory Management options
-> Page Block Order (PAGE_BLOCK_ORDER [=10])
Commit: e13e7922 (mm: add CONFIG_PAGE_BLOCK_ORDER to select page block order)
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
diff --git a/redhat/configs/common/generic/CONFIG_PAGE_BLOCK_ORDER b/redhat/configs/common/generic/CONFIG_PAGE_BLOCK_ORDER
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_PAGE_BLOCK_ORDER
@@ -0,0 +1 @@
+CONFIG_PAGE_BLOCK_ORDER=10
diff --git a/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_PAGE_BLOCK_ORDER b/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_PAGE_BLOCK_ORDER
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_PAGE_BLOCK_ORDER
@@ -0,0 +1 @@
+CONFIG_PAGE_BLOCK_ORDER=13
diff --git a/redhat/configs/pending-fedora/generic/powerpc/CONFIG_PAGE_BLOCK_ORDER b/redhat/configs/common/generic/powerpc/CONFIG_PAGE_BLOCK_ORDER
rename from redhat/configs/pending-fedora/generic/powerpc/CONFIG_PAGE_BLOCK_ORDER
rename to redhat/configs/common/generic/powerpc/CONFIG_PAGE_BLOCK_ORDER
index blahblah..blahblah 100644
--- a/redhat/configs/pending-fedora/generic/powerpc/CONFIG_PAGE_BLOCK_ORDER
+++ b/redhat/configs/common/generic/powerpc/CONFIG_PAGE_BLOCK_ORDER
diff --git a/redhat/configs/common/rt/arm/aarch64/64k/CONFIG_PAGE_BLOCK_ORDER b/redhat/configs/common/rt/arm/aarch64/64k/CONFIG_PAGE_BLOCK_ORDER
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/rt/arm/aarch64/64k/CONFIG_PAGE_BLOCK_ORDER
@@ -0,0 +1 @@
+CONFIG_PAGE_BLOCK_ORDER=13
diff --git a/redhat/configs/pending-fedora/generic/CONFIG_PAGE_BLOCK_ORDER b/redhat/configs/pending-fedora/generic/CONFIG_PAGE_BLOCK_ORDER
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-fedora/generic/CONFIG_PAGE_BLOCK_ORDER
+++ /dev/null
@@ -1,13 +0,0 @@
-# Symbol: PAGE_BLOCK_ORDER [=10]
-# Type : integer
-# Range : [1 10]
-# Defined at mm/Kconfig:1008
-# Prompt: Page Block Order
-# Location:
-# -> Memory Management options
-# -> Page Block Order (PAGE_BLOCK_ORDER [=10])
-#
-#
-#
-# Commit: e13e7922d034 (mm: add CONFIG_PAGE_BLOCK_ORDER to select page block order)
-CONFIG_PAGE_BLOCK_ORDER=10
diff --git a/redhat/configs/pending-rhel/generic/CONFIG_PAGE_BLOCK_ORDER b/redhat/configs/pending-rhel/generic/CONFIG_PAGE_BLOCK_ORDER
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/CONFIG_PAGE_BLOCK_ORDER
+++ /dev/null
@@ -1,13 +0,0 @@
-# Symbol: PAGE_BLOCK_ORDER [=10]
-# Type : integer
-# Range : [1 10]
-# Defined at mm/Kconfig:1008
-# Prompt: Page Block Order
-# Location:
-# -> Memory Management options
-# -> Page Block Order (PAGE_BLOCK_ORDER [=10])
-#
-#
-#
-# Commit: e13e7922d034 (mm: add CONFIG_PAGE_BLOCK_ORDER to select page block order)
-CONFIG_PAGE_BLOCK_ORDER=10
diff --git a/redhat/configs/pending-rhel/generic/powerpc/CONFIG_PAGE_BLOCK_ORDER b/redhat/configs/pending-rhel/generic/powerpc/CONFIG_PAGE_BLOCK_ORDER
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/powerpc/CONFIG_PAGE_BLOCK_ORDER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAGE_BLOCK_ORDER=8
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3928
From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[redhat] New configs in mm/Kconfig
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: PAGE_BLOCK_ORDER [=10]
Type : integer
Range : [1 10]
Defined at mm/Kconfig:1008
Prompt: Page Block Order
Location:
-> Memory Management options
-> Page Block Order (PAGE_BLOCK_ORDER [=10])
Commit: e13e7922d034 (mm: add CONFIG_PAGE_BLOCK_ORDER to select page block order)
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
diff --git a/redhat/configs/pending-rhel/generic/CONFIG_PAGE_BLOCK_ORDER b/redhat/configs/pending-rhel/generic/CONFIG_PAGE_BLOCK_ORDER
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/CONFIG_PAGE_BLOCK_ORDER
+++ /dev/null
@@ -1,13 +0,0 @@
-# Symbol: PAGE_BLOCK_ORDER [=10]
-# Type : integer
-# Range : [1 10]
-# Defined at mm/Kconfig:1008
-# Prompt: Page Block Order
-# Location:
-# -> Memory Management options
-# -> Page Block Order (PAGE_BLOCK_ORDER [=10])
-#
-#
-#
-# Commit: e13e7922d034 (mm: add CONFIG_PAGE_BLOCK_ORDER to select page block order)
-CONFIG_PAGE_BLOCK_ORDER=10
diff --git a/redhat/configs/rhel/generic/CONFIG_PAGE_BLOCK_ORDER b/redhat/configs/rhel/generic/CONFIG_PAGE_BLOCK_ORDER
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_PAGE_BLOCK_ORDER
@@ -0,0 +1 @@
+CONFIG_PAGE_BLOCK_ORDER=10
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3928