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
Hi, we tested your kernel and here are the results:
Overall result: PASSED
Merge: OK
Compile: OK
Test: OK
Tested-by: CKI Project <cki-project(a)redhat.com>
Kernel information:
Brew / Koji Task ID: 134145255
You can find all the details about the test run at
https://datawarehouse.cki-project.org/kcidb/checkouts/redhat:koji-134145255
Tests that were not ran because of internal issues:
Boot test [s390x]
CKI/restraint [s390x]
machineinfo [ppc64le, s390x]
Reboot test [s390x, x86_64]
SELinux Custom Module Setup [ppc64le, s390x, x86_64]
stress: stress-ng - cpu [s390x]
stress: stress-ng - cpu-cache [s390x]
stress: stress-ng - interrupt [s390x]
stress: stress-ng - memory [s390x]
If you find a failure unrelated to your changes, please ask the test maintainer to review it.
This will prevent the failures from being incorrectly reported in the future.
Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
From: Don Zickus <dzickus(a)redhat.com>
Simplify include Makefile.rhelver
The current problem with where the include Makefile.rhelver is, is that
it is used before any of the standard definitions are defined. This
makes it challenging to use stock methods and instead use kludgy ifneq
definitions.
There is no real reason to have the include this high in the Makefile.
It was just a legacy place that didn't change much thus minimizing merge
conflicts.
Let's move the 'include' later in the file _after_ the definitions and
in a place that is surrounded by code that haven't changed in 20 years.
This allows us to use expected definitions that hopefully make things
more future proof.
This change will be later rolled into ark-infra.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff --git a/Makefile b/Makefile
index blahblah..blahblah 100644
--- a/Makefile
+++ b/Makefile
@@ -22,18 +22,6 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
PHONY := __all
__all:
-# Set RHEL variables
-# Note that this ifdef'ery is required to handle when building with
-# the O= mechanism (relocate the object file results) due to upstream
-# commit 67d7c302 which broke our RHEL include file
-ifneq ($(realpath source),)
-include $(realpath source)/Makefile.rhelver
-else
-ifneq ($(realpath Makefile.rhelver),)
-include Makefile.rhelver
-endif
-endif
-
# We are using a recursive build, so we need to do a little thinking
# to get the ordering right.
#
@@ -1321,6 +1309,8 @@ uapi-asm-generic:
# Generate some files
# ---------------------------------------------------------------------------
+include $(srctree)/Makefile.rhelver
+
# KERNELRELEASE can change from a few different places, meaning version.h
# needs to be updated, so this check is forced on all builds
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3961
From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[redhat] New configs in kernel/Kconfig.kexec
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: CRASH_DM_CRYPT [=n]
Type : bool
Defined at kernel/Kconfig.kexec:132
Prompt: Support saving crash dump to dm-crypt encrypted volume
Depends on: KEXEC_FILE [=y] && CRASH_DUMP [=y] && DM_CRYPT [=m]
Location:
-> General setup
-> Kexec and crash features
-> kernel crash dumps (CRASH_DUMP [=y])
-> Support saving crash dump to dm-crypt encrypted volume (CRASH_DM_CRYPT [=n])
Commit: 180cf31af7c3 (crash_dump: make dm crypt keys persist for the kdump kernel)
---
Symbol: KEXEC_HANDOVER [=n]
Type : bool
Defined at kernel/Kconfig.kexec:97
Prompt: kexec handover
Depends on: ARCH_SUPPORTS_KEXEC_HANDOVER [=y] && ARCH_SUPPORTS_KEXEC_FILE [=y]
Location:
-> General setup
-> Kexec and crash features
-> kexec handover (KEXEC_HANDOVER [=n])
Selects: MEMBLOCK_KHO_SCRATCH [=n] && KEXEC_FILE [=y] && DEBUG_FS [=y] && LIBFDT [=n] && CMA [=y]
Commit: 4e1d010e3bda (kexec: add config option for KHO)
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
v2:
- CONFIG_CRASH_DM_CRYPT enable for rhel.
- CONFIG_KEXEC_HANDOVER enable for rhel.
Signed-off-by: Patrick Talbert <ptalbert(a)redhat.com>
diff --git a/redhat/configs/pending-rhel/generic/CONFIG_CRASH_DM_CRYPT b/redhat/configs/pending-rhel/generic/CONFIG_CRASH_DM_CRYPT
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/CONFIG_CRASH_DM_CRYPT
+++ /dev/null
@@ -1,15 +0,0 @@
-# Symbol: CRASH_DM_CRYPT [=n]
-# Type : bool
-# Defined at kernel/Kconfig.kexec:132
-# Prompt: Support saving crash dump to dm-crypt encrypted volume
-# Depends on: KEXEC_FILE [=y] && CRASH_DUMP [=y] && DM_CRYPT [=m]
-# Location:
-# -> General setup
-# -> Kexec and crash features
-# -> kernel crash dumps (CRASH_DUMP [=y])
-# -> Support saving crash dump to dm-crypt encrypted volume (CRASH_DM_CRYPT [=n])
-#
-#
-#
-# Commit: 180cf31af7c3 (crash_dump: make dm crypt keys persist for the kdump kernel)
-# CONFIG_CRASH_DM_CRYPT is not set
diff --git a/redhat/configs/pending-rhel/generic/CONFIG_KEXEC_HANDOVER b/redhat/configs/pending-rhel/generic/CONFIG_KEXEC_HANDOVER
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/CONFIG_KEXEC_HANDOVER
+++ /dev/null
@@ -1,15 +0,0 @@
-# Symbol: KEXEC_HANDOVER [=n]
-# Type : bool
-# Defined at kernel/Kconfig.kexec:97
-# Prompt: kexec handover
-# Depends on: ARCH_SUPPORTS_KEXEC_HANDOVER [=y] && ARCH_SUPPORTS_KEXEC_FILE [=y]
-# Location:
-# -> General setup
-# -> Kexec and crash features
-# -> kexec handover (KEXEC_HANDOVER [=n])
-# Selects: MEMBLOCK_KHO_SCRATCH [=n] && KEXEC_FILE [=y] && DEBUG_FS [=y] && LIBFDT [=n] && CMA [=y]
-#
-#
-#
-# Commit: 4e1d010e3bda (kexec: add config option for KHO)
-# CONFIG_KEXEC_HANDOVER is not set
diff --git a/redhat/configs/rhel/generic/CONFIG_CRASH_DM_CRYPT b/redhat/configs/rhel/generic/CONFIG_CRASH_DM_CRYPT
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_CRASH_DM_CRYPT
@@ -0,0 +1 @@
+CONFIG_CRASH_DM_CRYPT=y
diff --git a/redhat/configs/rhel/generic/CONFIG_KEXEC_HANDOVER b/redhat/configs/rhel/generic/CONFIG_KEXEC_HANDOVER
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_KEXEC_HANDOVER
@@ -0,0 +1 @@
+CONFIG_KEXEC_HANDOVER=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3924
From: Gordon Messmer <gordon.messmer(a)gmail.com>
The rescue kernel can only be used to boot a system normally if
the corresponding kernel and modules are still available. Once
they are removed, functionality is significantly reduced.
When a kernel is removed, check the rescue kernel and remove it
if it matches the kernel to be removed.
The currently running kernel is assumed good, so build a rescue
kernel based on this version as long as it is still installed.
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -3846,6 +3846,9 @@ touch %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?-v:+%
%define kernel_variant_preun(v:u:) \
%{expand:%%preun %{?-v:%{-v*}-}%{!?-u*:core}%{?-u*:uki-%{-u*}}}\
/bin/kernel-install remove %{KVERREL}%{?-v:+%{-v*}} || exit $?\
+read -r MACHINE_ID < /etc/machine-id && /bin/cmp /boot/vmlinuz-0-rescue-${MACHINE_ID} boot/vmlinuz-%{KVERREL}%{?-v:+%{-v*}} &&\
+ /bin/rm /boot/vmlinuz-0-rescue-${MACHINE_ID} /boot/initramfs-0-rescue-${MACHINE_ID}.img &&\
+ [ -e /boot/vmlinuz-$(uname -r) ] && kernel-install add $(uname -r) /lib/modules/$(uname -r)/vmlinuz\
%if !%{with_automotive}\
if [ -x %{_sbindir}/weak-modules ]\
then\
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3960