memblock: seasonal cleaning^w cleanup
Subsystems (27)
Mike Rapoport
maintainerv2 cover memblock: seasonal cleaning^w cleanup
From: Mike Rapoport <[email protected]>
Hi,
These patches simplify several uses of memblock iterators and hide some of the memblock implementation details from the rest of the system.
The patches are on top of v5.8-rc7 + cherry-pick of "mm/sparse: cleanup the code surrounding memory_present()" [1] from mmotm tree.
v2 changes:
* replace for_each_memblock() with two versions, one for memblock.memory and another one for memblock.reserved
* fix overzealous cleanup of powerpc fadamp: keep the traversal over the memblocks, but use better suited iterators
* don't remove traversal over memblock.reserved in x86 numa cleanup but replace for_each_memblock() with new for_each_reserved_mem_region()
* simplify ramdisk and crash kernel allocations on x86
* drop more redundant and unused code: __next_reserved_mem_region() and memblock_mem_size()
* add description of numa initialization fix on arm64 (thanks Jonathan)
* add Acked and Reviewed tags
[1] http://lkml.kernel.org/r/[email protected]
Mike Rapoport (17):
KVM: PPC: Book3S HV: simplify kvm_cma_reserve()
dma-contiguous: simplify cma_early_percent_memory()
arm, xtensa: simplify initialization of high memory pages
arm64: numa: simplify dummy_numa_init()
h8300, nds32, openrisc: simplify detection of memory extents
riscv: drop unneeded node initialization
mircoblaze: drop unneeded NUMA and sparsemem initializations
memblock: make for_each_memblock_type() iterator private
memblock: make memblock_debug and related functionality private
memblock: reduce number of parameters in for_each_mem_range() arch, mm: replace for_each_memblock() with for_each_mem_pfn_range() arch, drivers: replace for_each_membock() with for_each_mem_range() x86/setup: simplify initrd relocation and reservation x86/setup: simplify reserve_crashkernel()
memblock: remove unused memblock_mem_size()
memblock: implement for_each_reserved_mem_region() using __next_mem_region()
memblock: use separate iterators for memory and reserved regions
.clang-format | 4 +- arch/arm/kernel/setup.c | 18 +++-- arch/arm/mm/init.c | 59 ++++------------ arch/arm/mm/mmu.c | 39 ++++------- arch/arm/mm/pmsa-v7.c | 20 +++--- arch/arm/mm/pmsa-v8.c | 17 +++-- arch/arm/xen/mm.c | 7 +- arch/arm64/kernel/machine_kexec_file.c | 6 +- arch/arm64/kernel/setup.c | 4 +- arch/arm64/mm/init.c | 11 ++- arch/arm64/mm/kasan_init.c | 10 +-- arch/arm64/mm/mmu.c | 11 +-- arch/arm64/mm/numa.c | 15 ++--- arch/c6x/kernel/setup.c | 9 +-- arch/h8300/kernel/setup.c | 8 +-- arch/microblaze/mm/init.c | 24 ++----- arch/mips/cavium-octeon/dma-octeon.c | 12 ++-- arch/mips/kernel/setup.c | 31 +++++---- arch/mips/netlogic/xlp/setup.c | 2 +- arch/nds32/kernel/setup.c | 8 +-- arch/openrisc/kernel/setup.c | 9 +-- arch/openrisc/mm/init.c | 8 ++- arch/powerpc/kernel/fadump.c | 57 ++++++++-------- arch/powerpc/kvm/book3s_hv_builtin.c | 11 +-- arch/powerpc/mm/book3s64/hash_utils.c | 16 ++--- arch/powerpc/mm/book3s64/radix_pgtable.c | 11 ++- arch/powerpc/mm/kasan/kasan_init_32.c | 8 +-- arch/powerpc/mm/mem.c | 33 +++++---- arch/powerpc/mm/numa.c | 7 +- arch/powerpc/mm/pgtable_32.c | 8 +-- arch/riscv/mm/init.c | 34 +++------- arch/riscv/mm/kasan_init.c | 10 +-- arch/s390/kernel/crash_dump.c | 8 +-- arch/s390/kernel/setup.c | 31 +++++---- arch/s390/mm/page-states.c | 6 +- arch/s390/mm/vmem.c | 16 +++-- arch/sh/mm/init.c | 9 +-- arch/sparc/mm/init_64.c | 12 ++-- arch/x86/kernel/setup.c | 56 +++++----------- arch/x86/mm/numa.c | 2 +- arch/xtensa/mm/init.c | 55 +++------------ drivers/bus/mvebu-mbus.c | 12 ++-- drivers/irqchip/irq-gic-v3-its.c | 2 +- drivers/s390/char/zcore.c | 9 +-- include/linux/memblock.h | 65 +++++++++--------- kernel/dma/contiguous.c | 11 +-- mm/memblock.c | 85 ++++++++---------------- mm/page_alloc.c | 11 ++- mm/sparse.c | 10 ++- 49 files changed, 366 insertions(+), 561 deletions(-)
Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v2 1/17 KVM: PPC: Book3S HV: simplify kvm_cma_reserve()
From: Mike Rapoport <[email protected]>
The memory size calculation in kvm_cma_reserve() traverses memblock.memory rather than simply call memblock_phys_mem_size(). The comment in that function suggests that at some point there should have been call to memblock_analyze() before memblock_phys_mem_size() could be used. As of now, there is no memblock_analyze() at all and memblock_phys_mem_size() can be used as soon as cold-plug memory is registerd with memblock.
Replace loop over memblock.memory with a call to memblock_phys_mem_size().
--- arch/powerpc/kvm/book3s_hv_builtin.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
arch/powerpc/kvm/book3s_hv_builtin.c +2 -9
@@ -95,22 +95,15 @@ EXPORT_SYMBOL_GPL(kvm_free_hpt_cma);void __init kvm_cma_reserve (void ) {unsigned long align_size; -struct memblock_region *reg; -phys_addr_t selected_size =0 ; +phys_addr_t selected_size;/* * We need CMA reservation only when we are in HV mode */ if (!cpu_has_feature (CPU_FTR_HVMODE ))return ; -/* -* We cannot use memblock_phys_mem_size() here, because -* memblock_analyze() has not been called yet. -*/ -for_each_memblock (memory, reg) - selected_size +=memblock_region_memory_end_pfn (reg) - -memblock_region_memory_base_pfn (reg); + selected_size =PHYS_PFN (memblock_phys_mem_size ()); selected_size = (selected_size * kvm_cma_resv_ratio /100 ) <<PAGE_SHIFT ;if (selected_size) { pr_debug("%s: reserving %ld MiB for global area\n", __func__,
Signature · 1 line
2.26.2
Re: [PATCH v2 01/17] KVM: PPC: Book3S HV: simplify kvm_cma_reserve()
Hi Mike,
Quoted 33 lines
The memory size calculation in
kvm_cma_reserve()traverses memblock.memory rather than simply callmemblock_phys_mem_size(). The comment in that function suggests that at some point there should have been call tomemblock_analyze()beforememblock_phys_mem_size()could be used. As of now, there is nomemblock_analyze()at all andmemblock_phys_mem_size()can be used as soon as cold-plug memory is registerd with memblock.Replace loop over memblock.memory with a call to
memblock_phys_mem_size().Signed-off-by Mike Rapoport <[email protected]>--- arch/powerpc/kvm/book3s_hv_builtin.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)arch/powerpc/kvm/book3s_hv_builtin.c +1
-2@@ -95,22 +95,15 @@ EXPORT_SYMBOL_GPL(kvm_free_hpt_cma);void __init kvm_cma_reserve (void ) {unsigned long align_size; -struct memblock_region *reg; -phys_addr_t selected_size =0 ; +phys_addr_t selected_size;/* * We need CMA reservation only when we are in HV mode */ if (!cpu_has_feature (CPU_FTR_HVMODE ))return ;
arch/powerpc/kvm/book3s_hv_builtin.c EXPORT_SYMBOL_GPL(kvm_free_hpt_cma); · line 107
Quoted 10 lines
arch/powerpc/kvm/book3s_hv_builtin.c +1
-7-/* -* We cannot use memblock_phys_mem_size() here, because -* memblock_analyze() has not been called yet. -*/ -for_each_memblock (memory, reg) - selected_size +=memblock_region_memory_end_pfn (reg) - -memblock_region_memory_base_pfn (reg); + selected_size =PHYS_PFN (memblock_phys_mem_size ()); selected_size = (selected_size * kvm_cma_resv_ratio /100 ) <<PAGE_SHIFT ;
I think this is correct, but PHYS_PFN does x >> PAGE_SHIFT and then the next line does x << PAGE_SHIFT, so I think we could combine those two lines as:
selected_size = PAGE_ALIGN(memblock_phys_mem_size() * kvm_cma_resv_ratio / 100);
(I think that might technically change it from aligning down to aligning up but I don't think 1 page matters here.)
Kind regards,
Daniel
Quoted 4 lines
arch/powerpc/kvm/book3s_hv_builtin.c +0
-0if (selected_size) { pr_debug("%s: reserving %ld MiB for global area\n", __func__,Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v2 2/17 dma-contiguous: simplify cma_early_percent_memory()
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
The memory size calculation in cma_early_percent_memory() traverses memblock.memory rather than simply call memblock_phys_mem_size(). The comment in that function suggests that at some point there should have been call to memblock_analyze() before memblock_phys_mem_size() could be used. As of now, there is no memblock_analyze() at all and memblock_phys_mem_size() can be used as soon as cold-plug memory is registerd with memblock.
Replace loop over memblock.memory with a call to memblock_phys_mem_size().
--- kernel/dma/contiguous.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
kernel/dma/contiguous.c +1 -10
@@ -73,16 +73,7 @@ early_param("cma", early_cma);static phys_addr_t __init __maybe_unused cma_early_percent_memory (void ) { -struct memblock_region *reg; -unsigned long total_pages =0 ; - -/* -* We cannot use memblock_phys_mem_size() here, because -* memblock_analyze() has not been called yet. -*/ -for_each_memblock (memory, reg) - total_pages +=memblock_region_memory_end_pfn (reg) - -memblock_region_memory_base_pfn (reg); +unsigned long total_pages =PHYS_PFN (memblock_phys_mem_size ());return (total_pages *CONFIG_CMA_SIZE_PERCENTAGE /100 ) <<PAGE_SHIFT ; }
Signature · 1 line
2.26.2
Re: [PATCH v2 02/17] dma-contiguous: simplify cma_early_percent_memory()
Quoted 27 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
The memory size calculation in
cma_early_percent_memory()traverses memblock.memory rather than simply callmemblock_phys_mem_size(). The comment in that function suggests that at some point there should have been call tomemblock_analyze()beforememblock_phys_mem_size()could be used. As of now, there is nomemblock_analyze()at all andmemblock_phys_mem_size()can be used as soon as cold-plug memory is registerd with memblock.Replace loop over memblock.memory with a call to
memblock_phys_mem_size().Signed-off-by Mike Rapoport <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>--- kernel/dma/contiguous.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)kernel/dma/contiguous.c +0
-1@@ -73,16 +73,7 @@ early_param("cma", early_cma);static phys_addr_t __init __maybe_unused cma_early_percent_memory (void ) { -struct memblock_region *reg;
kernel/dma/contiguous.c early_param("cma", early_cma); · line 76
Quoted 10 lines
kernel/dma/contiguous.c +1
-9-unsigned long total_pages =0 ; - -/* -* We cannot use memblock_phys_mem_size() here, because -* memblock_analyze() has not been called yet. -*/ -for_each_memblock (memory, reg) - total_pages +=memblock_region_memory_end_pfn (reg) - -memblock_region_memory_base_pfn (reg); +unsigned long total_pages =PHYS_PFN (memblock_phys_mem_size ());
Quoted 6 lines
kernel/dma/contiguous.c +0
-0return (total_pages *CONFIG_CMA_SIZE_PERCENTAGE /100 ) <<PAGE_SHIFT ; }Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v2 3/17 arm, xtensa: simplify initialization of high memory pages
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
The function free_highpages() in both arm and xtensa essentially open-code for_each_free_mem_range() loop to detect high memory pages that were not reserved and that should be initialized and passed to the buddy allocator.
Replace open-coded implementation of for_each_free_mem_range() with usage of memblock API to simplify the code.
--- arch/arm/mm/init.c | 48 +++++++------------------------------ arch/xtensa/mm/init.c | 55 ++++++++----------------------------------- 2 files changed, 18 insertions(+), 85 deletions(-)
arch/arm/mm/init.c +8 -40
@@ -352,61 +352,29 @@ static void __init free_unused_memmap(void)#endif } -#ifdef CONFIG_HIGHMEM -static inline void free_area_high (unsigned long pfn,unsigned long end) -{ -for (; pfn < end; pfn++) -free_highmem_page (pfn_to_page (pfn)); -} -#endif -static void __init free_highpages (void ) {#ifdef CONFIG_HIGHMEM unsigned long max_low = max_low_pfn; -struct memblock_region *mem, *res; +phys_addr_t range_start, range_end; +u64 i;/* set highmem page free */ -for_each_memblock (memory, mem) { -unsigned long start =memblock_region_memory_base_pfn (mem); -unsigned long end =memblock_region_memory_end_pfn (mem); +for_each_free_mem_range (i,NUMA_NO_NODE ,MEMBLOCK_NONE , + &range_start, &range_end,NULL ) { +unsigned long start =PHYS_PFN (range_start); +unsigned long end =PHYS_PFN (range_end);/* Ignore complete lowmem entries */ if (end <= max_low)continue ; -if (memblock_is_nomap (mem)) -continue ; -/* Truncate partial highmem entries */ if (start < max_low) start = max_low; -/* Find and exclude any reserved regions */ -for_each_memblock (reserved, res) { -unsigned long res_start, res_end; - - res_start =memblock_region_reserved_base_pfn (res); - res_end =memblock_region_reserved_end_pfn (res); - -if (res_end < start) -continue ; -if (res_start < start) - res_start = start; -if (res_start > end) - res_start = end; -if (res_end > end) - res_end = end; -if (res_start != start) -free_area_high (start, res_start); - start = res_end; -if (start = end) -break ; - } - -/* And now free anything which remains */ -if (start < end) -free_area_high (start, end); +for (; start < end; start++) +free_highmem_page (pfn_to_page (start)); }#endif }
arch/xtensa/mm/init.c +10 -45
77 lines not on this page · raw message
Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v2 4/17 arm64: numa: simplify dummy_numa_init()
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
dummy_numa_init() loops over memblock.memory and passes nid=0 to numa_add_memblk() which essentially wraps memblock_set_node(). However, memblock_set_node() can cope with entire memory span itself, so the loop over memblock.memory regions is redundant.
Using a single call to memblock_set_node() rather than a loop also fixes an issue with a buggy ACPI firmware in which the SRAT table covers some but not all of the memory in the EFI memory map.
Jonathan Cameron says:
This issue can be easily triggered by having an SRAT table which fails to cover all elements of the EFI memory map.
This firmware error is detected and a warning printed. e.g. "NUMA: Warning: invalid memblk node 64 [mem 0x240000000-0x27fffffff]" At that point we fall back to dummy_numa_init().
However, the failed ACPI init has left us with our memblocks all broken up as we split them when trying to assign them to NUMA nodes.
We then iterate over the memblocks and add them to node 0.
numa_add_memblk() calls memblock_set_node() which merges regions that were previously split up during the earlier attempt to add them to different nodes during parsing of SRAT.
This means elements are moved in the memblock array and we can end up in a different memblock after the call to numa_add_memblk(). Result is:
Unable to handle kernel paging request at virtual address 0000000000003a40
Mem abort info:
ESR = 0x96000004
EC = 0x25: DABT (current EL), IL = 32 bits
SET = 0, FnV = 0
EA = 0, S1PTW = 0
Data abort info:
ISV = 0, ISS = 0x00000004
CM = 0, WnR = 0
[0000000000003a40] user address but active_mm is swapper
Internal error: Oops: 96000004 [#1] PREEMPT SMP...
Call trace:
sparse_init_nid+0x5c/0x2b0
sparse_init+0x138/0x170
bootmem_init+0x80/0xe0
setup_arch+0x2a0/0x5fc
start_kernel+0x8c/0x648Replace the loop with a single call to memblock_set_node() to the entire memory.
--- arch/arm64/mm/numa.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
arch/arm64/mm/numa.c +5 -8
@@ -423,19 +423,16 @@ static int __init numa_init(int (*init_func)(void))*/ static int __init dummy_numa_init (void ) { +phys_addr_t start =memblock_start_of_DRAM (); +phys_addr_t end =memblock_end_of_DRAM ();int ret; -struct memblock_region *mblk;if (numa_off)pr_info ("NUMA disabled\n" );/* Forced off on command line. */ -pr_info ("Faking a node at [mem %#018Lx-%#018Lx]\n" , -memblock_start_of_DRAM (),memblock_end_of_DRAM () -1 ); - -for_each_memblock (memory, mblk) { - ret =numa_add_memblk (0 , mblk->base, mblk->base + mblk->size); -if (!ret) -continue ; +pr_info ("Faking a node at [mem %#018Lx-%#018Lx]\n" , start, end -1 ); + ret =numa_add_memblk (0 , start, end); +if (ret) {pr_err ("NUMA init failed\n" );return ret; }
Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v2 5/17 h8300, nds32, openrisc: simplify detection of memory extents
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
Instead of traversing memblock.memory regions to find memory_start and memory_end, simply query memblock_{start,end}_of_DRAM().
--- arch/h8300/kernel/setup.c | 8 +++----- arch/nds32/kernel/setup.c | 8 ++------ arch/openrisc/kernel/setup.c | 9 ++------- 3 files changed, 7 insertions(+), 18 deletions(-)
arch/h8300/kernel/setup.c +3 -5
@@ -74,17 +74,15 @@ static void __init bootmem_init(void) memory_end = memory_start =0 ;/* Find main memory where is the kernel */ -for_each_memblock (memory, region) { - memory_start = region->base; - memory_end = region->base + region->size; - } + memory_start =memblock_start_of_DRAM (); + memory_end =memblock_end_of_DRAM ();if (!memory_end)panic ("No memory!" );/* setup bootmem globals (we use no_bootmem, but mm still depends on this) */ min_low_pfn =PFN_UP (memory_start); - max_low_pfn =PFN_DOWN (memblock_end_of_DRAM ()); + max_low_pfn =PFN_DOWN (memory_end); max_pfn = max_low_pfn;memblock_reserve (__pa (_stext), _end - _stext);
arch/nds32/kernel/setup.c +2 -6
@@ -249,12 +249,8 @@ static void __init setup_memory(void) memory_end = memory_start =0 ;/* Find main memory where is the kernel */ -for_each_memblock (memory, region) { - memory_start = region->base; - memory_end = region->base + region->size; -pr_info ("%s: Memory: 0x%x-0x%x\n" , __func__, - memory_start, memory_end); - } + memory_start =memblock_start_of_DRAM (); + memory_end =memblock_end_of_DRAM ();if (!memory_end) {panic ("No memory!" );
arch/openrisc/kernel/setup.c +2 -7
@@ -48,17 +48,12 @@ static void __init setup_memory(void)unsigned long ram_start_pfn;unsigned long ram_end_pfn;phys_addr_t memory_start, memory_end; -struct memblock_region *region; memory_end = memory_start =0 ;/* Find main memory where is the kernel, we assume its the only one */ -for_each_memblock (memory, region) { - memory_start = region->base; - memory_end = region->base + region->size; -printk (KERN_INFO "%s: Memory: 0x%x-0x%x\n" , __func__, - memory_start, memory_end); - } + memory_start =memblock_start_of_DRAM (); + memory_end =memblock_end_of_DRAM ();if (!memory_end) {panic ("No memory!" );
Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v2 6/17 riscv: drop unneeded node initialization
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
RISC-V does not (yet) support NUMA and for UMA architectures node 0 is used implicitly during early memory initialization.
There is no need to call memblock_set_node(), remove this call and the surrounding code.
--- arch/riscv/mm/init.c | 9 --------- 1 file changed, 9 deletions(-)
arch/riscv/mm/init.c +0 -9
@@ -191,15 +191,6 @@ void __init setup_bootmem(void)early_init_fdt_scan_reserved_mem ();memblock_allow_resize ();memblock_dump_all (); - -for_each_memblock (memory, reg) { -unsigned long start_pfn =memblock_region_memory_base_pfn (reg); -unsigned long end_pfn =memblock_region_memory_end_pfn (reg); - -memblock_set_node (PFN_PHYS (start_pfn), -PFN_PHYS (end_pfn - start_pfn), - &memblock.memory,0 ); - } }#ifdef CONFIG_MMU
Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v2 7/17 mircoblaze: drop unneeded NUMA and sparsemem initializations
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
microblaze does not support neither NUMA not SPARSMEM, so there is no point to call memblock_set_node() and sparse_memory_present_with_active_regions() functions during microblaze memory initialization.
Remove these calls and the surrounding code.
--- arch/microblaze/mm/init.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)
arch/microblaze/mm/init.c +1 -16
@@ -105,9 +105,8 @@ static void __init paging_init(void)void __init setup_memory (void ) { -struct memblock_region *reg; -#ifndef CONFIG_MMU +struct memblock_region *reg;u32 kernel_align_start, kernel_align_size;/* Find main memory where is the kernel */
@@ -161,20 +160,6 @@ void __init setup_memory(void)pr_info ("%s: max_low_pfn: %#lx\n" , __func__, max_low_pfn);pr_info ("%s: max_pfn: %#lx\n" , __func__, max_pfn); -/* Add active regions with valid PFNs */ -for_each_memblock (memory, reg) { -unsigned long start_pfn, end_pfn; - - start_pfn =memblock_region_memory_base_pfn (reg); - end_pfn =memblock_region_memory_end_pfn (reg); -memblock_set_node (start_pfn <<PAGE_SHIFT , - (end_pfn - start_pfn) <<PAGE_SHIFT , - &memblock.memory,0 ); - } - -/* XXX need to clip this if using highmem? */ -sparse_memory_present_with_active_regions (0 ); -paging_init (); }
Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v2 8/17 memblock: make for_each_memblock_type() iterator private
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
for_each_memblock_type() is not used outside mm/memblock.c, move it there from include/linux/memblock.h
--- include/linux/memblock.h | 5 ----- mm/memblock.c | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-)
include/linux/memblock.h +0 -5
@@ -532,11 +532,6 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo region < (memblock.memblock_type.regions + memblock.memblock_type.cnt); \ region++) -#define for_each_memblock_type (i, memblock_type, rgn) \ - for (i = 0, rgn = &memblock_type->regions[0]; \ - i < memblock_type->cnt; \ - i++, rgn = &memblock_type->regions[i]) - extern void *alloc_large_system_hash(const char *tablename, unsigned long bucketsize, unsigned long numentries,
mm/memblock.c +5 -0
@@ -129,6 +129,11 @@ struct memblock memblock __initdata_memblock = { .current_limit = MEMBLOCK_ALLOC_ANYWHERE, }; +#define for_each_memblock_type (i, memblock_type, rgn) \ + for (i = 0, rgn = &memblock_type->regions[0]; \ + i < memblock_type->cnt; \ + i++, rgn = &memblock_type->regions[i]) + int memblock_debug __initdata_memblock; static bool system_has_some_mirror __initdata_memblock = false; static int memblock_can_resize __initdata_memblock;
Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v2 9/17 memblock: make memblock_debug and related functionality private
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
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.
--- arch/s390/kernel/setup.c | 4 ++-- include/linux/memblock.h | 12 +----------- mm/memblock.c | 13 +++++++++++-- 3 files changed, 14 insertions(+), 15 deletions(-)
arch/s390/kernel/setup.c +2 -2
@@ -776,8 +776,8 @@ static void __init memblock_add_mem_detect_info(void)unsigned long start, end;int i; -memblock_dbg ("physmem info source: %s (%hhd)\n" , -get_mem_info_source (), mem_detect.info_source); +pr_debug ("physmem info source: %s (%hhd)\n" , +get_mem_info_source (), mem_detect.info_source);/* keep memblock lists close to the kernel */ memblock_set_bottom_up (true);for_each_mem_detect_block (i, &start, &end) {
include/linux/memblock.h +1 -11
@@ -90,7 +90,6 @@ struct memblock { };extern struct memblock memblock; -extern int memblock_debug;#ifndef CONFIG_ARCH_KEEP_MEMBLOCK #define __init_memblock __meminit
@@ -102,9 +101,6 @@ void memblock_discard(void);static inline void memblock_discard (void ) {}#endif -#define memblock_dbg (fmt, ...) \ - if (memblock_debug) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) -phys_addr_t memblock_find_in_range (phys_addr_t start,phys_addr_t end,phys_addr_t size,phys_addr_t align);void memblock_allow_resize (void );
@@ -456,13 +452,7 @@ bool memblock_is_region_memory(phys_addr_t base, phys_addr_t size);bool memblock_is_reserved (phys_addr_t addr);bool memblock_is_region_reserved (phys_addr_t base,phys_addr_t size); -extern void __memblock_dump_all (void ); - -static inline void memblock_dump_all (void ) -{ -if (memblock_debug) -__memblock_dump_all (); -} +void memblock_dump_all (void );/** * memblock_set_current_limit - Set the current allocation limit to allow
mm/memblock.c +11 -2
@@ -134,7 +134,10 @@ struct memblock memblock __initdata_memblock = { i < memblock_type->cnt; \ i++, rgn = &memblock_type->regions[i]) -int memblock_debug __initdata_memblock; +#define memblock_dbg (fmt, ...) \ + if (memblock_debug) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) + +static int memblock_debug __initdata_memblock; static bool system_has_some_mirror __initdata_memblock = false; static int memblock_can_resize __initdata_memblock; static int memblock_memory_in_slab __initdata_memblock = 0;
@@ -1919,7 +1922,7 @@ static void __init_memblock memblock_dump(struct memblock_type *type) } } -void __init_memblock __memblock_dump_all(void) +static void __init_memblock __memblock_dump_all(void) {pr_info ("MEMBLOCK configuration:\n" ); pr_info(" memory size = %pa reserved size = %pa\n",
@@ -1933,6 +1936,12 @@ void __init_memblock __memblock_dump_all(void)#endif } +void __init_memblock memblock_dump_all(void) +{ +if (memblock_debug) +__memblock_dump_all (); +} +void __init memblock_allow_resize (void ) { memblock_can_resize =1 ;
Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v2 10/17 memblock: reduce number of parameters in for_each_mem_range()
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
Currently for_each_mem_range() iterator is the most generic way to traverse memblock regions. As such, it has 8 parameters and it is hardly convenient to users. Most users choose to utilize one of its wrappers and the only user that actually needs most of the parameters outside memblock is s390 crash dump implementation.
To avoid yet another naming for memblock iterators, rename the existing for_each_mem_range() to __for_each_mem_range() and add a new for_each_mem_range() wrapper 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.
--- .clang-format | 1 + arch/arm64/kernel/machine_kexec_file.c | 6 ++---- arch/s390/kernel/crash_dump.c | 8 ++++---- include/linux/memblock.h | 18 ++++++++++++++---- mm/page_alloc.c | 3 +-- 5 files changed, 22 insertions(+), 14 deletions(-)
.clang-format +1 -0
@@ -205,6 +205,7 @@ ForEachMacros: - 'for_each_memblock_type' - 'for_each_memcg_cache_index' - 'for_each_mem_pfn_range' + - '__for_each_mem_range' - 'for_each_mem_range' - 'for_each_mem_range_rev' - 'for_each_migratetype_order'
arch/arm64/kernel/machine_kexec_file.c +2 -4
@@ -215,8 +215,7 @@ static int prepare_elf_headers(void **addr, unsigned long *sz)phys_addr_t start, end; nr_ranges =1 ;/* for exclusion of crashkernel region */ -for_each_mem_range (i, &memblock.memory,NULL ,NUMA_NO_NODE , -MEMBLOCK_NONE , &start, &end,NULL ) +for_each_mem_range (i, &start, &end) nr_ranges++; cmem =kmalloc (struct_size (cmem, ranges, nr_ranges),GFP_KERNEL );
@@ -225,8 +224,7 @@ static int prepare_elf_headers(void **addr, unsigned long *sz) cmem->max_nr_ranges = nr_ranges; cmem->nr_ranges =0 ; -for_each_mem_range (i, &memblock.memory,NULL ,NUMA_NO_NODE , -MEMBLOCK_NONE , &start, &end,NULL ) { +for_each_mem_range (i, &start, &end) { cmem->ranges[cmem->nr_ranges].start = start; cmem->ranges[cmem->nr_ranges].end = end -1 ; cmem->nr_ranges++;
arch/s390/kernel/crash_dump.c +4 -4
@@ -549,8 +549,8 @@ static int get_mem_chunk_cnt(void)int cnt =0 ;u64 idx; -for_each_mem_range (idx, &memblock.physmem, &oldmem_type,NUMA_NO_NODE , -MEMBLOCK_NONE ,NULL ,NULL ,NULL ) +__for_each_mem_range (idx, &memblock.physmem, &oldmem_type,NUMA_NO_NODE , +MEMBLOCK_NONE ,NULL ,NULL ,NULL ) cnt++;return cnt; }
@@ -563,8 +563,8 @@ static void loads_init(Elf64_Phdr *phdr, u64 loads_offset)phys_addr_t start, end;u64 idx; -for_each_mem_range (idx, &memblock.physmem, &oldmem_type,NUMA_NO_NODE , -MEMBLOCK_NONE , &start, &end,NULL ) { +__for_each_mem_range (idx, &memblock.physmem, &oldmem_type,NUMA_NO_NODE , +MEMBLOCK_NONE , &start, &end,NULL ) { phdr->p_filesz = end - start; phdr->p_type =PT_LOAD ; phdr->p_offset = start;
include/linux/memblock.h +14 -4
@@ -142,7 +142,7 @@ void __next_reserved_mem_region(u64 *idx, phys_addr_t *out_start,void __memblock_free_late (phys_addr_t base,phys_addr_t size);/** -* for_each_mem_range - iterate through memblock areas from type_a and not +* __for_each_mem_range - iterate through memblock areas from type_a and not * included in type_b. Or just type_a if type_b is NULL. * @i: u64 used as loop variable * @type_a: ptr to memblock_type to iterate
@@ -153,7 +153,7 @@ void __memblock_free_late(phys_addr_t base, phys_addr_t size);* @p_end: ptr to phys_addr_t for end address of the range, can be %NULL * @p_nid: ptr to int for nid of the range, can be %NULL */ -#define for_each_mem_range (i, type_a, type_b, nid, flags, \ +#define __for_each_mem_range (i, type_a, type_b, nid, flags, \ p_start, p_end, p_nid) \ for (i = 0, __next_mem_range(&i, nid, flags, type_a, type_b, \ p_start, p_end, p_nid); \
@@ -182,6 +182,16 @@ void __memblock_free_late(phys_addr_t base, phys_addr_t size); __next_mem_range_rev(&i, nid, flags, type_a, type_b, \ p_start, p_end, p_nid)) +/** +* for_each_mem_range - iterate through memory areas. +* @i: u64 used as loop variable +* @p_start: ptr to phys_addr_t for start address of the range, can be %NULL +* @p_end: ptr to phys_addr_t for end address of the range, can be %NULL +*/ +#define for_each_mem_range (i, p_start, p_end) \ + __for_each_mem_range(i, &memblock.memory, NULL, NUMA_NO_NODE, \ + MEMBLOCK_NONE, p_start, p_end, NULL) +/** * for_each_reserved_mem_region - iterate over all reserved memblock areas * @i: u64 used as loop variable
@@ -287,8 +297,8 @@ int __init deferred_page_init_max_threads(const struct cpumask *node_cpumask);* soon as memblock is initialized. */ #define for_each_free_mem_range (i, nid, flags, p_start, p_end, p_nid) \ - for_each_mem_range(i, &memblock.memory, &memblock.reserved, \ - nid, flags, p_start, p_end, p_nid) + __for_each_mem_range(i, &memblock.memory, &memblock.reserved, \ + nid, flags, p_start, p_end, p_nid)/** * for_each_free_mem_range_reverse - rev-iterate through free memblock areas
mm/page_alloc.c +1 -2
@@ -6972,8 +6972,7 @@ static void __init init_unavailable_mem(void)* Loop through unavailable ranges not covered by memblock.memory. */ pgcnt =0 ; -for_each_mem_range (i, &memblock.memory,NULL , -NUMA_NO_NODE ,MEMBLOCK_NONE , &start, &end,NULL ) { +for_each_mem_range (i, &start, &end) {if (next < start) pgcnt +=init_unavailable_range (PFN_DOWN (next),PFN_UP (start));
Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v2 11/17 arch, mm: replace for_each_memblock() with for_each_mem_pfn_range()
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
There are several occurrences of the following pattern:
for_each_memblock(memory, reg) {
start_pfn = memblock_region_memory_base_pfn(reg);
end_pfn = memblock_region_memory_end_pfn(reg);
/* do something with start_pfn and end_pfn */
}Rather than iterate over all memblock.memory regions and each time query for their start and end PFNs, use for_each_mem_pfn_range() iterator to get simpler and clearer code.
--- arch/arm/mm/init.c | 11 ++++------- arch/arm64/mm/init.c | 11 ++++------- arch/powerpc/kernel/fadump.c | 11 ++++++----- arch/powerpc/mm/mem.c | 15 ++++++++------- arch/powerpc/mm/numa.c | 7 ++----- arch/s390/mm/page-states.c | 6 ++---- arch/sh/mm/init.c | 9 +++------ mm/memblock.c | 6 ++---- mm/sparse.c | 10 ++++------ 9 files changed, 35 insertions(+), 51 deletions(-)
arch/arm/mm/init.c +4 -7
@@ -304,16 +304,14 @@ free_memmap(unsigned long start_pfn, unsigned long end_pfn)*/ static void __init free_unused_memmap (void ) { -unsigned long start, prev_end =0 ; -struct memblock_region *reg; +unsigned long start, end, prev_end =0 ; +int i;/* * This relies on each bank being in address order. * The banks are sorted previously in bootmem_init(). */ -for_each_memblock (memory, reg) { - start =memblock_region_memory_base_pfn (reg); - +for_each_mem_pfn_range (i,MAX_NUMNODES , &start, &end,NULL ) {#ifdef CONFIG_SPARSEMEM /* * Take care not to free memmap entries that don't exist
@@ -341,8 +339,7 @@ static void __init free_unused_memmap(void)* memmap entries are valid from the bank end aligned to * MAX_ORDER_NR_PAGES. */ - prev_end =ALIGN (memblock_region_memory_end_pfn (reg), -MAX_ORDER_NR_PAGES ); + prev_end =ALIGN (end,MAX_ORDER_NR_PAGES ); }#ifdef CONFIG_SPARSEMEM
arch/arm64/mm/init.c +4 -7
@@ -473,12 +473,10 @@ static inline void free_memmap(unsigned long start_pfn, unsigned long end_pfn)*/ static void __init free_unused_memmap (void ) { -unsigned long start, prev_end =0 ; -struct memblock_region *reg; - -for_each_memblock (memory, reg) { - start =__phys_to_pfn (reg->base); +unsigned long start, end, prev_end =0 ; +int i; +for_each_mem_pfn_range (i,MAX_NUMNODES , &start, &end,NULL ) {#ifdef CONFIG_SPARSEMEM /* * Take care not to free memmap entries that don't exist due
@@ -498,8 +496,7 @@ static void __init free_unused_memmap(void)* memmap entries are valid from the bank end aligned to * MAX_ORDER_NR_PAGES. */ - prev_end =ALIGN (__phys_to_pfn (reg->base + reg->size), -MAX_ORDER_NR_PAGES ); + prev_end =ALIGN (end,MAX_ORDER_NR_PAGES ); }#ifdef CONFIG_SPARSEMEM
arch/powerpc/kernel/fadump.c +6 -5
@@ -1216,14 +1216,15 @@ static void fadump_free_reserved_memory(unsigned long start_pfn,*/ static void fadump_release_reserved_area (u64 start,u64 end) { -u64 tstart, tend, spfn, epfn; -struct memblock_region *reg; +u64 tstart, tend, spfn, epfn, reg_spfn, reg_epfn, i; spfn =PHYS_PFN (start); epfn =PHYS_PFN (end); -for_each_memblock (memory, reg) { - tstart =max_t (u64, spfn,memblock_region_memory_base_pfn (reg)); - tend =min_t (u64, epfn,memblock_region_memory_end_pfn (reg)); + +for_each_mem_pfn_range (i,MAX_NUMNODES , ®_spfn, ®_epfn,NULL ) { + tstart =max_t (u64, spfn, reg_spfn); + tend =min_t (u64, epfn, reg_epfn); +if (tstart < tend) {fadump_free_reserved_memory (tstart, tend);
arch/powerpc/mm/mem.c +8 -7
@@ -192,15 +192,16 @@ void __init initmem_init(void)/* mark pages that don't exist as nosave */ static int __init mark_nonram_nosave (void ) { -struct memblock_region *reg, *prev =NULL ; +unsigned long spfn, epfn, prev =0 ; +int i; -for_each_memblock (memory, reg) { -if (prev && -memblock_region_memory_end_pfn (prev) <memblock_region_memory_base_pfn (reg)) -register_nosave_region (memblock_region_memory_end_pfn (prev), -memblock_region_memory_base_pfn (reg)); - prev = reg; +for_each_mem_pfn_range (i,MAX_NUMNODES , &spfn, &epfn,NULL ) { +if (prev && prev < spfn) +register_nosave_region (prev, spfn); + + prev = epfn; } +return 0 ; }#else /* CONFIG_NEED_MULTIPLE_NODES */
arch/powerpc/mm/numa.c +2 -5
@@ -800,17 +800,14 @@ static void __init setup_nonnuma(void)unsigned long total_ram =memblock_phys_mem_size ();unsigned long start_pfn, end_pfn;unsigned int nid =0 ; -struct memblock_region *reg; +int i;printk (KERN_DEBUG "Top of RAM: 0x%lx, Total RAM: 0x%lx\n" , top_of_ram, total_ram);printk (KERN_DEBUG "Memory hole size: %ldMB\n" , (top_of_ram - total_ram) >>20 ); -for_each_memblock (memory, reg) { - start_pfn =memblock_region_memory_base_pfn (reg); - end_pfn =memblock_region_memory_end_pfn (reg); - +for_each_mem_pfn_range (i,MAX_NUMNODES , &start_pfn, &end_pfn,NULL ) {fake_numa_create_new_node (end_pfn, &nid); memblock_set_node(PFN_PHYS(start_pfn), PFN_PHYS(end_pfn - start_pfn),
arch/s390/mm/page-states.c +2 -4
@@ -183,9 +183,9 @@ static void mark_kernel_pgd(void)void __init cmma_init_nodat (void ) { -struct memblock_region *reg;struct page *page;unsigned long start, end, ix; +int i;if (cmma_flag <2 )return ;
@@ -193,9 +193,7 @@ void __init cmma_init_nodat(void)mark_kernel_pgd ();/* Set all kernel pages not used for page tables to stable/no-dat */ -for_each_memblock (memory, reg) { - start =memblock_region_memory_base_pfn (reg); - end =memblock_region_memory_end_pfn (reg); +for_each_mem_pfn_range (i,MAX_NUMNODES , &start, &end,NULL ) { page =pfn_to_page (start);for (ix = start; ix < end; ix++, page++) {if (__test_and_clear_bit (PG_arch_1, &page->flags))
arch/sh/mm/init.c +3 -6
@@ -224,15 +224,12 @@ void __init allocate_pgdat(unsigned int nid)static void __init do_init_bootmem (void ) { -struct memblock_region *reg; +unsigned long start_pfn, end_pfn; +int i;/* Add active regions with valid PFNs. */ -for_each_memblock (memory, reg) { -unsigned long start_pfn, end_pfn; - start_pfn =memblock_region_memory_base_pfn (reg); - end_pfn =memblock_region_memory_end_pfn (reg); +for_each_mem_pfn_range (i,MAX_NUMNODES , &start_pfn, &end_pfn,NULL )__add_active_range (0 , start_pfn, end_pfn); - }/* All of system RAM sits in node 0 for the non-NUMA case */ allocate_pgdat (0 );
mm/memblock.c +2 -4
@@ -1659,12 +1659,10 @@ phys_addr_t __init_memblock memblock_reserved_size(void)phys_addr_t __init memblock_mem_size (unsigned long limit_pfn) {unsigned long pages =0 ; -struct memblock_region *r;unsigned long start_pfn, end_pfn; +int i; -for_each_memblock (memory, r) { - start_pfn =memblock_region_memory_base_pfn (r); - end_pfn =memblock_region_memory_end_pfn (r); +for_each_mem_pfn_range (i,MAX_NUMNODES , &start_pfn, &end_pfn,NULL ) { start_pfn = min_t(unsigned long, start_pfn, limit_pfn); end_pfn = min_t(unsigned long, end_pfn, limit_pfn); pages += end_pfn - start_pfn;
mm/sparse.c +4 -6
@@ -292,13 +292,11 @@ void __init memory_present(int nid, unsigned long start, unsigned long end)*/ void __init memblocks_present (void ) { -struct memblock_region *reg; +unsigned long start, end; +int i, nid; -for_each_memblock (memory, reg) { -memory_present (memblock_get_region_node (reg), -memblock_region_memory_base_pfn (reg), -memblock_region_memory_end_pfn (reg)); - } +for_each_mem_pfn_range (i,MAX_NUMNODES , &start, &end, &nid) +memory_present (nid, start, end); }/*
Signature · 1 line
2.26.2
Re: [PATCH v2 11/17] arch, mm: replace for_each_memblock() with for_each_mem_pfn_range()
Quoted 16 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
There are several occurrences of the following pattern:
for_each_memblock(memory, reg) { start_pfn = memblock_region_memory_base_pfn(reg); end_pfn = memblock_region_memory_end_pfn(reg); /* do something with start_pfn and end_pfn */ }Rather than iterate over all memblock.memory regions and each time query for their start and end PFNs, use
for_each_mem_pfn_range()iterator to get simpler and clearer code.Signed-off-by Mike Rapoport <[email protected]>
Quoted 12 lines
--- arch/arm/mm/init.c | 11 ++++------- arch/arm64/mm/init.c | 11 ++++------- arch/powerpc/kernel/fadump.c | 11 ++++++----- arch/powerpc/mm/mem.c | 15 ++++++++------- arch/powerpc/mm/numa.c | 7 ++----- arch/s390/mm/page-states.c | 6 ++---- arch/sh/mm/init.c | 9 +++------ mm/memblock.c | 6 ++---- mm/sparse.c | 10 ++++------ 9 files changed, 35 insertions(+), 51 deletions(-)
Mike Rapoport
maintainerPATCH v2 12/17 arch, drivers: replace for_each_membock() with for_each_mem_range()
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
There are several occurrences of the following pattern:
for_each_memblock(memory, reg) {
start = __pfn_to_phys(memblock_region_memory_base_pfn(reg);
end = __pfn_to_phys(memblock_region_memory_end_pfn(reg));
/* do something with start and end */
}Using for_each_mem_range() iterator is more appropriate in such cases and allows simpler and cleaner code.
--- arch/arm/kernel/setup.c | 18 ++++++--- arch/arm/mm/mmu.c | 39 ++++++------------ arch/arm/mm/pmsa-v7.c | 20 +++++----- arch/arm/mm/pmsa-v8.c | 17 ++++---- arch/arm/xen/mm.c | 7 ++-- arch/arm64/mm/kasan_init.c | 10 ++--- arch/arm64/mm/mmu.c | 11 ++---- arch/c6x/kernel/setup.c | 9 +++-- arch/microblaze/mm/init.c | 9 +++-- arch/mips/cavium-octeon/dma-octeon.c | 12 +++--- arch/mips/kernel/setup.c | 31 +++++++-------- arch/openrisc/mm/init.c | 8 ++-- arch/powerpc/kernel/fadump.c | 50 +++++++++++------------- arch/powerpc/mm/book3s64/hash_utils.c | 16 ++++---- arch/powerpc/mm/book3s64/radix_pgtable.c | 11 +++--- arch/powerpc/mm/kasan/kasan_init_32.c | 8 ++-- arch/powerpc/mm/mem.c | 16 +++++--- arch/powerpc/mm/pgtable_32.c | 8 ++-- arch/riscv/mm/init.c | 25 +++++------- arch/riscv/mm/kasan_init.c | 10 ++--- arch/s390/kernel/setup.c | 27 ++++++++----- arch/s390/mm/vmem.c | 16 ++++---- arch/sparc/mm/init_64.c | 12 ++---- drivers/bus/mvebu-mbus.c | 12 +++--- drivers/s390/char/zcore.c | 9 +++-- 25 files changed, 200 insertions(+), 211 deletions(-)
arch/arm/kernel/setup.c +12 -6
@@ -843,19 +843,25 @@ early_param("mem", early_mem);static void __init request_standard_resources (const struct machine_desc *mdesc) { -struct memblock_region *region; +phys_addr_t start, end, res_end;struct resource *res; +u64 i; kernel_code.start =virt_to_phys (_text); kernel_code.end =virt_to_phys (__init_begin -1 ); kernel_data.start =virt_to_phys (_sdata); kernel_data.end =virt_to_phys (_end -1 ); -for_each_memblock (memory, region) { -phys_addr_t start =__pfn_to_phys (memblock_region_memory_base_pfn (region)); -phys_addr_t end =__pfn_to_phys (memblock_region_memory_end_pfn (region)) -1 ; +for_each_mem_range (i, &start, &end) {unsigned long boot_alias_start; +/* +* In memblock, end points to the first byte after the +* range while in resourses, end points to the last byte in +* the range. +*/ + res_end = end -1 ; +/* * Some systems have a special memory alias which is only * used for booting. We need to advertise this region to
@@ -869,7 +875,7 @@ static void __init request_standard_resources(const struct machine_desc *mdesc) __func__, sizeof(*res)); res->name ="System RAM (boot alias)" ; res->start = boot_alias_start; - res->end =phys_to_idmap (end); + res->end =phys_to_idmap (res_end); res->flags =IORESOURCE_MEM |IORESOURCE_BUSY ;request_resource (&iomem_resource, res); }
@@ -880,7 +886,7 @@ static void __init request_standard_resources(const struct machine_desc *mdesc) sizeof(*res)); res->name ="System RAM" ; res->start = start; - res->end = end; + res->end = res_end; res->flags =IORESOURCE_SYSTEM_RAM |IORESOURCE_BUSY ;request_resource (&iomem_resource, res);
arch/arm/mm/mmu.c +13 -26
@@ -1155,9 +1155,8 @@ phys_addr_t arm_lowmem_limit __initdata = 0;void __init adjust_lowmem_bounds (void ) { -phys_addr_t memblock_limit =0 ; -u64 vmalloc_limit; -struct memblock_region *reg; +phys_addr_t block_start, block_end, memblock_limit =0 ; +u64 vmalloc_limit, i;phys_addr_t lowmem_limit =0 ;/*
@@ -1173,26 +1172,18 @@ void __init adjust_lowmem_bounds(void)* The first usable region must be PMD aligned. Mark its start * as MEMBLOCK_NOMAP if it isn't */ -for_each_memblock (memory, reg) { -if (!memblock_is_nomap (reg)) { -if (!IS_ALIGNED (reg->base,PMD_SIZE )) { -phys_addr_t len; +for_each_mem_range (i, &block_start, &block_end) { +if (!IS_ALIGNED (block_start,PMD_SIZE )) { +phys_addr_t len; - len =round_up (reg->base,PMD_SIZE ) - reg->base; -memblock_mark_nomap (reg->base, len); - } -break ; + len =round_up (block_start,PMD_SIZE ) - block_start; +memblock_mark_nomap (block_start, len); } +break ; } -for_each_memblock (memory, reg) { -phys_addr_t block_start = reg->base; -phys_addr_t block_end = reg->base + reg->size; - -if (memblock_is_nomap (reg)) -continue ; - -if (reg->base < vmalloc_limit) { +for_each_mem_range (i, &block_start, &block_end) { +if (block_start < vmalloc_limit) {if (block_end > lowmem_limit)/* * Compare as u64 to ensure vmalloc_limit does
@@ -1441,19 +1432,15 @@ static void __init kmap_init(void)static void __init map_lowmem (void ) { -struct memblock_region *reg;phys_addr_t kernel_x_start =round_down (__pa (KERNEL_START ),SECTION_SIZE );phys_addr_t kernel_x_end =round_up (__pa (__init_end),SECTION_SIZE ); +phys_addr_t start, end; +u64 i;/* Map all the lowmem memory banks. */ -for_each_memblock (memory, reg) { -phys_addr_t start = reg->base; -phys_addr_t end = start + reg->size; +for_each_mem_range (i, &start, &end) {struct map_desc map; -if (memblock_is_nomap (reg)) -continue ; -if (end > arm_lowmem_limit) end = arm_lowmem_limit;if (start >= end)
arch/arm/mm/pmsa-v7.c +9 -11
@@ -231,10 +231,9 @@ static int __init allocate_region(phys_addr_t base, phys_addr_t size,void __init pmsav7_adjust_lowmem_bounds (void ) {phys_addr_t specified_mem_size =0 , total_mem_size =0 ; -struct memblock_region *reg; -bool first = true;phys_addr_t mem_start;phys_addr_t mem_end; +phys_addr_t reg_start, reg_end;unsigned int mem_max_regions;int num, i;
@@ -262,20 +261,19 @@ void __init pmsav7_adjust_lowmem_bounds(void) mem_max_regions -= num;#endif -for_each_memblock (memory, reg) { -if (first) { +for_each_mem_range (i, ®_start, ®_end) { +if (i =0 ) {phys_addr_t phys_offset =PHYS_OFFSET ;/* * Initially only use memory continuous from * PHYS_OFFSET */ -if (reg->base != phys_offset) +if (reg_start != phys_offset)panic ("First memory bank must be contiguous from PHYS_OFFSET" ); - mem_start = reg->base; - mem_end = reg->base + reg->size; - specified_mem_size = reg->size; - first = false; + mem_start = reg_start; + mem_end = reg_end + specified_mem_size = mem_end - mem_start; }else {/* * memblock auto merges contiguous blocks, remove
@@ -283,8 +281,8 @@ void __init pmsav7_adjust_lowmem_bounds(void)* blocks separately while iterating) */ pr_notice ("Ignoring RAM after %pa, memory at %pa ignored\n" , - &mem_end, ®->base); -memblock_remove (reg->base,0 - reg->base); + &mem_end, ®_start); +memblock_remove (reg_start,0 - reg_start);break ; } }
arch/arm/mm/pmsa-v8.c +8 -9
@@ -94,20 +94,19 @@ static __init bool is_region_fixed(int number)void __init pmsav8_adjust_lowmem_bounds (void ) {phys_addr_t mem_end; -struct memblock_region *reg; -bool first = true; +phys_addr_t reg_start, reg_end; +int i; -for_each_memblock (memory, reg) { -if (first) { +for_each_mem_range (i, ®_start, ®_end) { +if (i =0 ) {phys_addr_t phys_offset =PHYS_OFFSET ;/* * Initially only use memory continuous from * PHYS_OFFSET */ -if (reg->base != phys_offset) +if (reg_start != phys_offset)panic ("First memory bank must be contiguous from PHYS_OFFSET" ); - mem_end = reg->base + reg->size; - first = false; + mem_end = reg_end; }else {/* * memblock auto merges contiguous blocks, remove
@@ -115,8 +114,8 @@ void __init pmsav8_adjust_lowmem_bounds(void)* blocks separately while iterating) */ pr_notice ("Ignoring RAM after %pa, memory at %pa ignored\n" , - &mem_end, ®->base); -memblock_remove (reg->base,0 - reg->base); + &mem_end, ®_start); +memblock_remove (reg_start,0 - reg_start);break ; } }
arch/arm/xen/mm.c +4 -3
@@ -24,11 +24,12 @@unsigned long xen_get_swiotlb_free_pages (unsigned int order) { -struct memblock_region *reg; +phys_addr_t base;gfp_t flags = __GFP_NOWARN|__GFP_KSWAPD_RECLAIM; +u64 i; -for_each_memblock (memory, reg) { -if (reg->base < (phys_addr_t )0xffffffff ) { +for_each_mem_range (i, &base,NULL ) { +if (base < (phys_addr_t )0xffffffff ) {if (IS_ENABLED (CONFIG_ZONE_DMA32 )) flags |= __GFP_DMA32;else
arch/arm64/mm/kasan_init.c +5 -5
@@ -212,8 +212,8 @@ void __init kasan_init(void) {u64 kimg_shadow_start, kimg_shadow_end;u64 mod_shadow_start, mod_shadow_end; -struct memblock_region *reg; -int i; +phys_addr_t pa_start, pa_end; +u64 i; kimg_shadow_start = (u64 )kasan_mem_to_shadow (_text) &PAGE_MASK ; kimg_shadow_end =PAGE_ALIGN ((u64 )kasan_mem_to_shadow (_end));
@@ -246,9 +246,9 @@ void __init kasan_init(void)kasan_populate_early_shadow ((void *)mod_shadow_end, (void *)kimg_shadow_start); -for_each_memblock (memory, reg) { -void *start = (void *)__phys_to_virt (reg->base); -void *end = (void *)__phys_to_virt (reg->base + reg->size); +for_each_mem_range (i, &pa_start, &pa_end) { +void *start = (void *)__phys_to_virt (pa_start); +void *end = (void *)__phys_to_virt (pa_end);if (start >= end)break ;
arch/arm64/mm/mmu.c +3 -8
@@ -461,8 +461,9 @@ static void __init map_mem(pgd_t *pgdp) {phys_addr_t kernel_start =__pa_symbol (_text);phys_addr_t kernel_end =__pa_symbol (__init_begin); -struct memblock_region *reg; +phys_addr_t start, end;int flags =0 ; +u64 i;if (rodata_full ||debug_pagealloc_enabled ()) flags =NO_BLOCK_MAPPINGS |NO_CONT_MAPPINGS ;
@@ -481,15 +482,9 @@ static void __init map_mem(pgd_t *pgdp)#endif /* map all the memory banks */ -for_each_memblock (memory, reg) { -phys_addr_t start = reg->base; -phys_addr_t end = start + reg->size; - +for_each_mem_range (i, &start, &end) {if (start >= end)break ; -if (memblock_is_nomap (reg)) -continue ; -__map_memblock (pgdp, start, end,PAGE_KERNEL , flags); }
arch/c6x/kernel/setup.c +5 -4
@@ -287,7 +287,8 @@ notrace void __init machine_init(unsigned long dt_ptr)void __init setup_arch (char **cmdline_p) { -struct memblock_region *reg; +phys_addr_t start, end; +u64 i;printk (KERN_INFO "Initializing kernel\n" );
@@ -351,9 +352,9 @@ void __init setup_arch(char **cmdline_p)disable_caching (ram_start, ram_end -1 );/* Set caching of external RAM used by Linux */ -for_each_memblock (memory, reg) -enable_caching (CACHE_REGION_START (reg->base), -CACHE_REGION_START (reg->base + reg->size -1 )); +for_each_mem_range (i, &start, &end) +enable_caching (CACHE_REGION_START (start), +CACHE_REGION_START (end -1 ));#ifdef CONFIG_BLK_DEV_INITRD /*
arch/microblaze/mm/init.c +5 -4
@@ -106,13 +106,14 @@ static void __init paging_init(void)void __init setup_memory (void ) {#ifndef CONFIG_MMU -struct memblock_region *reg;u32 kernel_align_start, kernel_align_size; +phys_addr_t start, end; +u64 i;/* Find main memory where is the kernel */ -for_each_memblock (memory, reg) { - memory_start = (u32 )reg->base; - lowmem_size = reg->size; +for_each_mem_range (i, &start, &end) { + memory_start = start; + lowmem_size = end - start;if ((memory_start <= (u32 )_text) && ((u32 )_text <= (memory_start + lowmem_size -1 ))) { memory_size = lowmem_size;
arch/mips/cavium-octeon/dma-octeon.c +6 -6
@@ -190,25 +190,25 @@ char *octeon_swiotlb;void __init plat_swiotlb_setup (void ) { -struct memblock_region *mem; +phys_addr_t start, end;phys_addr_t max_addr;phys_addr_t addr_size;size_t swiotlbsize;unsigned long swiotlb_nslabs; +u64 i; max_addr =0 ; addr_size =0 ; -for_each_memblock (memory, mem) { +for_each_mem_range (i, &start, &end) {/* These addresses map low for PCI. */ if (mem->base >0x410000000ull && !OCTEON_IS_OCTEON2 ())continue ; - addr_size += mem->size; - -if (max_addr < mem->base + mem->size) - max_addr = mem->base + mem->size; + addr_size += (end - start); +if (max_addr < end) + max_addr = end; } swiotlbsize =PAGE_SIZE ;
arch/mips/kernel/setup.c +15 -16
@@ -300,8 +300,9 @@ static void __init bootmem_init(void)static void __init bootmem_init (void ) { -struct memblock_region *mem;phys_addr_t ramstart, ramend; +phys_addr_t start, end; +u64 i; ramstart =memblock_start_of_DRAM (); ramend =memblock_end_of_DRAM ();
@@ -338,18 +339,13 @@ static void __init bootmem_init(void) min_low_pfn =ARCH_PFN_OFFSET ; max_pfn =PFN_DOWN (ramend); -for_each_memblock (memory, mem) { -unsigned long start =memblock_region_memory_base_pfn (mem); -unsigned long end =memblock_region_memory_end_pfn (mem); - +for_each_mem_range (i, &start, &end) {/* * Skip highmem here so we get an accurate max_low_pfn if low * memory stops short of high memory. * If the region overlaps HIGHMEM_START, end is clipped so * max_pfn excludes the highmem portion. */ -if (memblock_is_nomap (mem)) -continue ;if (start >=PFN_DOWN (HIGHMEM_START ))continue ;if (end >PFN_DOWN (HIGHMEM_START ))
@@ -458,13 +454,12 @@ early_param("memmap", early_parse_memmap);unsigned long setup_elfcorehdr, setup_elfcorehdr_size;static int __init early_parse_elfcorehdr (char *p) { -struct memblock_region *mem; +phys_addr_t start, end; +u64 i; setup_elfcorehdr =memparse (p, &p); -for_each_memblock (memory, mem) { -unsigned long start = mem->base; -unsigned long end = start + mem->size; +for_each_mem_range (i, &start, &end) {if (setup_elfcorehdr >= start && setup_elfcorehdr < end) {/* * Reserve from the elf core header to the end of
@@ -728,7 +723,8 @@ static void __init arch_mem_init(char **cmdline_p)static void __init resource_init (void ) { -struct memblock_region *region; +phys_addr_t start, end; +u64 i;if (UNCAC_BASE !=IO_BASE )return ;
@@ -740,9 +736,7 @@ static void __init resource_init(void) bss_resource.start =__pa_symbol (&__bss_start); bss_resource.end =__pa_symbol (&__bss_stop) -1 ; -for_each_memblock (memory, region) { -phys_addr_t start =PFN_PHYS (memblock_region_memory_base_pfn (region)); -phys_addr_t end =PFN_PHYS (memblock_region_memory_end_pfn (region)) -1 ; +for_each_mem_range (i, &start, &end) {struct resource *res; res =memblock_alloc (sizeof (struct resource ),SMP_CACHE_BYTES );
@@ -751,7 +745,12 @@ static void __init resource_init(void) sizeof(struct resource)); res->start = start; - res->end = end; +/* +* In memblock, end points to the first byte after the +* range while in resourses, end points to the last byte in +* the range. +*/ + res->end = end -1 ; res->flags =IORESOURCE_SYSTEM_RAM |IORESOURCE_BUSY ; res->name ="System RAM" ;
arch/openrisc/mm/init.c +5 -3
@@ -64,6 +64,7 @@ extern const char _s_kernel_ro[], _e_kernel_ro[];*/ static void __init map_ram (void ) { +phys_addr_t start, end;unsigned long v, p, e;pgprot_t prot;pgd_t *pge;
@@ -71,6 +72,7 @@ static void __init map_ram(void)pud_t *pue;pmd_t *pme;pte_t *pte; +u64 i;/* These mark extents of read-only kernel pages... * ...from vmlinux.lds.S */
@@ -78,9 +80,9 @@ static void __init map_ram(void) v =PAGE_OFFSET ; -for_each_memblock (memory, region) { - p = (u32 ) region->base &PAGE_MASK ; - e = p + (u32 ) region->size; +for_each_mem_range (i, &start, &end) { + p = (u32 ) start &PAGE_MASK ; + e = (u32 ) end; v = (u32 )__va (p); pge =pgd_offset_k (v);
arch/powerpc/kernel/fadump.c +23 -27
108 lines not on this page · raw message
arch/powerpc/mm/book3s64/hash_utils.c +8 -8
@@ -7,7 +7,7 @@* * SMP scalability work: * Copyright (C) 2001 Anton Blanchard <[email protected]>, IBM -* +* * Module name: htab.c * * Description:
@@ -862,8 +862,8 @@ static void __init htab_initialize(void)unsigned long table;unsigned long pteg_count;unsigned long prot; -unsigned long base =0 , size =0 ; -struct memblock_region *reg; +phys_addr_t base =0 , size =0 , end; +u64 i;DBG (" -> htab_initialize()\n" );
@@ -879,7 +879,7 @@ static void __init htab_initialize(void)/* * Calculate the required size of the htab. We want the number of * PTEGs to equal one half the number of real pages. -*/ +*/ htab_size_bytes =htab_get_table_size (); pteg_count = htab_size_bytes >>7 ;
@@ -889,7 +889,7 @@ static void __init htab_initialize(void) firmware_has_feature(FW_FEATURE_PS3_LV1)) {/* Using a hypervisor which owns the htab */ htab_address =NULL ; - _SDR1 =0 ; + _SDR1 =0 ;#ifdef CONFIG_FA_DUMP /* * If firmware assisted dump is active firmware preserves
@@ -955,9 +955,9 @@ static void __init htab_initialize(void)#endif /* CONFIG_DEBUG_PAGEALLOC */ /* create bolted the linear mapping in the hash table */ -for_each_memblock (memory, reg) { - base = (unsigned long )__va (reg->base); - size = reg->size; +for_each_mem_range (i, &base, &end) { + size = end - base; + base = (unsigned long )__va (base);DBG ("creating mapping for region: %lx..%lx (prot: %lx)\n" , base, size, prot);
arch/powerpc/mm/book3s64/radix_pgtable.c +5 -6
@@ -318,28 +318,27 @@ static int __meminit create_physical_mapping(unsigned long start,static void __init radix_init_pgtable (void ) {unsigned long rts_field; -struct memblock_region *reg; +phys_addr_t start, end; +u64 i;/* We don't support slb for radix */ mmu_slb_size =0 ;/* * Create the linear mapping, using standard page size for now */ -for_each_memblock (memory, reg) { +for_each_mem_range (i, &start, &end) {/* * The memblock allocator is up at this point, so the * page tables will be allocated within the range. No * need or a node (which we don't have yet). */ -if ((reg->base + reg->size) >=RADIX_VMALLOC_START ) { +if (end >=RADIX_VMALLOC_START ) {pr_warn ("Outside the supported range\n" );continue ; } -WARN_ON (create_physical_mapping (reg->base, - reg->base + reg->size, --1 ,PAGE_KERNEL )); +WARN_ON (create_physical_mapping (start, end,-1 ,PAGE_KERNEL )); }/* Find out how many PID bits are supported */
arch/powerpc/mm/kasan/kasan_init_32.c +4 -4
@@ -120,11 +120,11 @@ static void __init kasan_unmap_early_shadow_vmalloc(void)static void __init kasan_mmu_init (void ) {int ret; -struct memblock_region *reg; +phys_addr_t base, end; +u64 i; -for_each_memblock (memory, reg) { -phys_addr_t base = reg->base; -phys_addr_t top =min (base + reg->size, total_lowmem); +for_each_mem_range (i, &base, &end) { +phys_addr_t top =min (end, total_lowmem);if (base >= top)continue ;
arch/powerpc/mm/mem.c +10 -6
@@ -593,20 +593,24 @@ void flush_icache_user_page(struct vm_area_struct *vma, struct page *page,*/ static int __init add_system_ram_resources (void ) { -struct memblock_region *reg; +phys_addr_t start, end; +u64 i; -for_each_memblock (memory, reg) { +for_each_mem_range (i, &start, &end) {struct resource *res; -unsigned long base = reg->base; -unsigned long size = reg->size; res =kzalloc (sizeof (struct resource ),GFP_KERNEL );WARN_ON (!res);if (res) { res->name ="System RAM" ; - res->start = base; - res->end = base + size -1 ; + res->start = start; +/* +* In memblock, end points to the first byte after +* the range while in resourses, end points to the +* last byte in the range. +*/ + res->end = end -1 ; res->flags =IORESOURCE_SYSTEM_RAM |IORESOURCE_BUSY ;WARN_ON (request_resource (&iomem_resource, res) <0 ); }
arch/powerpc/mm/pgtable_32.c +4 -4
@@ -123,11 +123,11 @@ static void __init __mapin_ram_chunk(unsigned long offset, unsigned long top)void __init mapin_ram (void ) { -struct memblock_region *reg; +phys_addr_t base, end; +u64 i; -for_each_memblock (memory, reg) { -phys_addr_t base = reg->base; -phys_addr_t top =min (base + reg->size, total_lowmem); +for_each_mem_range (i, &base, &end) { +phys_addr_t top =min (end, total_lowmem);if (base >= top)continue ;
arch/riscv/mm/init.c +10 -15
@@ -145,21 +145,21 @@ static phys_addr_t dtb_early_pa __initdata;void __init setup_bootmem (void ) { -struct memblock_region *reg;phys_addr_t mem_size =0 ;phys_addr_t total_mem =0 ; -phys_addr_t mem_start, end =0 ; +phys_addr_t mem_start, start, end =0 ;phys_addr_t vmlinux_end =__pa_symbol (&_end);phys_addr_t vmlinux_start =__pa_symbol (&_start); +u64 i;/* Find the memory region containing the kernel */ -for_each_memblock (memory, reg) { - end = reg->base + reg->size; +for_each_mem_range (i, &start, &end) { +phys_addr_t size = end - start;if (!total_mem) - mem_start = reg->base; -if (reg->base <= vmlinux_start && vmlinux_end <= end) -BUG_ON (reg->size =0 ); - total_mem = total_mem + reg->size; + mem_start = start; +if (start <= vmlinux_start && vmlinux_end <= end) +BUG_ON (size =0 ); + total_mem = total_mem + size; }/*
@@ -456,7 +456,7 @@ static void __init setup_vm_final(void) {uintptr_t va, map_size;phys_addr_t pa, start, end; -struct memblock_region *reg; +u64 i;/* Set mmu_enabled flag */ mmu_enabled = true;
@@ -467,14 +467,9 @@ static void __init setup_vm_final(void) PGDIR_SIZE, PAGE_TABLE);/* Map all memory banks */ -for_each_memblock (memory, reg) { - start = reg->base; - end = start + reg->size; - +for_each_mem_range (i, &start, &end) {if (start >= end)break ; -if (memblock_is_nomap (reg)) -continue ;if (start <=__pa (PAGE_OFFSET ) &&__pa (PAGE_OFFSET ) < end) start =__pa (PAGE_OFFSET );
arch/riscv/mm/kasan_init.c +5 -5
@@ -85,16 +85,16 @@ static void __init populate(void *start, void *end)void __init kasan_init (void ) { -struct memblock_region *reg; -unsigned long i; +phys_addr_t _start, _end; +u64 i;kasan_populate_early_shadow ((void *)KASAN_SHADOW_START , (void *)kasan_mem_to_shadow ((void *)VMALLOC_END )); -for_each_memblock (memory, reg) { -void *start = (void *)__va (reg->base); -void *end = (void *)__va (reg->base + reg->size); +for_each_mem_range (i, &_start, &_end) { +void *start = (void *)_start; +void *end = (void *)_end;if (start >= end)break ;
arch/s390/kernel/setup.c +17 -10
@@ -198,7 +198,7 @@ static void __init conmode_default(void)cpcmd ("QUERY TERM" , query_buffer,1024 ,NULL ); ptr =strstr (query_buffer,"CONMODE" );/* -* Set the conmode to 3215 so that the device recognition +* Set the conmode to 3215 so that the device recognition * will set the cu_type of the console to 3215. If the * conmode is 3270 and we don't set it back then both * 3215 and the 3270 driver will try to access the console
@@ -258,7 +258,7 @@ static inline void setup_zfcpdump(void) {}/* * Reboot, halt and power_off stubs. They just call _machine_restart, -* _machine_halt or _machine_power_off. +* _machine_halt or _machine_power_off. */ void machine_restart (char *command)
@@ -484,8 +484,9 @@ static struct resource __initdata *standard_resources[] = {static void __init setup_resources (void ) {struct resource *res, *std_res, *sub_res; -struct memblock_region *reg; +phys_addr_t start, end;int j; +u64 i; code_resource.start = (unsigned long ) _text; code_resource.end = (unsigned long ) _etext -1 ;
@@ -494,7 +495,7 @@ static void __init setup_resources(void) bss_resource.start = (unsigned long ) __bss_start; bss_resource.end = (unsigned long ) __bss_stop -1 ; -for_each_memblock (memory, reg) { +for_each_mem_range (i, &start, &end) { res =memblock_alloc (sizeof (*res),8 );if (!res) panic("%s: Failed to allocate %zu bytes align=0x%x\n",
@@ -502,8 +503,13 @@ static void __init setup_resources(void) res->flags =IORESOURCE_BUSY |IORESOURCE_SYSTEM_RAM ; res->name ="System RAM" ; - res->start = reg->base; - res->end = reg->base + reg->size -1 ; + res->start = start; +/* +* In memblock, end points to the first byte after the +* range while in resourses, end points to the last byte in +* the range. +*/ + res->end = end -1 ;request_resource (&iomem_resource, res);for (j =0 ; j <ARRAY_SIZE (standard_resources); j++) {
@@ -819,14 +825,15 @@ static void __init reserve_kernel(void)static void __init setup_memory (void ) { -struct memblock_region *reg; +phys_addr_t start, end; +u64 i;/* * Init storage key for present memory */ -for_each_memblock (memory, reg) { -storage_key_init_range (reg->base, reg->base + reg->size); - } +for_each_mem_range (i, &start, &end) +storage_key_init_range (start, end); +psw_set_key (PAGE_DEFAULT_KEY );/* Only cosmetics */
arch/s390/mm/vmem.c +9 -7
@@ -399,10 +399,11 @@ int vmem_add_mapping(unsigned long start, unsigned long size)*/ void __init vmem_map_init (void ) { -struct memblock_region *reg; +phys_addr_t start, end; +u64 i; -for_each_memblock (memory, reg) -vmem_add_mem (reg->base, reg->size); +for_each_mem_range (i, &start, &end) +vmem_add_mem (start, end - start);__set_memory ((unsigned long )_stext, (unsigned long )(_etext - _stext) >>PAGE_SHIFT ,SET_MEMORY_RO |SET_MEMORY_X );
@@ -428,16 +429,17 @@ void __init vmem_map_init(void)*/ static int __init vmem_convert_memory_chunk (void ) { -struct memblock_region *reg; +phys_addr_t start, end;struct memory_segment *seg; +u64 i;mutex_lock (&vmem_mutex); -for_each_memblock (memory, reg) { +for_each_mem_range (i, &start, &end) { seg =kzalloc (sizeof (*seg),GFP_KERNEL );if (!seg)panic ("Out of memory...\n" ); - seg->start = reg->base; - seg->size = reg->size; + seg->start = start; + seg->size = end - start;insert_memory_segment (seg); }mutex_unlock (&vmem_mutex);
arch/sparc/mm/init_64.c +4 -8
@@ -1192,18 +1192,14 @@ int of_node_to_nid(struct device_node *dp)static void __init add_node_ranges (void ) { -struct memblock_region *reg; +phys_addr_t start, end;unsigned long prev_max; +u64 i; memblock_resized: prev_max = memblock.memory.max; -for_each_memblock (memory, reg) { -unsigned long size = reg->size; -unsigned long start, end; - - start = reg->base; - end = start + size; +for_each_mem_range (i, &start, &end) {while (start < end) {unsigned long this_end;int nid;
@@ -1211,7 +1207,7 @@ static void __init add_node_ranges(void) this_end =memblock_nid_range (start, end, &nid);numadbg ("Setting memblock NUMA node nid[%d] " -"start[%lx] end[%lx]\n" , +"start[%llx] end[%lx]\n" , nid, start, this_end); memblock_set_node(start, this_end - start,
drivers/bus/mvebu-mbus.c +6 -6
@@ -610,23 +610,23 @@ static unsigned int armada_xp_mbus_win_remap_offset(int win)static void __init mvebu_mbus_find_bridge_hole (uint64_t *start,uint64_t *end) { -struct memblock_region *r; -uint64_t s =0 ; +phys_addr_t reg_start, reg_end; +uint64_t i, s =0 ; -for_each_memblock (memory, r) { +for_each_mem_range (i, ®_start, ®_end) {/* * This part of the memory is above 4 GB, so we don't * care for the MBus bridge hole. */ -if (r->base >=0x100000000ULL ) +if (reg_start >=0x100000000ULL )continue ;/* * The MBus bridge hole is at the end of the RAM under * the 4 GB limit. */ -if (r->base + r->size > s) - s = r->base + r->size; +if (reg_end > s) + s = reg_end; } *start = s;
drivers/s390/char/zcore.c +5 -4
@@ -148,18 +148,19 @@ static ssize_t zcore_memmap_read(struct file *filp, char __user *buf,static int zcore_memmap_open (struct inode *inode,struct file *filp) { -struct memblock_region *reg; +phys_addr_t start, end;char *buf;int i =0 ; +u64 r; buf =kcalloc (memblock.memory.cnt,CHUNK_INFO_SIZE ,GFP_KERNEL );if (!buf) {return -ENOMEM ; } -for_each_memblock (memory, reg) { +for_each_mem_range (r, &start, &end) {sprintf (buf + (i++ *CHUNK_INFO_SIZE ),"%016llx %016llx " , - (unsigned long long ) reg->base, - (unsigned long long ) reg->size); + (unsigned long long ) start, + (unsigned long long ) (end - start)); } filp->private_data = buf;return nonseekable_open (inode, filp);
Signature · 1 line
2.26.2
kernel test robot
build botRe: [PATCH v2 12/17] arch, drivers: replace for_each_membock() with for_each_mem_range()
I love your patch! Perhaps something to improve:
Hi Mike,
I love your patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on v5.8]
[cannot apply to hnaz-linux-mm/master powerpc/next arm64/for-next/core next-20200731] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Mike-Rapoport/memblock-seasonal-cleaning-w-cleanup/20200803-004031 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git ac3a0c8472969a03c0496ae774b3a29eb26c8d5a compiler: or1k-linux-gcc (GCC) 9.3.0
If you fix the issue, kindly add following tag as appropriate
cppcheck warnings: (new ones prefixed by >>)
>> arch/openrisc/mm/init.c:125:10: warning: Uninitialized variable: region [uninitvar]
region->base, region->base + region->size);
^vim +125 arch/openrisc/mm/init.c
61e85e367535a7b Jonas Bonn 2011-06-04 58
61e85e367535a7b Jonas Bonn 2011-06-04 59 /*
61e85e367535a7b Jonas Bonn 2011-06-04 60 * Map all physical memory into kernel's address space.
61e85e367535a7b Jonas Bonn 2011-06-04 61 *
61e85e367535a7b Jonas Bonn 2011-06-04 62 * This is explicitly coded for two-level page tables, so if you need
61e85e367535a7b Jonas Bonn 2011-06-04 63 * something else then this needs to change.
61e85e367535a7b Jonas Bonn 2011-06-04 64 */
61e85e367535a7b Jonas Bonn 2011-06-04 65 static void __init map_ram(void)
61e85e367535a7b Jonas Bonn 2011-06-04 66 {
860df8f8a56d7c5 Mike Rapoport 2020-08-02 67 phys_addr_t start, end;
61e85e367535a7b Jonas Bonn 2011-06-04 68 unsigned long v, p, e;
61e85e367535a7b Jonas Bonn 2011-06-04 69 pgprot_t prot;
61e85e367535a7b Jonas Bonn 2011-06-04 70 pgd_t *pge;
b187fb7fca9cc42 Mike Rapoport 2020-06-04 71 p4d_t *p4e;
61e85e367535a7b Jonas Bonn 2011-06-04 72 pud_t *pue;
61e85e367535a7b Jonas Bonn 2011-06-04 73 pmd_t *pme;
61e85e367535a7b Jonas Bonn 2011-06-04 74 pte_t *pte;
860df8f8a56d7c5 Mike Rapoport 2020-08-02 75 u64 i;
61e85e367535a7b Jonas Bonn 2011-06-04 76 /* These mark extents of read-only kernel pages...
61e85e367535a7b Jonas Bonn 2011-06-04 77 * ...from vmlinux.lds.S
61e85e367535a7b Jonas Bonn 2011-06-04 78 */
61e85e367535a7b Jonas Bonn 2011-06-04 79 struct memblock_region *region;
61e85e367535a7b Jonas Bonn 2011-06-04 80
61e85e367535a7b Jonas Bonn 2011-06-04 81 v = PAGE_OFFSET;
61e85e367535a7b Jonas Bonn 2011-06-04 82
860df8f8a56d7c5 Mike Rapoport 2020-08-02 83 for_each_mem_range(i, &start, &end) {
860df8f8a56d7c5 Mike Rapoport 2020-08-02 84 p = (u32) start & PAGE_MASK;
860df8f8a56d7c5 Mike Rapoport 2020-08-02 85 e = (u32) end;
61e85e367535a7b Jonas Bonn 2011-06-04 86
61e85e367535a7b Jonas Bonn 2011-06-04 87 v = (u32) __va(p);
61e85e367535a7b Jonas Bonn 2011-06-04 88 pge = pgd_offset_k(v);
61e85e367535a7b Jonas Bonn 2011-06-04 89
61e85e367535a7b Jonas Bonn 2011-06-04 90 while (p < e) {
61e85e367535a7b Jonas Bonn 2011-06-04 91 int j;
b187fb7fca9cc42 Mike Rapoport 2020-06-04 92 p4e = p4d_offset(pge, v);
b187fb7fca9cc42 Mike Rapoport 2020-06-04 93 pue = pud_offset(p4e, v);
61e85e367535a7b Jonas Bonn 2011-06-04 94 pme = pmd_offset(pue, v);
61e85e367535a7b Jonas Bonn 2011-06-04 95
61e85e367535a7b Jonas Bonn 2011-06-04 96 if ((u32) pue != (u32) pge || (u32) pme != (u32) pge) {
61e85e367535a7b Jonas Bonn 2011-06-04 97 panic("%s: OR1K kernel hardcoded for "
61e85e367535a7b Jonas Bonn 2011-06-04 98 "two-level page tables",
61e85e367535a7b Jonas Bonn 2011-06-04 99 __func__);
61e85e367535a7b Jonas Bonn 2011-06-04 100 }
61e85e367535a7b Jonas Bonn 2011-06-04 101
61e85e367535a7b Jonas Bonn 2011-06-04 102 /* Alloc one page for holding PTE's... */
fb054d0d91dbe3c Mike Rapoport 2019-03-11 103 pte = memblock_alloc_raw(PAGE_SIZE, PAGE_SIZE);
fb054d0d91dbe3c Mike Rapoport 2019-03-11 104 if (!pte)
fb054d0d91dbe3c Mike Rapoport 2019-03-11 105 panic("%s: Failed to allocate page for PTEs\n",
fb054d0d91dbe3c Mike Rapoport 2019-03-11 106 __func__);
61e85e367535a7b Jonas Bonn 2011-06-04 107 set_pmd(pme, __pmd(_KERNPG_TABLE + __pa(pte)));
61e85e367535a7b Jonas Bonn 2011-06-04 108
61e85e367535a7b Jonas Bonn 2011-06-04 109 /* Fill the newly allocated page with PTE'S */
f47706099bdb8c0 Stefan Kristiansson 2014-01-11 110 for (j = 0; p < e && j < PTRS_PER_PTE;
61e85e367535a7b Jonas Bonn 2011-06-04 111 v += PAGE_SIZE, p += PAGE_SIZE, j++, pte++) {
61e85e367535a7b Jonas Bonn 2011-06-04 112 if (v >= (u32) _e_kernel_ro ||
61e85e367535a7b Jonas Bonn 2011-06-04 113 v < (u32) _s_kernel_ro)
61e85e367535a7b Jonas Bonn 2011-06-04 114 prot = PAGE_KERNEL;
61e85e367535a7b Jonas Bonn 2011-06-04 115 else
61e85e367535a7b Jonas Bonn 2011-06-04 116 prot = PAGE_KERNEL_RO;
61e85e367535a7b Jonas Bonn 2011-06-04 117
61e85e367535a7b Jonas Bonn 2011-06-04 118 set_pte(pte, mk_pte_phys(p, prot));
61e85e367535a7b Jonas Bonn 2011-06-04 119 }
61e85e367535a7b Jonas Bonn 2011-06-04 120
61e85e367535a7b Jonas Bonn 2011-06-04 121 pge++;
61e85e367535a7b Jonas Bonn 2011-06-04 122 }
61e85e367535a7b Jonas Bonn 2011-06-04 123
61e85e367535a7b Jonas Bonn 2011-06-04 124 printk(KERN_INFO "%s: Memory: 0x%x-0x%x\n", __func__,
61e85e367535a7b Jonas Bonn 2011-06-04 @125 region->base, region->base + region->size);
61e85e367535a7b Jonas Bonn 2011-06-04 126 }
61e85e367535a7b Jonas Bonn 2011-06-04 127 }
61e85e367535a7b Jonas Bonn 2011-06-04 128 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: [PATCH v2 12/17] arch, drivers: replace for_each_membock() with for_each_mem_range()
In reply to Mike RapoportQuoted 11 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
There are several occurrences of the following pattern:
for_each_memblock(memory, reg) { start = __pfn_to_phys(memblock_region_memory_base_pfn(reg); end = __pfn_to_phys(memblock_region_memory_end_pfn(reg)); /* do something with start and end */ }
Quoted 7 lines
Using
for_each_mem_range()iterator is more appropriate in such cases and allows simpler and cleaner code.Signed-off-by Mike Rapoport <[email protected]>--- arch/mips/cavium-octeon/dma-octeon.c | 12 +++--- arch/mips/kernel/setup.c | 31 +++++++--------
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
Mike Rapoport
maintainerPATCH v2 13/17 x86/setup: simplify initrd relocation and reservation
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
Currently, initrd image is reserved very early during setup and then it might be relocated and re-reserved after the initial physical memory mapping is created. The "late" reservation of memblock verifies that mapped memory size exceeds the size of initrd, the checks whether the relocation required and, if yes, relocates inirtd to a new memory allocated from memblock and frees the old location.
The check for memory size is excessive as memblock allocation will anyway fail if there is not enough memory. Besides, there is no point to allocate memory from memblock using memblock_find_in_range() + memblock_reserve() when there exists memblock_phys_alloc_range() with required functionality.
Remove the redundant check and simplify memblock allocation.
--- arch/x86/kernel/setup.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-)
arch/x86/kernel/setup.c +3 -13
@@ -262,16 +262,12 @@ static void __init relocate_initrd(void)u64 area_size =PAGE_ALIGN (ramdisk_size);/* We need to move the initrd down into directly mapped mem */ - relocated_ramdisk =memblock_find_in_range (0 ,PFN_PHYS (max_pfn_mapped), - area_size,PAGE_SIZE ); - + relocated_ramdisk =memblock_phys_alloc_range (area_size,PAGE_SIZE ,0 , +PFN_PHYS (max_pfn_mapped));if (!relocated_ramdisk)panic ("Cannot find place for new RAMDISK of size %lld\n" , ramdisk_size); -/* Note: this includes all the mem currently occupied by -the initrd, we rely on that fact to keep the data intact. */ -memblock_reserve (relocated_ramdisk, area_size); initrd_start = relocated_ramdisk +PAGE_OFFSET ; initrd_end = initrd_start + ramdisk_size; printk(KERN_INFO "Allocated new RAMDISK: [mem %#010llx-%#010llx]\n",
@@ -298,13 +294,13 @@ static void __init early_reserve_initrd(void)memblock_reserve (ramdisk_image, ramdisk_end - ramdisk_image); } +static void __init reserve_initrd (void ) {/* Assume only end is not page aligned */ u64 ramdisk_image =get_ramdisk_image ();u64 ramdisk_size =get_ramdisk_size ();u64 ramdisk_end =PAGE_ALIGN (ramdisk_image + ramdisk_size); -u64 mapped_size;if (!boot_params.hdr.type_of_loader || !ramdisk_image || !ramdisk_size)
@@ -312,12 +308,6 @@ static void __init reserve_initrd(void) initrd_start =0 ; - mapped_size =memblock_mem_size (max_pfn_mapped); -if (ramdisk_size >= (mapped_size>>1 )) -panic ("initrd too large to handle, " -"disabling initrd (%lld needed, %lld available)\n" , - ramdisk_size, mapped_size>>1 ); -printk (KERN_INFO "RAMDISK: [mem %#010llx-%#010llx]\n" , ramdisk_image, ramdisk_end -1 );
Signature · 1 line
2.26.2
Re: [PATCH v2 13/17] x86/setup: simplify initrd relocation and reservation
Quoted 9 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
Currently, initrd image is reserved very early during setup and then it might be relocated and re-reserved after the initial physical memory mapping is created. The "late" reservation of memblock verifies that mapped memory size exceeds the size of initrd, the checks whether the relocation required and, if yes, relocates inirtd to a new memory allocated from memblock and frees the old location.
Quoted 8 lines
The check for memory size is excessive as memblock allocation will anyway fail if there is not enough memory. Besides, there is no point to allocate memory from memblock using
memblock_find_in_range()+memblock_reserve()when there existsmemblock_phys_alloc_range()with required functionality.Remove the redundant check and simplify memblock allocation.
Signed-off-by Mike Rapoport <[email protected]>
Assuming there's no hidden dependency here breaking something:
Thanks,
Ingo
Re: [PATCH v2 13/17] x86/setup: simplify initrd relocation and reservation
In reply to Mike RapoportQuoted 6 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
Currently, initrd image is reserved very early during setup and then it might be relocated and re-reserved after the initial physical memory mapping is created. The "late" reservation of memblock verifies that mapped memory size exceeds the size of initrd, the checks whether the relocation
~ then?
Quoted 54 lines
required and, if yes, relocates inirtd to a new memory allocated from memblock and frees the old location.
The check for memory size is excessive as memblock allocation will anyway fail if there is not enough memory. Besides, there is no point to allocate memory from memblock using
memblock_find_in_range()+memblock_reserve()when there existsmemblock_phys_alloc_range()with required functionality.Remove the redundant check and simplify memblock allocation.
Signed-off-by Mike Rapoport <[email protected]>--- arch/x86/kernel/setup.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-)arch/x86/kernel/setup.c +3
-7@@ -262,16 +262,12 @@ static void __init relocate_initrd(void)u64 area_size =PAGE_ALIGN (ramdisk_size);/* We need to move the initrd down into directly mapped mem */ - relocated_ramdisk =memblock_find_in_range (0 ,PFN_PHYS (max_pfn_mapped), - area_size,PAGE_SIZE ); - + relocated_ramdisk =memblock_phys_alloc_range (area_size,PAGE_SIZE ,0 , +PFN_PHYS (max_pfn_mapped));if (!relocated_ramdisk)panic ("Cannot find place for new RAMDISK of size %lld\n" , ramdisk_size); -/* Note: this includes all the mem currently occupied by -the initrd, we rely on that fact to keep the data intact. */ -memblock_reserve (relocated_ramdisk, area_size); initrd_start = relocated_ramdisk +PAGE_OFFSET ; initrd_end = initrd_start + ramdisk_size; printk(KERN_INFO "Allocated new RAMDISK: [mem %#010llx-%#010llx]\n",@@ -298,13 +294,13 @@ static void __init early_reserve_initrd(void)memblock_reserve (ramdisk_image, ramdisk_end - ramdisk_image); } +static void __init reserve_initrd (void ) {/* Assume only end is not page aligned */ u64 ramdisk_image =get_ramdisk_image ();u64 ramdisk_size =get_ramdisk_size ();u64 ramdisk_end =PAGE_ALIGN (ramdisk_image + ramdisk_size); -u64 mapped_size;if (!boot_params.hdr.type_of_loader || !ramdisk_image || !ramdisk_size)
arch/x86/kernel/setup.c static void __init reserve_initrd(void) · line 319
Quoted 8 lines
arch/x86/kernel/setup.c +0
-5@@ -312,12 +308,6 @@ static void __init reserve_initrd(void) initrd_start =0 ; - mapped_size =memblock_mem_size (max_pfn_mapped); -if (ramdisk_size >= (mapped_size>>1 )) -panic ("initrd too large to handle, " -"disabling initrd (%lld needed, %lld available)\n" , - ramdisk_size, mapped_size>>1 );
Quoted 7 lines
arch/x86/kernel/setup.c +0
-1-printk (KERN_INFO "RAMDISK: [mem %#010llx-%#010llx]\n" , ramdisk_image, ramdisk_end -1 );Signature · 1 line
2.26.2
Mike Rapoport
maintainerRe: [PATCH v2 13/17] x86/setup: simplify initrd relocation and reservation
Quoted 8 lines · Baoquan He
Quoted 6 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
Currently, initrd image is reserved very early during setup and then it might be relocated and re-reserved after the initial physical memory mapping is created. The "late" reservation of memblock verifies that mapped memory size exceeds the size of initrd, the checks whether the relocation
~ then?
Right, thanks!
Quoted 2 lines
Quoted 2 lines
required and, if yes, relocates inirtd to a new memory allocated from memblock and frees the old location.
Mike Rapoport
maintainerPATCH v2 14/17 x86/setup: simplify reserve_crashkernel()
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
* Replace magic numbers with defines
* Replace memblock_find_in_range() + memblock_reserve() with memblock_phys_alloc_range()
* Stop checking for low memory size in reserve_crashkernel_low(). The allocation from limited range will anyway fail if there is no enough memory, so there is no need for extra traversal of memblock.memory
--- arch/x86/kernel/setup.c | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-)
arch/x86/kernel/setup.c +14 -26
@@ -419,13 +419,13 @@ static int __init reserve_crashkernel_low(void) {#ifdef CONFIG_X86_64 unsigned long long base, low_base =0 , low_size =0 ; -unsigned long total_low_mem; +unsigned long low_mem_limit;int ret; - total_low_mem =memblock_mem_size (1UL << (32 -PAGE_SHIFT )); + low_mem_limit =min (memblock_phys_mem_size (),CRASH_ADDR_LOW_MAX );/* crashkernel=Y,low */ - ret =parse_crashkernel_low (boot_command_line, total_low_mem, &low_size, &base); + ret =parse_crashkernel_low (boot_command_line, low_mem_limit, &low_size, &base);if (ret) {/* * two parts from kernel/dma/swiotlb.c:
@@ -443,23 +443,17 @@ static int __init reserve_crashkernel_low(void)return 0 ; } - low_base =memblock_find_in_range (0 ,1ULL <<32 , low_size,CRASH_ALIGN ); + low_base =memblock_phys_alloc_range (low_size,CRASH_ALIGN ,0 ,CRASH_ADDR_LOW_MAX );if (!low_base) {pr_err ("Cannot reserve %ldMB crashkernel low memory, please try smaller size.\n" , (unsigned long )(low_size >>20 ));return -ENOMEM ; } - ret =memblock_reserve (low_base, low_size); -if (ret) { -pr_err ("%s: Error reserving crashkernel low memblock.\n" , __func__); -return ret; - } - -pr_info ("Reserving %ldMB of low memory at %ldMB for crashkernel (System low RAM: %ldMB)\n" , +pr_info ("Reserving %ldMB of low memory at %ldMB for crashkernel (low RAM limit: %ldMB)\n" , (unsigned long )(low_size >>20 ), (unsigned long )(low_base >>20 ), - (unsigned long )(total_low_mem >>20 )); + (unsigned long )(low_mem_limit >>20 )); crashk_low_res.start = low_base; crashk_low_res.end = low_base + low_size -1 ;
@@ -503,13 +497,13 @@ static void __init reserve_crashkernel(void)* unless "crashkernel=size[KMG],high" is specified. */ if (!high) - crash_base =memblock_find_in_range (CRASH_ALIGN , -CRASH_ADDR_LOW_MAX , - crash_size,CRASH_ALIGN ); + crash_base =memblock_phys_alloc_range (crash_size, +CRASH_ALIGN ,CRASH_ALIGN , +CRASH_ADDR_LOW_MAX );if (!crash_base) - crash_base =memblock_find_in_range (CRASH_ALIGN , -CRASH_ADDR_HIGH_MAX , - crash_size,CRASH_ALIGN ); + crash_base =memblock_phys_alloc_range (crash_size, +CRASH_ALIGN ,CRASH_ALIGN , +CRASH_ADDR_HIGH_MAX );if (!crash_base) {pr_info ("crashkernel reservation failed - No suitable area found.\n" );return ;
@@ -517,19 +511,13 @@ static void __init reserve_crashkernel(void) }else {unsigned long long start; - start =memblock_find_in_range (crash_base, - crash_base + crash_size, - crash_size,1 <<20 ); + start =memblock_phys_alloc_range (crash_size,SZ_1M , crash_base, + crash_base + crash_size);if (start != crash_base) {pr_info ("crashkernel reservation failed - memory is in use.\n" );return ; } } - ret =memblock_reserve (crash_base, crash_size); -if (ret) { -pr_err ("%s: Error reserving crashkernel memblock.\n" , __func__); -return ; - }if (crash_base >= (1ULL <<32 ) &&reserve_crashkernel_low ()) {memblock_free (crash_base, crash_size);
Signature · 1 line
2.26.2
Re: [PATCH v2 14/17] x86/setup: simplify reserve_crashkernel()
Quoted 10 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
* Replace magic numbers with defines
* Replacememblock_find_in_range()+memblock_reserve()withmemblock_phys_alloc_range()
* Stop checking for low memory size inreserve_crashkernel_low(). The allocation from limited range will anyway fail if there is no enough memory, so there is no need for extra traversal of memblock.memorySigned-off-by Mike Rapoport <[email protected]>
Assuming that this got or will get tested with a crash kernel:
Thanks,
Ingo
Re: [PATCH v2 14/17] x86/setup: simplify reserve_crashkernel()
In reply to Mike RapoportQuoted 9 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
* Replace magic numbers with defines
* Replacememblock_find_in_range()+memblock_reserve()withmemblock_phys_alloc_range()
* Stop checking for low memory size inreserve_crashkernel_low(). The allocation from limited range will anyway fail if there is no enough memory, so there is no need for extra traversal of memblock.memory
Quoted 4 lines
Signed-off-by Mike Rapoport <[email protected]>--- arch/x86/kernel/setup.c | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-)
Applied this patch on top of 5.8, crashkernel reservation works well. And the code change looks good.
Quoted 94 lines
arch/x86/kernel/setup.c +14
-26@@ -419,13 +419,13 @@ static int __init reserve_crashkernel_low(void) {#ifdef CONFIG_X86_64 unsigned long long base, low_base =0 , low_size =0 ; -unsigned long total_low_mem; +unsigned long low_mem_limit;int ret; - total_low_mem =memblock_mem_size (1UL << (32 -PAGE_SHIFT )); + low_mem_limit =min (memblock_phys_mem_size (),CRASH_ADDR_LOW_MAX );/* crashkernel=Y,low */ - ret =parse_crashkernel_low (boot_command_line, total_low_mem, &low_size, &base); + ret =parse_crashkernel_low (boot_command_line, low_mem_limit, &low_size, &base);if (ret) {/* * two parts from kernel/dma/swiotlb.c: @@ -443,23 +443,17 @@ static int __init reserve_crashkernel_low(void)return 0 ; } - low_base =memblock_find_in_range (0 ,1ULL <<32 , low_size,CRASH_ALIGN ); + low_base =memblock_phys_alloc_range (low_size,CRASH_ALIGN ,0 ,CRASH_ADDR_LOW_MAX );if (!low_base) {pr_err ("Cannot reserve %ldMB crashkernel low memory, please try smaller size.\n" , (unsigned long )(low_size >>20 ));return -ENOMEM ; } - ret =memblock_reserve (low_base, low_size); -if (ret) { -pr_err ("%s: Error reserving crashkernel low memblock.\n" , __func__); -return ret; - } - -pr_info ("Reserving %ldMB of low memory at %ldMB for crashkernel (System low RAM: %ldMB)\n" , +pr_info ("Reserving %ldMB of low memory at %ldMB for crashkernel (low RAM limit: %ldMB)\n" , (unsigned long )(low_size >>20 ), (unsigned long )(low_base >>20 ), - (unsigned long )(total_low_mem >>20 )); + (unsigned long )(low_mem_limit >>20 )); crashk_low_res.start = low_base; crashk_low_res.end = low_base + low_size -1 ;@@ -503,13 +497,13 @@ static void __init reserve_crashkernel(void)* unless "crashkernel=size[KMG],high" is specified. */ if (!high) - crash_base =memblock_find_in_range (CRASH_ALIGN , -CRASH_ADDR_LOW_MAX , - crash_size,CRASH_ALIGN ); + crash_base =memblock_phys_alloc_range (crash_size, +CRASH_ALIGN ,CRASH_ALIGN , +CRASH_ADDR_LOW_MAX );if (!crash_base) - crash_base =memblock_find_in_range (CRASH_ALIGN , -CRASH_ADDR_HIGH_MAX , - crash_size,CRASH_ALIGN ); + crash_base =memblock_phys_alloc_range (crash_size, +CRASH_ALIGN ,CRASH_ALIGN , +CRASH_ADDR_HIGH_MAX );if (!crash_base) {pr_info ("crashkernel reservation failed - No suitable area found.\n" );return ;@@ -517,19 +511,13 @@ static void __init reserve_crashkernel(void) }else {unsigned long long start; - start =memblock_find_in_range (crash_base, - crash_base + crash_size, - crash_size,1 <<20 ); + start =memblock_phys_alloc_range (crash_size,SZ_1M , crash_base, + crash_base + crash_size);if (start != crash_base) {pr_info ("crashkernel reservation failed - memory is in use.\n" );return ; } } - ret =memblock_reserve (crash_base, crash_size); -if (ret) { -pr_err ("%s: Error reserving crashkernel memblock.\n" , __func__); -return ; - }if (crash_base >= (1ULL <<32 ) &&reserve_crashkernel_low ()) {memblock_free (crash_base, crash_size);Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v2 15/17 memblock: remove unused memblock_mem_size()
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
The only user of memblock_mem_size() was x86 setup code, it is gone now and memblock_mem_size() funciton can be removed.
--- include/linux/memblock.h | 1 - mm/memblock.c | 15 --------------- 2 files changed, 16 deletions(-)
include/linux/memblock.h +0 -1
@@ -450,7 +450,6 @@ static inline bool memblock_bottom_up(void)phys_addr_t memblock_phys_mem_size (void );phys_addr_t memblock_reserved_size (void ); -phys_addr_t memblock_mem_size (unsigned long limit_pfn);phys_addr_t memblock_start_of_DRAM (void );phys_addr_t memblock_end_of_DRAM (void );void memblock_enforce_memory_limit (phys_addr_t memory_limit);
mm/memblock.c +0 -15
@@ -1656,21 +1656,6 @@ phys_addr_t __init_memblock memblock_reserved_size(void)return memblock.reserved.total_size; } -phys_addr_t __init memblock_mem_size (unsigned long limit_pfn) -{ -unsigned long pages =0 ; -unsigned long start_pfn, end_pfn; -int i; - -for_each_mem_pfn_range (i,MAX_NUMNODES , &start_pfn, &end_pfn,NULL ) { - start_pfn = min_t(unsigned long, start_pfn, limit_pfn); - end_pfn = min_t(unsigned long, end_pfn, limit_pfn); - pages += end_pfn - start_pfn; - } - -return PFN_PHYS (pages); -} -/* lowest address */ phys_addr_t __init_memblock memblock_start_of_DRAM(void) {
Signature · 1 line
2.26.2
Re: [PATCH v2 15/17] memblock: remove unused memblock_mem_size()
Quoted 35 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
The only user of
memblock_mem_size()was x86 setup code, it is gone now andmemblock_mem_size()funciton can be removed.Signed-off-by Mike Rapoport <[email protected]>--- include/linux/memblock.h | 1 - mm/memblock.c | 15 --------------- 2 files changed, 16 deletions(-)include/linux/memblock.h +0
-1@@ -450,7 +450,6 @@ static inline bool memblock_bottom_up(void)phys_addr_t memblock_phys_mem_size (void );phys_addr_t memblock_reserved_size (void ); -phys_addr_t memblock_mem_size (unsigned long limit_pfn);phys_addr_t memblock_start_of_DRAM (void );phys_addr_t memblock_end_of_DRAM (void );void memblock_enforce_memory_limit (phys_addr_t memory_limit);mm/memblock.c +0
-4@@ -1656,21 +1656,6 @@ phys_addr_t __init_memblock memblock_reserved_size(void)return memblock.reserved.total_size; } -phys_addr_t __init memblock_mem_size (unsigned long limit_pfn) -{ -unsigned long pages =0 ; -unsigned long start_pfn, end_pfn;
mm/memblock.c phys_addr_t __init_memblock memblock_reserved_size(void) · line 1672
Quoted 10 lines
mm/memblock.c +0
-10-int i; - -for_each_mem_pfn_range (i,MAX_NUMNODES , &start_pfn, &end_pfn,NULL ) { - start_pfn = min_t(unsigned long, start_pfn, limit_pfn); - end_pfn = min_t(unsigned long, end_pfn, limit_pfn); - pages += end_pfn - start_pfn; - } - -return PFN_PHYS (pages); -}
Mike Rapoport
maintainerPATCH v2 16/17 memblock: implement for_each_reserved_mem_region() using __next_mem_region()
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
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.
--- .clang-format | 2 +- arch/arm64/kernel/setup.c | 2 +- drivers/irqchip/irq-gic-v3-its.c | 2 +- include/linux/memblock.h | 12 +++------ mm/memblock.c | 46 +++++++------------------------- 5 files changed, 17 insertions(+), 47 deletions(-)
.clang-format +1 -1
@@ -266,7 +266,7 @@ ForEachMacros: - 'for_each_process_thread' - 'for_each_property_of_node' - 'for_each_registered_fb' - - 'for_each_reserved_mem_region' + - 'for_each_reserved_mem_range' - 'for_each_rtd_codec_dais' - 'for_each_rtd_codec_dais_rollback' - 'for_each_rtd_components'
arch/arm64/kernel/setup.c +1 -1
@@ -257,7 +257,7 @@ static int __init reserve_memblock_reserved_regions(void)if (!memblock_is_region_reserved (mem->start, mem_size))continue ; -for_each_reserved_mem_region (j, &r_start, &r_end) { +for_each_reserved_mem_range (j, &r_start, &r_end) {resource_size_t start, end; start =max (PFN_PHYS (PFN_DOWN (r_start)), mem->start);
drivers/irqchip/irq-gic-v3-its.c +1 -1
@@ -2192,7 +2192,7 @@ static bool gic_check_reserved_range(phys_addr_t addr, unsigned long size) addr_end = addr + size -1 ; -for_each_reserved_mem_region (i, &start, &end) { +for_each_reserved_mem_range (i, &start, &end) {if (addr >= start && addr_end <= end)return true; }
include/linux/memblock.h +4 -8
@@ -136,9 +136,6 @@ void __next_mem_range_rev(u64 *idx, int nid, enum memblock_flags flags, struct memblock_type *type_b, phys_addr_t *out_start, phys_addr_t *out_end, int *out_nid); -void __next_reserved_mem_region (u64 *idx,phys_addr_t *out_start, -phys_addr_t *out_end); -void __memblock_free_late (phys_addr_t base,phys_addr_t size);/**
@@ -193,7 +190,7 @@ void __memblock_free_late(phys_addr_t base, phys_addr_t size); MEMBLOCK_NONE, p_start, p_end, NULL)/** -* for_each_reserved_mem_region - iterate over all reserved memblock areas +* for_each_reserved_mem_range - iterate over all reserved memblock areas * @i: u64 used as loop variable * @p_start: ptr to phys_addr_t for start address of the range, can be %NULL * @p_end: ptr to phys_addr_t for end address of the range, can be %NULL
@@ -201,10 +198,9 @@ void __memblock_free_late(phys_addr_t base, phys_addr_t size);* Walks over reserved areas of memblock. Available as soon as memblock * is initialized. */ -#define for_each_reserved_mem_region (i, p_start, p_end) \ - for (i = 0UL, __next_reserved_mem_region(&i, p_start, p_end); \ - i != (u64)ULLONG_MAX; \ - __next_reserved_mem_region(&i, p_start, p_end)) +#define for_each_reserved_mem_range (i, p_start, p_end) \ + __for_each_mem_range(i, &memblock.reserved, NULL, NUMA_NO_NODE, \ + MEMBLOCK_NONE, p_start, p_end, NULL)static inline bool memblock_is_hotpluggable (struct memblock_region *m) {
mm/memblock.c +10 -36
73 lines not on this page · raw message
Signature · 1 line
2.26.2
Re: [PATCH v2 16/17] memblock: implement for_each_reserved_mem_region() using __next_mem_region()
Quoted 12 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
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()tofor_each_reserved_mem_range()for consistency.
Quoted 8 lines
Signed-off-by Mike Rapoport <[email protected]>--- .clang-format | 2 +- arch/arm64/kernel/setup.c | 2 +- drivers/irqchip/irq-gic-v3-its.c | 2 +- include/linux/memblock.h | 12 +++------ mm/memblock.c | 46 +++++++------------------------- 5 files changed, 17 insertions(+), 47 deletions(-)
Re: [PATCH v2 16/17] memblock: implement for_each_reserved_mem_region() using __next_mem_region()
In reply to Mike RapoportQuoted 2 lines · Mike Rapoport
.clang-format | 2 +-
The .clang-format bit:
Cheers,
Miguel
Mike Rapoport
maintainerPATCH v2 17/17 memblock: use separate iterators for memory and reserved regions
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
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.
--- .clang-format | 3 ++- arch/arm64/kernel/setup.c | 2 +- arch/arm64/mm/numa.c | 2 +- arch/mips/netlogic/xlp/setup.c | 2 +- arch/x86/mm/numa.c | 2 +- include/linux/memblock.h | 19 ++++++++++++++++--- mm/memblock.c | 4 ++-- mm/page_alloc.c | 8 ++++---- 8 files changed, 28 insertions(+), 14 deletions(-)
.clang-format +2 -1
@@ -201,7 +201,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'
@@ -267,6 +267,7 @@ ForEachMacros: - 'for_each_property_of_node' - 'for_each_registered_fb' - '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
@@ -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
@@ -350,7 +350,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
@@ -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/x86/mm/numa.c +1 -1
@@ -516,7 +516,7 @@ static void __init numa_clear_kernel_node_hotplug(void)* memory ranges, because quirks such as trim_snb_memory() * reserve specific pages for Sandy Bridge graphics. ] */ -for_each_memblock (reserved, mb_region) { +for_each_reserved_mem_region (mb_region) {int nid =memblock_get_region_node (mb_region);if (nid !=MAX_NUMNODES )
include/linux/memblock.h +16 -3
@@ -522,9 +522,22 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct membloreturn PFN_UP (reg->base + reg->size); } -#define for_each_memblock (memblock_type, region) \ - for (region = memblock.memblock_type.regions; \ - region < (memblock.memblock_type.regions + memblock.memblock_type.cnt); \ +/** +* for_each_mem_region - itereate over registered memory regions +* @region: loop variable +*/ +#define for_each_mem_region (region) \ + for (region = memblock.memory.regions; \ + region < (memblock.memory.regions + memblock.memory.cnt); \ + region++) + +/** +* for_each_reserved_mem_region - itereate over reserved memory regions +* @region: loop variable +*/ +#define for_each_reserved_mem_region (region) \ + for (region = memblock.reserved.regions; \ + region < (memblock.reserved.regions + memblock.reserved.cnt); \ region++) extern void *alloc_large_system_hash(const char *tablename,
mm/memblock.c +2 -2
@@ -1653,7 +1653,7 @@ static phys_addr_t __init_memblock __find_max_addr(phys_addr_t limit)* the memory memblock regions, if the @limit exceeds the total size * of those regions, max_addr will keep original value PHYS_ADDR_MAX */ -for_each_memblock (memory, r) { +for_each_mem_region (r) {if (limit <= r->size) { max_addr = r->base + limit;break ;
@@ -1823,7 +1823,7 @@ void __init_memblock memblock_trim_memory(phys_addr_t align)phys_addr_t start, end, orig_start, orig_end;struct memblock_region *r; -for_each_memblock (memory, r) { +for_each_mem_region (r) { orig_start = r->base; orig_end = r->base + r->size; start =round_up (orig_start, align);
mm/page_alloc.c +4 -4
@@ -5927,7 +5927,7 @@ overlap_memmap_init(unsigned long zone, unsigned long *pfn)if (mirrored_kernelcore && zone ==ZONE_MOVABLE ) {if (!r || *pfn >=memblock_region_memory_end_pfn (r)) { -for_each_memblock (memory, r) { +for_each_mem_region (r) {if (*pfn <memblock_region_memory_end_pfn (r))break ; }
@@ -6528,7 +6528,7 @@ static unsigned long __init zone_absent_pages_in_node(int nid,unsigned long start_pfn, end_pfn;struct memblock_region *r; -for_each_memblock (memory, r) { +for_each_mem_region (r) { start_pfn =clamp (memblock_region_memory_base_pfn (r), zone_start_pfn, zone_end_pfn); end_pfn = clamp(memblock_region_memory_end_pfn(r),
@@ -7122,7 +7122,7 @@ static void __init find_zone_movable_pfns_for_nodes(void)* options. */ if (movable_node_is_enabled ()) { -for_each_memblock (memory, r) { +for_each_mem_region (r) {if (!memblock_is_hotpluggable (r))continue ;
@@ -7143,7 +7143,7 @@ static void __init find_zone_movable_pfns_for_nodes(void)if (mirrored_kernelcore) {bool mem_below_4gb_not_mirrored = false; -for_each_memblock (memory, r) { +for_each_mem_region (r) {if (memblock_is_mirror (r))continue ;
Signature · 1 line
2.26.2
Re: [PATCH v2 17/17] memblock: use separate iterators for memory and reserved regions
Quoted 10 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
for_each_memblock()is used to iterate over memblock.memory in a few places that use data frommemblock_regionrather than the memory ranges.Introduce separate
for_each_mem_region()andfor_each_reserved_mem_region()to improve encapsulation of memblock internals from its users.Signed-off-by Mike Rapoport <[email protected]>
Quoted 10 lines
--- .clang-format | 3 ++- arch/arm64/kernel/setup.c | 2 +- arch/arm64/mm/numa.c | 2 +- arch/mips/netlogic/xlp/setup.c | 2 +- arch/x86/mm/numa.c | 2 +- include/linux/memblock.h | 19 ++++++++++++++++--- mm/memblock.c | 4 ++-- mm/page_alloc.c | 8 ++++---- 8 files changed, 28 insertions(+), 14 deletions(-)
The x86 part:
Thanks,
Ingo
Re: [PATCH v2 17/17] memblock: use separate iterators for memory and reserved regions
In reply to Mike RapoportQuoted 21 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
for_each_memblock()is used to iterate over memblock.memory in a few places that use data frommemblock_regionrather than the memory ranges.Introduce separate
for_each_mem_region()andfor_each_reserved_mem_region()to improve encapsulation of memblock internals from its users.Signed-off-by Mike Rapoport <[email protected]>--- .clang-format | 3 ++- arch/arm64/kernel/setup.c | 2 +- arch/arm64/mm/numa.c | 2 +- arch/mips/netlogic/xlp/setup.c | 2 +- arch/x86/mm/numa.c | 2 +- include/linux/memblock.h | 19 ++++++++++++++++--- mm/memblock.c | 4 ++-- mm/page_alloc.c | 8 ++++---- 8 files changed, 28 insertions(+), 14 deletions(-)
...
include/linux/memblock.h static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo · line 526
Quoted 13 lines
include/linux/memblock.h +2
-3@@ -522,9 +522,22 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct membloreturn PFN_UP (reg->base + reg->size); } -#define for_each_memblock (memblock_type, region) \ - for (region = memblock.memblock_type.regions; \ - region < (memblock.memblock_type.regions + memblock.memblock_type.cnt); \ +/** +* for_each_mem_region - itereate over registered memory regions
~~~~~~~~~~~~~~~~~
Wonder why emphasize 'registered' memory.
Other than this confusion to me, this patch looks good.
Re: [PATCH v2 17/17] memblock: use separate iterators for memory and reserved regions
In reply to Mike RapoportQuoted 6 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
for_each_memblock()is used to iterate over memblock.memory in a few places that use data frommemblock_regionrather than the memory ranges.
Quoted 6 lines
Introduce separate
for_each_mem_region()andfor_each_reserved_mem_region()to improve encapsulation of memblock internals from its users.Signed-off-by Mike Rapoport <[email protected]>--- arch/mips/netlogic/xlp/setup.c | 2 +-
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
Re: [PATCH v2 17/17] memblock: use separate iterators for memory and reserved regions
In reply to Mike RapoportQuoted 2 lines · Mike Rapoport
.clang-format | 3 ++-
The .clang-format bit:
Cheers,
Miguel