kernel September 2022

kernel@lists.fedoraproject.org

10 participants
20 discussions

[OS-BUILD PATCH 0/20] redhat: Update with RHEL-only changes
by Prarit Bhargava (via Email Bridge) 18 Sep '22

18 Sep '22

From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021 centos-stream-9 !1308 [1] updates the redhat/ directory in centos-stream-9 to match that of ARK. After that update there are about 40 changes that are not applied to ARK but have been applied to "downstream" centos-stream-9. Some of these changes are centos-stream-9/RHEL9 specific changes that should not be applied to ARK, and this MR applies the remaining set to ARK. Update with RHEL-only changes. [1] https://gitlab.com/redhat/centos-stream/src/kernel/centos- stream-9/-/merge_requests/1308 Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> --- redhat/configs/ark/generic/CONFIG_OCTEONTX2_AF | 1 + redhat/configs/ark/generic/CONFIG_OCTEONTX2_PF | 1 + redhat/kabi/check-kabi | 39 +- redhat/kabi/diff-kabi | 42 + redhat/kabi/show-kabi | 31 +- redhat/kabi/symtype-generate | 678 +++++++++++++++++++++++++ redhat/kabi/symtypes | 238 ++++++++ redhat/kabi/update-kabi | 125 ++++ redhat/rhel_files/filter-i686.sh.rhel | 0 redhat/scripts/clone_tree.sh | 32 - redhat/scripts/merge-subtrees.sh | 2 +- redhat/scripts/rh-dist-git.sh | 9 +- redhat/Makefile | 107 +++- redhat/Makefile.rhpkg | 13 - redhat/Makefile.variables | 4 + redhat/kernel.spec.template | 40 +- 16 files changed, 1281 insertions(+), 81 deletions(-)

2 22

[OS-BUILD PATCH] redhat/self-test: Ignore .rhpkg.mk files
by Prarit Bhargava (via Email Bridge) 17 Sep '22

17 Sep '22

From: Prarit Bhargava <prarit(a)redhat.com> redhat/self-test: Ignore .rhpkg.mk files If a user specifies, for example, a ~/.rhpkg.mk file, the file will be included in the MAKEFILE_LIST variable. This breaks the dist-dump-variables test, so these files should be excluded. Ignore user specified .rhpkg.mk files. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> diff --git a/redhat/self-test/data/create-data.sh b/redhat/self-test/data/create-data.sh index blahblah..blahblah 100755 --- a/redhat/self-test/data/create-data.sh +++ b/redhat/self-test/data/create-data.sh @@ -61,7 +61,8 @@ do grep -v -w RHGITURL |\ grep -v -w RHDISTDATADIR |\ grep -v -w VARS |\ - sort -u >& "${destdir}/${varfilename}" & + sort -u >& "${destdir}/${varfilename}" && \ + sed -i 's/ \S*$rhpkg.mk$\S*//g' "${destdir}/${varfilename}" & waitpids[${count}]=$! ((count++)) -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2023

1 0

[OS-BUILD PATCH] redhat/configs: Restructure and consolidate AArch64 16K page size config options
by Neal Gompa (via Email Bridge) 17 Sep '22

17 Sep '22

From: Neal Gompa <ngompa(a)fedoraproject.org> redhat/configs: Restructure and consolidate AArch64 16K page size config options This deduplicates the AArch64 page size config options and makes it possible for alternative kernels to easily build with 16K pages. Signed-off-by: Neal Gompa <ngompa(a)fedoraproject.org> diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARM64_16K_PAGES b/redhat/configs/common/generic/arm/aarch64/CONFIG_ARM64_16K_PAGES rename from redhat/configs/ark/generic/arm/aarch64/CONFIG_ARM64_16K_PAGES rename to redhat/configs/common/generic/arm/aarch64/CONFIG_ARM64_16K_PAGES index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARM64_16K_PAGES +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_ARM64_16K_PAGES diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_ARM64_VA_BITS_47 b/redhat/configs/common/generic/arm/aarch64/CONFIG_ARM64_VA_BITS_47 new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_ARM64_VA_BITS_47 @@ -0,0 +1 @@ +# CONFIG_ARM64_VA_BITS_47 is not set diff --git a/redhat/configs/fedora/generic/arm/CONFIG_ARM64_16K_PAGES b/redhat/configs/fedora/generic/arm/CONFIG_ARM64_16K_PAGES deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/arm/CONFIG_ARM64_16K_PAGES +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_ARM64_16K_PAGES is not set -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2022

1 0

❌ FAIL: Test report for 5.19.9-200.fc36 (fedora-36)
by cki-project＠redhat.com 15 Sep '22

15 Sep '22

Hi, we tested your kernel and here are the results: Overall result: FAILED Merge: OK Compile: OK Test: FAILED Kernel information: Brew / Koji Task ID: 92032682 You can find all the details about the test run at https://datawarehouse.cki-project.org/kcidb/checkouts/53409 One or more kernel tests failed: Unrecognized or new issues: ppc64le - Storage - blktests - nvmeof-mp Logs: https://datawarehouse.cki-project.org/kcidb/tests/5150389 We also see the following known issues which are not related to your changes: Issue: NFS Connectathon: SELinux prevents rpcbind URL: https://gitlab.com/redhat/centos-stream/tests/kernel/kernel-tests/-/issues/… Affected tests: aarch64 - NFS Connectathon ppc64le - NFS Connectathon Issue: Storage block - storage fio numa: Performance comparison: min:40535 * 1.15 < max:81259 URL: https://bugzilla.redhat.com/show_bug.cgi?id=2032094 Affected tests: x86_64 - Storage - block - storage fio numa If you find a failure unrelated to your changes, please tag it at https://datawarehouse.cki-project.org . This will prevent the failures from being incorrectly reported in the future. If you don't have permissions to tag an issue, you can contact the CKI team or test maintainers. 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

[OS-BUILD PATCH] redhat: cleaner kunit tests
by Nico Pache (via Email Bridge) 15 Sep '22

15 Sep '22

From: Nico Pache <npache(a)redhat.com> redhat: cleaner kunit tests Group (now sorted!) KUNIT tests into its own file for easier management. This also required some changes to the SPEC file to append the kunit tests back onto the mod-internal.list file before generating the image. Some tests were also forcefully disabled that can run perfectly fine. Re-enable these tests to increase our testing efforts. Upstream-status: RHEL-only Signed-off-by: Nico Pache <npache(a)redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -512,6 +512,7 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check kvm_stat.logrotate \ mod-denylist.sh \ mod-internal.list \ + mod-kunit.list \ mod-partner.list \ mod-sign.sh \ configs/flavors \ diff --git a/redhat/configs/common/generic/CONFIG_BITS_TEST b/redhat/configs/common/generic/CONFIG_BITS_TEST index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/CONFIG_BITS_TEST +++ b/redhat/configs/common/generic/CONFIG_BITS_TEST @@ -1 +1 @@ -# CONFIG_BITS_TEST is not set +CONFIG_BITS_TEST=m diff --git a/redhat/configs/common/generic/CONFIG_KPROBES_SANITY_TEST b/redhat/configs/common/generic/CONFIG_KPROBES_SANITY_TEST index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/CONFIG_KPROBES_SANITY_TEST +++ b/redhat/configs/common/generic/CONFIG_KPROBES_SANITY_TEST @@ -1 +1 @@ -# CONFIG_KPROBES_SANITY_TEST is not set +CONFIG_KPROBES_SANITY_TEST=m diff --git a/redhat/configs/common/generic/CONFIG_RESOURCE_KUNIT_TEST b/redhat/configs/common/generic/CONFIG_RESOURCE_KUNIT_TEST index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/CONFIG_RESOURCE_KUNIT_TEST +++ b/redhat/configs/common/generic/CONFIG_RESOURCE_KUNIT_TEST @@ -1 +1 @@ -# CONFIG_RESOURCE_KUNIT_TEST is not set +CONFIG_RESOURCE_KUNIT_TEST=m diff --git a/redhat/configs/ark/generic/CONFIG_SND_SOC_UTILS_KUNIT_TEST b/redhat/configs/common/generic/CONFIG_SND_SOC_UTILS_KUNIT_TEST rename from redhat/configs/ark/generic/CONFIG_SND_SOC_UTILS_KUNIT_TEST rename to redhat/configs/common/generic/CONFIG_SND_SOC_UTILS_KUNIT_TEST index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_SND_SOC_UTILS_KUNIT_TEST +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_UTILS_KUNIT_TEST diff --git a/redhat/configs/common/generic/CONFIG_TEST_SORT b/redhat/configs/common/generic/CONFIG_TEST_SORT index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/CONFIG_TEST_SORT +++ b/redhat/configs/common/generic/CONFIG_TEST_SORT @@ -1 +1 @@ -# CONFIG_TEST_SORT is not set +CONFIG_TEST_SORT=m diff --git a/redhat/configs/fedora/generic/CONFIG_SND_SOC_UTILS_KUNIT_TEST b/redhat/configs/fedora/generic/CONFIG_SND_SOC_UTILS_KUNIT_TEST deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/CONFIG_SND_SOC_UTILS_KUNIT_TEST +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SND_SOC_UTILS_KUNIT_TEST=m 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 @@ -817,6 +817,7 @@ Source82: update_scripts.sh Source84: mod-internal.list Source85: mod-partner.list +Source86: mod-kunit.list Source100: rheldup3.x509 Source101: rhelkpatch1.x509 @@ -2077,6 +2078,7 @@ BuildKernel() { %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $(realpath configs/mod-extra.list) # Identify modules in the kernel-modules-extras package %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE84} internal + %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE86} kunit %if 0%{!?fedora:1} # Identify modules in the kernel-modules-partner package %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE85} partner @@ -2094,6 +2096,7 @@ BuildKernel() { mkdir restore cp -r lib/modules/$KernelVer/* restore/. + cat mod-kunit.list >> mod-internal.list # don't include anything going into kernel-modules-extra in the file lists xargs rm -rf < mod-extra.list # don't include anything going int kernel-modules-internal in the file lists @@ -2167,6 +2170,7 @@ BuildKernel() { rm -f $RPM_BUILD_ROOT/module-dirs.list rm -f $RPM_BUILD_ROOT/mod-extra.list rm -f $RPM_BUILD_ROOT/mod-internal.list + rm -f $RPM_BUILD_ROOT/mod-kunit.list %if 0%{!?fedora:1} rm -f $RPM_BUILD_ROOT/mod-partner.list %endif diff --git a/redhat/mod-internal.list b/redhat/mod-internal.list index blahblah..blahblah 100644 --- a/redhat/mod-internal.list +++ b/redhat/mod-internal.list @@ -1,31 +1,4 @@ dmatest -kunit -kunit-test -ext4-inode-test -list-test -sysctl-test -mptcp_crypto_test -mptcp_token_test -bitfield_kunit -cmdline_kunit -property-entry-test -qos-test -resource_kunit -soc-topology-test -string-stream-test -test_linear_ranges -test_bits -test_kasan -time_test -fat_test -lib_test -rational-test -test_list_sort -slub_kunit -memcpy_kunit -dev_addr_lists_test -kfence_test -test_hash locktorture mac80211_hwsim netdevsim @@ -47,15 +20,6 @@ torture refscale rcuscale test_bpf -stackinit_kunit -overflow_kunit -clk-gate_test -clk_test mtty test_hmm test_vmalloc -test_cpumask -iio-test-format -iio-test-rescale -cros_kunit -cpumask_kunit diff --git a/redhat/mod-kunit.list b/redhat/mod-kunit.list new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/mod-kunit.list @@ -0,0 +1,35 @@ +bitfield_kunit +clk-gate_test +clk_test +cmdline_kunit +cpumask_kunit +cros_kunit +dev_addr_lists_test +ext4-inode-test +fat_test +iio-test-format +iio-test-rescale +kfence_test +kunit +kunit-test +lib_test +list-test +memcpy_kunit +mptcp_crypto_test +mptcp_token_test +overflow_kunit +rational-test +resource_kunit +slub_kunit +soc-topology-test +soc-utils-test +stackinit_kunit +sysctl-test +test_bits +test_hash +test_kasan +test_kprobes +test_linear_ranges +test_list_sort +test_sort +time_test -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2018

2 2

[OS-BUILD PATCH] redhat: sort config options based on their name only
by Frantisek Hrbata (via Email Bridge) 14 Sep '22

14 Sep '22

From: Frantisek Hrbata <fhrbata(a)redhat.com> redhat: sort config options based on their name only Bugzilla: INTERNAL Upstream Status: RHEL-only Tested: make dist-configs-prep LC_ALL=C vs make dist-configs-prep LC_ALL=en_US.UTF-8 generate the same config file, sorted content is the same as prior this change The content of generated config files is sorted in build_configs.sh. This gives unpredictable output if different locale is set. Let's sort it purely on the config option name with C locale. This keeps related options together no matter if they are set or not. Note that this still slightly changes the order compared to order before this change. This is updated version of !2011 which was reverted. Signed-off-by: Frantisek Hrbata <fhrbata(a)redhat.com> diff --git a/redhat/configs/build_configs.sh b/redhat/configs/build_configs.sh index blahblah..blahblah 100755 --- a/redhat/configs/build_configs.sh +++ b/redhat/configs/build_configs.sh @@ -108,7 +108,11 @@ function merge_configs() echo "# $arch" > "$name";; esac - sort config-merging."$count" >> "$name" + # sort config based on the config option names only + cat config-merging."$count" | + sed 's/^$CONFIG_[^=]\+$=$.*$/@ \1 =\2/' | + LC_ALL=C sort -k2,2 -b | + sed 's/@ $CONFIG_[^ ]\+$ =$.*$/\1=\2/' >> "$name" rm -f config-merged."$count" config-merging."$count" echo "Building $name complete" } -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2019

2 2

[OS-BUILD PATCH] redhat: set LC_ALL=C before sorting config content
by Frantisek Hrbata (via Email Bridge) 14 Sep '22

14 Sep '22

From: Frantisek Hrbata <fhrbata(a)redhat.com> redhat: set LC_ALL=C before sorting config content Bugzilla: INTERNAL Upstream Status: RHEL-only Tested: make dist-configs-prep LC_ALL=C vs make dist-configs-prep LC_ALL=en_US.UTF-8 generate the same config file The content of generated config files is sorted in build_configs.sh. This gives unpredictable output if different locale is set. Signed-off-by: Frantisek Hrbata <fhrbata(a)redhat.com> diff --git a/redhat/configs/build_configs.sh b/redhat/configs/build_configs.sh index blahblah..blahblah 100755 --- a/redhat/configs/build_configs.sh +++ b/redhat/configs/build_configs.sh @@ -108,7 +108,7 @@ function merge_configs() echo "# $arch" > "$name";; esac - sort config-merging."$count" >> "$name" + LC_ALL=C sort config-merging."$count" >> "$name" rm -f config-merged."$count" config-merging."$count" echo "Building $name complete" } -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2011

4 18

[OS-BUILD PATCH] configs: enable CONFIG_HP_ILO for aarch64
by Mark Salter (via Email Bridge) 13 Sep '22

13 Sep '22

From: Mark Salter <msalter(a)redhat.com> configs: enable CONFIG_HP_ILO for aarch64 There are now Arm based servers with HP ILO interfaces, so enable the driver for aarch64. Signed-off-by: Mark Salter <msalter(a)redhat.com> diff --git a/redhat/configs/generic/aarch64/CONFIG_HP_ILO b/redhat/configs/generic/aarch64/CONFIG_HP_ILO new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/generic/aarch64/CONFIG_HP_ILO @@ -0,0 +1 @@ +CONFIG_HP_ILO=m -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2009

3 4

[OS-BUILD PATCH] redhat: fix kunit compiling error
by Nico Pache (via Email Bridge) 12 Sep '22

12 Sep '22

From: Nico Pache <npache(a)redhat.com> redhat: fix kunit compiling error The cpumask_kunit.ko file is still being included in the kernel build due to it being incorrectly named in the mod-internal.list file. This causes the depmod to fail. Change test_cpumask to cpumask_kunit to fix this. Signed-off-by: Nico Pache <npache(a)redhat.com> diff --git a/redhat/mod-internal.list b/redhat/mod-internal.list index blahblah..blahblah 100644 --- a/redhat/mod-internal.list +++ b/redhat/mod-internal.list @@ -57,7 +57,7 @@ clk_test mtty test_hmm test_vmalloc -test_cpumask +cpumask_kunit iio-test-format iio-test-rescale cros_kunit -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2016

2 2

[OS-BUILD PATCH] redhat: create /boot symvers link if it doesn't exist
by Jan Stancek (via Email Bridge) 09 Sep '22

09 Sep '22

From: Jan Stancek <jstancek(a)redhat.com> redhat: create /boot symvers link if it doesn't exist Link is supposed to be created by 20-grub.install, but on s390x we don't build grub2 for ~10 years. Create the link ourselves if it doesn't exist already. Signed-off-by: Jan Stancek <jstancek(a)redhat.com> 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 @@ -2821,6 +2821,10 @@ fi\ %endif\ rm -f %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?1:+%{1}}\ /bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\ +if [[ ! -e "/boot/symvers-%{KVERREL}%{?1:+%{1}}.gz" ]]; then\ + ln -s "/lib/modules/%{KVERREL}%{?1:+%{1}}/symvers.gz" "/boot/symvers-%{KVERREL}%{?1:+%{1}}.gz"\ + command -v restorecon &>/dev/null && restorecon "/boot/symvers-%{KVERREL}%{?1:+%{1}}.gz" \ +fi\ %{nil} # -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2013

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel September 2022