[Patch v2 1/2] mm/mm_init.c: use memblock_region_memory_base_pfn() to get startpfn

[Patch v2 1/2] mm/mm_init.c: use memblock_region_memory_base_pfn() to get startpfn

[Wei Yang]

Just like what it does in "if (mirrored_kernelcore)", we should use
memblock_region_memory_base_pfn() to get the startpfn.

Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
---
 include/linux/memblock.h | 2 +-
 mm/mm_init.c             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index e2082240586d..6cf18dc2b4d0 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -565,7 +565,7 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo
 }
 
 /**
- * for_each_mem_region - itereate over memory regions
+ * for_each_mem_region - iterate over memory regions
  * @region: loop variable
  */
 #define for_each_mem_region(region)					\
diff --git a/mm/mm_init.c b/mm/mm_init.c
index f72b852bd5b8..2dfb87841fdb 100644
--- a/mm/mm_init.c
+++ b/mm/mm_init.c
@@ -363,7 +363,7 @@ static void __init find_zone_movable_pfns_for_nodes(void)
 
 			nid = memblock_get_region_node(r);
 
-			usable_startpfn = PFN_DOWN(r->base);
+			usable_startpfn = memblock_region_memory_base_pfn(r);
 			zone_movable_pfn[nid] = zone_movable_pfn[nid] ?
 				min(usable_startpfn, zone_movable_pfn[nid]) :
 				usable_startpfn;
-- 
2.34.1

[Patch v2 2/2] mm/mm_init.c: move nr_initialised reset down a bit

[Wei Yang]

We don't need to count nr_initialised in two cases:

* for low zones we always populate it
* after first_deferred_pfn is detected

Let's move the nr_initialised reset down a bit to reduce some comparison
of prev_end_pfn and end_pfn.

Signed-off-by: Wei Yang <richard.weiyang@gmail.com>

---
v2: move it after first_deferred_pfn is detected per rppt's comment
---
 mm/mm_init.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/mm/mm_init.c b/mm/mm_init.c
index 2dfb87841fdb..bdbd800b0436 100644
--- a/mm/mm_init.c
+++ b/mm/mm_init.c
@@ -676,6 +676,14 @@ defer_init(int nid, unsigned long pfn, unsigned long end_pfn)
 
 	if (early_page_ext_enabled())
 		return false;
+
+	/* Always populate low zones for address-constrained allocations */
+	if (end_pfn < pgdat_end_pfn(NODE_DATA(nid)))
+		return false;
+
+	if (NODE_DATA(nid)->first_deferred_pfn != ULONG_MAX)
+		return true;
+
 	/*
 	 * prev_end_pfn static that contains the end of previous zone
 	 * No need to protect because called very early in boot before smp_init.
@@ -685,12 +693,6 @@ defer_init(int nid, unsigned long pfn, unsigned long end_pfn)
 		nr_initialised = 0;
 	}
 
-	/* Always populate low zones for address-constrained allocations */
-	if (end_pfn < pgdat_end_pfn(NODE_DATA(nid)))
-		return false;
-
-	if (NODE_DATA(nid)->first_deferred_pfn != ULONG_MAX)
-		return true;
 	/*
 	 * We start only with one section of pages, more pages are added as
 	 * needed until the rest of deferred pages are initialized.
-- 
2.34.1

Re: [Patch v2 1/2] mm/mm_init.c: use memblock_region_memory_base_pfn() to get startpfn

[Mike Rapoport]

On Fri, May 24, 2024 at 01:19:13AM +0000, Wei Yang wrote:
> Just like what it does in "if (mirrored_kernelcore)", we should use
> memblock_region_memory_base_pfn() to get the startpfn.
> 
> Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
> ---
>  include/linux/memblock.h | 2 +-
>  mm/mm_init.c             | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/linux/memblock.h b/include/linux/memblock.h
> index e2082240586d..6cf18dc2b4d0 100644
> --- a/include/linux/memblock.h
> +++ b/include/linux/memblock.h
> @@ -565,7 +565,7 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo
>  }
>  
>  /**
> - * for_each_mem_region - itereate over memory regions
> + * for_each_mem_region - iterate over memory regions

Sorry I've missed this in v1, but it should be a separate patch

>   * @region: loop variable
>   */
>  #define for_each_mem_region(region)					\
> diff --git a/mm/mm_init.c b/mm/mm_init.c
> index f72b852bd5b8..2dfb87841fdb 100644
> --- a/mm/mm_init.c
> +++ b/mm/mm_init.c
> @@ -363,7 +363,7 @@ static void __init find_zone_movable_pfns_for_nodes(void)
>  
>  			nid = memblock_get_region_node(r);
>  
> -			usable_startpfn = PFN_DOWN(r->base);
> +			usable_startpfn = memblock_region_memory_base_pfn(r);
>  			zone_movable_pfn[nid] = zone_movable_pfn[nid] ?
>  				min(usable_startpfn, zone_movable_pfn[nid]) :
>  				usable_startpfn;
> -- 
> 2.34.1
> 

-- 
Sincerely yours,
Mike.

Re: [Patch v2 1/2] mm/mm_init.c: use memblock_region_memory_base_pfn() to get startpfn

[Wei Yang]

On Fri, May 24, 2024 at 11:16:37AM +0300, Mike Rapoport wrote:
>On Fri, May 24, 2024 at 01:19:13AM +0000, Wei Yang wrote:
>> Just like what it does in "if (mirrored_kernelcore)", we should use
>> memblock_region_memory_base_pfn() to get the startpfn.
>> 
>> Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
>> ---
>>  include/linux/memblock.h | 2 +-
>>  mm/mm_init.c             | 2 +-
>>  2 files changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git a/include/linux/memblock.h b/include/linux/memblock.h
>> index e2082240586d..6cf18dc2b4d0 100644
>> --- a/include/linux/memblock.h
>> +++ b/include/linux/memblock.h
>> @@ -565,7 +565,7 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo
>>  }
>>  
>>  /**
>> - * for_each_mem_region - itereate over memory regions
>> + * for_each_mem_region - iterate over memory regions
>
>Sorry I've missed this in v1, but it should be a separate patch

Sure, will separate it.


-- 
Wei Yang
Help you, Help me