From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21CB2C4707B for ; Thu, 18 Jan 2024 06:19:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 771776B007E; Thu, 18 Jan 2024 01:19:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 721E26B0080; Thu, 18 Jan 2024 01:19:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 611486B0081; Thu, 18 Jan 2024 01:19:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 4F4A26B007E for ; Thu, 18 Jan 2024 01:19:13 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 1F0BEC012C for ; Thu, 18 Jan 2024 06:19:13 +0000 (UTC) X-FDA: 81691429386.15.739344E Received: from out-189.mta1.migadu.com (out-189.mta1.migadu.com [95.215.58.189]) by imf14.hostedemail.com (Postfix) with ESMTP id 6D828100009 for ; Thu, 18 Jan 2024 06:19:11 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=q2SumlNy; spf=pass (imf14.hostedemail.com: domain of yajun.deng@linux.dev designates 95.215.58.189 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705558751; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=sH3eJ1PeLEzp5iMX2ShmJd90S2HOzxuMkVgsHD8St1Y=; b=NaQd1Pw8fJjS7QXZnueUCvgQoqEhxBO8ffsqjCWv2aRS8yZBwckivX8bmJppqL4muAjKSx HgREUMn9BYu4bdu3QKkg8okJAG6cCKNfYdiKbjmPBa04egDTRohSomexpF9x39Nmb3uQDc zm/j2o9RqCsgllesHeC1lBQeeb2hBy8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705558751; a=rsa-sha256; cv=none; b=CDZ8Dv24TBHcSlde1PxIzYW/6yv1VV7BZL/i1WfZsjlTQjSiiC/NYLjJNCZQZKQC8BOEtP KEQW8AJwC8rUdFD8zOPxsknlgQNTGzdAJME4oL8EY/waSuu1QtubvBGLxyVz9W5LGWk1ad yIG5Moj9OkKdm86NjCUlE7McB4z55YQ= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=q2SumlNy; spf=pass (imf14.hostedemail.com: domain of yajun.deng@linux.dev designates 95.215.58.189 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1705558750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=sH3eJ1PeLEzp5iMX2ShmJd90S2HOzxuMkVgsHD8St1Y=; b=q2SumlNy5FfAKZtKClDn1OZKQxeQKmH5Ko8ONI9YBImUJweeTR0HEQzbzogjPn7TpyvV+/ 8ZS/gh2bUD/06yC8yrpxg0VMAs5WzeXGxNeSj0pCv/MQE6LWrhKsYgZJV2Dywlsff9GjUN lZXP7e+Ow4a2bjv8x9ynsVWigz+rWj8= From: Yajun Deng To: rppt@kernel.org, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH] memblock: fix crash when reserved memory is not added to memory Date: Thu, 18 Jan 2024 14:18:53 +0800 Message-Id: <20240118061853.2652295-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Stat-Signature: 33w6xp8ow7rzrh7zs455b191foedebik X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 6D828100009 X-Rspam-User: X-HE-Tag: 1705558751-960583 X-HE-Meta: U2FsdGVkX19tB3DoXRESfvTL8Wk48CqsMley3U1WK4aDnb00q+Uc/SArJFBQCsTzWaXFSLeDXDRtpZT3BC+DA526hGqniAkWcTTyKxpVYO2dGkkBYoyPmzMtAYTmop0M7hIBlHLdCsyaM7D36l7PJEc52jQeCupdz+cccLmkZUDSYIpKfuBC8gMmybuSVDQYlUnUYn6dKmWF6NlgxkR2EcUxD0E2uS0hk/Dgzt+sKl/75Dl7g8QdR46DTdv1HOiOSMUPoIGKRPNYG13peWACtiWiguJrXM1A/zG4JuLkqSCaK7gokwJZilHIGoSOdJclonrwxejsvd8ARR5CevlHv3k6JztPmgv/sTN3clAGJTCCVQ+RjDeZibkphAbTRYtQxbq6dViTQMm+hGNIEymr8aHdGjRUiZBA8N4UGWvaFf+PSUVpbJyOHSToPofjW2k0jAvJnYX3caRdHHHRhHX2qzriEAbPatvh+bXiylJACo61Qxdfi64G1IEIyVYWqcer4PNztljNXn8KwKniSLH4VdPiSefpzhrgxPtBISMDS3gLodR1kvCmeoxNxksq0RPtRI98ZQdUdwR16365yhs+RP6lZAOK7QsKm/agt0I1D0ZPVju/+S4E7nFShxWQIyAf7PWAODSp2TkM3ayD0/PTbORWt+bLEOzDSYDDqh1XbwOfPHU7uIlk9wJLXNJ1GAkPGlPJ7dY/iMAqzE/Q5tXwqGYm8cU9l/o9yoUX3F/QqXOinai82jzTy/c94uFhW+9rZYGIgsA1yJ9J99EDm4WkUgw0Sln/SKYQmo496pTNPiKStmfHHUL4RsKdsjpUj0Q0ukhRjy4P8g+y/pt3RPo/ZNvEmR3QT+s0vHrh5P9Uz1QCE4zne2pu2e/JpdRJSZopgzVJ0ubZ/h0+Q8AE1ekeLT2R/daVos4UB5iLEco8aAX5eP10eZ9t6JOOeDpSbvROIyTNROzZheyWROGQK21 kODd4+YJ G29IlBGVO2MoAIgmscM6nyFh/eyMgVzwP1lt2bI0cz2B/iacn+l98NAQjsb/qj1AGABZv6dfJdchISdQ= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 --- 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