mm-memory_hotplug-allow-architecture-to-override-memmap-on-memory-support-check.patch removed from -mm tree
The quilt patch titled
Subject: mm/memory_hotplug: allow architecture to override memmap on memory support check
has been removed from the -mm tree. Its filename was
mm-memory_hotplug-allow-architecture-to-override-memmap-on-memory-support-check.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Aneesh Kumar K.V" <[email protected]>
Subject: mm/memory_hotplug: allow architecture to override memmap on memory support check
Date: Tue, 8 Aug 2023 14:44:58 +0530
Some architectures would want different restrictions. Hence add an architecture-specific override.
The PMD_SIZE check is moved there.
---
mm/memory_hotplug.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-)
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~mm-memory_hotplug-allow-architecture-to-override-memmap-on-memory-support-check +20 -4
@@ -1247,10 +1247,26 @@ static int online_memory_block(struct mereturn device_online (&mem->dev); } +static inline unsigned long memory_block_memmap_size (void ) +{ +return PHYS_PFN (memory_block_size_bytes ()) *sizeof (struct page ); +} + +#ifndef arch_supports_memmap_on_memory +static inline bool arch_supports_memmap_on_memory (unsigned long vmemmap_size) +{ +/* +* As default, we want the vmemmap to span a complete PMD such that we +* can map the vmemmap using a single PMD if supported by the +* architecture. +*/ +return IS_ALIGNED (vmemmap_size,PMD_SIZE ); +} +#endif +static bool mhp_supports_memmap_on_memory (unsigned long size) { -unsigned long nr_vmemmap_pages = size /PAGE_SIZE ; -unsigned long vmemmap_size = nr_vmemmap_pages *sizeof (struct page ); +unsigned long vmemmap_size =memory_block_memmap_size ();unsigned long remaining_size = size - vmemmap_size;/*
@@ -1281,8 +1297,8 @@ static bool mhp_supports_memmap_on_memor*/ return mhp_memmap_on_memory () && size ==memory_block_size_bytes () && -IS_ALIGNED (vmemmap_size,PMD_SIZE ) && -IS_ALIGNED (remaining_size, (pageblock_nr_pages <<PAGE_SHIFT )); +IS_ALIGNED (remaining_size, (pageblock_nr_pages <<PAGE_SHIFT )) && +arch_supports_memmap_on_memory (vmemmap_size); }/*
_
Patches currently in -mm which might be from [email protected] are