Skip to contentSkip to conversation

mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning

PATCH Superseded Waiman Long 2 participants 4 messages Mar 30, 2022 – Mar 31, 2022

Subsystems (3)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 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.

Fixes 3e347261a80b ("sparsemem extreme implementation")
---
 include/linux/mmzone.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
include/linux/mmzone.h +1 -3
index 962b14d403e8..8a89efe47571 100644
@@ -1398,11 +1398,9 @@ static inline unsigned long *section_to_usemap(struct mem_section *ms)
 static inline struct mem_section *__nr_to_section(unsigned long nr)
 {
 #ifdef CONFIG_SPARSEMEM_EXTREME
-	if (!mem_section)
+	if (!mem_section || !mem_section[SECTION_NR_TO_ROOT(nr)])
 		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];
 }
 extern size_t mem_section_usage_size(void);
Signature · 1 line
2.27.0
#1 lore raw
I love your patch! Perhaps something to improve:

Hi Waiman,

I love your patch! Perhaps something to improve:

[auto build test WARNING on hnaz-mm/master]

url:    https://github.com/intel-lab-lkp/linux/commits/Waiman-Long/mm-sparsemem-Fix-mem_section-will-never-be-NULL-gcc-12-warning/20220331-050049
base:   https://github.com/hnaz/linux-mm master
config: arm-randconfig-c024-20220330 (https://download.01.org/0day-ci/archive/20220331/[email protected]/config)
compiler: arm-linux-gnueabi-gcc (GCC) 11.2.0

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/2098f1d78cde338e81b3ba596ea39f37824e496e
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Waiman-Long/mm-sparsemem-Fix-mem_section-will-never-be-NULL-gcc-12-warning/20220331-050049 git checkout 2098f1d78cde338e81b3ba596ea39f37824e496e
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=arm SHELL=/bin/bash security/keys/encrypted-keys/

If you fix the issue, kindly add following tag as appropriate

All warnings (new ones prefixed by >>):

In file included from include/linux/gfp.h:6,
from include/linux/umh.h:4,
from include/linux/kmod.h:9,
from include/linux/module.h:17,
from security/keys/encrypted-keys/encrypted.c:15:
security/keys/encrypted-keys/encrypted.c: In function 'derived_key_encrypt.constprop':

>> include/linux/mmzone.h:1432:23: warning: array subscript 32 is outside array bounds of 'struct mem_section[32][1]' [-Warray-bounds]
    1432 |         unsigned long map = section->section_mem_map;
         |                       ^~~
   include/linux/mmzone.h:1390:27: note: while referencing 'mem_section'
    1390 | extern struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT];
         |                           ^~~~~~~~~~~

vim +1432 include/linux/mmzone.h

29751f6991e845 Andy Whitcroft 2005-06-23  1429  
29751f6991e845 Andy Whitcroft 2005-06-23  1430  static inline struct page *__section_mem_map_addr(struct mem_section *section)
29751f6991e845 Andy Whitcroft 2005-06-23  1431  {
29751f6991e845 Andy Whitcroft 2005-06-23 @1432  	unsigned long map = section->section_mem_map;
29751f6991e845 Andy Whitcroft 2005-06-23  1433  	map &= SECTION_MAP_MASK;
29751f6991e845 Andy Whitcroft 2005-06-23  1434  	return (struct page *)map;
29751f6991e845 Andy Whitcroft 2005-06-23  1435  }

29751f6991e845 Andy Whitcroft 2005-06-23 1436

Signature · 2 lines
0-DAY CI Kernel Test Service
https://01.org/lkp
#2 lore raw
Quoted 42 lines · kernel test robot

Hi Waiman,

I love your patch! Perhaps something to improve:

[auto build test WARNING on hnaz-mm/master]

url:    https://github.com/intel-lab-lkp/linux/commits/Waiman-Long/mm-sparsemem-Fix-mem_section-will-never-be-NULL-gcc-12-warning/20220331-050049
base:   https://github.com/hnaz/linux-mm master
config: arm-randconfig-c024-20220330 (https://download.01.org/0day-ci/archive/20220331/202203312327.XGeCiD5T-lkp(a)intel.com/config)
compiler: arm-linux-gnueabi-gcc (GCC) 11.2.0

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/2098f1d78cde338e81b3ba596ea39f37824e496e
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Waiman-Long/mm-sparsemem-Fix-mem_section-will-never-be-NULL-gcc-12-warning/20220331-050049 git checkout 2098f1d78cde338e81b3ba596ea39f37824e496e
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=arm SHELL=/bin/bash security/keys/encrypted-keys/

If you fix the issue, kindly add following tag as appropriate

All warnings (new ones prefixed by >>):

In file included from include/linux/gfp.h:6,
from include/linux/umh.h:4,
from include/linux/kmod.h:9,
from include/linux/module.h:17,
from security/keys/encrypted-keys/encrypted.c:15:
security/keys/encrypted-keys/encrypted.c: In function 'derived_key_encrypt.constprop':

Quoted 1 line
Quoted 1 line

include/linux/mmzone.h:1432:23: warning: array subscript 32 is outside array bounds of 'struct mem_section[32][1]' [-Warray-bounds]

     1432 |         unsigned long map = section->section_mem_map;
          |                       ^~~
    include/linux/mmzone.h:1390:27: note: while referencing 'mem_section'
     1390 | extern struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT];
          |                           ^~~~~~~~~~~

vim +1432 include/linux/mmzone.h

Quoted 8 lines
29751f6991e845 Andy Whitcroft 2005-06-23  1429
29751f6991e845 Andy Whitcroft 2005-06-23  1430  static inline struct page *__section_mem_map_addr(struct mem_section *section)
29751f6991e845 Andy Whitcroft 2005-06-23  1431  {
29751f6991e845 Andy Whitcroft 2005-06-23 @1432  	unsigned long map = section->section_mem_map;
29751f6991e845 Andy Whitcroft 2005-06-23  1433  	map &= SECTION_MAP_MASK;
29751f6991e845 Andy Whitcroft 2005-06-23  1434  	return (struct page *)map;
29751f6991e845 Andy Whitcroft 2005-06-23  1435  }

29751f6991e845 Andy Whitcroft 2005-06-23 1436

I think this is a pre-existing warning. It is not caused by my patch, but I will take a look what cause the warning.

Thanks,
Longman

#3 lore raw
In reply to kernel test robot
Quoted 42 lines · kernel test robot

Hi Waiman,

I love your patch! Perhaps something to improve:

[auto build test WARNING on hnaz-mm/master]

url:    https://github.com/intel-lab-lkp/linux/commits/Waiman-Long/mm-sparsemem-Fix-mem_section-will-never-be-NULL-gcc-12-warning/20220331-050049
base:   https://github.com/hnaz/linux-mm master
config: arm-randconfig-c024-20220330 (https://download.01.org/0day-ci/archive/20220331/202203312327.XGeCiD5T-lkp(a)intel.com/config)
compiler: arm-linux-gnueabi-gcc (GCC) 11.2.0

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/2098f1d78cde338e81b3ba596ea39f37824e496e
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Waiman-Long/mm-sparsemem-Fix-mem_section-will-never-be-NULL-gcc-12-warning/20220331-050049 git checkout 2098f1d78cde338e81b3ba596ea39f37824e496e
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=arm SHELL=/bin/bash security/keys/encrypted-keys/

If you fix the issue, kindly add following tag as appropriate

All warnings (new ones prefixed by >>):

In file included from include/linux/gfp.h:6,
from include/linux/umh.h:4,
from include/linux/kmod.h:9,
from include/linux/module.h:17,
from security/keys/encrypted-keys/encrypted.c:15:
security/keys/encrypted-keys/encrypted.c: In function 'derived_key_encrypt.constprop':

Quoted 1 line
Quoted 1 line

include/linux/mmzone.h:1432:23: warning: array subscript 32 is outside array bounds of 'struct mem_section[32][1]' [-Warray-bounds]

     1432 |         unsigned long map = section->section_mem_map;
          |                       ^~~
    include/linux/mmzone.h:1390:27: note: while referencing 'mem_section'
     1390 | extern struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT];
          |                           ^~~~~~~~~~~

vim +1432 include/linux/mmzone.h

Quoted 9 lines
29751f6991e845 Andy Whitcroft 2005-06-23  1429
29751f6991e845 Andy Whitcroft 2005-06-23  1430  static inline struct page *__section_mem_map_addr(struct mem_section *section)
29751f6991e845 Andy Whitcroft 2005-06-23  1431  {
29751f6991e845 Andy Whitcroft 2005-06-23 @1432  	unsigned long map = section->section_mem_map;
29751f6991e845 Andy Whitcroft 2005-06-23  1433  	map &= SECTION_MAP_MASK;
29751f6991e845 Andy Whitcroft 2005-06-23  1434  	return (struct page *)map;
29751f6991e845 Andy Whitcroft 2005-06-23  1435  }

29751f6991e845 Andy Whitcroft 2005-06-23 1436

This warning happens with !CONFIG_SPARSEMEM_VMEMMAP && CONFIG_SPARSEMEM. In this case, __section_mem_map_addr() is used only by __pfn_to_page() and __page_to_pfn().  My patch only modifies __nr_to_section. In this particular case, it is removing The !mem_section[32] check. Perhaps it is somewhat equivalent to a (sec >= 32) check for gcc 11.2. However, this check will cause a warning in gcc 12. I will update the patch to add an explicit (sec >= NR_SECTION_ROOTS) then.

Thanks,
Longman