Skip to contentSkip to conversation

mm: Make SPLIT_PTE_PTLOCKS depend on SMP

PATCH Applied Guenter Roeck 3 participants 3 messages Sep 24, 2024 – Sep 25, 2024

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

PATCH v3 1/1 mm: Make SPLIT_PTE_PTLOCKS depend on SMP

SPLIT_PTE_PTLOCKS depends on "NR_CPUS >= 4". Unfortunately, that evaluates to true if there is no NR_CPUS configuration option. This results in CONFIG_SPLIT_PTE_PTLOCKS=y for mac_defconfig. This in turn causes the m68k "q800" and "virt" machines to crash in qemu if debugging options are enabled.

Making CONFIG_SPLIT_PTE_PTLOCKS dependent on the existence of NR_CPUS does not work since a dependency on the existence of a numeric Kconfig entry always evaluates to false. Example:

config HAVE_NO_NR_CPUS
def_bool y
depends on !NR_CPUS

After adding this to a Kconfig file, "make defconfig" includes:

$ grep NR_CPUS .config
CONFIG_NR_CPUS=64
CONFIG_HAVE_NO_NR_CPUS=y

Defining NR_CPUS for m68k does not help either since many architectures define NR_CPUS only for SMP configurations.

Make SPLIT_PTE_PTLOCKS depend on SMP instead to solve the problem.

Fixes 394290cba966 ("mm: turn USE_SPLIT_PTE_PTLOCKS / USE_SPLIT_PTE_PTLOCKS into Kconfig options")
Cc David Hildenbrand <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Geert Uytterhoeven <[email protected]>

---
v3: Make SPLIT_PTE_PTLOCKS depend on SMP instead of defining NR_CPUS
for m68k.
Drop David's Acked-by: tag.

v2: Instead of trying to make SPLIT_PTE_PTLOCKS depend on the
existence of NR_CPUS, define NR_CPUS for m68k.
https://lore.kernel.org/lkml/[email protected]/

v1: https://lore.kernel.org/lkml/[email protected]/

 mm/Kconfig | 1 +
 1 file changed, 1 insertion(+)
mm/Kconfig +1 -0
index e85164c2812b..33fa51d608dc 100644
@@ -595,6 +595,7 @@ config ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE
 config SPLIT_PTE_PTLOCKS
 	def_bool y
 	depends on MMU
+	depends on SMP
 	depends on NR_CPUS >= 4
 	depends on !ARM || CPU_CACHE_VIPT
 	depends on !PARISC || PA20
Signature · 1 line
2.45.2
Acked-by on v3 1/1
#1 lore raw
Quoted 22 lines · Guenter Roeck

SPLIT_PTE_PTLOCKS depends on "NR_CPUS >= 4". Unfortunately, that evaluates to true if there is no NR_CPUS configuration option. This results in CONFIG_SPLIT_PTE_PTLOCKS=y for mac_defconfig. This in turn causes the m68k "q800" and "virt" machines to crash in qemu if debugging options are enabled.

Making CONFIG_SPLIT_PTE_PTLOCKS dependent on the existence of NR_CPUS does not work since a dependency on the existence of a numeric Kconfig entry always evaluates to false. Example:

config HAVE_NO_NR_CPUS
def_bool y
depends on !NR_CPUS

After adding this to a Kconfig file, "make defconfig" includes:

$ grep NR_CPUS .config
CONFIG_NR_CPUS=64
CONFIG_HAVE_NO_NR_CPUS=y

Defining NR_CPUS for m68k does not help either since many architectures define NR_CPUS only for SMP configurations.

Quoted 8 lines

Make SPLIT_PTE_PTLOCKS depend on SMP instead to solve the problem.

Fixes 394290cba966 ("mm: turn USE_SPLIT_PTE_PTLOCKS / USE_SPLIT_PTE_PTLOCKS into Kconfig options")
Cc David Hildenbrand <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Geert Uytterhoeven <[email protected]>

---

Signature · 3 lines
Cheers,

David / dhildenb
Reviewed-by Tested-by on v3 1/1
#2 lore raw
In reply to Guenter Roeck
Quoted 22 lines · Guenter Roeck

SPLIT_PTE_PTLOCKS depends on "NR_CPUS >= 4". Unfortunately, that evaluates to true if there is no NR_CPUS configuration option. This results in CONFIG_SPLIT_PTE_PTLOCKS=y for mac_defconfig. This in turn causes the m68k "q800" and "virt" machines to crash in qemu if debugging options are enabled.

Making CONFIG_SPLIT_PTE_PTLOCKS dependent on the existence of NR_CPUS does not work since a dependency on the existence of a numeric Kconfig entry always evaluates to false. Example:

config HAVE_NO_NR_CPUS
def_bool y
depends on !NR_CPUS

After adding this to a Kconfig file, "make defconfig" includes:

$ grep NR_CPUS .config
CONFIG_NR_CPUS=64
CONFIG_HAVE_NO_NR_CPUS=y

Defining NR_CPUS for m68k does not help either since many architectures define NR_CPUS only for SMP configurations.

Quoted 7 lines

Make SPLIT_PTE_PTLOCKS depend on SMP instead to solve the problem.

Fixes 394290cba966 ("mm: turn USE_SPLIT_PTE_PTLOCKS / USE_SPLIT_PTE_PTLOCKS into Kconfig options")
Cc David Hildenbrand <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Geert Uytterhoeven <[email protected]>

mm/Kconfig config ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE · line 599

Quoted 8 lines
mm/Kconfig +1 -0
@@ -595,6 +595,7 @@ config ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE
 config SPLIT_PTE_PTLOCKS
        def_bool y
        depends on MMU
+       depends on SMP
        depends on NR_CPUS >= 4

Nit: please combine these two lines, to make it clear they are related.

mm/Kconfig config ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE · line 601

Quoted 2 lines
mm/Kconfig +0 -0
        depends on !ARM || CPU_CACHE_VIPT
        depends on !PARISC || PA20

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
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