kernel October 2023

kernel@lists.fedoraproject.org

5 participants
53 discussions

[OS-BUILD PATCH 0/2] random: Add hook to override device reads and getrandom(2)
by Herbert Xu (via Email Bridge) 12 Feb '25

12 Feb '25

From: Herbert Xu on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2757 Upstream Status: RHEL only Restore the changes to /dev/random which were reverted after 5.18. This reverts commit 900f11e054896bae7b0146055698656e3d1e20a6 and 297bcb88233101e8d5062729ff3a5f989bad1c3b. This also brings the code up-to-date with respect to centos-stream commit 9de3a7339793d3c516b9305a8854267156f90c53 so that changes that were made after the kernel-ark revert have been brought in. Signed-off-by: Herbert Xu <herbert.xu(a)redhat.com> --- crypto/drbg.c | 18 ++++- crypto/rng.c | 149 +++++++++++++++++++++++++++++++++++++++++++----- drivers/char/random.c | 122 ++++++++++++++++++++++++++++++++++++++++ include/linux/crypto.h | 1 + include/linux/random.h | 10 +++ 5 files changed, 281 insertions(+), 19 deletions(-)

5 8

[OS-BUILD PATCHv3 0/0] random: Override random with FIPS RNG in FIPS mode
by Herbert Xu (via Email Bridge) 30 Jan '25

30 Jan '25

From: Herbert Xu on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1304 NOTE: Truncated patchset since committer email 'herbert(a)gondor.apana.org.au' does not match the submitter's GitLab public email address 'herbert.xu(a)redhat.com'. Upstream: RHEL only Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1984784 The RHEL FIPS certification effort ran into an show-stopper with /dev/urandom and getrandom(2) not being FIPS-compliant. At this point there is no realistic chance of making them FIPS-compliant upstream. It has also been deemed unrealistic to change user-space to use the FIPS-compliant RNG through the Crypto API. Therefore this patch series overrides /dev/*random as well as getrandom(2) with the Crypto API RNG so that FIPS certification can proceed. Signed-off-by: Herbert Xu <herbert.xu(a)redhat.com> --- crypto/rng.c | 73 ++++++++++++++++++++++++++++++- drivers/char/random.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/random.h | 7 ++ 3 files changed, 194 insertions(+), 1 deletions(-)

3 5

[OS-BUILD PATCH] Add wildcard macros -baseonly -gcov
by Don Zickus (via Email Bridge) 18 Sep '24

18 Sep '24

From: Don Zickus <dzickus(a)redhat.com> Add wildcard macros -baseonly -gcov There are multiple usecases for -baseonly and -gcov on various targets in the Makefile. Instead of calling those targets out repeatedly, lets generalize them a bit. Allow adding -baseonly and -gcov to: dist-rpm dist-srpm dist-brew dist-koji distg-brew distg-koji Gcov is useful for adding code coverage. Baseonly is useful to only build the kernel for debugging purposes without userspace tools. Signed-off-by: Don Zickus <dzickus(a)redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -297,6 +297,12 @@ dist-sources: dist-kabi dist-kabi-dup sources-rh dist-test-patch: generate-testpatch-tmp @mv $(TESTPATCH).tmp $(TESTPATCH); +%-baseonly: RPMBUILDOPTS=--target $(MACH) --without debug --without debuginfo --without vdso_install --without bpftool --without perf --without tools --without selftests -bb +%-baseonly: BUILDOPTS+=-debug -debuginfo -vdso_install -bpftool -perf -tools -selftests + +%-gcov: BUILDID=".gcov" +%-gcov: BUILDOPTS+="+gcov" + do-rpmbuild: dist-sources $(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" $(RPMBUILDOPTS) $(RPM)/SOURCES/$(PACKAGE_NAME).spec @@ -306,9 +312,9 @@ dist-all-rpms: dist-sources do-rpmbuild dist-srpm: RPMBUILDOPTS=--nodeps -bs dist-srpm: dist-sources do-rpmbuild -dist-srpm-gcov: BUILDID=".gcov" -dist-srpm-gcov: BUILDOPTS+="+gcov" -dist-srpm-gcov: dist-srpm +dist-srpm-%: dist-srpm + @# phony command to force this to be a target and not variable + @FOO=BAR dist-rpms: RPMBUILDOPTS=--target $(MACH) -bb dist-rpms: dist-sources do-rpmbuild @@ -322,8 +328,7 @@ dist-prep: dist-sources do-rpmbuild dist-perf: RPMBUILDOPTS=--without up --without smp --without zfcpdump --without debug --without doc --without headers --without --without doc --without debuginfo --target $(MACH) -bb dist-perf: dist-sources do-rpmbuild -dist-rpm-baseonly: RPMBUILDOPTS=--target $(MACH) --without debug --without debuginfo --without vdso_install --without bpftool --without perf --without tools -bb -dist-rpm-baseonly: dist-sources do-rpmbuild +dist-rpm-%: dist-sources do-rpmbuild # unless you know what you're doing, you don't want to use the next four ones dist-release-finish: setup-source @@ -388,9 +393,25 @@ distg-koji: BUILD_FLAGS ?= $(KOJI_FLAGS) $(TEST_FLAGS) dist-brew dist-koji: dist-%: dist-srpm $* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET) $(SRPMS)/$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)$(DIST).src.rpm $(OUTPUT_FILE) +dist-brew-%: dist-brew + @# phony command to force this to be a target and not variable + @FOO=BAR + +dist-koji-%: dist-koji + @# phony command to force this to be a target and not variable + @FOO=BAR + distg-brew distg-koji: distg-%: $* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET) "$(RHGITURL)?redhat/koji#$(RHGITCOMMIT)" +distg-brew-%: dist-brew + @# phony command to force this to be a target and not variable + @FOO=BAR + +distg-koji-%: dist-koji + @# phony command to force this to be a target and not variable + @FOO=BAR + .PHONY: $(REDHAT)/rpm/SOURCES/$(PACKAGE_NAME).spec $(REDHAT)/rpm/SOURCES/$(PACKAGE_NAME).spec: @echo "dist-sources" @@ -469,34 +490,30 @@ dist-full-help: @echo 'Building targets:' @echo ' All RPM/SRPM files will be put under the redhat/rpm/ directory.' @echo '' - @echo ' dist-srpm - Create a source RPM and put it into the redhat/rpm/SRPMS/' + @echo ' dist-srpm@ - Create a source RPM and put it into the redhat/rpm/SRPMS/' @echo ' directory. See the dist-brew target for available options.' - @echo ' dist-srpm-gcov - Create a source RPM with gcov enabled and put it into the' - @echo ' redhat/rpm/SRPMS/ directory.' - @echo ' dist-brew - Create a kernel SRPM and then call brew to build the' + @echo ' dist-brew@ - Create a kernel SRPM and then call brew to build the' @echo ' created SRPM. Add BUILDOPTS="+<opt> -<opt> [...]" to' @echo ' enable/disable build options.' @echo ' Available <opt>s and their default values:' \ $$(sed -n -e 's/^%define with_$[^ \t]*$.*\?_without_.*/+\1/p' \ -e 's/^%define with_$[^ \t]*$.*\?_with_.*/-\1/p' kernel.spec.template | \ grep -v 'only$$') | fmt -80 - @echo ' dist-koji - Create a kernel SRPM and then call koji to build the' + @echo ' dist-koji@ - Create a kernel SRPM and then call koji to build the' @echo ' created SRPM. See the dist-brew target for available' @echo ' options.' - @echo ' distg-brew - Pass HEAD of the current git branch to brew to build an' + @echo ' distg-brew@ - Pass HEAD of the current git branch to brew to build an' @echo ' RPM set. Do not forget to push to the remote repository' @echo ' first. Preceed make command by RHGITCOMMIT=<commitID>' @echo ' specify commit ID to use.' @echo ' To set the remote repo, invoke:' @echo ' git config rhg.url git://<repo_path>' - @echo ' distg-koji - Pass HEAD of the current git branch to koji to build an' + @echo ' distg-koji@ - Pass HEAD of the current git branch to koji to build an' @echo ' RPM set. Do not forget to push to the remote repository' @echo ' first. See the distg-brew target for options and' @echo ' configuration.' - @echo ' dist-rpms - Create the binary RPMS for the kernel.' + @echo ' dist-rpms@ - Create the binary RPMS for the kernel.' @echo ' See the dist-brew target for available options.' - @echo ' dist-rpm-baseonly - Create the binary RPMS for the kernel and modules' - @echo ' (no userspace tools or debuginfo).' @echo ' dist-kernel-<type> - Create binary RPMS for a particular kernel type.' @echo ' Available <type>s:'\ $$(sed -n 's/^%define with_$[^ ]*only$.*/\1/p' kernel.spec.template) @@ -524,6 +541,12 @@ dist-full-help: @echo ' dist-rhel-configs - build ELN configs' @echo ' dist-fedora-configs - build Fedora configs' + @echo '' + @echo 'Wildcard targets: [indicated by '@' above]' + @echo ' *-baseonly - builds only the kernel (disables userspace and debuginfo)' + @echo ' - Examples: dist-srpm-baseonly, dist-brew-baseonly' + @echo ' *-gcov - builds a kernel with gcov enabled' + @echo ' - Examples: dist-srpm-gcov, dist-brew-gcov' @echo '' @echo 'kABI targets:' @echo ' dist-kabi - Create kABI stablelist files in redhat/kabi/kabi-rhel*/' -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1444

3 2

[OS-BUILD PATCHv3 0/2] redhat: introduce RH_KABI_EXCLUDE_WITH_SIZE and enable size checks
by Sabrina Dubroca (via Email Bridge) 16 Nov '23

16 Nov '23

From: Sabrina Dubroca on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1619 This MR introduces a new kABI macro, RH_KABI_EXCLUDE_WITH_SIZE. The implementation is identical to RH_KABI_EXTEND_WITH_SIZE, but the meaning is more in line with RH_KABI_EXCLUDE. The size check and reserved space allows us to exclude an element embedded inside a kABI-protected structure while reserving space for it to grow in the future. The size checks that are part of multiple kABI macros are currently not enabled because the config option to turn them on is missing. Those size checks only make sense on regular builds, so they're disabled on debug kernels. Signed-off-by: Sabrina Dubroca <sdubroca(a)redhat.com> --- include/linux/rh_kabi.h | 26 ++++++++++ redhat/configs/ark/debug/CONFIG_RH_KABI_SIZE_ALIGN_CHECKS | 1 + redhat/configs/ark/generic/CONFIG_RH_KABI_SIZE_ALIGN_CHECKS | 1 + redhat/configs/ark/kgcov/CONFIG_RH_KABI_SIZE_ALIGN_CHECKS | 1 + redhat/configs/common/generic/CONFIG_RH_KABI_SIZE_ALIGN_CHECKS | 1 + Kconfig.redhat | 9 +++ 6 files changed, 39 insertions(+), 0 deletions(-)

4 7

[OS-BUILD PATCH 0/0] Add various modules to mod-internal.list after experiences with -next
by Thorsten Leemhuis (via Email Bridge) 01 Nov '23

01 Nov '23

From: Thorsten Leemhuis on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2771 NOTE: Truncated patchset since committer email 'fedora(a)leemhuis.info' does not match the submitter's GitLab public email address 'linux(a)leemhuis.info'. In the past few weeks while building linux-next for my kernel vanilla repositories I noticed a few upstream changes that requires changes to mod- internal.list for the kernel-ark build to succeed. Changes like these will most likely be needed in kernel-ark soon, as the those upstream changes are heading towards mainline currently. I'm providing these mod-internal.list changes in advance in case they might helpful for @jmflinuxtx or somebody else (either for cherry-picking for for merging as a whole). Signed-off-by: Thorsten Leemhuis <fedora(a)leemhuis.info> --- redhat/scripts/mod/mod-internal.list | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)

2 3

The kernel-ark os-build branch has been rebased
by Justin Forbes 30 Oct '23

30 Oct '23

Please rebase any pending MRs and repush. As we have done since 5.15, we have done this again for os-build, we expect to keep it up as a cadence with every upstream release. This means we will do it again when 6.7 releases, and again with 6.8... It is difficult to manage a regularly rebased tree, because any outstanding MR is invalidated and has to also be rebased. But not doing somewhat regular rebases can also be difficult in the spirit of the openness that Fedora is based upon. While there are plenty of ways to see which patches we carry compared to upstream, some of those patches are fairly old, and would not apply cleanly at all to a modern tree after several releases were merged in with them. As we have gotten into a flow of things with merge requests, we can get to the point of very few outstanding MRs towards the end of a release cycle, and that makes it an opportune time to rebase the tree. This also means that the patches we carry should be no more than 1 release out of date, making them easier to apply to various other trees. I do realize that this is a minor inconvenience every 2-3 months, but I believe the results are worth it. Thanks, Justin

1 0

[OS-BUILD PATCH] Fix binutils breakage
by Don Zickus (via Email Bridge) 30 Oct '23

30 Oct '23

From: Don Zickus <dzickus(a)redhat.com> Fix binutils breakage The binutils package in Rawhide has stricter checks about PIE/PIC code and will start reporting errors if it detects mixing and matching no-PIE with PIE binaries (especially around bpf binaries). Example errors look like: /usr/bin/ld: /tmp/ccL7dkfR.o: relocation R_X86_64_32S against `.rodata' can not be used when making a PIE object; recompile with -fPIE /usr/bin/ld: failed to set dynamic section sizes: bad value collect2: error: ld returned 1 exit status Fix this by adding more CFLAGS to force PIE/PIC generated binaries to bpf releated selftests, tools and samples. This patch was provided by Carlos O'Donell and understands how it works. I am just the middle man. All -fPIE errors are resolved except for one about libbpf.a. The static version of the library doesn't take CFLAGS so it can't be forced to build with PIE/PIC. This error is ignored by the spec file, so it is ignored by this patch too. Signed-off-by: Don Zickus <dzickus(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 @@ -2769,7 +2769,7 @@ if [ ! -f include/generated/autoconf.h ]; then %{make} %{?_smp_mflags} modules_prepare fi -%{make} %{?_smp_mflags} ARCH=$Arch V=1 M=samples/bpf/ VMLINUX_H="${RPM_VMLINUX_H}" || true +%{make} %{?_smp_mflags} TPROGS_CFLAGS="%{?build_hostcflags}" ARCH=$Arch V=1 M=samples/bpf/ VMLINUX_H="${RPM_VMLINUX_H}" || true # Prevent bpf selftests to build bpftool repeatedly: export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool @@ -2783,7 +2783,7 @@ pushd tools/testing/selftests force_targets="" %endif -%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf mm livepatch net net/forwarding net/mptcp netfilter tc-testing memfd drivers/net/bonding" SKIP_TARGETS="" $force_targets INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install +%{make} %{?_smp_mflags} USERCFLAGS="%{?build_hostcflags}" USERLDFLAGS="%{?build_hostldflags}" ARCH=$Arch V=1 TARGETS="bpf mm livepatch net net/forwarding net/mptcp netfilter tc-testing memfd drivers/net/bonding" SKIP_TARGETS="" $force_targets INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install # 'make install' for bpf is broken and upstream refuses to fix it. # Install the needed files manually. -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2749

5 25

[OS-BUILD PATCHv2] [Scheduled job] Catch config mismatches early during upstream merge
by Don Zickus (via Email Bridge) 30 Oct '23

30 Oct '23

From: Don Zickus <dzickus(a)redhat.com> [Scheduled job] Catch config mismatches early during upstream merge When merging the upstream git tree, the process commits all the new configs to the -pending directory. However, it needs another pass to catch any new mismatches resulting in those new config settings. This just adds another step, 'make dist-configs-check' to catch those problems before we blindly merge the upstream tree. Signed-off-by: Don Zickus <dzickus(a)redhat.com> diff --git a/redhat/scripts/ci/ark-update-configs.sh b/redhat/scripts/ci/ark-update-configs.sh index blahblah..blahblah 100755 --- a/redhat/scripts/ci/ark-update-configs.sh +++ b/redhat/scripts/ci/ark-update-configs.sh @@ -67,6 +67,9 @@ old_head="$(git rev-parse HEAD)" make FLAVOR=rhel dist-configs-commit new_head="$(git rev-parse HEAD)" +# check for config mismatches after setting configs in the commit step above +make dist-configs-check || die "Config mismatch detected" + # Converts each new pending config from above into its finalized git # configs/<date>/<config> branch. These commits are used for Merge # Requests. -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2768

1 0

[OS-BUILD PATCHv6 0/3] redhat: Switch KABI file compression to xz
by Prarit Bhargava (via Email Bridge) 30 Oct '23

30 Oct '23

From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760 Switch the KABI compression from bz2 to xz to match other compression targets. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> --- redhat/scripts/rh-dist-git.sh | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 4 ++-- redhat/Makefile | 12 ++++++------ redhat/kernel.spec.template | 14 +++++++------- 27 files changed, 63 insertions(+), 63 deletions(-)

2 6

[OS-BUILD PATCH] [Scheduled job] Catch config mismatches early during upstream merge
by Don Zickus (via Email Bridge) 30 Oct '23

30 Oct '23

From: Don Zickus <dzickus(a)redhat.com> [Scheduled job] Catch config mismatches early during upstream merge When merging the upstream git tree, the process commits all the new configs to the -pending directory. However, it needs another pass to catch any new mismatches resulting in those new config settings. This just adds another step, 'make dist-configs-check' to catch those problems before we blindly merge the upstream tree. Signed-off-by: Don Zickus <dzickus(a)redhat.com> diff --git a/redhat/scripts/ci/ark-update-configs.sh b/redhat/scripts/ci/ark-update-configs.sh index blahblah..blahblah 100755 --- a/redhat/scripts/ci/ark-update-configs.sh +++ b/redhat/scripts/ci/ark-update-configs.sh @@ -67,6 +67,9 @@ old_head="$(git rev-parse HEAD)" make FLAVOR=rhel dist-configs-commit new_head="$(git rev-parse HEAD)" +# check for config mismatches after setting configs in the commit step above +make dist-configs-check + # Converts each new pending config from above into its finalized git # configs/<date>/<config> branch. These commits are used for Merge # Requests. -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2768

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel October 2023