mm/memory_hotplug: preparatory patches for new online policy and memory
Subsystems (14)
Hi,
these are all cleanups and one fix previously sent as part of [1]:
[PATCH v1 00/12] mm/memory_hotplug: "auto-movable" online policy and memory groups
These patches make sense even without the other series, therefore I pulled them out to make the other series easier to digest.
[1] https://lkml.kernel.org/r/[email protected]
David Hildenbrand (4):
mm/memory_hotplug: use "unsigned long" for PFN in zone_for_pfn_range() mm/memory_hotplug: remove nid parameter from arch_remove_memory() mm/memory_hotplug: remove nid parameter from remove_memory() and
friends
ACPI: memhotplug: memory resources cannot be enabled yet
arch/arm64/mm/mmu.c | 3 +- arch/ia64/mm/init.c | 3 +- arch/powerpc/mm/mem.c | 3 +- .../platforms/pseries/hotplug-memory.c | 9 +++-- arch/s390/mm/init.c | 3 +- arch/sh/mm/init.c | 3 +- arch/x86/mm/init_32.c | 3 +- arch/x86/mm/init_64.c | 3 +- drivers/acpi/acpi_memhotplug.c | 11 +----- drivers/dax/kmem.c | 3 +- drivers/virtio/virtio_mem.c | 4 +-- include/linux/memory_hotplug.h | 17 +++++---- mm/memory_hotplug.c | 36 +++++++++++-------- mm/memremap.c | 5 +-- 14 files changed, 45 insertions(+), 61 deletions(-)
base-commit: e73f0f0ee7541171d89f2e2491130c7771ba58d3
Signature · 1 line
2.31.1
PATCH 1/4 mm/memory_hotplug: use "unsigned long" for PFN in zone_for_pfn_range()
Checkpatch complained on a follow-up patch that we are using "unsigned" here, which defaults to "unsigned int" and checkpatch is correct.
Use "unsigned long" instead, just as we do in other places when handling PFNs. This can bite us once we have physical addresses in the range of multiple TB.
--- include/linux/memory_hotplug.h | 4 ++-- mm/memory_hotplug.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
include/linux/memory_hotplug.h +2 -2
@@ -339,8 +339,8 @@ extern void sparse_remove_section(struct mem_section *ms, unsigned long map_offset, struct vmem_altmap *altmap);extern struct page *sparse_decode_mem_map (unsigned long coded_mem_map,unsigned long pnum); -extern struct zone *zone_for_pfn_range (int online_type,int nid,unsigned start_pfn, -unsigned long nr_pages); +extern struct zone *zone_for_pfn_range (int online_type,int nid, +unsigned long start_pfn,unsigned long nr_pages);extern int arch_create_linear_mapping (int nid,u64 start,u64 size,struct mhp_params *params);void arch_remove_linear_mapping (u64 start,u64 size);
mm/memory_hotplug.c +2 -2
@@ -708,8 +708,8 @@ static inline struct zone *default_zone_for_pfn(int nid, unsigned long start_pfnreturn movable_node_enabled ? movable_zone : kernel_zone; } -struct zone *zone_for_pfn_range (int online_type,int nid,unsigned start_pfn, -unsigned long nr_pages) +struct zone *zone_for_pfn_range (int online_type,int nid, +unsigned long start_pfn,unsigned long nr_pages) {if (online_type ==MMOP_ONLINE_KERNEL )return default_kernel_zone_for_pfn (nid, start_pfn, nr_pages);
Signature · 1 line
2.31.1
Heiko Carstens
maintainerRe: [PATCH v1 1/4] mm/memory_hotplug: use "unsigned long" for PFN in zone_for_pfn_range()
Quoted 7 lines · David Hildenbrand
Checkpatch complained on a follow-up patch that we are using "unsigned" here, which defaults to "unsigned int" and checkpatch is correct.
Use "unsigned long" instead, just as we do in other places when handling PFNs. This can bite us once we have physical addresses in the range of multiple TB.
Quoted 6 lines
Fixes e5e689302633 ("mm, memory_hotplug: display allowed zones in the preferred ordering")Signed-off-by David Hildenbrand <[email protected]>--- include/linux/memory_hotplug.h | 4 ++-- mm/memory_hotplug.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
I'd propose to add Cc: <[email protected]> since I actually had the fun to try to debug something like this a couple of years ago:6cdb18ad98a4 ("mm/vmstat: fix overflow in mod_zone_page_state()")
Re: [PATCH v1 1/4] mm/memory_hotplug: use "unsigned long" for PFN in zone_for_pfn_range()
Quoted 15 lines · Heiko Carstens
Quoted 7 lines · David Hildenbrand
Checkpatch complained on a follow-up patch that we are using "unsigned" here, which defaults to "unsigned int" and checkpatch is correct.
Use "unsigned long" instead, just as we do in other places when handling PFNs. This can bite us once we have physical addresses in the range of multiple TB.
Quoted 6 lines
Fixes e5e689302633 ("mm, memory_hotplug: display allowed zones in the preferred ordering")Signed-off-by David Hildenbrand <[email protected]>--- include/linux/memory_hotplug.h | 4 ++-- mm/memory_hotplug.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
Quoted 4 lines
I'd propose to add Cc: <[email protected]> since I actually had the fun to try to debug something like this a couple of years ago:
6cdb18ad98a4("mm/vmstat: fix overflow inmod_zone_page_state()")
Good point, and thinking again what can go wrong, I tend to agree. We are trying to keep zones contiguous and it could happen that we end up with something like ZONE_DMA here (via default_kernel_zone_for_pfn()) and would consequently online something to ZONE_DMA that doesn't belong there, resulting in crashes.
@Andrew can you add Cc: <[email protected]> and
"As we will search for a fitting zone using the wrong pfn, we might end up onlining memory to one of the special kernel zones, such as ZONE_DMA, which can end badly as the onlined memory does not satisfy properties of these zones."
Thanks Heiko!
Signature · 3 lines
Thanks, David / dhildenb
Andrew Morton
maintainerRe: [PATCH v1 1/4] mm/memory_hotplug: use "unsigned long" for PFN in zone_for_pfn_range()
Quoted 11 lines · On Thu, 15 Jul 2021 11:42:21 +0200 David Hildenbrand <[email protected]> wrote:
Quoted 4 lines
I'd propose to add Cc: <[email protected]> since I actually had the fun to try to debug something like this a couple of years ago:
6cdb18ad98a4("mm/vmstat: fix overflow inmod_zone_page_state()")Good point, and thinking again what can go wrong, I tend to agree. We are trying to keep zones contiguous and it could happen that we end up with something like
ZONE_DMAhere (viadefault_kernel_zone_for_pfn()) and would consequently online something toZONE_DMAthat doesn't belong there, resulting in crashes.
Quoted 6 lines
@Andrew can you add Cc: <[email protected]> and
"As we will search for a fitting zone using the wrong pfn, we might end up onlining memory to one of the special kernel zones, such as
ZONE_DMA, which can end badly as the onlined memory does not satisfy properties of these zones."
Yep, all done.
Re: [PATCH v1 1/4] mm/memory_hotplug: use "unsigned long" for PFN in zone_for_pfn_range()
In reply to David HildenbrandQuoted 34 lines
Checkpatch complained on a follow-up patch that we are using "unsigned" here, which defaults to "unsigned int" and checkpatch is correct.
Use "unsigned long" instead, just as we do in other places when handling PFNs. This can bite us once we have physical addresses in the range of multiple TB.
Fixes e5e689302633 ("mm, memory_hotplug: display allowed zones in the preferred ordering")Signed-off-by David Hildenbrand <[email protected]>--- include/linux/memory_hotplug.h | 4 ++-- mm/memory_hotplug.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)include/linux/memory_hotplug.h +2
-2@@ -339,8 +339,8 @@ extern void sparse_remove_section(struct mem_section *ms, unsigned long map_offset, struct vmem_altmap *altmap);extern struct page *sparse_decode_mem_map (unsigned long coded_mem_map,unsigned long pnum); -extern struct zone *zone_for_pfn_range (int online_type,int nid,unsigned start_pfn, -unsigned long nr_pages); +extern struct zone *zone_for_pfn_range (int online_type,int nid, +unsigned long start_pfn,unsigned long nr_pages);extern int arch_create_linear_mapping (int nid,u64 start,u64 size,struct mhp_params *params);void arch_remove_linear_mapping (u64 start,u64 size);mm/memory_hotplug.c +0
-0
mm/memory_hotplug.c static inline struct zone *default_zone_for_pfn(int nid, unsigned long start_pfn · line 715
Quoted 10 lines
mm/memory_hotplug.c +2
-2@@ -708,8 +708,8 @@ static inline struct zone *default_zone_for_pfn(int nid, unsigned long start_pfnreturn movable_node_enabled ? movable_zone : kernel_zone; } -struct zone *zone_for_pfn_range (int online_type,int nid,unsigned start_pfn, -unsigned long nr_pages) +struct zone *zone_for_pfn_range (int online_type,int nid, +unsigned long start_pfn,unsigned long nr_pages) {if (online_type ==MMOP_ONLINE_KERNEL )return default_kernel_zone_for_pfn (nid, start_pfn, nr_pages);
Re: [PATCH v1 1/4] mm/memory_hotplug: use "unsigned long" for PFN in zone_for_pfn_range()
In reply to David HildenbrandQuoted 9 lines · David Hildenbrand
Checkpatch complained on a follow-up patch that we are using "unsigned" here, which defaults to "unsigned int" and checkpatch is correct.
Use "unsigned long" instead, just as we do in other places when handling PFNs. This can bite us once we have physical addresses in the range of multiple TB.
Fixes e5e689302633 ("mm, memory_hotplug: display allowed zones in the preferred ordering")Signed-off-by David Hildenbrand <[email protected]>
Signature · 2 lines
Oscar Salvador SUSE L3
Re: [PATCH v1 1/4] mm/memory_hotplug: use "unsigned long" for PFN in zone_for_pfn_range()
In reply to David HildenbrandQuoted 10 lines · David Hildenbrand
Checkpatch complained on a follow-up patch that we are using "unsigned" here, which defaults to "unsigned int" and checkpatch is correct.
Use "unsigned long" instead, just as we do in other places when handling PFNs. This can bite us once we have physical addresses in the range of multiple TB.
Fixes e5e689302633 ("mm, memory_hotplug: display allowed zones in the preferred ordering")Signed-off-by David Hildenbrand <[email protected]>
PATCH 2/4 mm/memory_hotplug: remove nid parameter from arch_remove_memory()
In reply to David HildenbrandThe parameter is unused, let's remove it.
--- arch/arm64/mm/mmu.c | 3 +-- arch/ia64/mm/init.c | 3 +-- arch/powerpc/mm/mem.c | 3 +-- arch/s390/mm/init.c | 3 +-- arch/sh/mm/init.c | 3 +-- arch/x86/mm/init_32.c | 3 +-- arch/x86/mm/init_64.c | 3 +-- include/linux/memory_hotplug.h | 3 +-- mm/memory_hotplug.c | 4 ++-- mm/memremap.c | 5 +---- 10 files changed, 11 insertions(+), 22 deletions(-)
arch/arm64/mm/mmu.c +1 -2
@@ -1506,8 +1506,7 @@ int arch_add_memory(int nid, u64 start, u64 size,return ret; } -void arch_remove_memory (int nid,u64 start,u64 size, -struct vmem_altmap *altmap) +void arch_remove_memory (u64 start,u64 size,struct vmem_altmap *altmap) {unsigned long start_pfn = start >>PAGE_SHIFT ;unsigned long nr_pages = size >>PAGE_SHIFT ;
arch/ia64/mm/init.c +1 -2
@@ -484,8 +484,7 @@ int arch_add_memory(int nid, u64 start, u64 size,return ret; } -void arch_remove_memory (int nid,u64 start,u64 size, -struct vmem_altmap *altmap) +void arch_remove_memory (u64 start,u64 size,struct vmem_altmap *altmap) {unsigned long start_pfn = start >>PAGE_SHIFT ;unsigned long nr_pages = size >>PAGE_SHIFT ;
arch/powerpc/mm/mem.c +1 -2
@@ -119,8 +119,7 @@ int __ref arch_add_memory(int nid, u64 start, u64 size,return rc; } -void __ref arch_remove_memory (int nid,u64 start,u64 size, -struct vmem_altmap *altmap) +void __ref arch_remove_memory (u64 start,u64 size,struct vmem_altmap *altmap) {unsigned long start_pfn = start >>PAGE_SHIFT ;unsigned long nr_pages = size >>PAGE_SHIFT ;
arch/s390/mm/init.c +1 -2
@@ -306,8 +306,7 @@ int arch_add_memory(int nid, u64 start, u64 size,return rc; } -void arch_remove_memory (int nid,u64 start,u64 size, -struct vmem_altmap *altmap) +void arch_remove_memory (u64 start,u64 size,struct vmem_altmap *altmap) {unsigned long start_pfn = start >>PAGE_SHIFT ;unsigned long nr_pages = size >>PAGE_SHIFT ;
arch/sh/mm/init.c +1 -2
@@ -414,8 +414,7 @@ int arch_add_memory(int nid, u64 start, u64 size,return ret; } -void arch_remove_memory (int nid,u64 start,u64 size, -struct vmem_altmap *altmap) +void arch_remove_memory (u64 start,u64 size,struct vmem_altmap *altmap) {unsigned long start_pfn =PFN_DOWN (start);unsigned long nr_pages = size >>PAGE_SHIFT ;
arch/x86/mm/init_32.c +1 -2
@@ -801,8 +801,7 @@ int arch_add_memory(int nid, u64 start, u64 size,return __add_pages (nid, start_pfn, nr_pages, params); } -void arch_remove_memory (int nid,u64 start,u64 size, -struct vmem_altmap *altmap) +void arch_remove_memory (u64 start,u64 size,struct vmem_altmap *altmap) {unsigned long start_pfn = start >>PAGE_SHIFT ;unsigned long nr_pages = size >>PAGE_SHIFT ;
arch/x86/mm/init_64.c +1 -2
@@ -1255,8 +1255,7 @@ kernel_physical_mapping_remove(unsigned long start, unsigned long end)remove_pagetable (start, end, true,NULL ); } -void __ref arch_remove_memory (int nid,u64 start,u64 size, -struct vmem_altmap *altmap) +void __ref arch_remove_memory (u64 start,u64 size,struct vmem_altmap *altmap) {unsigned long start_pfn = start >>PAGE_SHIFT ;unsigned long nr_pages = size >>PAGE_SHIFT ;
include/linux/memory_hotplug.h +1 -2
@@ -130,8 +130,7 @@ static inline bool movable_node_is_enabled(void)return movable_node_enabled; } -extern void arch_remove_memory (int nid,u64 start,u64 size, -struct vmem_altmap *altmap); +extern void arch_remove_memory (u64 start,u64 size,struct vmem_altmap *altmap);extern void __remove_pages (unsigned long start_pfn,unsigned long nr_pages,struct vmem_altmap *altmap);
mm/memory_hotplug.c +2 -2
@@ -1106,7 +1106,7 @@ int __ref add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags)/* create memory block devices after memory was added */ ret =create_memory_block_devices (start, size, mhp_altmap.alloc);if (ret) { -arch_remove_memory (nid, start, size,NULL ); +arch_remove_memory (start, size,NULL ); goto error; }
@@ -1892,7 +1892,7 @@ static int __ref try_remove_memory(int nid, u64 start, u64 size)mem_hotplug_begin (); -arch_remove_memory (nid, start, size, altmap); +arch_remove_memory (start, size, altmap);if (IS_ENABLED (CONFIG_ARCH_KEEP_MEMBLOCK )) {memblock_free (start, size);
mm/memremap.c +1 -4
@@ -140,14 +140,11 @@ static void pageunmap_range(struct dev_pagemap *pgmap, int range_id) {struct range *range = &pgmap->ranges[range_id];struct page *first_page; -int nid;/* make sure to access a memmap that was actually initialized */ first_page =pfn_to_page (pfn_first (pgmap, range_id));/* pages are dead and unused, undo the arch mapping */ - nid =page_to_nid (first_page); -mem_hotplug_begin ();remove_pfn_range_from_zone (page_zone (first_page),PHYS_PFN (range->start),PHYS_PFN (range_len (range)));
@@ -155,7 +152,7 @@ static void pageunmap_range(struct dev_pagemap *pgmap, int range_id)__remove_pages (PHYS_PFN (range->start),PHYS_PFN (range_len (range)),NULL ); }else { -arch_remove_memory (nid, range->start,range_len (range), +arch_remove_memory (range->start,range_len (range),pgmap_altmap (pgmap));kasan_remove_zero_shadow (__va (range->start),range_len (range)); }
Signature · 1 line
2.31.1
Re: [PATCH v1 2/4] mm/memory_hotplug: remove nid parameter from arch_remove_memory()
Quoted 213 lines
The parameter is unused, let's remove it.
Acked-by Catalin Marinas <[email protected]>Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>Cc Michael Ellerman <[email protected]>Cc Benjamin Herrenschmidt <[email protected]>Cc Paul Mackerras <[email protected]>Cc Heiko Carstens <[email protected]>Cc Vasily Gorbik <[email protected]>Cc Christian Borntraeger <[email protected]>Cc Yoshinori Sato <[email protected]>Cc Rich Felker <[email protected]>Cc Dave Hansen <[email protected]>Cc Andy Lutomirski <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>Cc "H. Peter Anvin" <[email protected]>Cc Andrew Morton <[email protected]>Cc Anshuman Khandual <[email protected]>Cc Ard Biesheuvel <[email protected]>Cc Mike Rapoport <[email protected]>Cc Nicholas Piggin <[email protected]>Cc Pavel Tatashin <[email protected]>Cc Baoquan He <[email protected]>Cc Laurent Dufour <[email protected]>Cc Sergei Trofimovich <[email protected]>Cc Kefeng Wang <[email protected]>Cc Michel Lespinasse <[email protected]>Cc Christophe Leroy <[email protected]>Cc "Aneesh Kumar K.V" <[email protected]>Cc Thiago Jung Bauermann <[email protected]>Cc Joe Perches <[email protected]>Cc Pierre Morel <[email protected]>Cc Jia He <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- arch/arm64/mm/mmu.c | 3 +-- arch/ia64/mm/init.c | 3 +-- arch/powerpc/mm/mem.c | 3 +-- arch/s390/mm/init.c | 3 +-- arch/sh/mm/init.c | 3 +-- arch/x86/mm/init_32.c | 3 +-- arch/x86/mm/init_64.c | 3 +-- include/linux/memory_hotplug.h | 3 +-- mm/memory_hotplug.c | 4 ++-- mm/memremap.c | 5 +---- 10 files changed, 11 insertions(+), 22 deletions(-)arch/arm64/mm/mmu.c +1
-2@@ -1506,8 +1506,7 @@ int arch_add_memory(int nid, u64 start, u64 size,return ret; } -void arch_remove_memory (int nid,u64 start,u64 size, -struct vmem_altmap *altmap) +void arch_remove_memory (u64 start,u64 size,struct vmem_altmap *altmap) {unsigned long start_pfn = start >>PAGE_SHIFT ;unsigned long nr_pages = size >>PAGE_SHIFT ;arch/ia64/mm/init.c +1
-2@@ -484,8 +484,7 @@ int arch_add_memory(int nid, u64 start, u64 size,return ret; } -void arch_remove_memory (int nid,u64 start,u64 size, -struct vmem_altmap *altmap) +void arch_remove_memory (u64 start,u64 size,struct vmem_altmap *altmap) {unsigned long start_pfn = start >>PAGE_SHIFT ;unsigned long nr_pages = size >>PAGE_SHIFT ;arch/powerpc/mm/mem.c +1
-2@@ -119,8 +119,7 @@ int __ref arch_add_memory(int nid, u64 start, u64 size,return rc; } -void __ref arch_remove_memory (int nid,u64 start,u64 size, -struct vmem_altmap *altmap) +void __ref arch_remove_memory (u64 start,u64 size,struct vmem_altmap *altmap) {unsigned long start_pfn = start >>PAGE_SHIFT ;unsigned long nr_pages = size >>PAGE_SHIFT ;arch/s390/mm/init.c +1
-2@@ -306,8 +306,7 @@ int arch_add_memory(int nid, u64 start, u64 size,return rc; } -void arch_remove_memory (int nid,u64 start,u64 size, -struct vmem_altmap *altmap) +void arch_remove_memory (u64 start,u64 size,struct vmem_altmap *altmap) {unsigned long start_pfn = start >>PAGE_SHIFT ;unsigned long nr_pages = size >>PAGE_SHIFT ;arch/sh/mm/init.c +1
-2@@ -414,8 +414,7 @@ int arch_add_memory(int nid, u64 start, u64 size,return ret; } -void arch_remove_memory (int nid,u64 start,u64 size, -struct vmem_altmap *altmap) +void arch_remove_memory (u64 start,u64 size,struct vmem_altmap *altmap) {unsigned long start_pfn =PFN_DOWN (start);unsigned long nr_pages = size >>PAGE_SHIFT ;arch/x86/mm/init_32.c +1
-2@@ -801,8 +801,7 @@ int arch_add_memory(int nid, u64 start, u64 size,return __add_pages (nid, start_pfn, nr_pages, params); } -void arch_remove_memory (int nid,u64 start,u64 size, -struct vmem_altmap *altmap) +void arch_remove_memory (u64 start,u64 size,struct vmem_altmap *altmap) {unsigned long start_pfn = start >>PAGE_SHIFT ;unsigned long nr_pages = size >>PAGE_SHIFT ;arch/x86/mm/init_64.c +1
-2@@ -1255,8 +1255,7 @@ kernel_physical_mapping_remove(unsigned long start, unsigned long end)remove_pagetable (start, end, true,NULL ); } -void __ref arch_remove_memory (int nid,u64 start,u64 size, -struct vmem_altmap *altmap) +void __ref arch_remove_memory (u64 start,u64 size,struct vmem_altmap *altmap) {unsigned long start_pfn = start >>PAGE_SHIFT ;unsigned long nr_pages = size >>PAGE_SHIFT ;include/linux/memory_hotplug.h +1
-2@@ -130,8 +130,7 @@ static inline bool movable_node_is_enabled(void)return movable_node_enabled; } -extern void arch_remove_memory (int nid,u64 start,u64 size, -struct vmem_altmap *altmap); +extern void arch_remove_memory (u64 start,u64 size,struct vmem_altmap *altmap);extern void __remove_pages (unsigned long start_pfn,unsigned long nr_pages,struct vmem_altmap *altmap);mm/memory_hotplug.c +2
-2@@ -1106,7 +1106,7 @@ int __ref add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags)/* create memory block devices after memory was added */ ret =create_memory_block_devices (start, size, mhp_altmap.alloc);if (ret) { -arch_remove_memory (nid, start, size,NULL ); +arch_remove_memory (start, size,NULL ); goto error; }@@ -1892,7 +1892,7 @@ static int __ref try_remove_memory(int nid, u64 start, u64 size)mem_hotplug_begin (); -arch_remove_memory (nid, start, size, altmap); +arch_remove_memory (start, size, altmap);if (IS_ENABLED (CONFIG_ARCH_KEEP_MEMBLOCK )) {memblock_free (start, size);mm/memremap.c +0
-3@@ -140,14 +140,11 @@ static void pageunmap_range(struct dev_pagemap *pgmap, int range_id) {struct range *range = &pgmap->ranges[range_id];struct page *first_page; -int nid;/* make sure to access a memmap that was actually initialized */ first_page =pfn_to_page (pfn_first (pgmap, range_id));/* pages are dead and unused, undo the arch mapping */ - nid =page_to_nid (first_page); -mem_hotplug_begin ();remove_pfn_range_from_zone (page_zone (first_page),PHYS_PFN (range->start),PHYS_PFN (range_len (range)));
mm/memremap.c static void pageunmap_range(struct dev_pagemap *pgmap, int range_id) · line 158
Quoted 8 lines
mm/memremap.c +1
-1@@ -155,7 +152,7 @@ static void pageunmap_range(struct dev_pagemap *pgmap, int range_id)__remove_pages (PHYS_PFN (range->start),PHYS_PFN (range_len (range)),NULL ); }else { -arch_remove_memory (nid, range->start,range_len (range), +arch_remove_memory (range->start,range_len (range),pgmap_altmap (pgmap));kasan_remove_zero_shadow (__va (range->start),range_len (range)); }
PATCH 3/4 mm/memory_hotplug: remove nid parameter from remove_memory() and friends
In reply to David HildenbrandThere is only a single user remaining. We can simply lookup the nid only used for node offlining purposes when walking our memory blocks. We don't expect to remove multi-nid ranges; and if we'd ever do, we most probably don't care about removing multi-nid ranges that actually result in empty nodes.
If ever required, we can detect the "multi-nid" scenario and simply try offlining all online nodes.
--- .../platforms/pseries/hotplug-memory.c | 9 +++--- drivers/acpi/acpi_memhotplug.c | 7 +---- drivers/dax/kmem.c | 3 +- drivers/virtio/virtio_mem.c | 4 +-- include/linux/memory_hotplug.h | 10 +++---- mm/memory_hotplug.c | 28 +++++++++++-------- 6 files changed, 30 insertions(+), 31 deletions(-)
arch/powerpc/platforms/pseries/hotplug-memory.c +4 -5
@@ -286,7 +286,7 @@ static int pseries_remove_memblock(unsigned long base, unsigned long memblock_si {unsigned long block_sz, start_pfn;int sections_per_block; -int i, nid; +int i; start_pfn = base >>PAGE_SHIFT ;
@@ -297,10 +297,9 @@ static int pseries_remove_memblock(unsigned long base, unsigned long memblock_si block_sz =pseries_memory_block_size (); sections_per_block = block_sz /MIN_MEMORY_BLOCK_SIZE ; - nid =memory_add_physaddr_to_nid (base);for (i =0 ; i < sections_per_block; i++) { -__remove_memory (nid, base,MIN_MEMORY_BLOCK_SIZE ); +__remove_memory (base,MIN_MEMORY_BLOCK_SIZE ); base +=MIN_MEMORY_BLOCK_SIZE ; }
@@ -387,7 +386,7 @@ static int dlpar_remove_lmb(struct drmem_lmb *lmb) block_sz =pseries_memory_block_size (); -__remove_memory (mem_block->nid, lmb->base_addr, block_sz); +__remove_memory (lmb->base_addr, block_sz);put_device (&mem_block->dev);/* Update memory regions for memory remove */
@@ -660,7 +659,7 @@ static int dlpar_add_lmb(struct drmem_lmb *lmb) rc =dlpar_online_lmb (lmb);if (rc) { -__remove_memory (nid, lmb->base_addr, block_sz); +__remove_memory (lmb->base_addr, block_sz);invalidate_lmb_associativity_index (lmb); }else { lmb->flags |=DRCONF_MEM_ASSIGNED ;
drivers/acpi/acpi_memhotplug.c +1 -6
@@ -239,19 +239,14 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)static void acpi_memory_remove_memory (struct acpi_memory_device *mem_device) { -acpi_handle handle = mem_device->device->handle;struct acpi_memory_info *info, *n; -int nid =acpi_get_node (handle);list_for_each_entry_safe (info, n, &mem_device->res_list, list) {if (!info->enabled)continue ; -if (nid ==NUMA_NO_NODE ) - nid =memory_add_physaddr_to_nid (info->start_addr); -acpi_unbind_memory_blocks (info); -__remove_memory (nid, info->start_addr, info->length); +__remove_memory (info->start_addr, info->length);list_del (&info->list);kfree (info); }
drivers/dax/kmem.c +1 -2
@@ -156,8 +156,7 @@ static void dev_dax_kmem_remove(struct dev_dax *dev_dax)if (rc)continue ; - rc =remove_memory (dev_dax->target_node, range.start, -range_len (&range)); + rc =remove_memory (range.start,range_len (&range));if (rc ==0 ) {release_resource (data->res[i]);kfree (data->res[i]);
drivers/virtio/virtio_mem.c +2 -2
@@ -677,7 +677,7 @@ static int virtio_mem_remove_memory(struct virtio_mem *vm, uint64_t addr,dev_dbg (&vm->vdev->dev,"removing memory: 0x%llx - 0x%llx\n" , addr, addr + size -1 ); - rc =remove_memory (vm->nid, addr, size); + rc =remove_memory (addr, size);if (!rc) {atomic64_sub (size, &vm->offline_size);/*
@@ -720,7 +720,7 @@ static int virtio_mem_offline_and_remove_memory(struct virtio_mem *vm,"offlining and removing memory: 0x%llx - 0x%llx\n" , addr, addr + size - 1); - rc =offline_and_remove_memory (vm->nid, addr, size); + rc =offline_and_remove_memory (addr, size);if (!rc) {atomic64_sub (size, &vm->offline_size);/*
include/linux/memory_hotplug.h +5 -5
@@ -292,9 +292,9 @@ static inline void pgdat_resize_init(struct pglist_data *pgdat) {}extern void try_offline_node (int nid);extern int offline_pages (unsigned long start_pfn,unsigned long nr_pages); -extern int remove_memory (int nid,u64 start,u64 size); -extern void __remove_memory (int nid,u64 start,u64 size); -extern int offline_and_remove_memory (int nid,u64 start,u64 size); +extern int remove_memory (u64 start,u64 size); +extern void __remove_memory (u64 start,u64 size); +extern int offline_and_remove_memory (u64 start,u64 size);#else static inline void try_offline_node (int nid) {}
@@ -304,12 +304,12 @@ static inline int offline_pages(unsigned long start_pfn, unsigned long nr_pages) return -EINVAL; } -static inline int remove_memory (int nid,u64 start,u64 size) +static inline int remove_memory (u64 start,u64 size) {return -EBUSY ; } -static inline void __remove_memory (int nid,u64 start,u64 size) {} +static inline void __remove_memory (u64 start,u64 size) {}#endif /* CONFIG_MEMORY_HOTREMOVE */ extern void set_zone_contiguous (struct zone *zone);
mm/memory_hotplug.c +17 -11
@@ -1745,7 +1745,9 @@ int __ref offline_pages(unsigned long start_pfn, unsigned long nr_pages)static int check_memblock_offlined_cb (struct memory_block *mem,void *arg) {int ret = !is_memblock_offlined (mem); +int *nid = arg; + *nid = mem->nid;if (unlikely (ret)) {phys_addr_t beginpa, endpa;
@@ -1838,12 +1840,12 @@ void try_offline_node(int nid) }EXPORT_SYMBOL (try_offline_node); -static int __ref try_remove_memory (int nid,u64 start,u64 size) +static int __ref try_remove_memory (u64 start,u64 size) { -int rc =0 ;struct vmem_altmap mhp_altmap = {};struct vmem_altmap *altmap =NULL ;unsigned long nr_vmemmap_pages; +int rc =0 , nid =NUMA_NO_NODE ;BUG_ON (check_hotplug_memory_range (start, size));
@@ -1851,8 +1853,12 @@ static int __ref try_remove_memory(int nid, u64 start, u64 size)* All memory blocks must be offlined before removing memory. Check * whether all memory blocks in question are offline and return error * if this is not the case. +* +* While at it, determine the nid. Note that if we'd have mixed nodes, +* we'd only try to offline the last determined one -- which is good +* enough for the cases we care about. */ - rc =walk_memory_blocks (start, size,NULL , check_memblock_offlined_cb); + rc =walk_memory_blocks (start, size, &nid, check_memblock_offlined_cb);if (rc)return rc;
@@ -1901,7 +1907,8 @@ static int __ref try_remove_memory(int nid, u64 start, u64 size)release_mem_region_adjustable (start, size); -try_offline_node (nid); +if (nid !=NUMA_NO_NODE ) +try_offline_node (nid);mem_hotplug_done ();return 0 ;
@@ -1909,7 +1916,6 @@ static int __ref try_remove_memory(int nid, u64 start, u64 size)/** * __remove_memory - Remove memory if every memory block is offline -* @nid: the node ID * @start: physical address of the region to remove * @size: size of the region to remove *
@@ -1917,14 +1923,14 @@ static int __ref try_remove_memory(int nid, u64 start, u64 size)* and online/offline operations before this call, as required by * try_offline_node(). */ -void __remove_memory (int nid,u64 start,u64 size) +void __remove_memory (u64 start,u64 size) {/* * trigger BUG() if some memory is not offlined prior to calling this * function */ -if (try_remove_memory (nid, start, size)) +if (try_remove_memory (start, size))BUG (); }
@@ -1932,12 +1938,12 @@ void __remove_memory(int nid, u64 start, u64 size)* Remove memory if every memory block is offline, otherwise return -EBUSY is * some memory is not offline */ -int remove_memory (int nid,u64 start,u64 size) +int remove_memory (u64 start,u64 size) {int rc;lock_device_hotplug (); - rc =try_remove_memory (nid, start, size); + rc =try_remove_memory (start, size);unlock_device_hotplug ();return rc;
@@ -1997,7 +2003,7 @@ static int try_reonline_memory_block(struct memory_block *mem, void *arg)* unplugged all memory (so it's no longer in use) and want to offline + remove * that memory. */ -int offline_and_remove_memory (int nid,u64 start,u64 size) +int offline_and_remove_memory (u64 start,u64 size) {const unsigned long mb_count = size /memory_block_size_bytes ();uint8_t *online_types, *tmp;
@@ -2033,7 +2039,7 @@ int offline_and_remove_memory(int nid, u64 start, u64 size)* This cannot fail as it cannot get onlined in the meantime. */ if (!rc) { - rc =try_remove_memory (nid, start, size); + rc =try_remove_memory (start, size);if (rc)pr_err ("%s: Failed to remove memory: %d" , __func__, rc); }
Signature · 1 line
2.31.1
PATCH 4/4 ACPI: memhotplug: memory resources cannot be enabled yet
In reply to David HildenbrandWe allocate + initialize everything from scratch. In case enabling the device fails, we free all memory resourcs.
--- drivers/acpi/acpi_memhotplug.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/acpi/acpi_memhotplug.c +0 -4
@@ -182,10 +182,6 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)* (i.e. memory-hot-remove function) */ list_for_each_entry (info, &mem_device->res_list, list) { -if (info->enabled) {/* just sanity check...*/ - num_enabled++; -continue ; - }/* * If the memory block size is zero, please ignore it. * Don't try to do the following memory hotplug flowchart.
Signature · 1 line
2.31.1