linux.git/include/linux/memblock.h, branch v5.10-rc2

memblock: use separate iterators for memory and reserved regions

2020-10-14T01:38:35+00:00

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 
Signed-off-by: Andrew Morton 
Reviewed-by: Baoquan He 
Acked-by: Ingo Molnar 			[x86]
Acked-by: Thomas Bogendoerfer 	[MIPS]
Acked-by: Miguel Ojeda 	[.clang-format]
Cc: Andy Lutomirski 
Cc: Benjamin Herrenschmidt 
Cc: Borislav Petkov 
Cc: Catalin Marinas 
Cc: Christoph Hellwig 
Cc: Daniel Axtens 
Cc: Dave Hansen 
Cc: Emil Renner Berthing 
Cc: Hari Bathini 
Cc: Ingo Molnar 
Cc: Jonathan Cameron 
Cc: Marek Szyprowski 
Cc: Max Filippov 
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Palmer Dabbelt 
Cc: Paul Mackerras 
Cc: Paul Walmsley 
Cc: Peter Zijlstra 
Cc: Russell King 
Cc: Stafford Horne 
Cc: Thomas Gleixner 
Cc: Will Deacon 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20200818151634.14343-18-rppt@kernel.org
Signed-off-by: Linus Torvalds

memblock: implement for_each_reserved_mem_region() using __next_mem_region()

2020-10-14T01:38:35+00:00

Iteration over memblock.reserved with for_each_reserved_mem_region() used
__next_reserved_mem_region() that implemented a subset of
__next_mem_region().

Use __for_each_mem_range() and, essentially, __next_mem_region() with
appropriate parameters to reduce code duplication.

While on it, rename for_each_reserved_mem_region() to
for_each_reserved_mem_range() for consistency.

Signed-off-by: Mike Rapoport 
Signed-off-by: Andrew Morton 
Acked-by: Miguel Ojeda 	[.clang-format]
Cc: Andy Lutomirski 
Cc: Baoquan He 
Cc: Benjamin Herrenschmidt 
Cc: Borislav Petkov 
Cc: Catalin Marinas 
Cc: Christoph Hellwig 
Cc: Daniel Axtens 
Cc: Dave Hansen 
Cc: Emil Renner Berthing 
Cc: Hari Bathini 
Cc: Ingo Molnar 
Cc: Ingo Molnar 
Cc: Jonathan Cameron 
Cc: Marek Szyprowski 
Cc: Max Filippov 
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Palmer Dabbelt 
Cc: Paul Mackerras 
Cc: Paul Walmsley 
Cc: Peter Zijlstra 
Cc: Russell King 
Cc: Stafford Horne 
Cc: Thomas Bogendoerfer 
Cc: Thomas Gleixner 
Cc: Will Deacon 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20200818151634.14343-17-rppt@kernel.org
Signed-off-by: Linus Torvalds

memblock: remove unused memblock_mem_size()

2020-10-14T01:38:35+00:00

The only user of memblock_mem_size() was x86 setup code, it is gone now
and memblock_mem_size() funciton can be removed.

Signed-off-by: Mike Rapoport 
Signed-off-by: Andrew Morton 
Reviewed-by: Baoquan He 
Cc: Andy Lutomirski 
Cc: Benjamin Herrenschmidt 
Cc: Borislav Petkov 
Cc: Catalin Marinas 
Cc: Christoph Hellwig 
Cc: Daniel Axtens 
Cc: Dave Hansen 
Cc: Emil Renner Berthing 
Cc: Hari Bathini 
Cc: Ingo Molnar 
Cc: Ingo Molnar 
Cc: Jonathan Cameron 
Cc: Marek Szyprowski 
Cc: Max Filippov 
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Miguel Ojeda 
Cc: Palmer Dabbelt 
Cc: Paul Mackerras 
Cc: Paul Walmsley 
Cc: Peter Zijlstra 
Cc: Russell King 
Cc: Stafford Horne 
Cc: Thomas Bogendoerfer 
Cc: Thomas Gleixner 
Cc: Will Deacon 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20200818151634.14343-16-rppt@kernel.org
Signed-off-by: Linus Torvalds

memblock: reduce number of parameters in for_each_mem_range()

2020-10-14T01:38:35+00:00

Currently for_each_mem_range() and for_each_mem_range_rev() iterators are
the most generic way to traverse memblock regions.  As such, they have 8
parameters and they are hardly convenient to users.  Most users choose to
utilize one of their wrappers and the only user that actually needs most
of the parameters is memblock itself.

To avoid yet another naming for memblock iterators, rename the existing
for_each_mem_range[_rev]() to __for_each_mem_range[_rev]() and add a new
for_each_mem_range[_rev]() wrappers with only index, start and end
parameters.

The new wrapper nicely fits into init_unavailable_mem() and will be used
in upcoming changes to simplify memblock traversals.

Signed-off-by: Mike Rapoport 
Signed-off-by: Andrew Morton 
Acked-by: Thomas Bogendoerfer 	[MIPS]
Cc: Andy Lutomirski 
Cc: Baoquan He 
Cc: Benjamin Herrenschmidt 
Cc: Borislav Petkov 
Cc: Catalin Marinas 
Cc: Christoph Hellwig 
Cc: Daniel Axtens 
Cc: Dave Hansen 
Cc: Emil Renner Berthing 
Cc: Hari Bathini 
Cc: Ingo Molnar 
Cc: Ingo Molnar 
Cc: Jonathan Cameron 
Cc: Marek Szyprowski 
Cc: Max Filippov 
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Miguel Ojeda 
Cc: Palmer Dabbelt 
Cc: Paul Mackerras 
Cc: Paul Walmsley 
Cc: Peter Zijlstra 
Cc: Russell King 
Cc: Stafford Horne 
Cc: Thomas Gleixner 
Cc: Will Deacon 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20200818151634.14343-11-rppt@kernel.org
Signed-off-by: Linus Torvalds

memblock: make memblock_debug and related functionality private

2020-10-14T01:38:35+00:00

The only user of memblock_dbg() outside memblock was s390 setup code and
it is converted to use pr_debug() instead.  This allows to stop exposing
memblock_debug and memblock_dbg() to the rest of the kernel.

[akpm@linux-foundation.org: make memblock_dbg() safer and neater]

Signed-off-by: Mike Rapoport 
Signed-off-by: Andrew Morton 
Reviewed-by: Baoquan He 
Cc: Andy Lutomirski 
Cc: Benjamin Herrenschmidt 
Cc: Borislav Petkov 
Cc: Catalin Marinas 
Cc: Christoph Hellwig 
Cc: Daniel Axtens 
Cc: Dave Hansen 
Cc: Emil Renner Berthing 
Cc: Hari Bathini 
Cc: Ingo Molnar 
Cc: Ingo Molnar 
Cc: Jonathan Cameron 
Cc: Marek Szyprowski 
Cc: Max Filippov 
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Miguel Ojeda 
Cc: Palmer Dabbelt 
Cc: Paul Mackerras 
Cc: Paul Walmsley 
Cc: Peter Zijlstra 
Cc: Russell King 
Cc: Stafford Horne 
Cc: Thomas Bogendoerfer 
Cc: Thomas Gleixner 
Cc: Will Deacon 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20200818151634.14343-10-rppt@kernel.org
Signed-off-by: Linus Torvalds

memblock: make for_each_memblock_type() iterator private

2020-10-14T01:38:35+00:00

for_each_memblock_type() is not used outside mm/memblock.c, move it there
from include/linux/memblock.h

Signed-off-by: Mike Rapoport 
Signed-off-by: Andrew Morton 
Reviewed-by: Baoquan He 
Cc: Andy Lutomirski 
Cc: Benjamin Herrenschmidt 
Cc: Borislav Petkov 
Cc: Catalin Marinas 
Cc: Christoph Hellwig 
Cc: Daniel Axtens 
Cc: Dave Hansen 
Cc: Emil Renner Berthing 
Cc: Hari Bathini 
Cc: Ingo Molnar 
Cc: Ingo Molnar 
Cc: Jonathan Cameron 
Cc: Marek Szyprowski 
Cc: Max Filippov 
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Miguel Ojeda 
Cc: Palmer Dabbelt 
Cc: Paul Mackerras 
Cc: Paul Walmsley 
Cc: Peter Zijlstra 
Cc: Russell King 
Cc: Stafford Horne 
Cc: Thomas Bogendoerfer 
Cc: Thomas Gleixner 
Cc: Will Deacon 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20200818151634.14343-9-rppt@kernel.org
Signed-off-by: Linus Torvalds

mm/memblock: expose only miminal interface to add/walk physmem

2020-07-10T13:08:09+00:00

"physmem" in the memblock allocator is somewhat weird: it's not actually
used for allocation, it's simply information collected during boot, which
describes the unmodified physical memory map at boot time, without any
standby/hotplugged memory. It's only used on s390 and is currently the
only reason s390 keeps using CONFIG_ARCH_KEEP_MEMBLOCK.

Physmem isn't numa aware and current users don't specify any flags. Let's
hide it from the user, exposing only for_each_physmem(), and simplify. The
interface for physmem is now really minimalistic:
- memblock_physmem_add() to add ranges
- for_each_physmem() / __next_physmem_range() to walk physmem ranges

Don't place it into an __init section and don't discard it without
CONFIG_ARCH_KEEP_MEMBLOCK. As we're reusing __next_mem_range(), remove
the __meminit notifier to avoid section mismatch warnings once
CONFIG_ARCH_KEEP_MEMBLOCK is no longer used with
CONFIG_HAVE_MEMBLOCK_PHYS_MAP.

While fixing up the documentation, sneak in some related cleanups. We can
stop setting CONFIG_ARCH_KEEP_MEMBLOCK for s390 next.

Cc: Vasily Gorbik 
Cc: Christian Borntraeger 
Cc: Mike Rapoport 
Cc: Andrew Morton 
Signed-off-by: David Hildenbrand 
Reviewed-by: Mike Rapoport 
Message-Id: <20200701141830.18749-2-david@redhat.com>
Signed-off-by: Heiko Carstens

include/linux/memblock.h: fix minor typo and unclear comment

2020-06-04T03:09:49+00:00

Fix a minor typo "usabe->usable" for the current discription of member
variable "memory" in struct memblock.

BTW, I think it's unclear the member variable "base" in struct
memblock_type is currently described as the physical address of memory
region, change it to base address of the region is clearer since the
variable is decorated as phys_addr_t.

Signed-off-by: chenqiwu 
Signed-off-by: Andrew Morton 
Reviewed-by: Mike Rapoport 
Link: http://lkml.kernel.org/r/1588846952-32166-1-git-send-email-qiwuchen55@gmail.com
Signed-off-by: Linus Torvalds

mm: make deferred init's max threads arch-specific

2020-06-04T03:09:45+00:00

Using padata during deferred init has only been tested on x86, so for now
limit it to this architecture.

If another arch wants this, it can find the max thread limit that's best
for it and override deferred_page_init_max_threads().

Signed-off-by: Daniel Jordan 
Signed-off-by: Andrew Morton 
Tested-by: Josh Triplett 
Cc: Alexander Duyck 
Cc: Alex Williamson 
Cc: Dan Williams 
Cc: Dave Hansen 
Cc: David Hildenbrand 
Cc: Herbert Xu 
Cc: Jason Gunthorpe 
Cc: Jonathan Corbet 
Cc: Kirill Tkhai 
Cc: Michal Hocko 
Cc: Pavel Machek 
Cc: Pavel Tatashin 
Cc: Peter Zijlstra 
Cc: Randy Dunlap 
Cc: Robert Elliott 
Cc: Shile Zhang 
Cc: Steffen Klassert 
Cc: Steven Sistare 
Cc: Tejun Heo 
Cc: Zi Yan 
Link: http://lkml.kernel.org/r/20200527173608.2885243-8-daniel.m.jordan@oracle.com
Signed-off-by: Linus Torvalds

mm: remove CONFIG_HAVE_MEMBLOCK_NODE_MAP option

2020-06-04T03:09:43+00:00

CONFIG_HAVE_MEMBLOCK_NODE_MAP is used to differentiate initialization of
nodes and zones structures between the systems that have region to node
mapping in memblock and those that don't.

Currently all the NUMA architectures enable this option and for the
non-NUMA systems we can presume that all the memory belongs to node 0 and
therefore the compile time configuration option is not required.

The remaining few architectures that use DISCONTIGMEM without NUMA are
easily updated to use memblock_add_node() instead of memblock_add() and
thus have proper correspondence of memblock regions to NUMA nodes.

Still, free_area_init_node() must have a backward compatible version
because its semantics with and without CONFIG_HAVE_MEMBLOCK_NODE_MAP is
different.  Once all the architectures will use the new semantics, the
entire compatibility layer can be dropped.

To avoid addition of extra run time memory to store node id for
architectures that keep memblock but have only a single node, the node id
field of the memblock_region is guarded by CONFIG_NEED_MULTIPLE_NODES and
the corresponding accessors presume that in those cases it is always 0.

Signed-off-by: Mike Rapoport 
Signed-off-by: Andrew Morton 
Tested-by: Hoan Tran 	[arm64]
Acked-by: Catalin Marinas 	[arm64]
Cc: Baoquan He 
Cc: Brian Cain 
Cc: "David S. Miller" 
Cc: Geert Uytterhoeven 
Cc: Greentime Hu 
Cc: Greg Ungerer 
Cc: Guan Xuetao 
Cc: Guo Ren 
Cc: Heiko Carstens 
Cc: Helge Deller 
Cc: "James E.J. Bottomley" 
Cc: Jonathan Corbet 
Cc: Ley Foon Tan 
Cc: Mark Salter 
Cc: Matt Turner 
Cc: Max Filippov 
Cc: Michael Ellerman 
Cc: Michal Hocko 
Cc: Michal Simek 
Cc: Nick Hu 
Cc: Paul Walmsley 
Cc: Richard Weinberger 
Cc: Rich Felker 
Cc: Russell King 
Cc: Stafford Horne 
Cc: Thomas Bogendoerfer 
Cc: Tony Luck 
Cc: Vineet Gupta 
Cc: Yoshinori Sato 
Link: http://lkml.kernel.org/r/20200412194859.12663-4-rppt@kernel.org
Signed-off-by: Linus Torvalds