memblock: use separate iterators for memory and reserved regions (cc6de168) · Commits · 戴 / test

for_each_memblock() is used to iterate over memblock.memory in a few places that use data from memblock_region rather than the memory ranges. Introduce separate for_each_mem_region() and for_each_reserved_mem_region() to improve encapsulation of memblock internals from its users. Signed-off-by:

Mike Rapoport <rppt@linux.ibm.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Reviewed-by:

Baoquan He <bhe@redhat.com> Acked-by: Ingo Molnar <mingo@kernel.org> [x86] Acked-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> [MIPS] Acked-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> [.clang-format] Cc: Andy Lutomirski <luto@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Daniel Axtens <dja@axtens.net> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Emil Renner Berthing <kernel@esmil.dk> Cc: Hari Bathini <hbathini@linux.ibm.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Max Filippov <jcmvbkbc@gmail.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michal Simek <monstr@monstr.eu> Cc: Palmer Dabbelt <palmer@dabbelt.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Paul Walmsley <paul.walmsley@sifive.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Russell King <linux@armlinux.org.uk> Cc: Stafford Horne <shorne@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Will Deacon <will@kernel.org> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Link: https://lkml.kernel.org/r/20200818151634.14343-18-rppt@kernel.org Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

.clang-format

+2 −1

Original line number	Diff line number	Diff line
		@@ -203,7 +203,7 @@ ForEachMacros:
		- 'for_each_matching_node'
		- 'for_each_matching_node_and_match'
		- 'for_each_member'
		- 'for_each_memblock'
		- 'for_each_mem_region'
		- 'for_each_memblock_type'
		- 'for_each_memcg_cache_index'
		- 'for_each_mem_pfn_range'
		@@ -274,6 +274,7 @@ ForEachMacros:
		- 'for_each_requested_gpio'
		- 'for_each_requested_gpio_in_range'
		- 'for_each_reserved_mem_range'
		- 'for_each_reserved_mem_region'
		- 'for_each_rtd_codec_dais'
		- 'for_each_rtd_codec_dais_rollback'
		- 'for_each_rtd_components'

arch/arm64/kernel/setup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -217,7 +217,7 @@ static void __init request_standard_resources(void)
		if (!standard_resources)
		panic("%s: Failed to allocate %zu bytes\n", __func__, res_size);

		for_each_memblock(memory, region) {
		for_each_mem_region(region) {
		res = &standard_resources[i++];
		if (memblock_is_nomap(region)) {
		res->name = "reserved";

arch/arm64/mm/numa.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -354,7 +354,7 @@ static int __init numa_register_nodes(void)
		struct memblock_region *mblk;

		/* Check that valid nid is set to memblks */
		for_each_memblock(memory, mblk) {
		for_each_mem_region(mblk) {
		int mblk_nid = memblock_get_region_node(mblk);

		if (mblk_nid == NUMA_NO_NODE \|\| mblk_nid >= MAX_NUMNODES) {

arch/mips/netlogic/xlp/setup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ static void nlm_fixup_mem(void)
		const int pref_backup = 512;
		struct memblock_region *mem;

		for_each_memblock(memory, mem) {
		for_each_mem_region(mem) {
		memblock_remove(mem->base + mem->size - pref_backup,
		pref_backup);
		}

arch/riscv/mm/init.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -531,7 +531,7 @@ static void __init resource_init(void)
		{
		struct memblock_region *region;

		for_each_memblock(memory, region) {
		for_each_mem_region(region) {
		struct resource *res;

		res = memblock_alloc(sizeof(struct resource), SMP_CACHE_BYTES);

Admin message