kernel April 2024

kernel@lists.fedoraproject.org

3 participants
40 discussions

[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 PATCHv2] Fix binutils breakage
by Don Zickus (via Email Bridge) 15 Aug '24

15 Aug '24

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_USER_CFLAGS="%{?build_hostcflags}" TPROGS_USER_LDFLAGS="%{?build_hostldflags}" EXTRA_CFLAGS="%{?build_hostcflags}" EXTRA_LDFLAGS="%{?build_hostldflags}" 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

4 6

[OS-BUILD PATCHv17 0/2] redhat/kernel.spec: add uki_addons to create UKI kernel cmdline addons
by Emanuele Giuseppe Esposito (via Email Bridge) 05 Aug '24

05 Aug '24

From: Emanuele Giuseppe Esposito on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2917 We want to enable kernel.spec to optionally ship UKI addons defined in a common config file in redhat folder. The folder redhat/uki_addons will contain all addons configs specifying the UKI kernel cmdline addons to be created in the next build. An addon config is simply a .addon plain text file, where any line is taken as kernel cmdline, except for the ones starting with '#', which will be automatically ignored. redhat/scripts/uki_addons.py will take care of parsing all configs and folders in redhat/uki_addons and call 'ukify' to create the actual addons. The output addon filename will be a concatenation of all folders in redhat/uki_addons that are part of the addon config path. The folder hierarchy inside of redhat/uki_addons is similar to redhat/configs: $distro/$UKI_NAME/%arch. It is also possible to add .sbat to all the generated addons, by populating redhat/addons/$distro/$UKI_NAME/%arch/sbat/sbat.conf. Syntax is same as the addons config. At build time, Makefile will create a tar.gz archive (uki_addons.tar.gz) containing all the files in redhat/uki_addons. It will then passed to the kernel specfile that will extract the addons from it and generate the UKI kernel cmdline addons. As an example of this feature, add the fips addon to optionally enable fips (https://issues.redhat.com/browse/RHEL-23049) --- redhat/scripts/uki_addons.py | 162 +++++++++++++++++++++++++++++++ redhat/uki_addons/virt/common/fips.addon | 1 + redhat/Makefile | 3 + redhat/kernel.spec.template | 44 ++++++++ 4 files changed, 210 insertions(+), 0 deletions(-)

4 7

[OS-BUILD PATCH] redhat/configs: enable RTL8822BU for rhel
by José Ignacio Tornos Martínez (via Email Bridge) 13 May '24

13 May '24

From: Jose Ignacio Tornos Martinez <jtornosm(a)redhat.com> redhat/configs: enable RTL8822BU for rhel RTL8822BU Realtek WiFi USB device (CONFIG_RTW88_8822BU) has been requested to be enabled for rhel. Unify configuration with fedora (it was previously enabled). Signed-off-by: Jose Ignacio Tornos Martinez <jtornosm(a)redhat.com> diff --git a/redhat/configs/fedora/generic/CONFIG_RTW88_8822BU b/redhat/configs/common/generic/CONFIG_RTW88_8822BU rename from redhat/configs/fedora/generic/CONFIG_RTW88_8822BU rename to redhat/configs/common/generic/CONFIG_RTW88_8822BU index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_RTW88_8822BU +++ b/redhat/configs/common/generic/CONFIG_RTW88_8822BU diff --git a/redhat/configs/rhel/generic/CONFIG_RTW88_8822BU b/redhat/configs/rhel/generic/CONFIG_RTW88_8822BU deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_RTW88_8822BU +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_RTW88_8822BU is not set -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3085

2 2

[OS-BUILD PATCHv3 0/2] configs: add CONFIG_BLK_SED_OPAL and CONFIG_BLK_DEV_UBLK
by Ming Lei (via Email Bridge) 13 May '24

13 May '24

From: Ming Lei on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3071 We plan to support both two in cs10. Signed-off-by: Ming Lei <ming.lei(a)redhat.com> --- redhat/configs/fedora/generic/CONFIG_BLKDEV_UBLK_LEGACY_OPCODES => redhat/configs/common/generic/CONFIG_BLKDEV_UBLK_LEGACY_OPCODES | 0 redhat/configs/fedora/generic/CONFIG_BLK_DEV_UBLK => redhat/configs/common/generic/CONFIG_BLK_DEV_UBLK | 0 redhat/configs/fedora/generic/CONFIG_BLK_SED_OPAL => redhat/configs/common/generic/CONFIG_BLK_SED_OPAL | 0 redhat/configs/rhel/generic/CONFIG_BLK_DEV_UBLK => redhat/configs/rhel/generic/s390x/zfcpdump/CONFIG_BLK_DEV_UBLK | 0 redhat/configs/rhel/generic/CONFIG_BLK_SED_OPAL | 1 - 5 files changed, 0 insertions(+), 1 deletions(-)

3 4

[OS-BUILD PATCH] redhat/kernel.spec.template: avoid process substitution
by Jan Stancek (via Email Bridge) 02 May '24

02 May '24

From: Jan Stancek <jstancek(a)redhat.com> redhat/kernel.spec.template: avoid process substitution Wang Yugui reports that the process substitution construct doesn't work in old environments (e.g. rhel7 + devtoolsets-8): /var/tmp/rpm-tmp.mVZU4h: line 696: syntax error near unexpected token `<' while read -r kmod; do local target_file="$RPM_BUILD_ROOT/lib/modules/$KernelVer/$subdir_name/$kmod" local target_dir="${target_file%/*}" mkdir -p "$target_dir" mv "$RPM_BUILD_ROOT/lib/modules/$KernelVer/kernel/$kmod" "$target_dir" L696: done < <(sed -e 's|^kernel/||' "$module_list") set -x Simplify it using a temp file. Fixes: ad0b8a853077 ("spec: rework filter-mods and mod-denylist") Reported-by: Wang Yugui <wangyugui(a)e16-tech.com> Signed-off-by: Jan Stancek <jstancek(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 @@ -2581,16 +2581,19 @@ BuildKernel() { { local module_list="$1" local subdir_name="$2" + local tmpfile=$(mktemp) mkdir -p "$RPM_BUILD_ROOT/lib/modules/$KernelVer/$subdirname" + sed -e 's|^kernel/||' "$module_list" > $tmpfile set +x while read -r kmod; do local target_file="$RPM_BUILD_ROOT/lib/modules/$KernelVer/$subdir_name/$kmod" local target_dir="${target_file%/*}" mkdir -p "$target_dir" mv "$RPM_BUILD_ROOT/lib/modules/$KernelVer/kernel/$kmod" "$target_dir" - done < <(sed -e 's|^kernel/||' "$module_list") + done < $tmpfile + rm -f $tmpfile set -x } -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3087

3 3

[OS-BUILD PATCH] redhat/configs: Enable CONFIG_DM_VDO in RHEL
by Benjamin Marzinski (via Email Bridge) 29 Apr '24

29 Apr '24

From: Benjamin Marzinski <bmarzins(a)redhat.com> redhat/configs: Enable CONFIG_DM_VDO in RHEL dm-vdo is planned to be supported in RHEL-10. Signed-off-by: Benjamin Marzinski <bmarzins(a)redhat.com> diff --git a/redhat/configs/fedora/generic/CONFIG_DM_VDO b/redhat/configs/common/generic/CONFIG_DM_VDO rename from redhat/configs/fedora/generic/CONFIG_DM_VDO rename to redhat/configs/common/generic/CONFIG_DM_VDO index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_DM_VDO +++ b/redhat/configs/common/generic/CONFIG_DM_VDO diff --git a/redhat/configs/pending-rhel/generic/CONFIG_DM_VDO b/redhat/configs/pending-rhel/generic/CONFIG_DM_VDO deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/pending-rhel/generic/CONFIG_DM_VDO +++ /dev/null @@ -1,16 +0,0 @@ -# Symbol: DM_VDO [=n] -# Type : tristate -# Defined at drivers/md/dm-vdo/Kconfig:3 -# Prompt: VDO: deduplication and compression target -# Depends on: MD [=y] && 64BIT [=y] && BLK_DEV_DM [=m] -# Location: -# -> Device Drivers -# -> Multiple devices driver support (RAID and LVM) (MD [=y]) -# -> Device mapper support (BLK_DEV_DM [=m]) -# -> VDO: deduplication and compression target (DM_VDO [=n]) -# Selects: DM_BUFIO [=m] && LZ4_COMPRESS [=m] && LZ4_DECOMPRESS [=y] -# -# -# -# Commit: f36b1d3ba533 (dm vdo: use a proper Makefile for dm-vdo) -# CONFIG_DM_VDO is not set -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3086

1 0

[OS-BUILD PATCH 0/0] update packaging of livepatching selftests
by Jan Stancek (via Email Bridge) 29 Apr '24

29 Apr '24

From: Jan Stancek on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3068 NOTE: Truncated patchset since committer email 'joe.lawrence(a)redhat.com' does not match the submitter's GitLab public email address 'jstancek(a)redhat.com'. Update Red Hat building and packaging to support livepatching kernel selftests moving from lib/ to tools/testing/selftests/. Signed-off-by: Joe Lawrence joe.lawrence(a)redhat.com Signed-off-by: Jan Stancek <jstancek(a)redhat.com> --- redhat/configs/fedora/generic/CONFIG_TEST_LIVEPATCH | 1 - redhat/configs/rhel/generic/arm/aarch64/CONFIG_TEST_LIVEPATCH | 1 - redhat/configs/rhel/generic/CONFIG_TEST_LIVEPATCH | 1 - redhat/kernel.spec.template | 17 ++++++++++- 4 files changed, 16 insertions(+), 4 deletions(-)

3 4

[OS-BUILD PATCHv2 0/2] configs: add CONFIG_BLK_SED_OPAL and CONFIG_BLK_DEV_UBLK
by Ming Lei (via Email Bridge) 28 Apr '24

28 Apr '24

From: Ming Lei on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3071 We plan to support both two in cs10. Signed-off-by: Ming Lei <ming.lei(a)redhat.com> --- redhat/configs/fedora/generic/CONFIG_BLKDEV_UBLK_LEGACY_OPCODES => redhat/configs/common/generic/CONFIG_BLKDEV_UBLK_LEGACY_OPCODES | 0 redhat/configs/fedora/generic/CONFIG_BLK_DEV_UBLK => redhat/configs/common/generic/CONFIG_BLK_DEV_UBLK | 0 redhat/configs/fedora/generic/CONFIG_BLK_SED_OPAL => redhat/configs/common/generic/CONFIG_BLK_SED_OPAL | 0 redhat/configs/rhel/generic/CONFIG_BLK_DEV_UBLK | 1 - redhat/configs/rhel/generic/CONFIG_BLK_SED_OPAL | 1 - 5 files changed, 0 insertions(+), 2 deletions(-)

1 3

✅ PASS: Test report for 6.8.8-200.fc39 (fedora-latest)
by cki-project＠redhat.com 27 Apr '24

27 Apr '24

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: 116956887 You can find all the details about the test run at https://datawarehouse.cki-project.org/kcidb/checkouts/redhat:koji-116956887 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 `-' ______________________________________________________________________________

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel April 2024