From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) (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 E06E215539A for ; Mon, 17 Nov 2025 02:32:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.17 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763346775; cv=none; b=YByl55AORr3/pH43wMQERHomQ/y1m5zcbXcbsYaujHXy4526pVmd06bHE05l8KCErjtQ3LPAHLoqGI1wUSt3ESplEyQTPEN7+Im21X15093RbZf2yfiU7p57n6Hg5OlRoR8UZ3qd4+NT+MIAlXAeJToupf8lmZ6yhseADxUhpgU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763346775; c=relaxed/simple; bh=Z4YEi9qbtWiwRlqs9qbYFwWfrbJZ6vVZMpfrCH6e9DI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=U7u9eUJ7bvJnzDjP4xjjoVLNzz0Z7NnqjNGfpUN0B1rhDqQIpa/4PM1E+KvCkZXGHXO2BJkloD4HAeQTnT1+ooWvxYw8wLoSYA7jxiN6ZZnTWBYmYpUH2FkKXHau8P1KPYUrU1l9AKkXsefFCm/L/xdTis+v2xSK3arE+GaoUjk= 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=kim9daLN; arc=none smtp.client-ip=192.198.163.17 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="kim9daLN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1763346772; x=1794882772; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=Z4YEi9qbtWiwRlqs9qbYFwWfrbJZ6vVZMpfrCH6e9DI=; b=kim9daLNzg/5IABjUyZ2SCiwFEDLtRz5+LaPFp8SAgQwYGXb4yjb54UF 7RdX3eqMwVpk+7e9+3tVpzBlKof2pKrxHQx9uflGa9YRCh7CUAWAp2B3m /QwNqLx+nVzcRv4L1WdUtsNk7BoIIw44GNqOHq/OXZTC+5ZXVTn8tUU0b 0W3Dsp+ZYeXb+qLz/2mBtjHiwEOHfgb6Xgw6q0qkeire+B4P6TUorNKgi aPhXb00fm+vF0Si5BHW+AE6pNMsGOf3Eb1+0wy8mrZCcuOdLaoQxDVch7 IKGP9p6bObMprRJlaHHmsSIZvIzGcT139AwWKGq2izcU2uUg2c7GINV1h g==; X-CSE-ConnectionGUID: DUPB7buBSty9WUZtB7bEJg== X-CSE-MsgGUID: i0wXu64wSoCYeQa8JgeJmw== X-IronPort-AV: E=McAfee;i="6800,10657,11615"; a="65244435" X-IronPort-AV: E=Sophos;i="6.19,310,1754982000"; d="scan'208";a="65244435" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2025 18:32:52 -0800 X-CSE-ConnectionGUID: /IYMZ3NgS/G3f4sulk4UCw== X-CSE-MsgGUID: 3SMwPYNWS6yAGSCWkBCWfg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,310,1754982000"; d="scan'208";a="220965541" Received: from linux-pnp-server-27.sh.intel.com ([10.239.147.41]) by orviesa002.jf.intel.com with ESMTP; 16 Nov 2025 18:32:49 -0800 From: Tianyou Li To: David Hildenbrand , Oscar Salvador 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] mm/memory hotplug/unplug: Optimize zone->contiguous update when move pfn range Date: Mon, 17 Nov 2025 11:30:52 +0800 Message-ID: <20251117033052.371890-1-tianyou.li@intel.com> X-Mailer: git-send-email 2.47.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When invoke move_pfn_range_to_zone, it will update the zone->contiguous by checking the new zone's pfn range from the beginning to the end, regardless the previous state of the old zone. When the zone's pfn range is large, the cost of traversing the pfn range to update the zone->contiguous could be significant. Add fast paths to quickly detect cases where zone is definitely not contiguous without scanning the new zone. The cases are: when the new range did not overlap with previous range, the contiguous should be false; if the new range adjacent with the previous range, just need to check the new range; if the new added pages could not fill the hole of previous zone, the contiguous should be false. The following test cases of memory hotplug for a VM [1], tested in the environment [2], show that this optimization can significantly reduce the memory hotplug time [3]. +----------------+------+---------------+--------------+----------------+ | | Size | Time (before) | Time (after) | Time Reduction | | +------+---------------+--------------+----------------+ | Memory Hotplug | 256G | 10s | 3s | 70% | | +------+---------------+--------------+----------------+ | | 512G | 33s | 8s | 76% | +----------------+------+---------------+--------------+----------------+ [1] Qemu commands to hotplug 512G memory for a VM: object_add memory-backend-ram,id=hotmem0,size=512G,share=on device_add virtio-mem-pci,id=vmem1,memdev=hotmem0,bus=port1 qom-set vmem1 requested-size 512G [2] Hardware : Intel Icelake server Guest Kernel : v6.18-rc2 Qemu : v9.0.0 Launch VM : qemu-system-x86_64 -accel kvm -cpu host \ -drive file=./Centos10_cloud.qcow2,format=qcow2,if=virtio \ -drive file=./seed.img,format=raw,if=virtio \ -smp 3,cores=3,threads=1,sockets=1,maxcpus=3 \ -m 2G,slots=10,maxmem=2052472M \ -device pcie-root-port,id=port1,bus=pcie.0,slot=1,multifunction=on \ -device pcie-root-port,id=port2,bus=pcie.0,slot=2 \ -nographic -machine q35 \ -nic user,hostfwd=tcp::3000-:22 Guest kernel auto-onlines newly added memory blocks: echo online > /sys/devices/system/memory/auto_online_blocks [3] The time from typing the QEMU commands in [1] to when the output of 'grep MemTotal /proc/meminfo' on Guest reflects that all hotplugged memory is recognized. Reported-by: Nanhai Zou Reported-by: Chen Zhang Tested-by: Yuan Liu Reviewed-by: Tim Chen Reviewed-by: Qiuxu Zhuo Reviewed-by: Yu C Chen Reviewed-by: Pan Deng Reviewed-by: Nanhai Zou Signed-off-by: Tianyou Li --- mm/internal.h | 3 +++ mm/memory_hotplug.c | 48 ++++++++++++++++++++++++++++++++++++++++++++- mm/mm_init.c | 31 ++++++++++++++++++++++------- 3 files changed, 74 insertions(+), 8 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 1561fc2ff5b8..734caae6873c 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -734,6 +734,9 @@ void set_zone_contiguous(struct zone *zone); bool pfn_range_intersects_zones(int nid, unsigned long start_pfn, unsigned long nr_pages); +bool check_zone_contiguous(struct zone *zone, unsigned long start_pfn, + unsigned long nr_pages); + static inline void clear_zone_contiguous(struct zone *zone) { zone->contiguous = false; diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 0be83039c3b5..96c003271b8e 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -723,6 +723,47 @@ static void __meminit resize_pgdat_range(struct pglist_data *pgdat, unsigned lon } +static void __meminit update_zone_contiguous(struct zone *zone, + bool old_contiguous, unsigned long old_start_pfn, + unsigned long old_nr_pages, unsigned long old_absent_pages, + unsigned long new_start_pfn, unsigned long new_nr_pages) +{ + unsigned long old_end_pfn = old_start_pfn + old_nr_pages; + unsigned long new_end_pfn = new_start_pfn + new_nr_pages; + unsigned long new_filled_pages = 0; + + /* + * If the moved pfn range does not intersect with the old zone span, + * the contiguous property is surely false. + */ + if (new_end_pfn < old_start_pfn || new_start_pfn > old_end_pfn) + return; + + /* + * If the moved pfn range is adjacent to the old zone span, + * check the range to the left or to the right + */ + if (new_end_pfn == old_start_pfn || new_start_pfn == old_end_pfn) { + zone->contiguous = old_contiguous && + check_zone_contiguous(zone, new_start_pfn, new_nr_pages); + return; + } + + /* + * If old zone's hole larger than the new filled pages, the contiguous + * property is surely false. + */ + new_filled_pages = new_end_pfn - old_start_pfn; + if (new_start_pfn > old_start_pfn) + new_filled_pages -= new_start_pfn - old_start_pfn; + if (new_end_pfn > old_end_pfn) + new_filled_pages -= new_end_pfn - old_end_pfn; + if (new_filled_pages < old_absent_pages) + return; + + set_zone_contiguous(zone); +} + #ifdef CONFIG_ZONE_DEVICE static void section_taint_zone_device(unsigned long pfn) { @@ -752,6 +793,10 @@ void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn, { struct pglist_data *pgdat = zone->zone_pgdat; int nid = pgdat->node_id; + bool old_contiguous = zone->contiguous; + unsigned long old_start_pfn = zone->zone_start_pfn; + unsigned long old_nr_pages = zone->spanned_pages; + unsigned long old_absent_pages = zone->spanned_pages - zone->present_pages; clear_zone_contiguous(zone); @@ -783,7 +828,8 @@ void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn, MEMINIT_HOTPLUG, altmap, migratetype, isolate_pageblock); - set_zone_contiguous(zone); + update_zone_contiguous(zone, old_contiguous, old_start_pfn, old_nr_pages, + old_absent_pages, start_pfn, nr_pages); } struct auto_movable_stats { diff --git a/mm/mm_init.c b/mm/mm_init.c index 7712d887b696..04fdd949fe49 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -2263,26 +2263,43 @@ void __init init_cma_pageblock(struct page *page) } #endif -void set_zone_contiguous(struct zone *zone) +/* + * Check if all pageblocks in the given PFN range belong to the given zone. + * The given range is expected to be within the zone's pfn range, otherwise + * false is returned. + */ +bool check_zone_contiguous(struct zone *zone, unsigned long start_pfn, + unsigned long nr_pages) { - unsigned long block_start_pfn = zone->zone_start_pfn; + unsigned long end_pfn = start_pfn + nr_pages; + unsigned long block_start_pfn = start_pfn; unsigned long block_end_pfn; + if (start_pfn < zone->zone_start_pfn || end_pfn > zone_end_pfn(zone)) + return false; + block_end_pfn = pageblock_end_pfn(block_start_pfn); - for (; block_start_pfn < zone_end_pfn(zone); + for (; block_start_pfn < end_pfn; block_start_pfn = block_end_pfn, block_end_pfn += pageblock_nr_pages) { - block_end_pfn = min(block_end_pfn, zone_end_pfn(zone)); + block_end_pfn = min(block_end_pfn, end_pfn); if (!__pageblock_pfn_to_page(block_start_pfn, block_end_pfn, zone)) - return; + return false; cond_resched(); } - /* We confirm that there is no hole */ - zone->contiguous = true; + return true; +} + +void set_zone_contiguous(struct zone *zone) +{ + unsigned long start_pfn = zone->zone_start_pfn; + unsigned long nr_pages = zone->spanned_pages; + + zone->contiguous = check_zone_contiguous(zone, start_pfn, nr_pages); } /* -- 2.47.1