Skip to contentSkip to conversation

mm-make-split_pte_ptlocks-depend-on-smp.patch removed from -mm tree

merged mm-hotfixes-stable Andrew Morton 1 participant 1 message Sep 26, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: make SPLIT_PTE_PTLOCKS depend on SMP
has been removed from the -mm tree. Its filename was
mm-make-split_pte_ptlocks-depend-on-smp.patch

This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Guenter Roeck <[email protected]>
Subject: mm: make SPLIT_PTE_PTLOCKS depend on SMP
Date: Tue, 24 Sep 2024 08:42:05 -0700

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

---

 mm/Kconfig |    1 +
 1 file changed, 1 insertion(+)
mm/Kconfig renamed from mm/Kconfig~mm-make-split_pte_ptlocks-depend-on-smp +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
 	depends on !ARM || CPU_CACHE_VIPT
 	depends on !PARISC || PA20

_

Patches currently in -mm which might be from [email protected] are