+ memblock-check-memory-total_size.patch added to -mm tree

+ memblock-check-memory-total_size.patch added to -mm tree

[akpm]

The patch titled
     Subject: memblock: check memory total_size
has been added to the -mm tree.  Its filename is
     memblock-check-memory-total_size.patch

This patch should soon appear at
    https://ozlabs.org/~akpm/mmots/broken-out/memblock-check-memory-total_size.patch
and later at
    https://ozlabs.org/~akpm/mmotm/broken-out/memblock-check-memory-total_size.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***

The -mm tree is included into linux-next and is updated
there every 3-4 working days

------------------------------------------------------
From: Peng Fan <peng.fan@nxp.com>
Subject: memblock: check memory total_size

mem=[X][G|M] is broken on ARM64 platform, there are cases that even
type.cnt is 1, but total_size is not 0 because regions are merged into 1. 
So only check 'cnt' is not enough, total_size should be used, othersize
bootargs 'mem=[X][G|B]' not work anymore.

Link: https://lkml.kernel.org/r/20210930024437.32598-1-peng.fan@oss.nxp.com
Fixes: e888fa7bb882 ("memblock: Check memory add/cap ordering")
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/memblock.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/mm/memblock.c~memblock-check-memory-total_size
+++ a/mm/memblock.c
@@ -1687,7 +1687,7 @@ void __init memblock_cap_memory_range(ph
 	if (!size)
 		return;
 
-	if (memblock.memory.cnt <= 1) {
+	if (!memblock_memory->total_size) {
 		pr_warn("%s: No memory registered yet\n", __func__);
 		return;
 	}
_

Patches currently in -mm which might be from peng.fan@nxp.com are

memblock-check-memory-total_size.patch

Re: + memblock-check-memory-total_size.patch added to -mm tree

[Mike Rapoport]

On Thu, Sep 30, 2021 at 03:23:04PM -0700, akpm@linux-foundation.org wrote:
> 
> The patch titled
>      Subject: memblock: check memory total_size
> has been added to the -mm tree.  Its filename is
>      memblock-check-memory-total_size.patch
> 
> This patch should soon appear at
>     https://ozlabs.org/~akpm/mmots/broken-out/memblock-check-memory-total_size.patch
> and later at
>     https://ozlabs.org/~akpm/mmotm/broken-out/memblock-check-memory-total_size.patch
> 
> Before you just go and hit "reply", please:
>    a) Consider who else should be cc'ed
>    b) Prefer to cc a suitable mailing list as well
>    c) Ideally: find the original patch on the mailing list and do a
>       reply-to-all to that, adding suitable additional cc's
> 
> *** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
> 
> The -mm tree is included into linux-next and is updated
> there every 3-4 working days
> 
> ------------------------------------------------------
> From: Peng Fan <peng.fan@nxp.com>
> Subject: memblock: check memory total_size
> 
> mem=[X][G|M] is broken on ARM64 platform, there are cases that even
> type.cnt is 1, but total_size is not 0 because regions are merged into 1. 
> So only check 'cnt' is not enough, total_size should be used, othersize
> bootargs 'mem=[X][G|B]' not work anymore.
> 
> Link: https://lkml.kernel.org/r/20210930024437.32598-1-peng.fan@oss.nxp.com
> Fixes: e888fa7bb882 ("memblock: Check memory add/cap ordering")
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> Cc: Mike Rapoport <rppt@kernel.org>
> Cc: Geert Uytterhoeven <geert+renesas@glider.be>
> Cc: David Hildenbrand <david@redhat.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

I was planing to take it via memblock tree but since it's already in mmotm:

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

> ---
> 
>  mm/memblock.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> --- a/mm/memblock.c~memblock-check-memory-total_size
> +++ a/mm/memblock.c
> @@ -1687,7 +1687,7 @@ void __init memblock_cap_memory_range(ph
>  	if (!size)
>  		return;
>  
> -	if (memblock.memory.cnt <= 1) {
> +	if (!memblock_memory->total_size) {
>  		pr_warn("%s: No memory registered yet\n", __func__);
>  		return;
>  	}
> _
> 
> Patches currently in -mm which might be from peng.fan@nxp.com are
> 
> memblock-check-memory-total_size.patch
> 

-- 
Sincerely yours,
Mike.