mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning
Subsystems (3)
PATCH v2 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 both CONFIG_SPARSEMEM_EXTREME on and 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];
#endifIn the CONFIG_SPARSEMEM_EXTREME case, mem_section obviously cannot be NULL, but *mem_section can be if memory hasn't been allocated for the dynamic mem_section[] array yet. 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 checking for "!*mem_section" instead of "!mem_section" and moving the "!mem_section[SECTION_NR_TO_ROOT(nr)]" check up inside the CONFIG_SPARSEMEM_EXTREME block.
--- include/linux/mmzone.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
include/linux/mmzone.h +1 -3
@@ -1390,11 +1390,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
Andrew Morton
maintainerQuoted 39 lines · On Tue, 1 Feb 2022 19:35:50 -0500 Waiman Long <[email protected]> wrote:
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 both
CONFIG_SPARSEMEM_EXTREMEon and off. Themem_sectiondefinition is#ifdef CONFIG_SPARSEMEM_EXTREME extern struct mem_section **mem_section; #else extern struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT]; #endifIn the
CONFIG_SPARSEMEM_EXTREMEcase,mem_sectionobviously cannot be NULL, but*mem_sectioncan be if memory hasn't been allocated for the dynamic mem_section[] array yet. In the !CONFIG_SPARSEMEM_EXTREME case,mem_sectionis a static 2-dimensional array and so the check "!mem_section[SECTION_NR_TO_ROOT(nr)]" doesn't make sense.Fix this warning by checking for "!*mem_section" instead of "!mem_section" and moving the "!mem_section[SECTION_NR_TO_ROOT(nr)]" check up inside the
CONFIG_SPARSEMEM_EXTREMEblock....
include/linux/mmzone.h +0
-0@@ -1390,11 +1390,9 @@ static inline unsigned long *section_to_usemap(struct mem_section *ms)static inline struct mem_section *__nr_to_section (unsigned long nr) {
include/linux/mmzone.h static inline unsigned long *section_to_usemap(struct mem_section *ms) · line 1398
Quoted 10 lines
include/linux/mmzone.h +1
-3#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 );
What does the v1->v2 change do?
include/linux/mmzone.h renamed from include/linux/mmzone.h~mm-sparsemem-fix-mem_section-will-never-be-null-gcc-12-warning-v2 +1 -3
@@ -1390,11 +1390,9 @@ static inline unsigned long *section_to_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 );
_
Quoted 68 lines · Andrew Morton
Quoted 39 lines · On Tue, 1 Feb 2022 19:35:50 -0500 Waiman Long <[email protected]> wrote:
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 both
CONFIG_SPARSEMEM_EXTREMEon and off. Themem_sectiondefinition is#ifdef CONFIG_SPARSEMEM_EXTREME extern struct mem_section **mem_section; #else extern struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT]; #endifIn the
CONFIG_SPARSEMEM_EXTREMEcase,mem_sectionobviously cannot be NULL, but*mem_sectioncan be if memory hasn't been allocated for the dynamic mem_section[] array yet. In the !CONFIG_SPARSEMEM_EXTREME case,mem_sectionis a static 2-dimensional array and so the check "!mem_section[SECTION_NR_TO_ROOT(nr)]" doesn't make sense.Fix this warning by checking for "!*mem_section" instead of "!mem_section" and moving the "!mem_section[SECTION_NR_TO_ROOT(nr)]" check up inside the
CONFIG_SPARSEMEM_EXTREMEblock....
include/linux/mmzone.h +0
-0@@ -1390,11 +1390,9 @@ static inline unsigned long *section_to_usemap(struct mem_section *ms)static inline struct mem_section *__nr_to_section (unsigned long nr) {include/linux/mmzone.h static inline unsigned long *section_to_usemap(struct mem_section *ms) · line 1398
Quoted 10 lines
include/linux/mmzone.h +1
-3#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 );What does the
v1->v2change do?include/linux/mmzone.h renamed from include/linux/mmzone.h~mm-sparsemem-fix-mem_section-will-never-be-null-gcc-12-warning-v2 +1
-3@@ -1390,11 +1390,9 @@ static inline unsigned long *section_to_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 );
Quoted 1 line
_
When !CONFIG_SPARSEMEM_EXTREME, mem_section is really a static 2-D array. Since it is not a table of pointers, mem_section[SECTION_NR_TO_ROOT(nr)] has no real meaning. That is why the compiler is complaining. This check isn't applicable in the !CONFIG_SPARSEMEM_EXTREME case, but it is meaningful for CONFIG_SPARSEMEM_EXTREME. That is why it is pulled into the CONFIG_SPARSEMEM_EXTREME block.
Thanks,
Longman