From nobody Mon Feb 9 08:53:58 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) (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 E0BCB42DFF3 for ; Tue, 20 Jan 2026 13:33:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768916021; cv=none; b=UuqjQm5MEePgJpvxMMVA1YJWek2uUa6FFtNoveEk1uLAPe4AYBCMOcWdm7GaG4sbJFBG82iPnCmB3lHlT6muY/WFhLPvJ+TOkDYQKUsQSQowRD3qVgmOEIcUDfo/whhz20pEnMYGgQTgZs480tGi5/jhDl0qUrjvx81Jl0JBdWk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768916021; c=relaxed/simple; bh=sGg98/0mfkXeZaIF7/NLUeUNQ16GKxKIfCu6nxC+d64=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r5FSvNEb3e3NsS1bdyp0l+0IhdNB2h7DEyqK+uafXBOYt7NQdYhcDM622uP0GrIQoiYqoX7ft/UypKk9SdC/+pph7IcOA9SU1wZkLoCbPr+YG80llGCqsZfiAn4zaiNQlYX1Wopj+V9ghz6OuekVVj3npPMsBxXERJOoYUUa/aA= 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=TdP4HPmm; arc=none smtp.client-ip=192.198.163.10 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="TdP4HPmm" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1768916020; x=1800452020; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sGg98/0mfkXeZaIF7/NLUeUNQ16GKxKIfCu6nxC+d64=; b=TdP4HPmmEfRTsUt8FX6qLRWshvfcFv4CHm6bxkmKUhSXiEmNy7WeR7Wi W4h38rjk4AjYl4eGisRw6MsaprDXM1k57YXAAjvMwdw/HZ1QcwPIci0p2 O6cdaMVxB2DSRTPB7EjB7D6Bze3fNajZxHee7ap/Bay24/gXQAYRxeYHq PjiZn3Dhh6fHieg6wIa7rGXybNP24PXMqsOXF2ldqAdEg5WATavTYiksO LIXWknARLAljoCAUwIcjcffG4cAdhE5mn2G3FwwbwKM7+cLw+SJkXkHpv ykSAiJMHtbqoclPqHH+LxgJAcwu3wr4bw9SM7h7yh9v8G4lLXHNYDlICL g==; X-CSE-ConnectionGUID: y2vkG4zRTp66LQm0517sKg== X-CSE-MsgGUID: PNsCtTkbTjWYMm/ig/UykA== X-IronPort-AV: E=McAfee;i="6800,10657,11676"; a="81494866" X-IronPort-AV: E=Sophos;i="6.21,240,1763452800"; d="scan'208";a="81494866" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2026 05:33:39 -0800 X-CSE-ConnectionGUID: S+MvX06HQgqHMRKQsNBUiQ== X-CSE-MsgGUID: Gz9yuQqbR9q/M8E47MMh+g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,240,1763452800"; d="scan'208";a="210272049" Received: from linux-pnp-server-27.sh.intel.com ([10.239.147.41]) by orviesa003.jf.intel.com with ESMTP; 20 Jan 2026 05:33:35 -0800 From: Tianyou Li To: David Hildenbrand , Oscar Salvador , Mike Rapoport , Wei Yang , Michal Hocko 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 v8 2/3] mm/memory hotplug/unplug: Add online_memory_block_pages() and offline_memory_block_pages() Date: Tue, 20 Jan 2026 22:33:45 +0800 Message-ID: <20260120143346.1427837-3-tianyou.li@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260120143346.1427837-1-tianyou.li@intel.com> References: <20260120143346.1427837-1-tianyou.li@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: quoted-printable Content-Type: text/plain; charset="utf-8" Encapsulate the mhp_init_memmap_on_memory() and online_pages() into online_memory_block_pages(). Thus we can further optimize the set_zone_contiguous() to check the whole memory block range, instead of check the zone contiguous in separate range. Correspondingly, encapsulate the mhp_deinit_memmap_on_memory() and offline_pages() into offline_memory_block_pages(). Tested-by: Yuan Liu Reviewed-by: Yuan Liu Signed-off-by: Tianyou Li --- drivers/base/memory.c | 53 ++++++--------------------- include/linux/memory_hotplug.h | 18 +++++----- mm/memory_hotplug.c | 65 +++++++++++++++++++++++++++++++--- 3 files changed, 80 insertions(+), 56 deletions(-) diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 751f248ca4a8..ea4d6fbf34fd 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -246,31 +246,12 @@ static int memory_block_online(struct memory_block *m= em) nr_vmemmap_pages =3D mem->altmap->free; =20 mem_hotplug_begin(); - if (nr_vmemmap_pages) { - ret =3D mhp_init_memmap_on_memory(start_pfn, nr_vmemmap_pages, zone); - if (ret) - goto out; - } - - ret =3D online_pages(start_pfn + nr_vmemmap_pages, - nr_pages - nr_vmemmap_pages, zone, mem->group); - if (ret) { - if (nr_vmemmap_pages) - mhp_deinit_memmap_on_memory(start_pfn, nr_vmemmap_pages); - goto out; - } - - /* - * Account once onlining succeeded. If the zone was unpopulated, it is - * now already properly populated. - */ - if (nr_vmemmap_pages) - adjust_present_page_count(pfn_to_page(start_pfn), mem->group, - nr_vmemmap_pages); - - mem->zone =3D zone; -out: + ret =3D online_memory_block_pages(start_pfn, nr_pages, nr_vmemmap_pages, + zone, mem->group); + if (!ret) + mem->zone =3D zone; mem_hotplug_done(); + return ret; } =20 @@ -295,26 +276,12 @@ static int memory_block_offline(struct memory_block *= mem) nr_vmemmap_pages =3D mem->altmap->free; =20 mem_hotplug_begin(); - if (nr_vmemmap_pages) - adjust_present_page_count(pfn_to_page(start_pfn), mem->group, - -nr_vmemmap_pages); - - ret =3D offline_pages(start_pfn + nr_vmemmap_pages, - nr_pages - nr_vmemmap_pages, mem->zone, mem->group); - if (ret) { - /* offline_pages() failed. Account back. */ - if (nr_vmemmap_pages) - adjust_present_page_count(pfn_to_page(start_pfn), - mem->group, nr_vmemmap_pages); - goto out; - } - - if (nr_vmemmap_pages) - mhp_deinit_memmap_on_memory(start_pfn, nr_vmemmap_pages); - - mem->zone =3D NULL; -out: + ret =3D offline_memory_block_pages(start_pfn, nr_pages, nr_vmemmap_pages, + mem->zone, mem->group); + if (!ret) + mem->zone =3D NULL; mem_hotplug_done(); + return ret; } =20 diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index f2f16cdd73ee..1f8d5edd820d 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -106,11 +106,9 @@ extern void adjust_present_page_count(struct page *pag= e, struct memory_group *group, long nr_pages); /* VM interface that may be used by firmware interface */ -extern int mhp_init_memmap_on_memory(unsigned long pfn, unsigned long nr_p= ages, - struct zone *zone); -extern void mhp_deinit_memmap_on_memory(unsigned long pfn, unsigned long n= r_pages); -extern int online_pages(unsigned long pfn, unsigned long nr_pages, - struct zone *zone, struct memory_group *group); +extern int online_memory_block_pages(unsigned long start_pfn, + unsigned long nr_pages, unsigned long nr_vmemmap_pages, + struct zone *zone, struct memory_group *group); extern unsigned long __offline_isolated_pages(unsigned long start_pfn, unsigned long end_pfn); =20 @@ -261,8 +259,9 @@ static inline void pgdat_resize_init(struct pglist_data= *pgdat) {} #ifdef CONFIG_MEMORY_HOTREMOVE =20 extern void try_offline_node(int nid); -extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages, - struct zone *zone, struct memory_group *group); +extern int offline_memory_block_pages(unsigned long start_pfn, + unsigned long nr_pages, unsigned long nr_vmemmap_pages, + struct zone *zone, struct memory_group *group); extern int remove_memory(u64 start, u64 size); extern void __remove_memory(u64 start, u64 size); extern int offline_and_remove_memory(u64 start, u64 size); @@ -270,8 +269,9 @@ extern int offline_and_remove_memory(u64 start, u64 siz= e); #else static inline void try_offline_node(int nid) {} =20 -static inline int offline_pages(unsigned long start_pfn, unsigned long nr_= pages, - struct zone *zone, struct memory_group *group) +static inline int offline_memory_block_pages(unsigned long start_pfn, + unsigned long nr_pages, unsigned long nr_vmemmap_pages, + struct zone *zone, struct memory_group *group) { return -EINVAL; } diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index c8f492b5daf0..8793a83702c5 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1085,7 +1085,7 @@ void adjust_present_page_count(struct page *page, str= uct memory_group *group, group->present_kernel_pages +=3D nr_pages; } =20 -int mhp_init_memmap_on_memory(unsigned long pfn, unsigned long nr_pages, +static int mhp_init_memmap_on_memory(unsigned long pfn, unsigned long nr_p= ages, struct zone *zone) { unsigned long end_pfn =3D pfn + nr_pages; @@ -1116,7 +1116,7 @@ int mhp_init_memmap_on_memory(unsigned long pfn, unsi= gned long nr_pages, return ret; } =20 -void mhp_deinit_memmap_on_memory(unsigned long pfn, unsigned long nr_pages) +static void mhp_deinit_memmap_on_memory(unsigned long pfn, unsigned long n= r_pages) { unsigned long end_pfn =3D pfn + nr_pages; =20 @@ -1139,7 +1139,7 @@ void mhp_deinit_memmap_on_memory(unsigned long pfn, u= nsigned long nr_pages) /* * Must be called with mem_hotplug_lock in write mode. */ -int online_pages(unsigned long pfn, unsigned long nr_pages, +static int online_pages(unsigned long pfn, unsigned long nr_pages, struct zone *zone, struct memory_group *group) { struct memory_notify mem_arg =3D { @@ -1254,6 +1254,37 @@ int online_pages(unsigned long pfn, unsigned long nr= _pages, return ret; } =20 +int online_memory_block_pages(unsigned long start_pfn, + unsigned long nr_pages, unsigned long nr_vmemmap_pages, + struct zone *zone, struct memory_group *group) +{ + int ret; + + if (nr_vmemmap_pages) { + ret =3D mhp_init_memmap_on_memory(start_pfn, nr_vmemmap_pages, zone); + if (ret) + return ret; + } + + ret =3D online_pages(start_pfn + nr_vmemmap_pages, + nr_pages - nr_vmemmap_pages, zone, group); + if (ret) { + if (nr_vmemmap_pages) + mhp_deinit_memmap_on_memory(start_pfn, nr_vmemmap_pages); + return ret; + } + + /* + * Account once onlining succeeded. If the zone was unpopulated, it is + * now already properly populated. + */ + if (nr_vmemmap_pages) + adjust_present_page_count(pfn_to_page(start_pfn), group, + nr_vmemmap_pages); + + return ret; +} + /* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG = */ static pg_data_t *hotadd_init_pgdat(int nid) { @@ -1896,7 +1927,7 @@ static int count_system_ram_pages_cb(unsigned long st= art_pfn, /* * Must be called with mem_hotplug_lock in write mode. */ -int offline_pages(unsigned long start_pfn, unsigned long nr_pages, +static int offline_pages(unsigned long start_pfn, unsigned long nr_pages, struct zone *zone, struct memory_group *group) { unsigned long pfn, managed_pages, system_ram_pages =3D 0; @@ -2101,6 +2132,32 @@ int offline_pages(unsigned long start_pfn, unsigned = long nr_pages, return ret; } =20 +int offline_memory_block_pages(unsigned long start_pfn, + unsigned long nr_pages, unsigned long nr_vmemmap_pages, + struct zone *zone, struct memory_group *group) +{ + int ret; + + if (nr_vmemmap_pages) + adjust_present_page_count(pfn_to_page(start_pfn), group, + -nr_vmemmap_pages); + + ret =3D offline_pages(start_pfn + nr_vmemmap_pages, + nr_pages - nr_vmemmap_pages, zone, group); + if (ret) { + /* offline_pages() failed. Account back. */ + if (nr_vmemmap_pages) + adjust_present_page_count(pfn_to_page(start_pfn), + group, nr_vmemmap_pages); + return ret; + } + + if (nr_vmemmap_pages) + mhp_deinit_memmap_on_memory(start_pfn, nr_vmemmap_pages); + + return ret; +} + static int check_memblock_offlined_cb(struct memory_block *mem, void *arg) { int *nid =3D arg; --=20 2.47.1