From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 380323CF68D for ; Tue, 21 Apr 2026 12:55:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776776111; cv=none; b=eUUL8qekZ5KWDOy27BqSYCbQNp9zRZHQE0F4LbXonQRROsQS2UK+ofNYrjWl2bYNGiTHhvc/cXgpgQVcayjzegLBaIQzwtaKOtjEjdD0IsZsHnz2clMUAffEAlmxBXGinqV2ZMOuU6prNHpB+HYTm6+OrASARcLtjPI8JScmZFM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776776111; c=relaxed/simple; bh=la0kE+U18VpZTh/JecOWzTRDqzNAkItoXGtY/DvNqnw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z8+RuW0C1IofGTXhQpoMzOfu/FSEj1ufyVuBaZ0S+AE9Yy3+/IyBhTD0DBHzZmqNQlWNv8eJv84ayXPpqQbfm50hM+sq52CvgnYBVHzcLw5F68aqLA3/AUpa0Z+HRbXh25LKR8ew+S9+ch31l3a0Gb6qcIn0+pCQg0KGQcRQzwY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=U/exIEBz; arc=none smtp.client-ip=192.198.163.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="U/exIEBz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1776776110; x=1808312110; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=la0kE+U18VpZTh/JecOWzTRDqzNAkItoXGtY/DvNqnw=; b=U/exIEBz4rCj+ipbdpoTet28bbzZKedD3lg7f6AELKN/SZuNSy/LoLvc icwsTAemKfhaVWkVJjJgPlyMc8qfRW6t26w1BYkRe/ovtU+lBrWLxT0ms xzUQB+0xCciU6CP9xwGUU0FGCHfmi9JU95ElJmsTClEaAFXhCOild3p5+ XUKH2E+fp0b6guoRfhLeWeDX/BenRaQDhBNTnUolX+fw5U6duHXm+Rpog M9T9cjdE+R6rgPLhuw6TpQIc4oZNeezfo+v8mt+6a16VIVDwgIQRDsN7X n48XU2W8KJ5TOPisFjh8CvvOK5MESlBuZWsdaaCGpagAAc/DLKXJlbw/4 g==; X-CSE-ConnectionGUID: GPP4RCF3T2q/ut3A+awyxA== X-CSE-MsgGUID: ITvWLHRcQeqbetNI4vWIBw== X-IronPort-AV: E=McAfee;i="6800,10657,11762"; a="80294044" X-IronPort-AV: E=Sophos;i="6.23,191,1770624000"; d="scan'208";a="80294044" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2026 05:55:10 -0700 X-CSE-ConnectionGUID: xMEVpwGxQwqo+KXyKqoENw== X-CSE-MsgGUID: 0HjUGPv1T6qrWSKq25A/SA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,191,1770624000"; d="scan'208";a="231138638" Received: from spr10.sh.intel.com (HELO localhost) ([10.239.23.75]) by orviesa010.jf.intel.com with ESMTP; 21 Apr 2026 05:55:06 -0700 From: Yuan Liu To: David Hildenbrand , Oscar Salvador , Mike Rapoport , Wei Yang Cc: linux-mm@kvack.org, Yong Hu , Nanhai Zou , Yuan Liu , Tim Chen , Qiuxu Zhuo , Yu C Chen , Pan Deng , Tianyou Li , Chen Zhang , linux-kernel@vger.kernel.org Subject: [PATCH v4 1/2] mm: move overlap memory map init check to memmap_init() Date: Tue, 21 Apr 2026 08:55:07 -0400 Message-ID: <20260421125508.2317429-2-yuan1.liu@intel.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260421125508.2317429-1-yuan1.liu@intel.com> References: <20260421125508.2317429-1-yuan1.liu@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Move the overlap memmap init check from memmap_init_range() into memmap_init(). When mirrored kernelcore is enabled, avoid memory map initialization for overlap regions. There are two cases that may overlap: a mirror memory region assigned to movable zone, or a non-mirror memory region assigned to a non-movable zone but falling within the movable zone range. Signed-off-by: Yuan Liu --- mm/mm_init.c | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/mm/mm_init.c b/mm/mm_init.c index df34797691bd..2b5233060504 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -797,28 +797,6 @@ void __meminit reserve_bootmem_region(phys_addr_t start, } } -/* If zone is ZONE_MOVABLE but memory is mirrored, it is an overlapped init */ -static bool __meminit -overlap_memmap_init(unsigned long zone, unsigned long *pfn) -{ - static struct memblock_region *r; - - if (mirrored_kernelcore && zone == ZONE_MOVABLE) { - if (!r || *pfn >= memblock_region_memory_end_pfn(r)) { - for_each_mem_region(r) { - if (*pfn < memblock_region_memory_end_pfn(r)) - break; - } - } - if (*pfn >= memblock_region_memory_base_pfn(r) && - memblock_is_mirror(r)) { - *pfn = memblock_region_memory_end_pfn(r); - return true; - } - } - return false; -} - /* * Only struct pages that correspond to ranges defined by memblock.memory * are zeroed and initialized by going through __init_single_page() during @@ -905,8 +883,6 @@ void __meminit memmap_init_range(unsigned long size, int nid, unsigned long zone * function. They do not exist on hotplugged memory. */ if (context == MEMINIT_EARLY) { - if (overlap_memmap_init(zone, &pfn)) - continue; if (defer_init(nid, pfn, zone_end_pfn)) { deferred_struct_pages = true; break; @@ -971,6 +947,7 @@ static void __init memmap_init(void) for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, &nid) { struct pglist_data *node = NODE_DATA(nid); + struct memblock_region *r = &memblock.memory.regions[i]; for (j = 0; j < MAX_NR_ZONES; j++) { struct zone *zone = node->node_zones + j; @@ -978,6 +955,18 @@ static void __init memmap_init(void) if (!populated_zone(zone)) continue; + if (mirrored_kernelcore) { + const bool is_mirror = memblock_is_mirror(r); + const bool is_movable_zone = (j == ZONE_MOVABLE); + + if (is_mirror && is_movable_zone) + continue; + + if (!is_mirror && !is_movable_zone && + start_pfn >= zone_movable_pfn[nid]) + continue; + } + memmap_init_zone_range(zone, start_pfn, end_pfn, &hole_pfn); zone_id = j; -- 2.47.3