From: Dorinda Bassey <dbassey(a)redhat.com>
redhat/configs: automotive: Enable CONFIG_BOOTPARAM_HUNG_TASK_PANIC config
Enable the CONFIG_BOOTPARAM_HUNG_TASK_PANIC and this also
automatically enables it's related dependencies.
This is needed to satisfy a requirement of FuSa efforts
for RHIVOS.
Link: https://issues.redhat.com/browse/RHEL-86217
Signed-off-by: Dorinda Bassey <dbassey(a)redhat.com>
diff --git a/redhat/configs/rhel/automotive/generic/CONFIG_BOOTPARAM_HUNG_TASK_PANIC b/redhat/configs/rhel/automotive/generic/CONFIG_BOOTPARAM_HUNG_TASK_PANIC
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/automotive/generic/CONFIG_BOOTPARAM_HUNG_TASK_PANIC
@@ -0,0 +1 @@
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3821
From: Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com>
enable new CORESIGHT_CTCU module for aarch64
We have other CoreSight modules enabled so this one should follow.
Symbol: CORESIGHT_CTCU [=n]
Type : tristate
Defined at drivers/hwtracing/coresight/Kconfig:136
Prompt: CoreSight TMC Control Unit driver
Depends on: CORESIGHT [=m] && CORESIGHT_LINK_AND_SINK_TMC [=m]
Location:
-> Kernel hacking
-> arm64 Debugging
-> CoreSight Tracing Support (CORESIGHT [=m])
-> CoreSight TMC Control Unit driver (CORESIGHT_CTCU [=n])
Commit: f78d206f3d73 (Coresight: Add Coresight TMC Control Unit driver)
Message-ID: <2a69366c1289d324dd1c454894b4df1267372009.1744019658.git.mjuszkiewicz(a)redhat.com>
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_CORESIGHT_CTCU b/redhat/configs/common/generic/arm/aarch64/CONFIG_CORESIGHT_CTCU
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_CORESIGHT_CTCU
@@ -0,0 +1 @@
+CONFIG_CORESIGHT_CTCU=m
diff --git a/redhat/configs/pending-rhel/generic/CONFIG_CORESIGHT_CTCU b/redhat/configs/pending-rhel/generic/CONFIG_CORESIGHT_CTCU
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/CONFIG_CORESIGHT_CTCU
+++ /dev/null
@@ -1,15 +0,0 @@
-# Symbol: CORESIGHT_CTCU [=n]
-# Type : tristate
-# Defined at drivers/hwtracing/coresight/Kconfig:136
-# Prompt: CoreSight TMC Control Unit driver
-# Depends on: CORESIGHT [=m] && CORESIGHT_LINK_AND_SINK_TMC [=m]
-# Location:
-# -> Kernel hacking
-# -> arm64 Debugging
-# -> CoreSight Tracing Support (CORESIGHT [=m])
-# -> CoreSight TMC Control Unit driver (CORESIGHT_CTCU [=n])
-#
-#
-#
-# Commit: f78d206f3d73 (Coresight: Add Coresight TMC Control Unit driver)
-# CONFIG_CORESIGHT_CTCU is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3820
From: Hangbin Liu <haliu(a)redhat.com>
[redhat] move TEST_BLACKHOLE_DEV to BLACKHOLE_DEV_KUNIT_TEST and enable it
Since commit b341f6fd45ab ("blackhole_dev: convert self-test to KUnit"),
config TEST_BLACKHOLE_DEV is renamed to BLACKHOLE_DEV_KUNIT_TEST.
Also enable it for kunit testing.
Signed-off-by: Hangbin Liu <haliu(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_BLACKHOLE_DEV_KUNIT_TEST b/redhat/configs/common/generic/CONFIG_BLACKHOLE_DEV_KUNIT_TEST
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_BLACKHOLE_DEV_KUNIT_TEST
@@ -0,0 +1 @@
+CONFIG_BLACKHOLE_DEV_KUNIT_TEST=m
diff --git a/redhat/configs/common/generic/CONFIG_TEST_BLACKHOLE_DEV b/redhat/configs/common/generic/CONFIG_TEST_BLACKHOLE_DEV
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/CONFIG_TEST_BLACKHOLE_DEV
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_TEST_BLACKHOLE_DEV is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3818
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: 131109398
You can find all the details about the test run at
https://datawarehouse.cki-project.org/kcidb/checkouts/redhat:koji-131109398
Tests that were not ran because of internal issues:
Boot test [s390x]
CKI/restraint [s390x]
machineinfo [s390x]
Reboot test [s390x]
SELinux Custom Module Setup [s390x]
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: Patrick Talbert <ptalbert(a)redhat.com>
[redhat] configs: do not override CRYPTO_CHACHA20_P10 in rhel
Since 17ec3e71 ('crypto: lib/Kconfig - Hide arch options from user') the
config option CRYPTO_CHACHA20_P10 is no longer user-selectable. Accept
the new default value of being enabled (as CRYPTO_LIB_CHACHA_INTERNAL is
enabled foir powerpc).
Signed-off-by: Patrick Talbert <ptalbert(a)redhat.com>
diff --git a/redhat/configs/pending-rhel/generic/powerpc/CONFIG_CRYPTO_CHACHA20_P10 b/redhat/configs/pending-rhel/generic/powerpc/CONFIG_CRYPTO_CHACHA20_P10
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/powerpc/CONFIG_CRYPTO_CHACHA20_P10
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_CHACHA20_P10=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3786
From: Patrick Talbert <ptalbert(a)redhat.com>
[redhat] scripts: sort dumped keys in uki_create_json.py
The order of the keys in the json output may change causing unnecessary
churn in the dist-git diffs. Fix this by setting sort_keys=True in the
json.dump() call. Outside of locale sorting differences this should
provide a more stable experience.
Signed-off-by: Patrick Talbert <ptalbert(a)redhat.com>
diff --git a/redhat/scripts/uki_addons/uki_create_json.py b/redhat/scripts/uki_addons/uki_create_json.py
index blahblah..blahblah 100755
--- a/redhat/scripts/uki_addons/uki_create_json.py
+++ b/redhat/scripts/uki_addons/uki_create_json.py
@@ -86,7 +86,7 @@ def create_json(addons):
def write_json(obj, dest_file):
with open(dest_file, 'w') as f:
- json.dump(obj , f, indent=4)
+ json.dump(obj , f, indent=4, sort_keys=True)
print(f'Processed addons files are in {dest_file}')
if __name__ == "__main__":
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3817
From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[redhat] New configs in security/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: MSEAL_SYSTEM_MAPPINGS [=n]
Type : bool
Defined at security/Kconfig:54
Prompt: mseal system mappings
Depends on: 64BIT [=y] && ARCH_SUPPORTS_MSEAL_SYSTEM_MAPPINGS [=y] && !CHECKPOINT_RESTORE [=n]
Location:
-> Security options
-> mseal system mappings (MSEAL_SYSTEM_MAPPINGS [=n])
Commit: 5796d3967c09 (mseal sysmap: kernel config and header change)
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
diff --git a/redhat/configs/pending-rhel/generic/CONFIG_MSEAL_SYSTEM_MAPPINGS b/redhat/configs/pending-rhel/generic/CONFIG_MSEAL_SYSTEM_MAPPINGS
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/CONFIG_MSEAL_SYSTEM_MAPPINGS
+++ /dev/null
@@ -1,13 +0,0 @@
-# Symbol: MSEAL_SYSTEM_MAPPINGS [=n]
-# Type : bool
-# Defined at security/Kconfig:54
-# Prompt: mseal system mappings
-# Depends on: 64BIT [=y] && ARCH_SUPPORTS_MSEAL_SYSTEM_MAPPINGS [=y] && !CHECKPOINT_RESTORE [=n]
-# Location:
-# -> Security options
-# -> mseal system mappings (MSEAL_SYSTEM_MAPPINGS [=n])
-#
-#
-#
-# Commit: 5796d3967c09 (mseal sysmap: kernel config and header change)
-# CONFIG_MSEAL_SYSTEM_MAPPINGS is not set
diff --git a/redhat/configs/rhel/generic/CONFIG_MSEAL_SYSTEM_MAPPINGS b/redhat/configs/rhel/generic/CONFIG_MSEAL_SYSTEM_MAPPINGS
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_MSEAL_SYSTEM_MAPPINGS
@@ -0,0 +1 @@
+# CONFIG_MSEAL_SYSTEM_MAPPINGS is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3816
From: Tomas Glozar <tglozar(a)redhat.com>
redhat/kernel.spec.template: Build rtla with BPF sample collection
Sample collection using BPF was introduced in 6.15 as a faster default
mechanism. The previous implementation using a tracefs pipe is now a
fallback.
This allows rtla to work properly when measuring on a large number of
CPUs, as well as reduces CPU usage on all systems.
Add build dependency on libbpf-devel, bpftool, and clang, and runtime
dependency on libbpf for rtla in order to enable rtla BPF sample
collection.
Signed-off-by: Tomas Glozar <tglozar(a)redhat.com>
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
@@ -755,6 +755,9 @@ BuildRequires: libcap-devel libcap-ng-devel
BuildRequires: python3-docutils
BuildRequires: libtraceevent-devel
BuildRequires: libtracefs-devel
+BuildRequires: libbpf-devel
+BuildRequires: bpftool
+BuildRequires: clang
%ifnarch s390x
BuildRequires: pciutils-devel
@@ -1311,6 +1314,7 @@ Epoch: %{gemini}
Summary: Real-Time Linux Analysis tools
Requires: libtraceevent
Requires: libtracefs
+Requires: libbpf
%ifarch %{cpupowerarchs}
Requires: %{package_name}-tools-libs = %{version}-%{release}
%endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3815
From: Gregory Bell <grbell(a)redhat.com>
samples/bpf: fix build
Moving bootstrap bpftool build into a function then pass bootstrap bpftool to
samples/bpf Makefile instead of rebuilding during the samples/bpf make process.
If bpftool is not already built then build right before samples/bpf build and
pass to samples/bpf.
Always pass vmlinux.h to samples/bpf by setting RPM_VMLINUX_H variable
depending on current build. If the kernel is built with debuginfo it is
located at RPM_BUILD_ROOT/DevelDir/vmlinux.h. In the case of tools only build
it is at DevelDir/vmlinux.h
Signed-off-by: Gregory Bell <grbell(a)redhat.com>
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
@@ -2185,6 +2185,13 @@ InitBuildVars() {
fi
}
+#Build bootstrap bpftool
+BuildBpftool(){
+ export BPFBOOTSTRAP_CFLAGS=$(echo "%{__global_compiler_flags}" | sed -r "s/\-specs=[^\ ]+\/redhat-annobin-cc1//")
+ export BPFBOOTSTRAP_LDFLAGS=$(echo "%{__global_ldflags}" | sed -r "s/\-specs=[^\ ]+\/redhat-annobin-cc1//")
+ CFLAGS="" LDFLAGS="" make EXTRA_CFLAGS="${BPFBOOTSTRAP_CFLAGS}" EXTRA_CXXFLAGS="${BPFBOOTSTRAP_CFLAGS}" EXTRA_LDFLAGS="${BPFBOOTSTRAP_LDFLAGS}" %{?make_opts} %{?clang_make_opts} V=1 -C tools/bpf/bpftool bootstrap
+}
+
BuildKernel() {
%{log_msg "BuildKernel for $4"}
MakeTarget=$1
@@ -2912,10 +2919,7 @@ BuildKernel() {
if [ "$Variant" != "zfcpdump" ]; then
%{log_msg "Build the bootstrap bpftool to generate vmlinux.h"}
# Build the bootstrap bpftool to generate vmlinux.h
- export BPFBOOTSTRAP_CFLAGS=$(echo "%{__global_compiler_flags}" | sed -r "s/\-specs=[^\ ]+\/redhat-annobin-cc1//")
- export BPFBOOTSTRAP_LDFLAGS=$(echo "%{__global_ldflags}" | sed -r "s/\-specs=[^\ ]+\/redhat-annobin-cc1//")
- CFLAGS="" LDFLAGS="" make EXTRA_CFLAGS="${BPFBOOTSTRAP_CFLAGS}" EXTRA_CXXFLAGS="${BPFBOOTSTRAP_CFLAGS}" EXTRA_LDFLAGS="${BPFBOOTSTRAP_LDFLAGS}" %{?make_opts} %{?clang_make_opts} V=1 -C tools/bpf/bpftool bootstrap
-
+ BuildBpftool
tools/bpf/bpftool/bootstrap/bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h
fi
%endif
@@ -3152,7 +3156,10 @@ pushd tools/tracing/rtla
popd
%endif
-if [ -f $DevelDir/vmlinux.h ]; then
+#set RPM_VMLINUX_H
+if [ -f $RPM_BUILD_ROOT/$DevelDir/vmlinux.h ]; then
+ RPM_VMLINUX_H=$RPM_BUILD_ROOT/$DevelDir/vmlinux.h
+elif [ -f $DevelDir/vmlinux.h ]; then
RPM_VMLINUX_H=$DevelDir/vmlinux.h
fi
echo "${RPM_VMLINUX_H}" > ../vmlinux_h_path
@@ -3173,8 +3180,13 @@ if [ ! -f include/generated/autoconf.h ]; then
%{make} %{?_smp_mflags} modules_prepare
fi
+# Build BPFtool for samples/bpf
+if [ ! -f tools/bpf/bpftool/bootstrap/bpftool ]; then
+ BuildBpftool
+fi
+
%{log_msg "build samples/bpf"}
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 M=samples/bpf/ VMLINUX_H="${RPM_VMLINUX_H}" || true
+%{make} %{?_smp_mflags} ARCH=$Arch BPFTOOL=$(pwd)/tools/bpf/bpftool/bootstrap/bpftool V=1 M=samples/bpf/ VMLINUX_H="${RPM_VMLINUX_H}" || true
pushd tools/testing/selftests
# We need to install here because we need to call make with ARCH set which
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3812