Skip to contentSkip to conversation

powerpc/mm: Cleanup memory block size probing

PATCH In review Aneesh Kumar K.V 2 participants 3 messages Aug 1, 2023 – Aug 23, 2023

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

PATCH v4 1/2 powerpc/mm: Cleanup memory block size probing

Parse the device tree in early init to find the memory block size to be used by the kernel. Consolidate the memory block size device tree parsing to one helper and use that on both powernv and pseries. We still want to use machine-specific callback because on all machine types other than powernv and pseries we continue to return MIN_MEMORY_BLOCK_SIZE.

pseries_memory_block_size used to look for the second memory block (memory@x) to determine the memory_block_size value. This patch changed that to look at all memory blocks and make sure we can map them all correctly using the computed memory block size value.

Add workaround to force 256MB memory block size if device driver managed memory such as GPU memory is present. This helps to add GPU memory that is not aligned to 1G.

---
Changes from v3:
* Update workaround for GPU memory

 arch/powerpc/include/asm/book3s/64/mmu.h      |   5 +-
 arch/powerpc/mm/book3s64/radix_pgtable.c      |  65 +---------
 arch/powerpc/mm/init_64.c                     | 112 ++++++++++++++++++
 arch/powerpc/platforms/powernv/setup.c        |  10 +-
 .../platforms/pseries/hotplug-memory.c        |  60 +---------
 arch/powerpc/platforms/pseries/pseries.h      |   2 -
 arch/powerpc/platforms/pseries/setup.c        |   7 ++
 7 files changed, 126 insertions(+), 135 deletions(-)
arch/powerpc/include/asm/book3s/64/mmu.h +1 -4
index 570a4960cf17..28033fd5403c 100644
@@ -71,10 +71,7 @@ extern unsigned int mmu_pid_bits;
 /* Base PID to allocate from */
 extern unsigned int mmu_base_pid;
 
-/*
- * memory block size used with radix translation.
- */
-extern unsigned long __ro_after_init radix_mem_block_size;
+extern unsigned long __ro_after_init memory_block_size;
 
 #define PRTB_SIZE_SHIFT	(mmu_pid_bits + 4)
 #define PRTB_ENTRIES	(1ul << mmu_pid_bits)
arch/powerpc/mm/book3s64/radix_pgtable.c +1 -64

89 lines not on this page · raw message

arch/powerpc/mm/init_64.c +112 -0

130 lines not on this page · raw message

arch/powerpc/platforms/powernv/setup.c +1 -9
index 5e9c6b55809f..4dbb47ddbdcc 100644
@@ -482,15 +482,7 @@ static void pnv_kexec_cpu_down(int crash_shutdown, int secondary)
 #ifdef CONFIG_MEMORY_HOTPLUG
 static unsigned long pnv_memory_block_size(void)
 {
-	/*
-	 * We map the kernel linear region with 1GB large pages on radix. For
-	 * memory hot unplug to work our memory block size must be at least
-	 * this size.
-	 */
-	if (radix_enabled())
-		return radix_mem_block_size;
-	else
-		return 256UL * 1024 * 1024;
+	return memory_block_size;
 }
 #endif
 
arch/powerpc/platforms/pseries/hotplug-memory.c +4 -56

93 lines not on this page · raw message

arch/powerpc/platforms/pseries/pseries.h +0 -2
index f8bce40ebd0c..02c012976b19 100644
@@ -90,8 +90,6 @@ extern struct pci_controller_ops pseries_pci_controller_ops;
 int pseries_msi_allocate_domains(struct pci_controller *phb);
 void pseries_msi_free_domains(struct pci_controller *phb);
 
-unsigned long pseries_memory_block_size(void);
-
 extern int CMO_PrPSP;
 extern int CMO_SecPSP;
 extern unsigned long CMO_PageSize;
arch/powerpc/platforms/pseries/setup.c +7 -0
index e2a57cfa6c83..6683debe283e 100644
@@ -1116,6 +1116,13 @@ static int pSeries_pci_probe_mode(struct pci_bus *bus)
 	return PCI_PROBE_NORMAL;
 }
 
+#ifdef CONFIG_MEMORY_HOTPLUG
+static unsigned long pseries_memory_block_size(void)
+{
+	return memory_block_size;
+}
+#endif
+
 struct pci_controller_ops pseries_pci_controller_ops = {
 	.probe_mode		= pSeries_pci_probe_mode,
 #ifdef CONFIG_SPAPR_TCE_IOMMU
Signature · 1 line
2.41.0
#1 lore raw

PATCH v4 2/2 powerpc/mm: Add memory_block_size as a kernel parameter

Certain devices can possess non-standard memory capacities, not constrained to multiples of 1GB. Provide a kernel parameter so that we can map the device memory completely on memory hotplug.

Restrict memory_block_size value to a power of 2 value similar to LMB size. The memory block size should also be more than the section size.

---
 .../admin-guide/kernel-parameters.txt         |  3 +++
 arch/powerpc/kernel/setup_64.c                | 23 +++++++++++++++++++
 arch/powerpc/mm/init_64.c                     | 17 ++++++++++----
 3 files changed, 38 insertions(+), 5 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +3 -0
index a1457995fd41..4e49696e0976 100644
@@ -3201,6 +3201,9 @@
 			Note that even when enabled, there are a few cases where
 			the feature is not effective.
 
+	memory_block_size=size [PPC]
+			 Use this parameter to configure the memory block size value.
+
 	memtest=	[KNL,X86,ARM,M68K,PPC,RISCV] Enable memtest
 			Format: <integer>
 			default : 0 <disable>
arch/powerpc/kernel/setup_64.c +23 -0
index 246201d0d879..cbdb924462c7 100644
@@ -892,6 +892,29 @@ unsigned long memory_block_size_bytes(void)
 
 	return MIN_MEMORY_BLOCK_SIZE;
 }
+
+/*
+ * Restrict to a power of 2 value for memblock which is larger than
+ * section size
+ */
+static int __init parse_mem_block_size(char *ptr)
+{
+	unsigned int order;
+	unsigned long size = memparse(ptr, NULL);
+
+	order = fls64(size);
+	if (!order)
+		return 0;
+
+	order--;
+	if (order < SECTION_SIZE_BITS)
+		return 0;
+
+	memory_block_size = 1UL << order;
+
+	return 0;
+}
+early_param("memory_block_size", parse_mem_block_size);
 #endif
 
 #if defined(CONFIG_PPC_INDIRECT_PIO) || defined(CONFIG_PPC_INDIRECT_MMIO)
arch/powerpc/mm/init_64.c +12 -5
index d74d4a441616..fcda46c2b8df 100644
@@ -566,13 +566,20 @@ static int __init probe_memory_block_size(unsigned long node, const char *uname,
 	return 0;
 }
 
-/*
- * start with 1G memory block size. Early init will
- * fix this with correct value.
- */
-unsigned long memory_block_size __ro_after_init = 1UL << 30;
+unsigned long memory_block_size __ro_after_init;
 static void __init early_init_memory_block_size(void)
 {
+	/*
+	 * if it is set via early param just return.
+	 */
+	if (memory_block_size)
+		return;
+
+	/*
+	 * start with 1G memory block size. update_memory_block_size()
+	 * will derive the right value based on device tree details.
+	 */
+	memory_block_size = SZ_1G;
 	/*
 	 * We need to do memory_block_size probe early so that
 	 * radix__early_init_mmu() can use this as limit for
Signature · 1 line
2.41.0
#2 lore raw

Re: (subset) [PATCH v4 1/2] powerpc/mm: Cleanup memory block size probing

In reply to Aneesh Kumar K.V
Quoted 6 lines · Aneesh Kumar K.V

Parse the device tree in early init to find the memory block size to be used by the kernel. Consolidate the memory block size device tree parsing to one helper and use that on both powernv and pseries. We still want to use machine-specific callback because on all machine types other than powernv and pseries we continue to return MIN_MEMORY_BLOCK_SIZE.

Quoted 6 lines

pseries_memory_block_size used to look for the second memory block (memory@x) to determine the memory_block_size value. This patch changed that to look at all memory blocks and make sure we can map them all correctly using the computed memory block size value.

[...]

Patch 1 applied to powerpc/next.

[1/2] powerpc/mm: Cleanup memory block size probing

      https://git.kernel.org/powerpc/c/4d15721177d539d743fcf31d7bb376fb3b81aeb6

cheers