Skip to contentSkip to conversation

mm: make arch_has_descending_max_zone_pfns() static

PATCH Applied Arnd Bergmann 5 participants 5 messages Apr 15, 2023 – Apr 18, 2023

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mm: make arch_has_descending_max_zone_pfns() static

From: Arnd Bergmann <[email protected]>

clang produces a build failure on x86 for some randconfig builds after a change that moves around code to mm/mm_init.c:

Cannot find symbol for section 2: .text.
mm/mm_init.o: failed

I have not been able to figure out why this happens, but the __weak annotation on arch_has_descending_max_zone_pfns() is the trigger here.

Removing the weak function in favor of an open-coded Kconfig option check avoids the problem and becomes clearer as well as better to optimize by the compiler.

Fixes 9420f89db2dd ("mm: move most of core MM initialization to mm/mm_init.c")

---
v2: fix logic bug reported-by: kernel test robot <[email protected]>, see https://lore.kernel.org/oe-lkp/[email protected]

---
 arch/arc/mm/init.c | 5 -----
 include/linux/mm.h | 1 -
 mm/mm_init.c       | 4 ++--
 3 files changed, 2 insertions(+), 8 deletions(-)
arch/arc/mm/init.c +0 -5
index ce4e939a7f07..2b89b6c53801 100644
@@ -74,11 +74,6 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
 		base, TO_MB(size), !in_use ? "Not used":"");
 }
 
-bool arch_has_descending_max_zone_pfns(void)
-{
-	return !IS_ENABLED(CONFIG_ARC_HAS_PAE40);
-}
-
 /*
  * First memory setup routine called from setup_arch()
  * 1. setup swapper's mm @init_mm
include/linux/mm.h +0 -1
index 63acf4a598fe..75d8adce0aee 100644
@@ -3061,7 +3061,6 @@ extern void setup_per_cpu_pageset(void);
 extern int min_free_kbytes;
 extern int watermark_boost_factor;
 extern int watermark_scale_factor;
-extern bool arch_has_descending_max_zone_pfns(void);
 
 /* nommu.c */
 extern atomic_long_t mmap_pages_allocated;
mm/mm_init.c +2 -2
index 35302b7bca83..7f7f9c677854 100644
@@ -1754,9 +1754,9 @@ static void __init free_area_init_memoryless_node(int nid)
  * Some architectures, e.g. ARC may have ZONE_HIGHMEM below ZONE_NORMAL. For
  * such cases we allow max_zone_pfn sorted in the descending order
  */
-bool __weak arch_has_descending_max_zone_pfns(void)
+static bool arch_has_descending_max_zone_pfns(void)
 {
-	return false;
+	return IS_ENABLED(CONFIG_ARC) && !IS_ENABLED(CONFIG_ARC_HAS_PAE40);
 }
 
 /**
Signature · 1 line
2.39.2
Acked-by on v2 1/1
#1 lore raw
Quoted 11 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

clang produces a build failure on x86 for some randconfig builds after a change that moves around code to mm/mm_init.c:

Cannot find symbol for section 2: .text.
mm/mm_init.o: failed

I have not been able to figure out why this happens, but the __weak annotation on arch_has_descending_max_zone_pfns() is the trigger here.

Quoted 7 lines

Removing the weak function in favor of an open-coded Kconfig option check avoids the problem and becomes clearer as well as better to optimize by the compiler.

Fixes 9420f89db2dd ("mm: move most of core MM initialization to mm/mm_init.c")

Makes sense if there's only a single arch that has the special case.

Quoted 53 lines

---
v2: fix logic bug reported-by: kernel test robot <[email protected]>, see https://lore.kernel.org/oe-lkp/[email protected]

---
 arch/arc/mm/init.c | 5 -----
 include/linux/mm.h | 1 -
 mm/mm_init.c       | 4 ++--
 3 files changed, 2 insertions(+), 8 deletions(-)
arch/arc/mm/init.c +0 -5
index ce4e939a7f07..2b89b6c53801 100644
@@ -74,11 +74,6 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
 		base, TO_MB(size), !in_use ? "Not used":"");
 }
 
-bool arch_has_descending_max_zone_pfns(void)
-{
-	return !IS_ENABLED(CONFIG_ARC_HAS_PAE40);
-}
-
 /*
  * First memory setup routine called from setup_arch()
  * 1. setup swapper's mm @init_mm
include/linux/mm.h +0 -1
index 63acf4a598fe..75d8adce0aee 100644
@@ -3061,7 +3061,6 @@ extern void setup_per_cpu_pageset(void);
 extern int min_free_kbytes;
 extern int watermark_boost_factor;
 extern int watermark_scale_factor;
-extern bool arch_has_descending_max_zone_pfns(void);
 
 /* nommu.c */
 extern atomic_long_t mmap_pages_allocated;
mm/mm_init.c +2 -2
index 35302b7bca83..7f7f9c677854 100644
@@ -1754,9 +1754,9 @@ static void __init free_area_init_memoryless_node(int nid)
  * Some architectures, e.g. ARC may have ZONE_HIGHMEM below ZONE_NORMAL. For
  * such cases we allow max_zone_pfn sorted in the descending order
  */
-bool __weak arch_has_descending_max_zone_pfns(void)
+static bool arch_has_descending_max_zone_pfns(void)
 {
-	return false;
+	return IS_ENABLED(CONFIG_ARC) && !IS_ENABLED(CONFIG_ARC_HAS_PAE40);
 }
 
 /**
Tested-by on v2 1/1
#2 lore raw
In reply to Arnd Bergmann
Quoted 15 lines · On Sat, 15 Apr 2023 10:18:20 +0200 Arnd Bergmann <[email protected]> wrote:

From: Arnd Bergmann <[email protected]>

clang produces a build failure on x86 for some randconfig builds after a change that moves around code to mm/mm_init.c:

Cannot find symbol for section 2: .text.
mm/mm_init.o: failed

I have not been able to figure out why this happens, but the __weak annotation on arch_has_descending_max_zone_pfns() is the trigger here.

Removing the weak function in favor of an open-coded Kconfig option check avoids the problem and becomes clearer as well as better to optimize by the compiler.

Quoted 6 lines
Fixes 9420f89db2dd ("mm: move most of core MM initialization to mm/mm_init.c")

---
v2: fix logic bug reported-by: kernel test robot <[email protected]>, see https://lore.kernel.org/oe-lkp/[email protected]

I was also encountering similar issue, and confirmed replacing the old version of this patch with this one fixes it.

Thanks,
SJ

Quoted 5 lines
---
 arch/arc/mm/init.c | 5 -----
 include/linux/mm.h | 1 -
 mm/mm_init.c       | 4 ++--
 3 files changed, 2 insertions(+), 8 deletions(-)
Tested-by on v2 1/1
#3 lore raw
In reply to Arnd Bergmann

Hi Arnd,

Quoted 15 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

clang produces a build failure on x86 for some randconfig builds after a change that moves around code to mm/mm_init.c:

Cannot find symbol for section 2: .text.
mm/mm_init.o: failed

I have not been able to figure out why this happens, but the __weak annotation on arch_has_descending_max_zone_pfns() is the trigger here.

Removing the weak function in favor of an open-coded Kconfig option check avoids the problem and becomes clearer as well as better to optimize by the compiler.

Quoted 6 lines
Fixes 9420f89db2dd ("mm: move most of core MM initialization to mm/mm_init.c")

---
v2: fix logic bug reported-by: kernel test robot <[email protected]>, see https://lore.kernel.org/oe-lkp/[email protected]

Thanks, reverting commit 413d478d3b366d09 ("mm: make arch_has_descending_max_zone_pfns() static") in next-20230417 and applying your v2 makes Salvator-XS regain its DMA memory zone.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

maintainer Acked-by on v2 1/1
#4 lore raw
In reply to Arnd Bergmann
Quoted 11 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

clang produces a build failure on x86 for some randconfig builds after a change that moves around code to mm/mm_init.c:

Cannot find symbol for section 2: .text.
mm/mm_init.o: failed

I have not been able to figure out why this happens, but the __weak annotation on arch_has_descending_max_zone_pfns() is the trigger here.

Quoted 7 lines

Removing the weak function in favor of an open-coded Kconfig option check avoids the problem and becomes clearer as well as better to optimize by the compiler.

Fixes 9420f89db2dd ("mm: move most of core MM initialization to mm/mm_init.c")
Quoted 56 lines

---
v2: fix logic bug reported-by: kernel test robot <[email protected]>, see https://lore.kernel.org/oe-lkp/[email protected]

---
 arch/arc/mm/init.c | 5 -----
 include/linux/mm.h | 1 -
 mm/mm_init.c       | 4 ++--
 3 files changed, 2 insertions(+), 8 deletions(-)
arch/arc/mm/init.c +0 -5
index ce4e939a7f07..2b89b6c53801 100644
@@ -74,11 +74,6 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
 		base, TO_MB(size), !in_use ? "Not used":"");
 }
 
-bool arch_has_descending_max_zone_pfns(void)
-{
-	return !IS_ENABLED(CONFIG_ARC_HAS_PAE40);
-}
-
 /*
  * First memory setup routine called from setup_arch()
  * 1. setup swapper's mm @init_mm
include/linux/mm.h +0 -1
index 63acf4a598fe..75d8adce0aee 100644
@@ -3061,7 +3061,6 @@ extern void setup_per_cpu_pageset(void);
 extern int min_free_kbytes;
 extern int watermark_boost_factor;
 extern int watermark_scale_factor;
-extern bool arch_has_descending_max_zone_pfns(void);
 
 /* nommu.c */
 extern atomic_long_t mmap_pages_allocated;
mm/mm_init.c +2 -2
index 35302b7bca83..7f7f9c677854 100644
@@ -1754,9 +1754,9 @@ static void __init free_area_init_memoryless_node(int nid)
  * Some architectures, e.g. ARC may have ZONE_HIGHMEM below ZONE_NORMAL. For
  * such cases we allow max_zone_pfn sorted in the descending order
  */
-bool __weak arch_has_descending_max_zone_pfns(void)
+static bool arch_has_descending_max_zone_pfns(void)
 {
-	return false;
+	return IS_ENABLED(CONFIG_ARC) && !IS_ENABLED(CONFIG_ARC_HAS_PAE40);
 }
 
 /**
Signature · 1 line
2.39.2
Signature · 2 lines
Sincerely yours,
Mike.