kernel November 2022

kernel@lists.fedoraproject.org

9 participants
64 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 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 PATCHv3 0/0] scriptlets: clean up declared installation dependencies, stop calling kernel-install in chroot or container
by Zbigniew Jędrzejewski-Szmek (via Email Bridge) 06 Feb '23

06 Feb '23

From: Zbigniew Jędrzejewski-Szmek on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1617 NOTE: Truncated patchset due to missing public @redhat.com email address on your GitLab profile at https://gitlab.com/-/profile. Once that is fixed, close and reopen the merge request to retrigger sending the emails. --- redhat/kernel.spec.template | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-)

3 6

[OS-BUILD PATCH] redhat/configs: enable ChromeOS ACPI driver
by Mark Langsdorf (via Email Bridge) 12 Jan '23

12 Jan '23

From: Mark Langsdorf <mlangsdo(a)redhat.com> redhat/configs: enable ChromeOS ACPI driver Provide a device interface for exporting ACPI data on x86 Chromebooks. Signed-off-by: Mark Langsdorf <mlangsdo(a)redhat.com> diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_CHROMEOS_ACPI b/redhat/configs/ark/generic/arm/aarch64/CONFIG_CHROMEOS_ACPI new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/arm/aarch64/CONFIG_CHROMEOS_ACPI @@ -0,0 +1 @@ +CONFIG_CHROMEOS_ACPI=y -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2153

4 4

[OS-BUILD PATCH] Add gcc-c++ to BuildRequires
by GitLab Bridge on behalf of jmflinuxtx 20 Dec '22

20 Dec '22

From: "Justin M. Forbes" <jforbes(a)fedoraproject.org> This is required for some of the gcc plugins. Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org> --- redhat/kernel.spec.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index 5941924711d4..c8ee1f82c494 100755 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -501,7 +501,7 @@ Requires: kernel-modules-uname-r = %{KVERREL}%{?variant} # BuildRequires: kmod, patch, bash, tar, git-core BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk -BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex +BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex, gcc-c++ BuildRequires: net-tools, hostname, bc, elfutils-devel BuildRequires: dwarves BuildRequires: python3-devel -- GitLab

4 3

[OS-BUILD PATCH] redhat: Remove cpupower files
by Prarit Bhargava (via Email Bridge) 09 Dec '22

09 Dec '22

From: Prarit Bhargava <prarit(a)redhat.com> redhat: Remove cpupower files The cpupower.config and cpupower.service files no longer serve a purpose. System level performance control is generally controlled by tuned and other system applications. Remove the cpupower files from the kernel. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -626,8 +626,7 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check @sed -e "s/%%SPECKVERSION%%/$(SPECKVERSION)/" \ -e "s/%%SPECKPATCHLEVEL%%/$(SPECKPATCHLEVEL)/" \ rpminspect.yaml > $(SOURCES)/rpminspect.yaml - @cp cpupower.* \ - keys/rhel*.x509 \ + @cp keys/rhel*.x509 \ kabi/check-kabi \ configs/$(PACKAGE_NAME)-*.config \ configs/partial*.config \ diff --git a/redhat/cpupower.config b/redhat/cpupower.config deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/cpupower.config +++ /dev/null @@ -1,3 +0,0 @@ -# See 'cpupower help' and cpupower(1) for more info -CPUPOWER_START_OPTS="frequency-set -g performance" -CPUPOWER_STOP_OPTS="frequency-set -g ondemand" diff --git a/redhat/cpupower.service b/redhat/cpupower.service deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/cpupower.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Configure CPU power related settings -After=syslog.target - -[Service] -Type=oneshot -RemainAfterExit=yes -EnvironmentFile=/etc/sysconfig/cpupower -ExecStart=/usr/bin/cpupower $CPUPOWER_START_OPTS -ExecStop=/usr/bin/cpupower $CPUPOWER_STOP_OPTS - -[Install] -WantedBy=multi-user.target diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100755 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -840,8 +840,6 @@ Source300: kernel-abi-stablelists-%{kabiversion}.tar.bz2 Source301: kernel-kabi-dw-%{kabiversion}.tar.bz2 # Sources for kernel-tools -Source2000: cpupower.service -Source2001: cpupower.config Source2002: kvm_stat.logrotate # Some people enjoy building customized kernels from the dist-git in Fedora and @@ -2591,9 +2589,6 @@ mv cpupower.lang ../ popd %endif chmod 0755 %{buildroot}%{_libdir}/libcpupower.so* -mkdir -p %{buildroot}%{_unitdir} %{buildroot}%{_sysconfdir}/sysconfig -install -m644 %{SOURCE2000} %{buildroot}%{_unitdir}/cpupower.service -install -m644 %{SOURCE2001} %{buildroot}%{_sysconfdir}/sysconfig/cpupower %endif %ifarch x86_64 mkdir -p %{buildroot}%{_mandir}/man8 @@ -2739,15 +2734,6 @@ popd ### %if %{with_tools} -%post -n kernel-tools -%systemd_post cpupower.service - -%preun -n kernel-tools -%systemd_preun cpupower.service - -%postun -n kernel-tools -%systemd_postun cpupower.service - %post -n kernel-tools-libs /sbin/ldconfig -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2125

2 1

[OS-BUILD PATCHv2] Check for kernel config git-push failures
by Don Zickus (via Email Bridge) 09 Dec '22

09 Dec '22

From: Don Zickus <dzickus(a)redhat.com> Check for kernel config git-push failures An automated nightly job is run to merge the upstream tree and check for new configs to be set. The new configs are automatically added to the redhat/configs/pending-ark directory and pushed. A second script then comes along and walks through those new configs and converts them into automatically generated config MRs for review. Those MRs periodically fail to git-push due to infrastructure issues. The script reports success and the maintainers never realize an MR failed to be created until a pending config audit is performed before the GA release. Let's update the script to check for those failures and report them (by failing the script). The script failure leads to an email to the maintainer who can then re-run the script by hand to regenerate the MRs or fix issues manually. Tested by * committing dummy change to Makefile * git push -o merge_request.create dzickus dummy * committing second dummy change to Makefile * git push -o merge_request.create dzickus dummy (git push succeeds with following warning message) remote: remote: ================================================================ remote: remote: WARNINGS: Error encountered with push options remote: 'merge_request.create' 'merge_request.target=os-build' remote: 'merge_request.remove_source_branch': Validate branches Another remote: open merge request already exists for this source branch: !2164 remote: remote: =============================================================== remote: Ran script changes by hand to verify shell logic. Untested in cronjob. 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,8 @@ else fi if test -n "$DIST_PUSH"; then + tmpfile=".push-warnings" + echo "Pushing branch $(git branch --show-current) to $(git remote get-url gitlab)" git push gitlab HEAD @@ -76,8 +78,16 @@ if test -n "$DIST_PUSH"; then -o merge_request.create \ -o merge_request.target="$BRANCH" \ -o merge_request.remove_source_branch \ - gitlab "$branch" + gitlab "$branch" 2>&1 | tee -a $tmpfile done + + # GitLab server side warnings do not fail git-push but leave verbose + # WARNING messages. Grep for those and consider it a script + # failure. Make sure all branches are pushed first as follow up + # git-pushes may succeed. + grep -q "remote:[ ]* WARNINGS" $tmpfile && RC=1 || RC=0 + rm $tmpfile + test $RC && exit $RC else printf " To push all the release artifacts, run: -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2165

3 5

[OS-BUILD PATCHv2] Clean up the config for the Tegra186 timer
by Al Stone (via Email Bridge) 05 Dec '22

05 Dec '22

From: Al Stone <ahs3(a)redhat.com> Clean up the config for the Tegra186 timer This device is used by NVIDIA Orin and needs to be enabled for arm64. However, the default is to be not set so we can move this to common and simplify. Signed-off-by: Al Stone <ahs3(a)redhat.com> diff --git a/redhat/configs/ark/generic/CONFIG_TEGRA186_TIMER b/redhat/configs/common/generic/arm/CONFIG_TEGRA186_TIMER rename from redhat/configs/ark/generic/CONFIG_TEGRA186_TIMER rename to redhat/configs/common/generic/arm/CONFIG_TEGRA186_TIMER index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_TEGRA186_TIMER +++ b/redhat/configs/common/generic/arm/CONFIG_TEGRA186_TIMER diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA186_TIMER b/redhat/configs/common/generic/arm/aarch64/CONFIG_TEGRA186_TIMER rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA186_TIMER rename to redhat/configs/common/generic/arm/aarch64/CONFIG_TEGRA186_TIMER index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA186_TIMER +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_TEGRA186_TIMER diff --git a/redhat/configs/fedora/generic/arm/CONFIG_TEGRA186_TIMER b/redhat/configs/fedora/generic/arm/CONFIG_TEGRA186_TIMER deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/arm/CONFIG_TEGRA186_TIMER +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_TEGRA186_TIMER is not set -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2166

4 7

[OS-BUILD PATCH] redhat/configs: move CONFIG_TEGRA186_GPC_DMA config
by Mark Salter (via Email Bridge) 30 Nov '22

30 Nov '22

From: Mark Salter <msalter(a)redhat.com> redhat/configs: move CONFIG_TEGRA186_GPC_DMA config CONFIG_TEGRA186_GPC_DMA is an aarch64-only option so move it into an aarch64-only config directory. Signed-off-by: Mark Salter <msalter(a)redhat.com> diff --git a/redhat/configs/ark/generic/CONFIG_TEGRA186_GPC_DMA b/redhat/configs/ark/generic/arm/aarch64/CONFIG_TEGRA186_GPC_DMA rename from redhat/configs/ark/generic/CONFIG_TEGRA186_GPC_DMA rename to redhat/configs/ark/generic/arm/aarch64/CONFIG_TEGRA186_GPC_DMA index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_TEGRA186_GPC_DMA +++ b/redhat/configs/ark/generic/arm/aarch64/CONFIG_TEGRA186_GPC_DMA -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2169

2 1

[OS-BUILD PATCH] redhat: genlog.sh should expect genlog.py in the current directory
by Patrick Talbert (via Email Bridge) 30 Nov '22

30 Nov '22

From: Patrick Talbert <ptalbert(a)redhat.com> redhat: genlog.sh should expect genlog.py in the current directory MR !2095 shuffled around the scripts and incorrectly changed the expected path of genlog.py. Fix it. Signed-off-by: Patrick Talbert <ptalbert(a)redhat.com> diff --git a/redhat/scripts/genspec/genlog.sh b/redhat/scripts/genspec/genlog.sh index blahblah..blahblah 100755 --- a/redhat/scripts/genspec/genlog.sh +++ b/redhat/scripts/genspec/genlog.sh @@ -32,7 +32,7 @@ cversion="[$DISTBASEVERSION]"; echo "* $cdate $cname $cversion" > "$clogf" git log --topo-order --no-merges -z "$GIT_NOTES" "$GIT_FORMAT" \ - ^"${UPSTREAM}" "$lasttag".. -- ':!/redhat/rhdocs' | "${0%/*}"/scripts/genspec/genlog.py >> "$clogf" + ^"${UPSTREAM}" "$lasttag".. -- ':!/redhat/rhdocs' | "${0%/*}"/genlog.py >> "$clogf" if [ "$HIDE_REDHAT" = "1" ]; then grep -v -e "^- \[redhat\]" "$clogf" | -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2167

2 2

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel November 2022