Received-SPF: pass (google.com: domain of linux-kernel+bounces-29744-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Thu, 18 Jan 2024 08:42:08 +0200
From: Mike Rapoport <rppt@kernel.org>
To: Yajun Deng <yajun.deng@linux.dev>, Huang Pei <huangpei@loongson.cn>
Cc: akpm@linux-foundation.org, linux-mm@kvack.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] memblock: fix crash when reserved memory is not added to
 memory
Message-ID: <ZajIQGtqUNWgBWkk@kernel.org>
References: <20240118061853.2652295-1-yajun.deng@linux.dev>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240118061853.2652295-1-yajun.deng@linux.dev>

(adding Huang Pei to verify this fixes the crash on loongarch)

On Thu, Jan 18, 2024 at 02:18:53PM +0800, Yajun Deng wrote:
> After commit 61167ad5fecd ("mm: pass nid to reserve_bootmem_region()"),
> we set nid on all reserved pages based on memory region, but some reserved
> memory may not be added to memory on certain architectures. The nid is
> invalid.
> 
> Add the nid check, make sure the nid is valid by early_pfn_to_nid().
> 
> Fixes: 61167ad5fecd ("mm: pass nid to reserve_bootmem_region()")
> Signed-off-by: Yajun Deng <yajun.deng@linux.dev>
> ---
>  mm/memblock.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/mm/memblock.c b/mm/memblock.c
> index abd92869874d..4dcb2ee35eca 100644
> --- a/mm/memblock.c
> +++ b/mm/memblock.c
> @@ -2176,6 +2176,9 @@ static void __init memmap_init_reserved_pages(void)
>  			start = region->base;
>  			end = start + region->size;
>  
> +			if (nid == NUMA_NO_NODE || nid >= MAX_NUMNODES)
> +				nid = early_pfn_to_nid(PFN_DOWN(start));
> +
>  			reserve_bootmem_region(start, end, nid);
>  		}
>  	}
> -- 
> 2.25.1
> 

-- 
Sincerely yours,
Mike.