[PATCH v1 2/4] memblock: allow to specify flags with memblock_add_node()
We want to specify flags when hotplugging memory. Let's prepare to pass flags to memblock_add_node() by adjusting all existing users. Note that when hotplugging memory the system is already up and running and we don't want to add the memory first and apply flags later: it should happen within one memblock call. Signed-off-by: David Hildenbrand --- arch/arc/mm/init.c | 4 ++-- arch/ia64/mm/contig.c| 2 +- arch/ia64/mm/init.c | 2 +- arch/m68k/mm/mcfmmu.c| 3 ++- arch/m68k/mm/motorola.c | 6 -- arch/mips/loongson64/init.c | 4 +++- arch/mips/sgi-ip27/ip27-memory.c | 3 ++- arch/s390/kernel/setup.c | 3 ++- include/linux/memblock.h | 3 ++- include/linux/mm.h | 2 +- mm/memblock.c| 9 + mm/memory_hotplug.c | 2 +- 12 files changed, 26 insertions(+), 17 deletions(-) diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c index 699ecf119641..110eb69e9bee 100644 --- a/arch/arc/mm/init.c +++ b/arch/arc/mm/init.c @@ -59,13 +59,13 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size) low_mem_sz = size; in_use = 1; - memblock_add_node(base, size, 0); + memblock_add_node(base, size, 0, MEMBLOCK_NONE); } else { #ifdef CONFIG_HIGHMEM high_mem_start = base; high_mem_sz = size; in_use = 1; - memblock_add_node(base, size, 1); + memblock_add_node(base, size, 1, MEMBLOCK_NONE); memblock_reserve(base, size); #endif } diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c index 42e025cfbd08..24901d809301 100644 --- a/arch/ia64/mm/contig.c +++ b/arch/ia64/mm/contig.c @@ -153,7 +153,7 @@ find_memory (void) efi_memmap_walk(find_max_min_low_pfn, NULL); max_pfn = max_low_pfn; - memblock_add_node(0, PFN_PHYS(max_low_pfn), 0); + memblock_add_node(0, PFN_PHYS(max_low_pfn), 0, MEMBLOCK_NONE); find_initrd(); diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 5c6da8d83c1a..5d165607bf35 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -378,7 +378,7 @@ int __init register_active_ranges(u64 start, u64 len, int nid) #endif if (start < end) - memblock_add_node(__pa(start), end - start, nid); + memblock_add_node(__pa(start), end - start, nid, MEMBLOCK_NONE); return 0; } diff --git a/arch/m68k/mm/mcfmmu.c b/arch/m68k/mm/mcfmmu.c index eac9dde65193..6f1f25125294 100644 --- a/arch/m68k/mm/mcfmmu.c +++ b/arch/m68k/mm/mcfmmu.c @@ -174,7 +174,8 @@ void __init cf_bootmem_alloc(void) m68k_memory[0].addr = _rambase; m68k_memory[0].size = _ramend - _rambase; - memblock_add_node(m68k_memory[0].addr, m68k_memory[0].size, 0); + memblock_add_node(m68k_memory[0].addr, m68k_memory[0].size, 0, + MEMBLOCK_NONE); /* compute total pages in system */ num_pages = PFN_DOWN(_ramend - _rambase); diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c index 3a653f0a4188..e80c5d7e6728 100644 --- a/arch/m68k/mm/motorola.c +++ b/arch/m68k/mm/motorola.c @@ -410,7 +410,8 @@ void __init paging_init(void) min_addr = m68k_memory[0].addr; max_addr = min_addr + m68k_memory[0].size; - memblock_add_node(m68k_memory[0].addr, m68k_memory[0].size, 0); + memblock_add_node(m68k_memory[0].addr, m68k_memory[0].size, 0, + MEMBLOCK_NONE); for (i = 1; i < m68k_num_memory;) { if (m68k_memory[i].addr < min_addr) { printk("Ignoring memory chunk at 0x%lx:0x%lx before the first chunk\n", @@ -421,7 +422,8 @@ void __init paging_init(void) (m68k_num_memory - i) * sizeof(struct m68k_mem_info)); continue; } - memblock_add_node(m68k_memory[i].addr, m68k_memory[i].size, i); + memblock_add_node(m68k_memory[i].addr, m68k_memory[i].size, i, + MEMBLOCK_NONE); addr = m68k_memory[i].addr + m68k_memory[i].size; if (addr > max_addr) max_addr = addr; diff --git a/arch/mips/loongson64/init.c b/arch/mips/loongson64/init.c index 76e0a9636a0e..4ac5ba80bbf6 100644 --- a/arch/mips/loongson64/init.c +++ b/arch/mips/loongson64/init.c @@ -77,7 +77,9 @@ void __init szmem(unsigned int node) (u32)node_id, mem_type, mem_start, mem_size); pr_info(" start_pfn:0x%llx, end_pfn:0x%llx, num_physpages:0x%lx\n", start_pfn, end_pfn, num_physpages); - memblock_add_node(PFN_PHYS(start_pfn), PFN_PHYS(node_psize), node); + memblock_add_node(PFN_PHYS(start_pfn), +
Re: [PATCH v1 2/4] memblock: allow to specify flags with memblock_add_node()
On Mon, Sep 27, 2021 at 5:05 PM David Hildenbrand wrote: > We want to specify flags when hotplugging memory. Let's prepare to pass > flags to memblock_add_node() by adjusting all existing users. > > Note that when hotplugging memory the system is already up and running > and we don't want to add the memory first and apply flags later: it > should happen within one memblock call. > > Signed-off-by: David Hildenbrand > arch/m68k/mm/mcfmmu.c| 3 ++- > arch/m68k/mm/motorola.c | 6 -- Acked-by: Geert Uytterhoeven Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org 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 ___ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH v1 2/4] memblock: allow to specify flags with memblock_add_node()
On Mon, Sep 27, 2021 at 05:05:16PM +0200, David Hildenbrand wrote: > We want to specify flags when hotplugging memory. Let's prepare to pass > flags to memblock_add_node() by adjusting all existing users. > > Note that when hotplugging memory the system is already up and running > and we don't want to add the memory first and apply flags later: it > should happen within one memblock call. > > Signed-off-by: David Hildenbrand > --- ... > arch/s390/kernel/setup.c | 3 ++- For s390 Acked-by: Heiko Carstens ___ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH v1 2/4] memblock: allow to specify flags with memblock_add_node()
On Mon, Sep 27, 2021 at 05:05:16PM +0200, David Hildenbrand wrote: > We want to specify flags when hotplugging memory. Let's prepare to pass > flags to memblock_add_node() by adjusting all existing users. > > Note that when hotplugging memory the system is already up and running > and we don't want to add the memory first and apply flags later: it > should happen within one memblock call. Why is it important that the system is up and why it should happen in a single call? I don't mind adding flags parameter to memblock_add_node() but this changelog does not really explain the reasons to do it. > Signed-off-by: David Hildenbrand > --- > arch/arc/mm/init.c | 4 ++-- > arch/ia64/mm/contig.c| 2 +- > arch/ia64/mm/init.c | 2 +- > arch/m68k/mm/mcfmmu.c| 3 ++- > arch/m68k/mm/motorola.c | 6 -- > arch/mips/loongson64/init.c | 4 +++- > arch/mips/sgi-ip27/ip27-memory.c | 3 ++- > arch/s390/kernel/setup.c | 3 ++- > include/linux/memblock.h | 3 ++- > include/linux/mm.h | 2 +- > mm/memblock.c| 9 + > mm/memory_hotplug.c | 2 +- > 12 files changed, 26 insertions(+), 17 deletions(-) > > diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c > index 699ecf119641..110eb69e9bee 100644 > --- a/arch/arc/mm/init.c > +++ b/arch/arc/mm/init.c > @@ -59,13 +59,13 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 > size) > > low_mem_sz = size; > in_use = 1; > - memblock_add_node(base, size, 0); > + memblock_add_node(base, size, 0, MEMBLOCK_NONE); > } else { > #ifdef CONFIG_HIGHMEM > high_mem_start = base; > high_mem_sz = size; > in_use = 1; > - memblock_add_node(base, size, 1); > + memblock_add_node(base, size, 1, MEMBLOCK_NONE); > memblock_reserve(base, size); > #endif > } > diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c > index 42e025cfbd08..24901d809301 100644 > --- a/arch/ia64/mm/contig.c > +++ b/arch/ia64/mm/contig.c > @@ -153,7 +153,7 @@ find_memory (void) > efi_memmap_walk(find_max_min_low_pfn, NULL); > max_pfn = max_low_pfn; > > - memblock_add_node(0, PFN_PHYS(max_low_pfn), 0); > + memblock_add_node(0, PFN_PHYS(max_low_pfn), 0, MEMBLOCK_NONE); > > find_initrd(); > > diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c > index 5c6da8d83c1a..5d165607bf35 100644 > --- a/arch/ia64/mm/init.c > +++ b/arch/ia64/mm/init.c > @@ -378,7 +378,7 @@ int __init register_active_ranges(u64 start, u64 len, int > nid) > #endif > > if (start < end) > - memblock_add_node(__pa(start), end - start, nid); > + memblock_add_node(__pa(start), end - start, nid, MEMBLOCK_NONE); > return 0; > } > > diff --git a/arch/m68k/mm/mcfmmu.c b/arch/m68k/mm/mcfmmu.c > index eac9dde65193..6f1f25125294 100644 > --- a/arch/m68k/mm/mcfmmu.c > +++ b/arch/m68k/mm/mcfmmu.c > @@ -174,7 +174,8 @@ void __init cf_bootmem_alloc(void) > m68k_memory[0].addr = _rambase; > m68k_memory[0].size = _ramend - _rambase; > > - memblock_add_node(m68k_memory[0].addr, m68k_memory[0].size, 0); > + memblock_add_node(m68k_memory[0].addr, m68k_memory[0].size, 0, > + MEMBLOCK_NONE); > > /* compute total pages in system */ > num_pages = PFN_DOWN(_ramend - _rambase); > diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c > index 3a653f0a4188..e80c5d7e6728 100644 > --- a/arch/m68k/mm/motorola.c > +++ b/arch/m68k/mm/motorola.c > @@ -410,7 +410,8 @@ void __init paging_init(void) > > min_addr = m68k_memory[0].addr; > max_addr = min_addr + m68k_memory[0].size; > - memblock_add_node(m68k_memory[0].addr, m68k_memory[0].size, 0); > + memblock_add_node(m68k_memory[0].addr, m68k_memory[0].size, 0, > + MEMBLOCK_NONE); > for (i = 1; i < m68k_num_memory;) { > if (m68k_memory[i].addr < min_addr) { > printk("Ignoring memory chunk at 0x%lx:0x%lx before the > first chunk\n", > @@ -421,7 +422,8 @@ void __init paging_init(void) > (m68k_num_memory - i) * sizeof(struct > m68k_mem_info)); > continue; > } > - memblock_add_node(m68k_memory[i].addr, m68k_memory[i].size, i); > + memblock_add_node(m68k_memory[i].addr, m68k_memory[i].size, i, > + MEMBLOCK_NONE); > addr = m68k_memory[i].addr + m68k_memory[i].size; > if (addr > max_addr) > max_addr = addr; > diff --git a/arch/mips/loongson64/init.c b/arch/mips/loongson64/init.c > index 76e0a9636a0e..4ac5ba80bbf6 100644 > --- a/arch/mips/loongson64/init.c > +++ b/arch/mips/loongson64/init.c > @@ -77,7 +77,9 @@ void __init szmem(unsigned int node) >
Re: [PATCH v1 2/4] memblock: allow to specify flags with memblock_add_node()
On 29.09.21 18:25, Mike Rapoport wrote: On Mon, Sep 27, 2021 at 05:05:16PM +0200, David Hildenbrand wrote: We want to specify flags when hotplugging memory. Let's prepare to pass flags to memblock_add_node() by adjusting all existing users. Note that when hotplugging memory the system is already up and running and we don't want to add the memory first and apply flags later: it should happen within one memblock call. Why is it important that the system is up and why it should happen in a single call? I don't mind adding flags parameter to memblock_add_node() but this changelog does not really explain the reasons to do it. "After memblock_add_node(), we could race with anybody performing a search for MEMBLOCK_NONE, like kexec_file -- and that only happens once the system is already up and running. So we want both steps to happen atomically." I can add that to the patch description. (I think it still won't be completely atomic because memblock isn't properly implementing locking yet, but that's a different story) -- Thanks, David / dhildenb ___ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec