Commit 952eea9b authored by David Hildenbrand's avatar David Hildenbrand Committed by Linus Torvalds
Browse files

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 might have concurrent memblock users: for example, while we're
hotplugging memory, kexec_file code might search for suitable memory
regions to place kexec images.  It's important to add the memory
directly to memblock via a single call with the right flags, instead of
adding the memory first and apply flags later: otherwise, concurrent
memblock users might temporarily stumble over memblocks with wrong
flags, which will be important in a follow-up patch that introduces a
new flag to properly handle add_memory_driver_managed().

Link: https://lkml.kernel.org/r/20211004093605.5830-4-david@redhat.com


Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Acked-by: Shahab Vahedi <shahab@synopsys.com>	[arch/arc]
Reviewed-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Cc: "Aneesh Kumar K . V" <aneesh.kumar@linux.ibm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Jianyong Wu <Jianyong.Wu@arm.com>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vineet Gupta <vgupta@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e14b4155

arch/arc/mm/init.c

+2 −2
Original line number Diff line number Diff line
@@ -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

	}

arch/ia64/mm/contig.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

arch/ia64/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

arch/m68k/mm/mcfmmu.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

arch/m68k/mm/motorola.c

+4 −2
Original line number Diff line number Diff line
@@ -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;