November 2022 - kernel - Fedora mailing-lists

[OS-BUILD PATCHv2] redhat/Makefile: Fix RHJOBS grep warning
by Prarit Bhargava (via Email Bridge) 17 Nov '22

17 Nov '22

From: Prarit Bhargava <prarit(a)redhat.com> redhat/Makefile: Fix RHJOBS grep warning Calculating RHJOBS results in the warning grep: warning: stray \ before white space Resolve this by using [ ] to detect a space in the regex. Before fix: Search for "before white space" in https://s3.amazonaws.com/arr-cki-prod-trusted-artifacts/trusted-artifacts/6… After fix: No "before white space" errors seen in https://s3.amazonaws.com/arr-cki-prod-trusted-artifacts/trusted-artifacts/6… Also, confirming that RHJOBS works correctly after the fix, [prarit@prarit kernel-ark]$ make -j13 dist-dump-variables | grep RHJOBS= RHJOBS=13 [prarit@prarit kernel-ark]$ 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 @@ -80,7 +80,7 @@ ifndef DISTRO endif ifndef RHJOBS - RHJOBS=$(shell j=$$(echo $(MAKEFLAGS) | grep -Eo "\ -j[0-9]*" | xargs ); \ + RHJOBS=$(shell j=$$(echo $(MAKEFLAGS) | grep -Eo "(^|[ ])-j[0-9]*" | xargs ); \ if [ -z "$${j}" ]; then \ echo "1"; \ else \ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2148

1 2

✅ PASS (3/297 SKIPPED): Test report for 6.0.9-200.fc36 (fedora-36)
by cki-project＠redhat.com 16 Nov '22

16 Nov '22

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: 94243446 You can find all the details about the test run at https://datawarehouse.cki-project.org/kcidb/checkouts/60165 One or more kernel tests failed: We also see the following known issues which are not related to your changes: 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 Issue: avc: denied { name_bind } for pid=897864 comm="rpcbind" src=63924 scontext=system_u:system_r:rpcbind_t:s0 tcontext=system_u:object_r:unreserved_port_t:s0 tclass=udp_socket permissive=1 URL: https://bugzilla.redhat.com/show_bug.cgi?id=1983604#c3 Affected tests: x86_64 - xfstests - nfsv4.2 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: xfstests - _check_xfs_filesystem: filesystem on /dev/nvme0n1p4 is inconsistent (r) URL: https://bugzilla.redhat.com/show_bug.cgi?id=1989409 Affected tests: aarch64 - xfstests - btrfs 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

[OS-BUILD PATCH] redhat/Makefile: Fix RHJOBS grep warning
by Prarit Bhargava (via Email Bridge) 16 Nov '22

16 Nov '22

From: Prarit Bhargava <prarit(a)redhat.com> redhat/Makefile: Fix RHJOBS grep warning Calculating RHJOBS results in the warning grep: warning: stray \ before white space Resolve this by using [ ] to detect a space in the regex. Before fix: Search for "before white space" in https://s3.amazonaws.com/arr-cki-prod-trusted-artifacts/trusted-artifacts/6… After fix: No "before white space" errors seen in https://s3.amazonaws.com/arr-cki-prod-trusted-artifacts/trusted-artifacts/6… Also, confirming that RHJOBS works correctly after the fix, [prarit@prarit kernel-ark]$ make -j13 dist-dump-variables | grep RHJOBS= RHJOBS=13 [prarit@prarit kernel-ark]$ 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 @@ -80,7 +80,7 @@ ifndef DISTRO endif ifndef RHJOBS - RHJOBS=$(shell j=$$(echo $(MAKEFLAGS) | grep -Eo "\ -j[0-9]*" | xargs ); \ + RHJOBS=$(shell j=$$(echo $(MAKEFLAGS) | grep -Eo "[ ]-j[0-9]*" | xargs ); \ if [ -z "$${j}" ]; then \ echo "1"; \ else \ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2148

2 1

[OS-BUILD PATCH] redhat/configs: Enable CONFIG_EFI_SECRET module
by Lenny Szubowicz (via Email Bridge) 16 Nov '22

16 Nov '22

From: Lenny Szubowicz <lszubowi(a)redhat.com> redhat/configs: Enable CONFIG_EFI_SECRET module Enable the efi_secret module to provide the contents of the EFI configuration table containing confidential computing (coco) secrets via /sys/kernel/security/secrets/coco/. CONFIG_EFI_SECRET depends on CONFIG_EFI_COCO_SECRETS, which is similarly defined. However, drivers/virt/coco/efi_secret/Kconfig currently effectively limits CONFIG_EFI_SECRET to X86_64. Signed-off-by: Lenny Szubowicz <lszubowi(a)redhat.com> diff --git a/redhat/configs/common/generic/CONFIG_EFI_SECRET b/redhat/configs/common/generic/CONFIG_EFI_SECRET new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_EFI_SECRET @@ -0,0 +1 @@ +CONFIG_EFI_SECRET=m -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2124

4 6

[OS-BUILD PATCH] redhat/configs: Move ark/generic/s390x/CONFIG_ZSMALLOC to common/generic
by Waiman Long (via Email Bridge) 16 Nov '22

16 Nov '22

From: Waiman Long <longman(a)redhat.com> redhat/configs: Move ark/generic/s390x/CONFIG_ZSMALLOC to common/generic Commit 3f72c8eb03cb ("Fix up ZSMALLOC config for s390") added s390x specific CONFIG_ZSMALLOC to resolve config generation problem due to upcommit commit b3fbd58fcbb1 ("mm: Kconfig: simplify zswap configuration"). As this commit is being backported to centos-stream-9 with similar config changes into the common/generic directory. It makes sense to move the ark/generic config files to common/generic too. Signed-off-by: Waiman Long <longman(a)redhat.com> diff --git a/redhat/configs/ark/generic/s390x/CONFIG_ZSMALLOC b/redhat/configs/common/generic/s390x/CONFIG_ZSMALLOC rename from redhat/configs/ark/generic/s390x/CONFIG_ZSMALLOC rename to redhat/configs/common/generic/s390x/CONFIG_ZSMALLOC index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/s390x/CONFIG_ZSMALLOC +++ b/redhat/configs/common/generic/s390x/CONFIG_ZSMALLOC diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_ZSMALLOC b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_ZSMALLOC rename from redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_ZSMALLOC rename to redhat/configs/common/generic/s390x/zfcpdump/CONFIG_ZSMALLOC index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_ZSMALLOC +++ b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_ZSMALLOC -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2127

2 3

[OS-BUILD PATCHv5] redhat: Force remove tmp file
by Prarit Bhargava (via Email Bridge) 16 Nov '22

16 Nov '22

From: Prarit Bhargava <prarit(a)redhat.com> redhat: Force remove tmp file If BTF is not enabled in the kernel config then .tmp_vmlinux.btf will not exist. The rpm build will throw an error because the file doesn't exist. Use 'rm -f' to delete the .tmp_vmlinux.btf file. Reported by: stan <upaitag(a)zoho.com> Signed-off-by: Prarit Bhargava <prarit(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 @@ -1683,7 +1683,8 @@ BuildKernel() { %endif # Remove large intermediate files we no longer need to save space - rm vmlinux.o .tmp_vmlinux.btf + # (-f required for zfcpdump builds that do not enable BTF) + rm -f vmlinux.o .tmp_vmlinux.btf # Start installing the results install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2135

2 1

[OS-BUILD PATCHv4] redhat: Force remove tmp file
by Prarit Bhargava (via Email Bridge) 16 Nov '22

16 Nov '22

From: Prarit Bhargava <prarit(a)redhat.com> redhat: Force remove tmp file If BTF is not enabled in the kernel config then .tmp_vmlinux.btf will not exist. The rpm build will throw an error because the file doesn't exist. Use 'rm -f' to delete the .tmp_vmlinux.btf file. Reported by: stan <upaitag(a)zoho.com> Signed-off-by: Prarit Bhargava <prarit(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 @@ -1683,7 +1683,7 @@ BuildKernel() { %endif # Remove large intermediate files we no longer need to save space - rm vmlinux.o .tmp_vmlinux.btf + rm -f vmlinux.o .tmp_vmlinux.btf # Start installing the results install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2135

2 2

[OS-BUILD PATCH 0/2] [redhat] New configs for the 9.2 DRM backport
by Karol Herbst (via Email Bridge) 16 Nov '22

16 Nov '22

From: Karol Herbst on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2152 Those I'll need for the DRM backport https://gitlab.com/redhat/centos- stream/src/kernel/centos-stream-9/-/merge_requests/1395 Depends on https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2145 /cc @ddutile Also disabled the option for `CONFIG_HSA_AMD_P2P` as with discussed we'll postpone enabling it until later. I might be wrong though. --- redhat/configs/ark/generic/CONFIG_DRM_IMX8QM_LDB | 1 + redhat/configs/ark/generic/CONFIG_DRM_IMX8QXP_LDB | 1 + redhat/configs/ark/generic/CONFIG_DRM_IMX8QXP_PIXEL_COMBINER | 1 + redhat/configs/ark/generic/CONFIG_DRM_IMX8QXP_PIXEL_LINK_TO_DPI | 1 + redhat/configs/ark/generic/CONFIG_DRM_RCAR_USE_MIPI_DSI | 1 + redhat/configs/ark/generic/CONFIG_HSA_AMD_P2P | 2 +- redhat/configs/ark/generic/CONFIG_INTEL_MEI_GSC | 1 - redhat/configs/fedora/generic/x86/CONFIG_INTEL_MEI_GSC => redhat/configs/common/generic/x86/CONFIG_INTEL_MEI_GSC | 0 redhat/configs/pending-ark/generic/CONFIG_DRM_RCAR_USE_MIPI_DSI | 13 ---------- 9 files changed, 6 insertions(+), 15 deletions(-)

2 3

[OS-BUILD PATCH] redhat/configs: ALSA - cleanups for the CentOS 9.2 update
by Jaroslav Kysela (via Email Bridge) 15 Nov '22

15 Nov '22

From: Jaroslav Kysela <jkysela(a)redhat.com> redhat/configs: ALSA - cleanups for the CentOS 9.2 update Those changes are related to the CentOS 9.2 update: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_… Change configuration CONFIG_SND_CTL_DEBUG Add common/debug:CONFIG_SND_CTL_DEBUG=y Add common/generic:CONFIG_SND_CTL_DEBUG=n Remove ark/debug:CONFIG_SND_CTL_DEBUG=y Remove ark/generic:CONFIG_SND_CTL_DEBUG=n Remove fedora/debug:CONFIG_SND_CTL_DEBUG=y Remove fedora/generic:CONFIG_SND_CTL_DEBUG=n Change configuration CONFIG_SND_CTL_INPUT_VALIDATION Add common/debug:CONFIG_SND_CTL_INPUT_VALIDATION=y Add common/generic:CONFIG_SND_CTL_INPUT_VALIDATION=n Remove ark/debug:CONFIG_SND_CTL_INPUT_VALIDATION=y Remove ark/generic:CONFIG_SND_CTL_INPUT_VALIDATION=n Remove fedora/debug:CONFIG_SND_CTL_INPUT_VALIDATION=y Remove fedora/generic:CONFIG_SND_CTL_INPUT_VALIDATION=n Change configuration CONFIG_SND_CTL_FAST_LOOKUP Add common/generic:CONFIG_SND_CTL_FAST_LOOKUP=y Change configuration CONFIG_SND_SOC_AMD_RPL_ACP6x Add common/generic:CONFIG_SND_SOC_AMD_RPL_ACP6x=n Remove ark/generic:CONFIG_SND_SOC_AMD_RPL_ACP6x=n Change configuration CONFIG_SND_SOC_CS35L45_I2C Add common/generic:CONFIG_SND_SOC_CS35L45_I2C=n Remove ark/generic:CONFIG_SND_SOC_CS35L45_I2C=n Change configuration CONFIG_SND_SOC_CS35L45_SPI Add common/generic:CONFIG_SND_SOC_CS35L45_SPI=n Remove ark/generic:CONFIG_SND_SOC_CS35L45_SPI=n Change configuration CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 Add common/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219=n Remove ark/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219=n Change configuration CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC Add common/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC=n Remove ark/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC=n Change configuration CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO Add common/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO=n Remove ark/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO=n Change configuration CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST Add common/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST=n Remove ark/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST=n Change configuration CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A Add common/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A=n Remove ark/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A=n Change configuration CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 Add common/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373=n Remove ark/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373=n Change configuration CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 Add common/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825=n Remove ark/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825=n Change configuration CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 Add common/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=n Remove ark/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=n Change configuration CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 Add common/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=n Remove ark/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=n Change configuration CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 Add common/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=n Remove ark/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=n Change configuration CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 Add common/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=n Remove ark/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=n Change configuration CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 Add common/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=n Remove ark/generic:CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=n Change configuration CONFIG_SND_SOC_MAX98396 Add common/generic:CONFIG_SND_SOC_MAX98396=n Remove ark/generic:CONFIG_SND_SOC_MAX98396=n Change configuration CONFIG_SND_SOC_TAS2780 Add common/generic:CONFIG_SND_SOC_TAS2780=n Remove ark/generic:CONFIG_SND_SOC_TAS2780=n Change configuration CONFIG_SND_SOC_WM8731_I2C Add common/generic:CONFIG_SND_SOC_WM8731_I2C=n Remove ark/generic:CONFIG_SND_SOC_WM8731_I2C=n Change configuration CONFIG_SND_SOC_WM8731_SPI Add common/generic:CONFIG_SND_SOC_WM8731_SPI=n Remove ark/generic:CONFIG_SND_SOC_WM8731_SPI=n Change configuration CONFIG_SND_SOC_WM8940 Add common/generic:CONFIG_SND_SOC_WM8940=n Remove ark/generic:CONFIG_SND_SOC_WM8940=n Change configuration CONFIG_SND_SOC_WSA883X Add common/generic:CONFIG_SND_SOC_WSA883X=n Remove ark/generic:CONFIG_SND_SOC_WSA883X=n Change configuration CONFIG_SND_SOC_SOF_METEORLAKE Add common/generic/x86:CONFIG_SND_SOC_SOF_METEORLAKE=m Add common/generic:CONFIG_SND_SOC_SOF_METEORLAKE=n Remove ark/generic:CONFIG_SND_SOC_SOF_METEORLAKE=m Remove fedora/generic/x86:CONFIG_SND_SOC_SOF_METEORLAKE=m Signed-off-by: Jaroslav Kysela <jkysela(a)redhat.com> diff --git a/redhat/configs/ark/debug/CONFIG_SND_CTL_DEBUG b/redhat/configs/common/debug/CONFIG_SND_CTL_DEBUG rename from redhat/configs/ark/debug/CONFIG_SND_CTL_DEBUG rename to redhat/configs/common/debug/CONFIG_SND_CTL_DEBUG index blahblah..blahblah 100644 --- a/redhat/configs/ark/debug/CONFIG_SND_CTL_DEBUG +++ b/redhat/configs/common/debug/CONFIG_SND_CTL_DEBUG diff --git a/redhat/configs/ark/debug/CONFIG_SND_CTL_INPUT_VALIDATION b/redhat/configs/common/debug/CONFIG_SND_CTL_INPUT_VALIDATION rename from redhat/configs/ark/debug/CONFIG_SND_CTL_INPUT_VALIDATION rename to redhat/configs/common/debug/CONFIG_SND_CTL_INPUT_VALIDATION index blahblah..blahblah 100644 --- a/redhat/configs/ark/debug/CONFIG_SND_CTL_INPUT_VALIDATION +++ b/redhat/configs/common/debug/CONFIG_SND_CTL_INPUT_VALIDATION diff --git a/redhat/configs/ark/generic/CONFIG_SND_CTL_DEBUG b/redhat/configs/common/generic/CONFIG_SND_CTL_DEBUG rename from redhat/configs/ark/generic/CONFIG_SND_CTL_DEBUG rename to redhat/configs/common/generic/CONFIG_SND_CTL_DEBUG index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_SND_CTL_DEBUG +++ b/redhat/configs/common/generic/CONFIG_SND_CTL_DEBUG diff --git a/redhat/configs/common/generic/CONFIG_SND_CTL_FAST_LOOKUP b/redhat/configs/common/generic/CONFIG_SND_CTL_FAST_LOOKUP new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_SND_CTL_FAST_LOOKUP @@ -0,0 +1 @@ +CONFIG_SND_CTL_FAST_LOOKUP=y diff --git a/redhat/configs/ark/generic/CONFIG_SND_CTL_INPUT_VALIDATION b/redhat/configs/common/generic/CONFIG_SND_CTL_INPUT_VALIDATION rename from redhat/configs/ark/generic/CONFIG_SND_CTL_INPUT_VALIDATION rename to redhat/configs/common/generic/CONFIG_SND_CTL_INPUT_VALIDATION index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_SND_CTL_INPUT_VALIDATION +++ b/redhat/configs/common/generic/CONFIG_SND_CTL_INPUT_VALIDATION diff --git a/redhat/configs/ark/generic/CONFIG_SND_SOC_AMD_RPL_ACP6x b/redhat/configs/common/generic/CONFIG_SND_SOC_AMD_RPL_ACP6x rename from redhat/configs/ark/generic/CONFIG_SND_SOC_AMD_RPL_ACP6x rename to redhat/configs/common/generic/CONFIG_SND_SOC_AMD_RPL_ACP6x index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_SND_SOC_AMD_RPL_ACP6x +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_AMD_RPL_ACP6x diff --git a/redhat/configs/ark/generic/CONFIG_SND_SOC_CS35L45_I2C b/redhat/configs/common/generic/CONFIG_SND_SOC_CS35L45_I2C rename from redhat/configs/ark/generic/CONFIG_SND_SOC_CS35L45_I2C rename to redhat/configs/common/generic/CONFIG_SND_SOC_CS35L45_I2C index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_SND_SOC_CS35L45_I2C +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_CS35L45_I2C diff --git a/redhat/configs/ark/generic/CONFIG_SND_SOC_CS35L45_SPI b/redhat/configs/common/generic/CONFIG_SND_SOC_CS35L45_SPI rename from redhat/configs/ark/generic/CONFIG_SND_SOC_CS35L45_SPI rename to redhat/configs/common/generic/CONFIG_SND_SOC_CS35L45_SPI index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_SND_SOC_CS35L45_SPI +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_CS35L45_SPI diff --git a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 rename from redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 rename to redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 diff --git a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC rename from redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC rename to redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC diff --git a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO rename from redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO rename to redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO diff --git a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST rename from redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST rename to redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST diff --git a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A rename from redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A rename to redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A diff --git a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 rename from redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 rename to redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 diff --git a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 rename from redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 rename to redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 diff --git a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 rename from redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 rename to redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 diff --git a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 rename from redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 rename to redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 diff --git a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 rename from redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 rename to redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 diff --git a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 rename from redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 rename to redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 diff --git a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 rename from redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 rename to redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2128

3 2

[OS-BUILD PATCH] redhat: avoid picking up stray editor backups when processing configs
by Clark Williams (via Email Bridge) 15 Nov '22

15 Nov '22

From: Clark Williams <williams(a)redhat.com> redhat: avoid picking up stray editor backups when processing configs Emacs and vim both use a trailing '~' to designate a backup file. This can cause puzzling behavior in the config generation logic because the build_configs.sh script will pick up both CONFIG_FOO and CONFIG_FOO~, which presumably have different values. Just avoid this by filtering out files with ~ extension when picking up CONFIGS from a directory. Signed-off-by: Clark Williams <williams(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 @@ -49,7 +49,8 @@ function combine_config_layer() return fi - cat "$dir"/CONFIG_* > "$file" + # avoid picking up editor backup files + cat $(ls -1 "$dir"/CONFIG_* | grep -v "~$") > "$file" } function merge_configs() -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2149

3 3

[OS-BUILD PATCH] redhat: clean up the partial-kgcov-snip.config file
by Patrick Talbert (via Email Bridge) 15 Nov '22

15 Nov '22

From: Patrick Talbert <ptalbert(a)redhat.com> redhat: clean up the partial-kgcov-snip.config file Since MR !1433 we generate a redhat/configs/partial-kgcov-snip.config file but none of the clean targets remove it. Fix this by having dist-clean-configs remove any partial-*-snip.config file. Signed-off-by: Patrick Talbert <ptalbert(a)redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -517,7 +517,7 @@ dist-configs-arch: ARCH_MACH = $(MACH) dist-configs-arch: dist-configs dist-clean-configs: - @cd $(REDHAT)/configs; rm -f kernel-*.config kernel-*.config.orig kernel-*.config.tmp + @cd $(REDHAT)/configs; rm -f kernel-*.config kernel-*.config.orig kernel-*.config.tmp partial-*-snip.config dist-clean-sources: @rm -f $(RPM)/SPECS/* -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2150

1 0

[OS-BUILD PATCHv2] redhat: Enable support for SN2201 system
by Ivan Vecera (via Email Bridge) 15 Nov '22

15 Nov '22

From: Ivan Vecera <ivecera(a)redhat.com> redhat: Enable support for SN2201 system Enable support for platform devices used on Nvidia SN2201 switch system. Signed-off-by: Ivan Vecera <ivecera(a)redhat.com> diff --git a/redhat/configs/common/generic/x86/CONFIG_NVSW_SN2201 b/redhat/configs/common/generic/x86/CONFIG_NVSW_SN2201 new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/x86/CONFIG_NVSW_SN2201 @@ -0,0 +1 @@ +CONFIG_NVSW_SN2201=m -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2136

2 2

[OS-BUILD PATCHv2 0/2] redhat: override `make help` to include dist-help
by Jonathan Toppins (via Email Bridge) 15 Nov '22

15 Nov '22

From: Jonathan Toppins on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2144 Override the upstream kernel `make help` target so we can inject distribution targets at the top of the help output. Signed-off-by: Jonathan Toppins <jtoppins(a)redhat.com> --- redhat/Makefile | 2 +- makefile | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-)

2 3

[OS-BUILD PATCH] redhat: override `make help` to include dist-help
by Jonathan Toppins (via Email Bridge) 14 Nov '22

14 Nov '22

From: Jonathan Toppins <jtoppins(a)redhat.com> redhat: override `make help` to include dist-help Override the upstream kernel `make help` target so we can inject distribution targets at the top of the help output. Signed-off-by: Jonathan Toppins <jtoppins(a)redhat.com> diff --git a/makefile b/makefile index blahblah..blahblah 100644 --- a/makefile +++ b/makefile @@ -1,16 +1,24 @@ -ifeq ($(filter dist-% distg-%,$(MAKECMDGOALS)),) +ifeq ($(filter help dist-% distg-%,$(MAKECMDGOALS)),) include Makefile endif +MAKEFLAGS += --no-print-directory _OUTPUT := "." # this section is needed in order to make O= to work ifeq ("$(origin O)", "command line") _OUTPUT := "$(abspath $(O))" _EXTRA_ARGS := O=$(_OUTPUT) endif +help:: + @echo "## Distribution Targets" + @$(MAKE) -C redhat dist-help + @echo "" + @echo "## Kernel Targets" + @$(MAKE) -f Makefile $(@) + dist-%:: - $(MAKE) -C redhat $(@) $(_EXTRA_ARGS) + @$(MAKE) -C redhat $(@) $(_EXTRA_ARGS) distg-%:: - $(MAKE) -C redhat $(@) $(_EXTRA_ARGS) + @$(MAKE) -C redhat $(@) $(_EXTRA_ARGS) -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2144

5 10

[OS-BUILD PATCH] redhat/Makefile: Fix RHJOBS grep warning
by Prarit Bhargava (via Email Bridge) 14 Nov '22

14 Nov '22

From: Prarit Bhargava <prarit(a)redhat.com> redhat/Makefile: Fix RHJOBS grep warning Calculating RHJOBS results in the warning grep: warning: stray \ before white space Resolve this by using [ ] to detect a space in the regex. Before fix: Search for "before white space" in https://s3.amazonaws.com/arr-cki-prod-trusted-artifacts/trusted-artifacts/6… After fix: No "before white space" errors seen in https://s3.amazonaws.com/arr-cki-prod-trusted-artifacts/trusted-artifacts/6… Also, confirming that RHJOBS works correctly after the fix, [prarit@prarit kernel-ark]$ make -j13 dist-dump-variables | grep RHJOBS= RHJOBS=13 [prarit@prarit kernel-ark]$ 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 @@ -80,7 +80,7 @@ ifndef DISTRO endif ifndef RHJOBS - RHJOBS=$(shell j=$$(echo $(MAKEFLAGS) | grep -Eo "\ -j[0-9]*" | xargs ); \ + RHJOBS=$(shell j=$$(echo $(MAKEFLAGS) | grep -Eo "[ ]-j[0-9]*" | xargs ); \ if [ -z "$${j}" ]; then \ echo "1"; \ else \ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2148

1 0

[OS-BUILD PATCHv2] RHMAINTAINERS: Update for Nov 10 2022
by Prarit Bhargava (via Email Bridge) 14 Nov '22

14 Nov '22

From: Prarit Bhargava <prarit(a)redhat.com> RHMAINTAINERS: Update for Nov 10 2022 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -306,6 +306,7 @@ S: Supported F: drivers/net/ethernet/realtek/r8169* ACCESSIBILITY SUBSYSTEM +M: Torez Smith <torez(a)redhat.com> M: Doug Ledford <dledford(a)redhat.com> M: Prarit Bhargava <prarit(a)redhat.com> S: Provided @@ -489,6 +490,7 @@ M: Mark Langsdorf <mlangsdo(a)redhat.com> M: Jeremy Linton <jlinton(a)redhat.com> S: Supported F: arch/arm64/ +X: arch/arm64/net/ ATHEROS ETHERNET DRIVERS M: Jarod Wilson <jarod(a)redhat.com> @@ -705,6 +707,7 @@ F: include/linux/configfs.h Continuous Integration (CKI) M: Veronika Kabatova <vkabatov(a)redhat.com> M: Michael Hofmann <mhofmann(a)redhat.com> +M: Serhii Turivnyi <sturivny(a)redhat.com> S: Supported F: .gitlab-ci.yml I: INTERNAL @@ -1020,7 +1023,6 @@ F: drivers/message/fusion/ FUTEX SUBSYSTEM M: Waiman Long <longman(a)redhat.com> R: Clark Williams <williams(a)redhat.com> -R: Donghai Qiao <dqiao(a)redhat.com> R: Julia Denham <jdenham(a)redhat.com> R: Nico Pache <npache(a)redhat.com> R: Oleg Nesterov <onestero(a)redhat.com> @@ -1137,6 +1139,7 @@ F: Documentation/ABI/testing/debugfs-hyperv I2C SUBSYSTEM M: Gopal Tiwari <gtiwari(a)redhat.com> M: David Arcari <darcari(a)redhat.com> +R: Tony Camuso <tcamuso(a)redhat.com> S: Supported F: Documentation/devicetree/bindings/i2c/ F: Documentation/i2c/ @@ -1346,11 +1349,6 @@ S: Supported F: drivers/scsi/*iscsi* F: include/scsi/*iscsi* -ISMT SMBUS DRIVER -M: Tony Camuso <tcamuso(a)redhat.com> -S: Supported -F: drivers/i2c/busses/i2c-ismt.c - JOURNALLING LAYER FOR BLOCK DEVICES (JBD2) M: Lukas Czerner <lczerner(a)redhat.com> S: Supported @@ -1525,7 +1523,6 @@ LOCKING PRIMITIVES M: Waiman Long <longman(a)redhat.com> R: Artem Savkov <asavkov(a)redhat.com> R: Clark Williams <williams(a)redhat.com> -R: Donghai Qiao <dqiao(a)redhat.com> R: Oleg Nesterov <onestero(a)redhat.com> R: Phil Auld <pauld(a)redhat.com> R: Wander Costa <wander(a)redhat.com> @@ -1643,9 +1640,8 @@ F: mm/ X: include/linux/memstick.h MFD DRIVERS (Multi Function Devices) -M: Torez Smith <torez(a)redhat.com> -M: David Arcari <darcari(a)redhat.com> -M: Tony Camuso <tcamuso(a)redhat.com> +M: Mark Salter <msalter(a)redhat.com> +M: Prarit Bhargava <prarit(a)redhat.com> S: Supported F: drivers/mfd/ @@ -1769,6 +1765,7 @@ R: Antoine Tenart <atenart(a)redhat.com> R: Balazs Nemeth <bnemeth(a)redhat.com> R: Davide Caratti <dcaratti(a)redhat.com> R: Eric Garver <egarver(a)redhat.com> +R: Felix Maurer <fmaurer(a)redhat.com> R: Flavio Leitner <fbl(a)redhat.com> R: Florian Westphal <fwestpha(a)redhat.com> R: Guillaume Nault <gnault(a)redhat.com> @@ -2220,6 +2217,7 @@ POWERPC (64-BIT) M: Steve Best <sbest(a)redhat.com> S: Supported F: arch/powerpc/ +X: arch/powerpc/net/ PPS SUPPORT M: Doug Ledford <dledford(a)redhat.com> @@ -2349,7 +2347,6 @@ READ-COPY UPDATE (RCU) M: Waiman Long <longman(a)redhat.com> R: Artem Savkov <asavkov(a)redhat.com> R: Clark Williams <williams(a)redhat.com> -R: Donghai Qiao <dqiao(a)redhat.com> R: Phil Auld <pauld(a)redhat.com> R: Wander Costa <wander(a)redhat.com> S: Supported @@ -2542,12 +2539,6 @@ M: Prarit Bhargava <prarit(a)redhat.com> S: Provided F: drivers/soundwire/ -SPEAKUP -M: John Linville <linville(a)redhat.com> -S: Supported -F: Documentation/ABI/stable/sysfs-driver-speakup -F: drivers/accessibility/speakup/ - SPI DRIVERS (Serial Peripheral Interface) M: Al Stone <ahs3(a)redhat.com> S: Supported @@ -2688,11 +2679,6 @@ M: Wander Lairson Costa <wander(a)redhat.com> S: Supported F: usr/ -UVC WEBCAM DRIVER -M: Tony Camuso <tcamuso(a)redhat.com> -S: Supported -F: drivers/media/usb/uvc/ - VFIO DRIVER M: Alex Williamson <alex.williamson(a)redhat.com> M: Eric Auger <eric.auger(a)redhat.com> -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2143

1 0

[OS-BUILD PATCHv5 0/6] redhat: Cleanup scripts
by Prarit Bhargava (via Email Bridge) 14 Nov '22

14 Nov '22

From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2095 The redhat/ directory contains a bunch of scripts. These can be moved around and cleaned up. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> --- redhat/scripts/ci/ark-update-configs.sh | 2 +- redhat/scripts/download_cross.sh => redhat/scripts/cross-compile/download_cross.sh | 0 redhat/scripts/generate-cross-report.sh => redhat/scripts/cross-compile/generate-cross-report.sh | 0 redhat/scripts/x86_rngd.sh => redhat/scripts/cross-compile/x86_rngd.sh | 0 redhat/gating.yaml => redhat/scripts/gating/gating.yaml | 0 redhat/rpminspect.yaml => redhat/scripts/gating/rpminspect.yaml | 0 redhat/commit_template => redhat/scripts/genspec/commit_template | 0 redhat/gen_config_patches.sh => redhat/scripts/genspec/gen_config_patches.sh | 2 +- redhat/genlog.py => redhat/scripts/genspec/genlog.py | 0 redhat/genlog.sh => redhat/scripts/genspec/genlog.sh | 2 +- redhat/genspec.sh => redhat/scripts/genspec/genspec.sh | 0 redhat/cpupower.config => redhat/scripts/kernel-tools/cpupower.config | 0 redhat/cpupower.service => redhat/scripts/kernel-tools/cpupower.service | 0 redhat/kvm_stat.logrotate => redhat/scripts/kernel-tools/kvm_stat.logrotate | 0 redhat/mod-denylist.sh => redhat/scripts/mod/mod-denylist.sh | 0 redhat/mod-internal.list => redhat/scripts/mod/mod-internal.list | 0 redhat/mod-partner.list => redhat/scripts/mod/mod-partner.list | 0 redhat/mod-sign.sh => redhat/scripts/mod/mod-sign.sh | 0 redhat/update_scripts.sh => redhat/scripts/update_scripts.sh | 0 redhat/self-test/1006-verify-SPEC-variables.bats | 4 +- redhat/Makefile | 23 +++--- redhat/Makefile.cross | 34 +++++----- 22 files changed, 34 insertions(+), 33 deletions(-)

1 6

[OS-BUILD PATCH] fs: fix leaked psi pressure state
by Justin M. Forbes (via Email Bridge) 14 Nov '22

14 Nov '22

From: Johannes Weiner <hannes(a)cmpxchg.org> fs: fix leaked psi pressure state When psi annotations were added to to btrfs compression reads, the psi state tracking over add_ra_bio_pages and btrfs_submit_compressed_read was faulty. A pressure state, once entered, is never left. This results in incorrectly elevated pressure, which triggers OOM kills. pflags record the *previous* memstall state when we enter a new one. The code tried to initialize pflags to 1, and then optimize the leave call when we either didn't enter a memstall, or were already inside a nested stall. However, there can be multiple PageWorkingset pages in the bio, at which point it's that path itself that enters repeatedly and overwrites pflags. This causes us to miss the exit. Enter the stall only once if needed, then unwind correctly. erofs has the same problem, fix that up too. And move the memstall exit past submit_bio() to restore submit accounting originally added by b8e24a9300b0 ("block: annotate refault stalls from IO submission"). Link: https://lkml.kernel.org/r/Y2UHRqthNUwuIQGS@cmpxchg.org Fixes: 4088a47e78f9 ("btrfs: add manual PSI accounting for compressed reads") Fixes: 99486c511f68 ("erofs: add manual PSI accounting for the compressed address space") Fixes: 118f3663fbc6 ("block: remove PSI accounting from the bio layer") Link: https://lore.kernel.org/r/d20a0a85-e415-cf78-27f9-77dd7a94bc8d@leemhuis.inf… Signed-off-by: Johannes Weiner <hannes(a)cmpxchg.org> Reported-by: Thorsten Leemhuis <linux(a)leemhuis.info> Tested-by: Thorsten Leemhuis <linux(a)leemhuis.info> Cc: Chao Yu <chao(a)kernel.org> Cc: Chris Mason <clm(a)fb.com> Cc: Christoph Hellwig <hch(a)lst.de> Cc: David Sterba <dsterba(a)suse.com> Cc: Gao Xiang <xiang(a)kernel.org> Cc: Jens Axboe <axboe(a)kernel.dk> Cc: Josef Bacik <josef(a)toxicpanda.com> Cc: Suren Baghdasaryan <surenb(a)google.com> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index blahblah..blahblah 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -512,7 +512,7 @@ static u64 bio_end_offset(struct bio *bio) static noinline int add_ra_bio_pages(struct inode *inode, u64 compressed_end, struct compressed_bio *cb, - unsigned long *pflags) + int *memstall, unsigned long *pflags) { struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); unsigned long end_index; @@ -581,8 +581,10 @@ static noinline int add_ra_bio_pages(struct inode *inode, continue; } - if (PageWorkingset(page)) + if (!*memstall && PageWorkingset(page)) { psi_memstall_enter(pflags); + *memstall = 1; + } ret = set_page_extent_mapped(page); if (ret < 0) { @@ -670,8 +672,8 @@ void btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, u64 em_len; u64 em_start; struct extent_map *em; - /* Initialize to 1 to make skip psi_memstall_leave unless needed */ - unsigned long pflags = 1; + unsigned long pflags; + int memstall = 0; blk_status_t ret; int ret2; int i; @@ -727,7 +729,7 @@ void btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, goto fail; } - add_ra_bio_pages(inode, em_start + em_len, cb, &pflags); + add_ra_bio_pages(inode, em_start + em_len, cb, &memstall, &pflags); /* include any pages we added in add_ra-bio_pages */ cb->len = bio->bi_iter.bi_size; @@ -807,7 +809,7 @@ void btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, } } - if (!pflags) + if (memstall) psi_memstall_leave(&pflags); if (refcount_dec_and_test(&cb->pending_ios)) diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c index blahblah..blahblah 100644 --- a/fs/erofs/zdata.c +++ b/fs/erofs/zdata.c @@ -1412,8 +1412,8 @@ static void z_erofs_submit_queue(struct z_erofs_decompress_frontend *f, struct block_device *last_bdev; unsigned int nr_bios = 0; struct bio *bio = NULL; - /* initialize to 1 to make skip psi_memstall_leave unless needed */ - unsigned long pflags = 1; + unsigned long pflags; + int memstall = 0; bi_private = jobqueueset_init(sb, q, fgq, force_fg); qtail[JQ_BYPASS] = &q[JQ_BYPASS]->head; @@ -1463,14 +1463,18 @@ static void z_erofs_submit_queue(struct z_erofs_decompress_frontend *f, if (bio && (cur != last_index + 1 || last_bdev != mdev.m_bdev)) { submit_bio_retry: - if (!pflags) - psi_memstall_leave(&pflags); submit_bio(bio); + if (memstall) { + psi_memstall_leave(&pflags); + memstall = 0; + } bio = NULL; } - if (unlikely(PageWorkingset(page))) + if (unlikely(PageWorkingset(page)) && !memstall) { psi_memstall_enter(&pflags); + memstall = 1; + } if (!bio) { bio = bio_alloc(mdev.m_bdev, BIO_MAX_VECS, @@ -1500,9 +1504,9 @@ static void z_erofs_submit_queue(struct z_erofs_decompress_frontend *f, } while (owned_head != Z_EROFS_PCLUSTER_TAIL); if (bio) { - if (!pflags) - psi_memstall_leave(&pflags); submit_bio(bio); + if (memstall) + psi_memstall_leave(&pflags); } /* -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2137

1 1

✅ PASS (3/297 SKIPPED): Test report for 6.0.8-200.fc36 (fedora-36)
by cki-project＠redhat.com 11 Nov '22

11 Nov '22

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: 94052520 You can find all the details about the test run at https://datawarehouse.cki-project.org/kcidb/checkouts/59656 One or more kernel tests failed: We also see the following known issues which are not related to your changes: Issue: [aarch64] [ampere] sysfs: cannot create duplicate filename '/devices/mc0' URL: http://lists.infradead.org/pipermail/linux-arm-kernel/2022-June/750380.html Affected tests: aarch64 - Boot test Issue: NFS Connectathon: SELinux prevents rpcbind URL: https://gitlab.com/redhat/centos-stream/tests/kernel/kernel-tests/-/issues/… Affected tests: x86_64 - NFS Connectathon Issue: avc: denied { name_bind } for pid=897864 comm="rpcbind" src=63924 scontext=system_u:system_r:rpcbind_t:s0 tcontext=system_u:object_r:unreserved_port_t:s0 tclass=udp_socket permissive=1 URL: https://bugzilla.redhat.com/show_bug.cgi?id=1983604#c3 Affected tests: x86_64 - xfstests - nfsv4.2 Issue: Storage blktests - blk: scsi/007: Reading from scsi_debug failed URL: https://bugzilla.redhat.com/show_bug.cgi?id=2027550 Affected tests: s390x - Storage - blktests - blk 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

[OS-BUILD PATCH] RHMAINTAINERS: Update for Nov 10 2022
by Prarit Bhargava (via Email Bridge) 10 Nov '22

10 Nov '22

From: Prarit Bhargava <prarit(a)redhat.com> RHMAINTAINERS: Update for Nov 10 2022 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -306,6 +306,7 @@ S: Supported F: drivers/net/ethernet/realtek/r8169* ACCESSIBILITY SUBSYSTEM +M: Torez Smith <torez(a)redhat.com> M: Doug Ledford <dledford(a)redhat.com> M: Prarit Bhargava <prarit(a)redhat.com> S: Provided @@ -489,6 +490,7 @@ M: Mark Langsdorf <mlangsdo(a)redhat.com> M: Jeremy Linton <jlinton(a)redhat.com> S: Supported F: arch/arm64/ +X: arch/arm64/net/ ATHEROS ETHERNET DRIVERS M: Jarod Wilson <jarod(a)redhat.com> @@ -705,6 +707,7 @@ F: include/linux/configfs.h Continuous Integration (CKI) M: Veronika Kabatova <vkabatov(a)redhat.com> M: Michael Hofmann <mhofmann(a)redhat.com> +M: Serhii Turivnyi <sturivny(a)redhat.com> S: Supported F: .gitlab-ci.yml I: INTERNAL @@ -1020,7 +1023,6 @@ F: drivers/message/fusion/ FUTEX SUBSYSTEM M: Waiman Long <longman(a)redhat.com> R: Clark Williams <williams(a)redhat.com> -R: Donghai Qiao <dqiao(a)redhat.com> R: Julia Denham <jdenham(a)redhat.com> R: Nico Pache <npache(a)redhat.com> R: Oleg Nesterov <onestero(a)redhat.com> @@ -1137,6 +1139,7 @@ F: Documentation/ABI/testing/debugfs-hyperv I2C SUBSYSTEM M: Gopal Tiwari <gtiwari(a)redhat.com> M: David Arcari <darcari(a)redhat.com> +R: Tony Camuso <tcamuso(a)redhat.com> S: Supported F: Documentation/devicetree/bindings/i2c/ F: Documentation/i2c/ @@ -1346,11 +1349,6 @@ S: Supported F: drivers/scsi/*iscsi* F: include/scsi/*iscsi* -ISMT SMBUS DRIVER -M: Tony Camuso <tcamuso(a)redhat.com> -S: Supported -F: drivers/i2c/busses/i2c-ismt.c - JOURNALLING LAYER FOR BLOCK DEVICES (JBD2) M: Lukas Czerner <lczerner(a)redhat.com> S: Supported @@ -1525,7 +1523,6 @@ LOCKING PRIMITIVES M: Waiman Long <longman(a)redhat.com> R: Artem Savkov <asavkov(a)redhat.com> R: Clark Williams <williams(a)redhat.com> -R: Donghai Qiao <dqiao(a)redhat.com> R: Oleg Nesterov <onestero(a)redhat.com> R: Phil Auld <pauld(a)redhat.com> R: Wander Costa <wander(a)redhat.com> @@ -1643,9 +1640,8 @@ F: mm/ X: include/linux/memstick.h MFD DRIVERS (Multi Function Devices) -M: Torez Smith <torez(a)redhat.com> -M: David Arcari <darcari(a)redhat.com> -M: Tony Camuso <tcamuso(a)redhat.com> +M: Mark Salter <msalter(a)redhat.com> +M: Prarit Bhargava <prarit(a)redhat.com> S: Supported F: drivers/mfd/ @@ -1769,6 +1765,7 @@ R: Antoine Tenart <atenart(a)redhat.com> R: Balazs Nemeth <bnemeth(a)redhat.com> R: Davide Caratti <dcaratti(a)redhat.com> R: Eric Garver <egarver(a)redhat.com> +R: Felix Maurer <fmaurer(a)redhat.com> R: Flavio Leitner <fbl(a)redhat.com> R: Florian Westphal <fwestpha(a)redhat.com> R: Guillaume Nault <gnault(a)redhat.com> @@ -2220,6 +2217,7 @@ POWERPC (64-BIT) M: Steve Best <sbest(a)redhat.com> S: Supported F: arch/powerpc/ +X: arch/powerpc/net/ PPS SUPPORT M: Doug Ledford <dledford(a)redhat.com> @@ -2349,7 +2347,6 @@ READ-COPY UPDATE (RCU) M: Waiman Long <longman(a)redhat.com> R: Artem Savkov <asavkov(a)redhat.com> R: Clark Williams <williams(a)redhat.com> -R: Donghai Qiao <dqiao(a)redhat.com> R: Phil Auld <pauld(a)redhat.com> R: Wander Costa <wander(a)redhat.com> S: Supported @@ -2542,12 +2539,6 @@ M: Prarit Bhargava <prarit(a)redhat.com> S: Provided F: drivers/soundwire/ -SPEAKUP -M: John Linville <linville(a)redhat.com> -S: Supported -F: Documentation/ABI/stable/sysfs-driver-speakup -F: drivers/accessibility/speakup/ - SPI DRIVERS (Serial Peripheral Interface) M: Al Stone <ahs3(a)redhat.com> S: Supported @@ -2688,11 +2679,6 @@ M: Wander Lairson Costa <wander(a)redhat.com> S: Supported F: usr/ -UVC WEBCAM DRIVER -M: Tony Camuso <tcamuso(a)redhat.com> -S: Supported -F: drivers/media/usb/uvc/ - VFIO DRIVER M: Alex Williamson <alex.williamson(a)redhat.com> M: Eric Auger <eric.auger(a)redhat.com> -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2143

1 0

[OS-BUILD PATCH] redhat: fix selftest git command so it picks the right commit
by Patrick Talbert (via Email Bridge) 09 Nov '22

09 Nov '22

From: Patrick Talbert <ptalbert(a)redhat.com> redhat: fix selftest git command so it picks the right commit The current git command used to fetch the latest release string may end up finding the latest release string of a different branch such as ark-latest and then comparing it to the version string in the changelog-9.99 file of the current branch. These two strings won't necessarily match so the test fails. Fix this by dropping '--all' from the git command so we end up finding the latest release commit of the current branch and comparing it to the changelog-9.99 file's string in the same current branch. These should be the same. Signed-off-by: Patrick Talbert <ptalbert(a)redhat.com> diff --git a/redhat/self-test/2001-dist-release.bats b/redhat/self-test/2001-dist-release.bats index blahblah..blahblah 100644 --- a/redhat/self-test/2001-dist-release.bats +++ b/redhat/self-test/2001-dist-release.bats @@ -36,7 +36,7 @@ _dist-release_test_2() { # release number in Makefile.rhelver. # and above in prologue. cd $BATS_TMPDIR/distrelease - title="$(git log --oneline --all --grep "\[redhat\] kernel" -n 1 --pretty="format:%s")" + title="$(git log --oneline --grep "\[redhat\] kernel" -n 1 --pretty="format:%s")" # title = ... [redhat] kernel-5.11.0-0.rc0.20201220git467f8165a2b0.104 # Just the title message part AFTER "[redhat] ": title=${title##*\[redhat\] } -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2142

1 1

[OS-BUILD PATCH] redhat/configs: enable HP_WATCHDOG for aarch64
by Mark Salter (via Email Bridge) 09 Nov '22

09 Nov '22

From: Mark Salter <msalter(a)redhat.com> redhat/configs: enable HP_WATCHDOG for aarch64 HP watchdog is now supported on some HP aarch64 platforms, so enable it. Also delete redhat/configs/pending-ark/generic/CONFIG_HP_WATCHDOG which was automatically added when ARM64 was added to HP_WATCHDOG supported arches. This had the unintended side effect of turning off HP_WATCHDOG for x86. Signed-off-by: Mark Salter <msalter(a)redhat.com> diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_HP_WATCHDOG b/redhat/configs/common/generic/arm/aarch64/CONFIG_HP_WATCHDOG new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_HP_WATCHDOG @@ -0,0 +1 @@ +CONFIG_HP_WATCHDOG=m diff --git a/redhat/configs/pending-ark/generic/CONFIG_HP_WATCHDOG b/redhat/configs/pending-ark/generic/CONFIG_HP_WATCHDOG deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/pending-ark/generic/CONFIG_HP_WATCHDOG +++ /dev/null @@ -1,14 +0,0 @@ -# Symbol: HP_WATCHDOG [=n] -# Type : tristate -# Defined at drivers/watchdog/Kconfig:1326 -# Prompt: HP ProLiant iLO2+ Hardware Watchdog Timer -# Depends on: WATCHDOG [=y] && (ARM64 [=y] || X86) && PCI [=y] -# Location: -# Main menu -# -> Device Drivers -# -> Watchdog Timer Support (WATCHDOG [=y]) -# Selects: WATCHDOG_CORE [=y] -# -# -# -# CONFIG_HP_WATCHDOG is not set -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2140

3 2

[OS-BUILD PATCH] redhat: Enable support for SN2201 system
by Ivan Vecera (via Email Bridge) 08 Nov '22

08 Nov '22

From: Ivan Vecera <ivecera(a)redhat.com> redhat: Enable support for SN2201 system Enable support for platform devices used on Nvidia SN2201 switch system. Signed-off-by: Ivan Vecera <ivecera(a)redhat.com> diff --git a/redhat/configs/common/generic/CONFIG_NVSW_SN2201 b/redhat/configs/common/generic/CONFIG_NVSW_SN2201 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/CONFIG_NVSW_SN2201 +++ b/redhat/configs/common/generic/CONFIG_NVSW_SN2201 @@ -1 +1 @@ -# CONFIG_NVSW_SN2201 is not set +CONFIG_NVSW_SN2201=m -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2136

3 3

[OS-BUILD PATCH] redhat: disable Kfence Kunit Test
by Nico Pache (via Email Bridge) 08 Nov '22

08 Nov '22

From: Nico Pache <npache(a)redhat.com> redhat: disable Kfence Kunit Test Disable the Kfence kunit test due to a known issue with the test. Signed-off-by: Nico Pache <npache(a)redhat.com> diff --git a/redhat/configs/common/generic/CONFIG_KFENCE_KUNIT_TEST b/redhat/configs/common/generic/CONFIG_KFENCE_KUNIT_TEST index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/CONFIG_KFENCE_KUNIT_TEST +++ b/redhat/configs/common/generic/CONFIG_KFENCE_KUNIT_TEST @@ -1 +1 @@ -CONFIG_KFENCE_KUNIT_TEST=m +# CONFIG_KFENCE_KUNIT_TEST is not set -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2139

1 0

[OS-BUILD PATCH] redhat: Test tmp file before deleting
by Prarit Bhargava (via Email Bridge) 08 Nov '22

08 Nov '22

From: Prarit Bhargava <prarit(a)redhat.com> redhat: Test tmp file before deleting If BTF is not enabled in the kernel config then .tmp_vmlinux.btf will not exist. The rpm build will throw an error because the file doesn't exist. Test for the existence of .tmp_vmlinux.btf before deleting it. Reported by: stan <upaitag(a)zoho.com> Signed-off-by: Prarit Bhargava <prarit(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 @@ -1683,7 +1683,10 @@ BuildKernel() { %endif # Remove large intermediate files we no longer need to save space - rm vmlinux.o .tmp_vmlinux.btf + rm vmlinux.o + if [ -f .tmp_vmlinux.btf ]; then + rm .tmp_vmlinux.btf + fi # Start installing the results install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2135

3 3

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel November 2022