March 2022 - kernel - Fedora Mailing-Lists

[OS-BUILD PATCHv3 0/2] redhat: introduce RH_KABI_EXCLUDE_WITH_SIZE and enable size checks

by Sabrina Dubroca (via Email Bridge)

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(-)

5 months, 1 week

4
7
0 / 0

[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)

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(-)

1 year, 2 months

3
6
0 / 0

[OS-BUILD PATCH] Add gcc-c++ to BuildRequires

by GitLab Bridge on behalf of jmflinuxtx

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

1 year, 4 months

4
3
0 / 0

[OS-BUILD PATCHv3] Enable KUNIT tests for redhat kernel-modules-internal

by Nico Pache (via Email Bridge)

From: Nico Pache <npache(a)redhat.com> Enable KUNIT tests for redhat kernel-modules-internal This commit will enable KUNIT tests to be compiled as modules and packaged into the kernel-modules-internal package. Signed-off-by: Nico Pache <npache(a)redhat.com> diff --git a/redhat/configs/common/debug/CONFIG_KASAN_KUNIT_TEST b/redhat/configs/common/debug/CONFIG_KASAN_KUNIT_TEST new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/debug/CONFIG_KASAN_KUNIT_TEST @@ -0,0 +1 @@ +CONFIG_KASAN_KUNIT_TEST=m diff --git a/redhat/configs/common/debug/CONFIG_TEST_LIST_SORT b/redhat/configs/common/debug/CONFIG_TEST_LIST_SORT index blahblah..blahblah 100644 --- a/redhat/configs/common/debug/CONFIG_TEST_LIST_SORT +++ b/redhat/configs/common/debug/CONFIG_TEST_LIST_SORT @@ -1 +1 @@ -CONFIG_TEST_LIST_SORT=y +CONFIG_TEST_LIST_SORT=m diff --git a/redhat/configs/common/generic/CONFIG_BITFIELD_KUNIT b/redhat/configs/common/generic/CONFIG_BITFIELD_KUNIT new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_BITFIELD_KUNIT @@ -0,0 +1 @@ +# CONFIG_BITFIELD_KUNIT is not set diff --git a/redhat/configs/common/generic/CONFIG_BITS_TEST b/redhat/configs/common/generic/CONFIG_BITS_TEST new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_BITS_TEST @@ -0,0 +1 @@ +# CONFIG_BITS_TEST is not set diff --git a/redhat/configs/common/generic/CONFIG_CMDLINE_KUNIT_TEST b/redhat/configs/common/generic/CONFIG_CMDLINE_KUNIT_TEST new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_CMDLINE_KUNIT_TEST @@ -0,0 +1 @@ +# CONFIG_CMDLINE_KUNIT_TEST is not set diff --git a/redhat/configs/common/generic/CONFIG_EXT4_KUNIT_TESTS b/redhat/configs/common/generic/CONFIG_EXT4_KUNIT_TESTS new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_EXT4_KUNIT_TESTS @@ -0,0 +1 @@ +CONFIG_EXT4_KUNIT_TESTS=m diff --git a/redhat/configs/common/generic/CONFIG_FAT_KUNIT_TEST b/redhat/configs/common/generic/CONFIG_FAT_KUNIT_TEST new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_FAT_KUNIT_TEST @@ -0,0 +1 @@ +CONFIG_FAT_KUNIT_TEST=m diff --git a/redhat/configs/common/generic/CONFIG_KFENCE_KUNIT_TEST b/redhat/configs/common/generic/CONFIG_KFENCE_KUNIT_TEST new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_KFENCE_KUNIT_TEST @@ -0,0 +1 @@ +CONFIG_KFENCE_KUNIT_TEST=m diff --git a/redhat/configs/common/generic/CONFIG_KUNIT b/redhat/configs/common/generic/CONFIG_KUNIT index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/CONFIG_KUNIT +++ b/redhat/configs/common/generic/CONFIG_KUNIT @@ -1 +1 @@ -# CONFIG_KUNIT is not set +CONFIG_KUNIT=m diff --git a/redhat/configs/common/generic/CONFIG_KUNIT_ALL_TESTS b/redhat/configs/common/generic/CONFIG_KUNIT_ALL_TESTS new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_KUNIT_ALL_TESTS @@ -0,0 +1 @@ +CONFIG_KUNIT_ALL_TESTS=m diff --git a/redhat/configs/common/generic/CONFIG_KUNIT_DEBUGFS b/redhat/configs/common/generic/CONFIG_KUNIT_DEBUGFS new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_KUNIT_DEBUGFS @@ -0,0 +1 @@ +CONFIG_KUNIT_DEBUGFS=y diff --git a/redhat/configs/common/generic/CONFIG_KUNIT_EXAMPLE_TEST b/redhat/configs/common/generic/CONFIG_KUNIT_EXAMPLE_TEST new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_KUNIT_EXAMPLE_TEST @@ -0,0 +1 @@ +CONFIG_KUNIT_EXAMPLE_TEST=m diff --git a/redhat/configs/common/generic/CONFIG_KUNIT_TEST b/redhat/configs/common/generic/CONFIG_KUNIT_TEST new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_KUNIT_TEST @@ -0,0 +1 @@ +CONFIG_KUNIT_TEST=m diff --git a/redhat/configs/common/generic/CONFIG_LINEAR_RANGES_TEST b/redhat/configs/common/generic/CONFIG_LINEAR_RANGES_TEST new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_LINEAR_RANGES_TEST @@ -0,0 +1 @@ +# CONFIG_LINEAR_RANGES_TEST is not set diff --git a/redhat/configs/common/generic/CONFIG_LIST_KUNIT_TEST b/redhat/configs/common/generic/CONFIG_LIST_KUNIT_TEST new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_LIST_KUNIT_TEST @@ -0,0 +1 @@ +CONFIG_LIST_KUNIT_TEST=m diff --git a/redhat/configs/common/generic/CONFIG_MPTCP_KUNIT_TEST b/redhat/configs/common/generic/CONFIG_MPTCP_KUNIT_TEST new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_MPTCP_KUNIT_TEST @@ -0,0 +1 @@ +CONFIG_MPTCP_KUNIT_TEST=m diff --git a/redhat/configs/common/generic/CONFIG_MPTCP_KUNIT_TESTS b/redhat/configs/common/generic/CONFIG_MPTCP_KUNIT_TESTS new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_MPTCP_KUNIT_TESTS @@ -0,0 +1 @@ +CONFIG_MPTCP_KUNIT_TESTS=m diff --git a/redhat/configs/common/generic/CONFIG_RATIONAL_KUNIT_TEST b/redhat/configs/common/generic/CONFIG_RATIONAL_KUNIT_TEST new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_RATIONAL_KUNIT_TEST @@ -0,0 +1 @@ +CONFIG_RATIONAL_KUNIT_TEST=m diff --git a/redhat/configs/common/generic/CONFIG_RESOURCE_KUNIT_TEST b/redhat/configs/common/generic/CONFIG_RESOURCE_KUNIT_TEST new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_RESOURCE_KUNIT_TEST @@ -0,0 +1 @@ +# CONFIG_RESOURCE_KUNIT_TEST is not set diff --git a/redhat/configs/common/generic/CONFIG_RTC_LIB_KUNIT_TEST b/redhat/configs/common/generic/CONFIG_RTC_LIB_KUNIT_TEST new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_RTC_LIB_KUNIT_TEST @@ -0,0 +1 @@ +CONFIG_RTC_LIB_KUNIT_TEST=m -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1422

1 year, 8 months

5
7
0 / 0

[OS-BUILD PATCH 0/0] [redhat] New configs in drivers/ata

by CKI Gitlab (via Email Bridge)

From: CKI Gitlab on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1675 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. Hi, As part of the ongoing rebase effort, the following configuration options need to be reviewed. As a reminder, the ARK configuration flow involves moving unreviewed configuration options from the pending directory to the ark directory. In the diff below, options are removed from the pending directory and added to the ark hierarchy. The final options that need to be ACKed are the files that are being added to the ark hierarchy. If the value for a file that is added should be changed, please reply with a better option. Symbol: SATA_LPM_POLICY [=0] Type : integer Range : [0 4] Defined at drivers/ata/Kconfig:118 Prompt: Default SATA Link Power Management policy for low power chipsets Depends on: ATA [=m] && HAS_DMA [=y] && SATA_AHCI [=m] Location: Main menu -> Device Drivers -> Serial ATA and Parallel ATA drivers (libata) (ATA [=m]) -> AHCI SATA support (SATA_AHCI [=m]) --- Cc: Gopal Tiwari <gtiwari(a)redhat.com> Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org> --- redhat/configs/ark/generic/CONFIG_SATA_LPM_POLICY | 1 + redhat/configs/ark/generic/CONFIG_SATA_MOBILE_LPM_POLICY | 1 - redhat/configs/pending-ark/generic/CONFIG_SATA_LPM_POLICY | 15 --------------- 3 files changed, 1 insertions(+), 16 deletions(-)

2 years

2
1
0 / 0

[OS-BUILD PATCHv2] redhat/configs: Set CONFIG_X86_AMD_PSTATE built-in on Fedora

by Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava <prarit(a)redhat.com> redhat/configs: Set CONFIG_X86_AMD_PSTATE built-in on Fedora In order to use the amd-pstate driver on AMD systems, users must first unload the acpi-cpufreq driver and then load the amd-pstate driver. Another option is to denylist the acpi-cpufreq driver but this also requires user modifications to the system. In ARK we have decided to build the amd-pstate driver into the kernel so that it loads before the acpi-cpufreq driver. Do the same for Fedora. Set CONFIG_X86_AMD_PSTATE to 'y' on Fedora. Suggested-by: Joel Wirāmu Pauling <jwp(a)redhat.com> Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> diff --git a/redhat/configs/fedora/generic/x86/CONFIG_X86_AMD_PSTATE b/redhat/configs/fedora/generic/x86/CONFIG_X86_AMD_PSTATE deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/x86/CONFIG_X86_AMD_PSTATE +++ /dev/null @@ -1 +0,0 @@ -CONFIG_X86_AMD_PSTATE=m -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1710

2 years

2
1
0 / 0

[OS-BUILD PATCHv7 0/4] ARK: Remove RHEL version specific device/driver support markers

by pjgeorg (via Email Bridge)

From: pjgeorg on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1610 Removes all {mark_driver,mark_hardware,pci_hw}_{disabled,deprecated,unmaintained} and mark_tech_preview markers. These are used in downstream RHEL to notify the user about support state. However this only applies to that specific release and may or may not affect future releases. Hence remove all these markers in ARK. Note: This MR does not revert 7e761c32ef94a, 5cc4742a2435c, fa7b1655d4cfc, df94c0106ec38, 1217d330b082f, e0be2cf6271ee, 71fc877b2e067, 117432b276e68, 96d74f2b9f3f7, d755f2826bf24 which drop PCI IDs not supported in RHEL 8/9. Following the argument above all of these should be reverted as well. --- arch/x86/kernel/setup.c | 2 -- drivers/net/ethernet/intel/e1000/e1000_main.c | 2 -- drivers/net/team/team.c | 2 -- drivers/net/wireguard/main.c | 1 - drivers/virtio/virtio_mem.c | 13 ------------- fs/ext4/super.c | 5 ----- fs/xfs/xfs_super.c | 5 ----- include/linux/kernel.h | 2 +- mm/cma.c | 10 ---------- 9 files changed, 1 insertions(+), 41 deletions(-)

2 years

3
10
0 / 0

[OS-BUILD PATCH] redhat: configs: Disable TPM 1.2 specific drivers

by Jerry Snitselaar (via Email Bridge)

From: Jerry Snitselaar <jsnitsel(a)redhat.com> redhat: configs: Disable TPM 1.2 specific drivers TPM 1.2 is not supported in RHEL9, so disable the TPM 1.2 specific drivers. Signed-off-by: Jerry Snitselaar <jsnitsel(a)redhat.com> diff --git a/redhat/configs/ark/generic/CONFIG_TCG_ATMEL b/redhat/configs/ark/generic/CONFIG_TCG_ATMEL new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_TCG_ATMEL @@ -0,0 +1 @@ +# CONFIG_TCG_ATMEL is not set diff --git a/redhat/configs/ark/generic/CONFIG_TCG_INFINEON b/redhat/configs/ark/generic/CONFIG_TCG_INFINEON index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_TCG_INFINEON +++ b/redhat/configs/ark/generic/CONFIG_TCG_INFINEON @@ -1 +1 @@ -CONFIG_TCG_INFINEON=m +# CONFIG_TCG_INFINEON is not set diff --git a/redhat/configs/ark/generic/CONFIG_TCG_NSC b/redhat/configs/ark/generic/CONFIG_TCG_NSC new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_TCG_NSC @@ -0,0 +1 @@ +# CONFIG_TCG_NSC is not set diff --git a/redhat/configs/ark/generic/CONFIG_TCG_TIS_I2C_ATMEL b/redhat/configs/ark/generic/CONFIG_TCG_TIS_I2C_ATMEL new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_TCG_TIS_I2C_ATMEL @@ -0,0 +1 @@ +# CONFIG_TCG_TIS_I2C_ATMEL is not set diff --git a/redhat/configs/ark/generic/CONFIG_TCG_TIS_I2C_INFINEON b/redhat/configs/ark/generic/CONFIG_TCG_TIS_I2C_INFINEON new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_TCG_TIS_I2C_INFINEON @@ -0,0 +1 @@ +# CONFIG_TCG_TIS_I2C_INFINEON is not set diff --git a/redhat/configs/ark/generic/CONFIG_TCG_TIS_ST33ZP24_I2C b/redhat/configs/ark/generic/CONFIG_TCG_TIS_ST33ZP24_I2C deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_TCG_TIS_ST33ZP24_I2C +++ /dev/null @@ -1 +0,0 @@ -CONFIG_TCG_TIS_ST33ZP24_I2C=m diff --git a/redhat/configs/ark/generic/powerpc/CONFIG_TCG_TIS_I2C_ATMEL b/redhat/configs/ark/generic/powerpc/CONFIG_TCG_TIS_I2C_ATMEL deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/powerpc/CONFIG_TCG_TIS_I2C_ATMEL +++ /dev/null @@ -1 +0,0 @@ -CONFIG_TCG_TIS_I2C_ATMEL=y diff --git a/redhat/configs/ark/generic/powerpc/CONFIG_TCG_TIS_I2C_INFINEON b/redhat/configs/ark/generic/powerpc/CONFIG_TCG_TIS_I2C_INFINEON deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/powerpc/CONFIG_TCG_TIS_I2C_INFINEON +++ /dev/null @@ -1 +0,0 @@ -CONFIG_TCG_TIS_I2C_INFINEON=y diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_TCG_TIS_ST33ZP24_I2C b/redhat/configs/common/generic/CONFIG_TCG_TIS_ST33ZP24_I2C rename from redhat/configs/ark/generic/arm/aarch64/CONFIG_TCG_TIS_ST33ZP24_I2C rename to redhat/configs/common/generic/CONFIG_TCG_TIS_ST33ZP24_I2C index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_TCG_TIS_ST33ZP24_I2C +++ b/redhat/configs/common/generic/CONFIG_TCG_TIS_ST33ZP24_I2C diff --git a/redhat/configs/fedora/generic/CONFIG_TCG_TIS_ST33ZP24_I2C b/redhat/configs/fedora/generic/CONFIG_TCG_TIS_ST33ZP24_I2C deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/CONFIG_TCG_TIS_ST33ZP24_I2C +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_TCG_TIS_ST33ZP24_I2C is not set -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1713

2 years

4
5
0 / 0

[OS-BUILD PATCH] configs: enable CONFIG_RMI4_F3A

by Benjamin Tissoires (via Email Bridge)

From: Benjamin Tissoires <benjamin.tissoires(a)redhat.com> configs: enable CONFIG_RMI4_F3A Upstream: RHEL only Tested: make dist-configs This config is required for supporting the touchpad of the Lenovo T14 and T490 at least. We should not disable it in RHEL. Signed-off-by: Benjamin Tissoires <benjamin.tissoires(a)redhat.com> diff --git a/redhat/configs/common/generic/CONFIG_RMI4_F3A b/redhat/configs/common/generic/CONFIG_RMI4_F3A index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/CONFIG_RMI4_F3A +++ b/redhat/configs/common/generic/CONFIG_RMI4_F3A @@ -1 +1 @@ -# CONFIG_RMI4_F3A is not set +CONFIG_RMI4_F3A=y diff --git a/redhat/configs/fedora/generic/CONFIG_RMI4_F3A b/redhat/configs/fedora/generic/CONFIG_RMI4_F3A deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/CONFIG_RMI4_F3A +++ /dev/null @@ -1 +0,0 @@ -CONFIG_RMI4_F3A=y -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1670

2 years

2
1
0 / 0

[OS-BUILD PATCHv6] mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning

by Justin M. Forbes (via Email Bridge)

From: Waiman Long <longman(a)redhat.com> mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning The gcc 12 compiler reports a "'mem_section' will never be NULL" warning on the following code: static inline struct mem_section *__nr_to_section(unsigned long nr) { #ifdef CONFIG_SPARSEMEM_EXTREME if (!mem_section) return NULL; #endif if (!mem_section[SECTION_NR_TO_ROOT(nr)]) return NULL; : It happens with CONFIG_SPARSEMEM_EXTREME off. The mem_section definition is #ifdef CONFIG_SPARSEMEM_EXTREME extern struct mem_section **mem_section; #else extern struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT]; #endif In the !CONFIG_SPARSEMEM_EXTREME case, mem_section is a static 2-dimensional array and so the check "!mem_section[SECTION_NR_TO_ROOT(nr)]" doesn't make sense. Fix this warning by moving the "!mem_section[SECTION_NR_TO_ROOT(nr)]" check up inside the CONFIG_SPARSEMEM_EXTREME block and adding an explicit NR_SECTION_ROOTS check to make sure that there is no out-of-bound array access. Fixes: 3e347261a80b ("sparsemem extreme implementation") Reported-by: Justin Forbes <jforbes(a)redhat.com> Signed-off-by: Waiman Long <longman(a)redhat.com> diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index blahblah..blahblah 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1397,13 +1397,16 @@ static inline unsigned long *section_to_usemap(struct mem_section *ms) static inline struct mem_section *__nr_to_section(unsigned long nr) { + unsigned long root = SECTION_NR_TO_ROOT(nr); + + if (unlikely(root >= NR_SECTION_ROOTS)) + return NULL; + #ifdef CONFIG_SPARSEMEM_EXTREME - if (!mem_section) + if (!mem_section || !mem_section[root]) return NULL; #endif - if (!mem_section[SECTION_NR_TO_ROOT(nr)]) - return NULL; - return &mem_section[SECTION_NR_TO_ROOT(nr)][nr & SECTION_ROOT_MASK]; + return &mem_section[root][nr & SECTION_ROOT_MASK]; } extern size_t mem_section_usage_size(void); -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1598

2 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel March 2022