From f9db59e0422736b171a3b9ab224c4b9196d6e6c4 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 28 Jul 2025 09:23:08 -0600 Subject: [PATCH] kernel-6.16.0-65 * Mon Jul 28 2025 Fedora Kernel Team [6.16.0-65] - redhat/configs: clang_lto: disable CONFIG_FORTIFY_KUNIT_TEST (Scott Weaver) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 3 ++ kernel.changelog | 30 +++++++++++++++- kernel.spec | 63 +++++++++++++++++++++++++++++---- patch-6.16-redhat.patch | 77 +++++++++++++++++++++++++++++++++++++++-- sources | 6 ++-- 6 files changed, 166 insertions(+), 15 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index f5db1c3bb..ab6f75282 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 60 +RHEL_RELEASE = 65 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 0a7726521..ea6acc0f7 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/8213e993e6b114c71d7607458ea0a967b59ec690 + 8213e993e6b114c71d7607458ea0a967b59ec690 selftests/bpf: Remove ksyms_weak_lskel test + https://gitlab.com/cki-project/kernel-ark/-/commit/8fa39ad0e51091a6e5236725ec959abb7177772f 8fa39ad0e51091a6e5236725ec959abb7177772f Simplify include Makefile.rhelver diff --git a/kernel.changelog b/kernel.changelog index c56e1e895..0e796bc17 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,7 +1,35 @@ -* Wed Jul 23 2025 Fedora Kernel Team [6.16.0-0.rc7.60] +* Mon Jul 28 2025 Fedora Kernel Team [6.16.0-65] - redhat/configs: clang_lto: disable CONFIG_FORTIFY_KUNIT_TEST (Scott Weaver) Resolves: +* Mon Jul 28 2025 Fedora Kernel Team [6.16.0-64] +- Linux v6.16.0 +Resolves: + +* Sun Jul 27 2025 Fedora Kernel Team [6.16.0-0.rc7.ec2df4364666.63] +- Linux v6.16.0-0.rc7.ec2df4364666 +Resolves: + +* Sat Jul 26 2025 Fedora Kernel Team [6.16.0-0.rc7.5f33ebd2018c.62] +- redhat/spec: package full bpftool in selftests (Gregory Bell) +- selftests/bpf: Remove ksyms_weak_lskel test (Artem Savkov) +- redhat/spec: Add libxml2-devel dependency for selftests build (Viktor Malik) +- redhat/spec: Bypass check-rpaths for kselftests/bpf/urandom_read (Viktor Malik) +- redhat/spec: Do not use source fortification for C++ selftest binaries (Viktor Malik) +- redhat/spec: Do not use source fortification for selftests (Viktor Malik) +- redhat/spec: Fix BPF selftests build with PIE (Viktor Malik) +- redhat/spec: Add EXTRA_CXXFLAGS to bpf samples and selftests make (Artem Savkov) +- Linux v6.16.0-0.rc7.5f33ebd2018c +Resolves: + +* Fri Jul 25 2025 Fedora Kernel Team [6.16.0-0.rc7.2942242dde89.61] +- Linux v6.16.0-0.rc7.2942242dde89 +Resolves: + +* Thu Jul 24 2025 Fedora Kernel Team [6.16.0-0.rc7.25fae0b93d1d.60] +- Linux v6.16.0-0.rc7.25fae0b93d1d +Resolves: + * Wed Jul 23 2025 Fedora Kernel Team [6.16.0-0.rc7.59] - fedora: minor cleanups (Peter Robinson) - fedora: aarch64: enable a couple of brcmstb reset drivers (Peter Robinson) diff --git a/kernel.spec b/kernel.spec index 6f09d5c1d..a3f62aa38 100644 --- a/kernel.spec +++ b/kernel.spec @@ -165,13 +165,13 @@ Summary: The Linux kernel %define specrpmversion 6.16.0 %define specversion 6.16.0 %define patchversion 6.16 -%define pkgrelease 0.rc7.60 +%define pkgrelease 65 %define kversion 6 -%define tarfile_release 6.16-rc7 +%define tarfile_release 6.16 # This is needed to do merge window version magic %define patchlevel 16 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.60%{?buildid}%{?dist} +%define specrelease 65%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.16.0 @@ -812,7 +812,7 @@ BuildRequires: clang llvm-devel fuse-devel zlib-devel binutils-devel python3-doc %ifarch x86_64 riscv64 BuildRequires: lld %endif -BuildRequires: libcap-devel libcap-ng-devel rsync libmnl-devel +BuildRequires: libcap-devel libcap-ng-devel rsync libmnl-devel libxml2-devel BuildRequires: numactl-devel %endif BuildConflicts: rhbuildsys(DiskFree) < 500Mb @@ -3265,7 +3265,7 @@ if [ ! -f tools/bpf/bpftool/bootstrap/bpftool ]; then fi %{log_msg "build samples/bpf"} -%{make} %{?_smp_mflags} ARCH=$Arch BPFTOOL=$(pwd)/tools/bpf/bpftool/bootstrap/bpftool V=1 M=samples/bpf/ VMLINUX_H="${RPM_VMLINUX_H}" || true +%{make} %{?_smp_mflags} EXTRA_CXXFLAGS="${RPM_OPT_FLAGS}" 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 @@ -3277,7 +3277,20 @@ pushd tools/testing/selftests %endif %{log_msg "main selftests compile"} -%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf cgroup kmod mm net net/forwarding net/mptcp net/netfilter net/packetdrill tc-testing memfd drivers/net drivers/net/hw iommu cachestat pid_namespace rlimits timens pidfd" SKIP_TARGETS="" $force_targets INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install + +# Some selftests (especially bpf) do not build with source fortification. +# Since selftests are not shipped, disable source fortification for them. +%global _fortify_level_bak %{_fortify_level} +%undefine _fortify_level +export CFLAGS="%{build_cflags}" +export CXXFLAGS="%{build_cxxflags}" + +%{make} %{?_smp_mflags} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_CXXFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}" ARCH=$Arch V=1 TARGETS="bpf cgroup kmod mm net net/forwarding net/mptcp net/netfilter net/packetdrill tc-testing memfd drivers/net drivers/net/hw iommu cachestat pid_namespace rlimits timens pidfd" SKIP_TARGETS="" $force_targets INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install + +# Restore the original level of source fortification +%define _fortify_level %{_fortify_level_bak} +export CFLAGS="%{build_cflags}" +export CXXFLAGS="%{build_cxxflags}" # 'make install' for bpf is broken and upstream refuses to fix it. # Install the needed files manually. @@ -3296,6 +3309,19 @@ for dir in bpf bpf/no_alu32 bpf/progs; do done %buildroot_save_unstripped "usr/libexec/kselftests/bpf/test_progs" %buildroot_save_unstripped "usr/libexec/kselftests/bpf/test_progs-no_alu32" + +# The urandom_read binary doesn't pass the check-rpaths check and upstream +# refuses to fix it. So, we save it to buildroot_unstripped and delete it so it +# will be hidden from check-rpaths and will automatically get restored later. +%buildroot_save_unstripped "usr/libexec/kselftests/bpf/urandom_read" +%buildroot_save_unstripped "usr/libexec/kselftests/bpf/no_alu32/urandom_read" +rm -f %{buildroot}/usr/libexec/kselftests/bpf/urandom_read +rm -f %{buildroot}/usr/libexec/kselftests/bpf/no_alu32/urandom_read + +# Copy bpftool to kselftests so selftests is packaged with +# the full bpftool instead of bootstrap bpftool +cp ./bpf/tools/sbin/bpftool %{buildroot}%{_libexecdir}/kselftests/bpf/bpftool + popd %{log_msg "end build selftests"} %endif @@ -4342,9 +4368,32 @@ fi\ # # %changelog -* Wed Jul 23 2025 Fedora Kernel Team [6.16.0-0.rc7.60] +* Mon Jul 28 2025 Fedora Kernel Team [6.16.0-65] - redhat/configs: clang_lto: disable CONFIG_FORTIFY_KUNIT_TEST (Scott Weaver) +* Mon Jul 28 2025 Fedora Kernel Team [6.16.0-64] +- Linux v6.16.0 + +* Sun Jul 27 2025 Fedora Kernel Team [6.16.0-0.rc7.ec2df4364666.63] +- Linux v6.16.0-0.rc7.ec2df4364666 + +* Sat Jul 26 2025 Fedora Kernel Team [6.16.0-0.rc7.5f33ebd2018c.62] +- redhat/spec: package full bpftool in selftests (Gregory Bell) +- selftests/bpf: Remove ksyms_weak_lskel test (Artem Savkov) +- redhat/spec: Add libxml2-devel dependency for selftests build (Viktor Malik) +- redhat/spec: Bypass check-rpaths for kselftests/bpf/urandom_read (Viktor Malik) +- redhat/spec: Do not use source fortification for C++ selftest binaries (Viktor Malik) +- redhat/spec: Do not use source fortification for selftests (Viktor Malik) +- redhat/spec: Fix BPF selftests build with PIE (Viktor Malik) +- redhat/spec: Add EXTRA_CXXFLAGS to bpf samples and selftests make (Artem Savkov) +- Linux v6.16.0-0.rc7.5f33ebd2018c + +* Fri Jul 25 2025 Fedora Kernel Team [6.16.0-0.rc7.2942242dde89.61] +- Linux v6.16.0-0.rc7.2942242dde89 + +* Thu Jul 24 2025 Fedora Kernel Team [6.16.0-0.rc7.25fae0b93d1d.60] +- Linux v6.16.0-0.rc7.25fae0b93d1d + * Wed Jul 23 2025 Fedora Kernel Team [6.16.0-0.rc7.59] - fedora: minor cleanups (Peter Robinson) - fedora: aarch64: enable a couple of brcmstb reset drivers (Peter Robinson) diff --git a/patch-6.16-redhat.patch b/patch-6.16-redhat.patch index cc5fffc24..285bdc449 100644 --- a/patch-6.16-redhat.patch +++ b/patch-6.16-redhat.patch @@ -75,7 +75,9 @@ security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 11 + - 77 files changed, 2720 insertions(+), 207 deletions(-) + tools/testing/selftests/bpf/Makefile | 2 +- + tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 31 -- + 79 files changed, 2721 insertions(+), 239 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 07e22ba5bfe3..f9d712044457 100644 @@ -190,7 +192,7 @@ index 000000000000..85771d74c34f + +endmenu diff --git a/Makefile b/Makefile -index be33e8c868ae..d5139906e788 100644 +index 478f2004602d..f8f9a2c89957 100644 --- a/Makefile +++ b/Makefile @@ -355,6 +355,17 @@ ifneq ($(filter install,$(MAKECMDGOALS)),) @@ -260,7 +262,7 @@ index be33e8c868ae..d5139906e788 100644 @: diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 3072731fe09c..d34abca3e149 100644 +index 962451e54fdd..8602c0ac5f43 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1232,9 +1232,9 @@ config HIGHMEM @@ -4452,3 +4454,72 @@ index cf83afa1d879..aba751e7abff 100644 static struct security_hook_list lockdown_hooks[] __ro_after_init = { LSM_HOOK_INIT(locked_down, lockdown_is_locked_down), }; +diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile +index 910d8d6402ef..5267287ba225 100644 +--- a/tools/testing/selftests/bpf/Makefile ++++ b/tools/testing/selftests/bpf/Makefile +@@ -501,7 +501,7 @@ LSKELS := fentry_test.c fexit_test.c fexit_sleep.c atomics.c \ + test_ringbuf_n.c test_ringbuf_map_key.c test_ringbuf_write.c + + # Generate both light skeleton and libbpf skeleton for these +-LSKELS_EXTRA := test_ksyms_module.c test_ksyms_weak.c kfunc_call_test.c \ ++LSKELS_EXTRA := test_ksyms_module.c kfunc_call_test.c \ + kfunc_call_test_subprog.c + SKEL_BLACKLIST += $$(LSKELS) + +diff --git a/tools/testing/selftests/bpf/prog_tests/ksyms_btf.c b/tools/testing/selftests/bpf/prog_tests/ksyms_btf.c +index 1d7a2f1e0731..b22f3a9cb8b8 100644 +--- a/tools/testing/selftests/bpf/prog_tests/ksyms_btf.c ++++ b/tools/testing/selftests/bpf/prog_tests/ksyms_btf.c +@@ -7,7 +7,6 @@ + #include "test_ksyms_btf.skel.h" + #include "test_ksyms_btf_null_check.skel.h" + #include "test_ksyms_weak.skel.h" +-#include "test_ksyms_weak.lskel.h" + #include "test_ksyms_btf_write_check.skel.h" + + static int duration; +@@ -111,33 +110,6 @@ static void test_weak_syms(void) + test_ksyms_weak__destroy(skel); + } + +-static void test_weak_syms_lskel(void) +-{ +- struct test_ksyms_weak_lskel *skel; +- struct test_ksyms_weak_lskel__data *data; +- int err; +- +- skel = test_ksyms_weak_lskel__open_and_load(); +- if (!ASSERT_OK_PTR(skel, "test_ksyms_weak_lskel__open_and_load")) +- return; +- +- err = test_ksyms_weak_lskel__attach(skel); +- if (!ASSERT_OK(err, "test_ksyms_weak_lskel__attach")) +- goto cleanup; +- +- /* trigger tracepoint */ +- usleep(1); +- +- data = skel->data; +- ASSERT_EQ(data->out__existing_typed, 0, "existing typed ksym"); +- ASSERT_NEQ(data->out__existing_typeless, -1, "existing typeless ksym"); +- ASSERT_EQ(data->out__non_existent_typeless, 0, "nonexistent typeless ksym"); +- ASSERT_EQ(data->out__non_existent_typed, 0, "nonexistent typed ksym"); +- +-cleanup: +- test_ksyms_weak_lskel__destroy(skel); +-} +- + static void test_write_check(bool test_handler1) + { + struct test_ksyms_btf_write_check *skel; +@@ -180,9 +152,6 @@ void test_ksyms_btf(void) + if (test__start_subtest("weak_ksyms")) + test_weak_syms(); + +- if (test__start_subtest("weak_ksyms_lskel")) +- test_weak_syms_lskel(); +- + if (test__start_subtest("write_check1")) + test_write_check(true); + diff --git a/sources b/sources index 027484213..72a41624f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.16-rc7.tar.xz) = 7372ad7fde8c8479258d43bf71a0511daac3865446e0a2f749a7bd606c4857f599b30505a453e38d883beac9c8a4fd53d14ebfb63d5bb6cb9504edc4ffcb8d07 -SHA512 (kernel-abi-stablelists-6.16.0.tar.xz) = 77b4dd496d46961a3a2bb6bcbf546e2bb9846e17101892565ded155075a6b693e733e6e95649c5089e01995b298cee789b24a5f31cd106c42e1691ff71f71975 -SHA512 (kernel-kabi-dw-6.16.0.tar.xz) = dffa55be5dd5eaadb6b4f4ce1807d17f16ae9d6d4c7b43e0d00407ed6f30ad0d06f934ea67b2876c6d75235791e6ddc9f0bd3a816873e11a027db00613730ff2 +SHA512 (linux-6.16.tar.xz) = 2ffd9bc80428a56e9234adb79cef2eb247d49e7c30776d7b1983fbfb6417c4cf81e1b78cd92befa971be313cb3be8505f678a5d12752f93da7e8266e1cf05663 +SHA512 (kernel-abi-stablelists-6.16.0.tar.xz) = 3e55fc55c21651e4d3ef635c2378267897ee2be59448f02243858cb8cb2e3dce2d19fc5c0dbada483205c502d0f65fbfd31cbf3ea4daa42b715ead2a09830040 +SHA512 (kernel-kabi-dw-6.16.0.tar.xz) = aed6a443c307ad458efce9e28f870272aa6dba0e0da5f409536bf7d4872311e8e81d0f15a6f7a53ca2410b7acea23e79e828740564d916079ff09c2d8244cbf2