From nobody Wed Dec 17 08:55:13 2025 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2089.outbound.protection.outlook.com [40.107.236.89]) (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 11F3325EF86 for ; Fri, 9 May 2025 20:01:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.89 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746820881; cv=fail; b=FzT/JeGAZbH08tJ/GKefJvVCaQ7AR0lRNUyK0r3Cf4xUxWUHh13r9i64/Etrkt1m40humk1yNRFaea0IoFlGWmbmm+yjV6PZUK3WS3HMypFDFg7h5HsN/zNwAWGs5Wlrftc7DtkiWM9JktIvbDLHZ+crAe5WhfJ8Pwp34Huz544= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746820881; c=relaxed/simple; bh=siw/w+I5rKjfUkLrzLXzDtz9XKLliBByIWCa5AJJBOI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=iBPC3E6/X4FeawfcdBN2qDoXHdq9nZLYWG/Mim/ai9n11k3u85+Ch9X5JSSLoXXPz19lnt45EjLGRIptZfYuFDtzRyl3/5TdvNyJeo21ck6NwWh0r5lemHyA+kDNaJpryHcp5GRTu15giDNckLVLdU1Tta8/KuCsr6d1FUoZPIs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=ChR+LqgL; arc=fail smtp.client-ip=40.107.236.89 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="ChR+LqgL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dCCtwvcmfJUk31V03KfLVgqr6M75h0y1S97pzp7SPyzhwV5uJmfMMxq8k/OGD84dY+9IoenXKB1pJOmoGzn/oxhQJC4k3qYCF0XRmbtHZ+EBMdHM0NJOAW1vTfVNeYj/Qq+FPAgkwLxh0hHdeFnm/RH0OYbEB5KjYo64KfNUPBuXXYVHuzd37ILwgt51DGRFNkND4MQw6wNlY41AS1W1OnROJ2t7dAxE11ydRQ/wx0Fxy1x1yvQPMaVaIlXZUJFL0smqOpMIvfpMwpkrawlEWJDtUYHOkKyekPzWj623WvNcnJ3ZpZsOR7P94nxySayOXDaVJjt3waLv1/tpFOiDgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=x+YkODnP+RXZBO5F7UJutAGnuS4GVqtM99Qb8YM6axQ=; b=uyv/llFZdc4Ccw3GlE9pVOhVQH7zEShczOVKa4TQ+PMr3mfPzJe4XQ7Imd20fne5gCoP1QjzExd1tr9BcDOrVyPCkZpz6/lak1ams7g8nStBWcZxXXVlv8Nl8bQFlNo35w1mkc/lMSnd3SA7iiXq3IZT5ujtkQzQ8XbUvTAGHmVUJ8BL3PeE8IRSXaYy+59LwKs1My5gFxEyIGOePEIyja5NKsYCLEqkY4el8xO8QNsuOJlh3RMDVlXuMGKdb6wqM18QvBFvnb2vdWpQPHgXTQ4DczD5qYBLnktLbPphO6xMvWh3lQ8UHf3/+a/CoNcziTjdEX3/0OW8KY+Lvu5hdQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=x+YkODnP+RXZBO5F7UJutAGnuS4GVqtM99Qb8YM6axQ=; b=ChR+LqgLvyZV1SuU0NA3uLk0lmgyH5UCMZ81g5j5iyy4nFmNi37/RdTOfdQRoS9AtxFDMj3S17BLgmHnPxMnz1GQkgNTe8Dz2vTSKKhATbJSwtQrt49YbrNpZq2wsQch4cgk7RPScdlxwiVKrjejY9pe277RN8Pk4wq/xaIE1/F5ARmt+268I9JnpL6GpCZjRDNcyijhouXe8NX26jUU4zqzCJqr4QNtqmiZmYUsvdCpOM0XYuxK3szyb3n3ld21SDiCqVN8UOOz1RuziYyeFwSNdxBbTkXhh6JddX7ln09B4r2LO+EXmc7ShEwBKmw5uU9Hl5mAL6XyKLTB0uVS5Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) by DM4PR12MB5865.namprd12.prod.outlook.com (2603:10b6:8:64::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.24; Fri, 9 May 2025 20:01:15 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a%5]) with mapi id 15.20.8722.020; Fri, 9 May 2025 20:01:15 +0000 From: Zi Yan To: David Hildenbrand , Oscar Salvador , Johannes Weiner , linux-mm@kvack.org Cc: Andrew Morton , Vlastimil Babka , Baolin Wang , "Kirill A . Shutemov" , Mel Gorman , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Richard Chang , linux-kernel@vger.kernel.org, Zi Yan Subject: [PATCH v4 1/4] mm/page_isolation: make page isolation a standalone bit. Date: Fri, 9 May 2025 16:01:08 -0400 Message-ID: <20250509200111.3372279-2-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250509200111.3372279-1-ziy@nvidia.com> References: <20250509200111.3372279-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MN0PR03CA0005.namprd03.prod.outlook.com (2603:10b6:208:52f::12) To DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS7PR12MB9473:EE_|DM4PR12MB5865:EE_ X-MS-Office365-Filtering-Correlation-Id: 5d7991ac-2dd0-471c-03d0-08dd8f34413b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?1BUJts5Jh9Mr9Z7UfB84yMD50qJZQDyr35L/6bsXKPRiORBtAMhe0kZAkkQi?= =?us-ascii?Q?i91IIdg6cLVwHrymrqoN1UxmUPW3dnFl1Dq9ywVsNgKY+OYia5dGU9jC0N7X?= =?us-ascii?Q?/6CuXtPH5T8C2E65cY4V1T5u8WMOtUazHwFHul+s8u4VfvApGZhHmARSxMQH?= =?us-ascii?Q?xc+tzGmU8GTDDATRPZ5T3Lx16jn9tT1wGjeerIHSMvBG8rK1JLQFSEwS7Qiw?= =?us-ascii?Q?ZXMteAcX6C+H4qlsYRvtrGpYwVMGqKxngj729/VGCYSP4heKl2+6SPHBB/RG?= =?us-ascii?Q?90i6mgwUQJRYAUsf2r18loOpLlV0wPbEagoCQfKOYo0trv936782LZcQ9aze?= =?us-ascii?Q?QVsKfJIzXVBW/6KoIG9+SdQtw+rdbyhJDt91156UGxAPoie7MNqbq0nWDgqO?= =?us-ascii?Q?J3Q+WCjeRS8r4QKPJ3nS9PZyfP3EPWFmuK58pw8PgYwXUZs35cCiEeN0c9IW?= =?us-ascii?Q?g4uTkwFlHM1tZhDxmKBtGkZjCO6vsOaKikre66V+4qzktwuZ03F8SrrygHhh?= =?us-ascii?Q?K+HGbimlekmIjn4HjYPS6oXpqOFt86v/9U9SU3M0fJVvJMKrGf+xaToHljsA?= =?us-ascii?Q?/KDnPLrSG+Y2CmVMRpW7ROfwa3UZ+i+uMh7A+UaUXjW87pA0R81k+Bk3XOBK?= =?us-ascii?Q?/sftPVc1eNLbdGqcX4GYQutJ8/r0YiQxU0snUyNBL2PMK0wBA3SRMt2nH0JF?= =?us-ascii?Q?ix+wi7ah4AgoDLP+y1XhmP4nQ4Pln4FAM2C4hSGdWkZZOPZNyoMDP8DgySup?= =?us-ascii?Q?mGKlnvzwncUCzd2phMbMYa4S1WZmdxwS+vOUhL+RwYIgelEO0fEJs5QCTx/m?= =?us-ascii?Q?lexKpsRB9Q8s4XY3p4mV8QPLs836nEHKwgw936EFC9zkF/qCtT67sLTNPg+/?= =?us-ascii?Q?TziBLcW81kmfLHY0Rmubuh91yW9aWfnwf/T9DveIy6v72T88TY29wofJC9zW?= =?us-ascii?Q?YlMHe4Zhhu328IPh1fL1vZNkTxwzrUNQQ4oLEiOyBEzV6mI++Hn+R0a97yS7?= =?us-ascii?Q?7HR8aCW4Y/M3GGqR4ThAHLIpztH7BX3uP8zgtZ/2jxyTJlnIKg9XN2/WMxE7?= =?us-ascii?Q?+rTduJXBSmtg+TESTVAqichKRmEmhAlowQfKvmUSgW2lpbgL68FrzuK2pxQf?= =?us-ascii?Q?jUvG5Y9+hpkk8mHqQPMVuYwpVFuY+U4x/Lvrx+ii5gnlLv7GkNAQDr/j4xYq?= =?us-ascii?Q?1haadxKCUtxuDaLanQ5hIOhKD3ssswwV0QHSn64Ne4sLFzwWMpsyw1pMgQ1u?= =?us-ascii?Q?sVXNDEhbEju6+gSLH7LxxmTpTS2rFgcHYGE7N7nh8X83jFErB3GHfk5phvfG?= =?us-ascii?Q?Wev6uxy5PEAwvtHdKY6jh2xbnuXtaXTtzg8y9K0O6SJLMmktxsI2/DQSV1vU?= =?us-ascii?Q?Fq5E06aehDFQdA69O/NV+oeZon6l6JBmIawmOZCD9xwsjqz0s6Ss9uJLJYLa?= =?us-ascii?Q?plBlMBhjtwQ=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR12MB9473.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?GicnRyp5ipSp90mJY6iJTcR2eh2Q2pYR+igUgXemjffTxoFn+Sfg3sKupefT?= =?us-ascii?Q?ppdkLGU6IByECMRadxSrNlCMCNaqwz/64w6MzQR4zIPTEzYCy6zfv7kbWKr6?= =?us-ascii?Q?3Xc94Qigq0pagJzguBIg/y+dnd2Gf9l/mM8OQC5e8VrVOWDhqbF//R8FmRQj?= =?us-ascii?Q?lHRYtaRtM6H0oV3k/jt50BSc3w5jWoWOp7rKSAKDVMDSkg5gkdByukH36xQV?= =?us-ascii?Q?rU3mgb3RW2Fs8oIf2EjchFLUk77Qu4u0+MiStcHH+tucrgrFSev82qJqdZuT?= =?us-ascii?Q?o/y1hrB/Rtihb5JLahdSKDJZze3POdWWGERP0azBdhLGvxt3xRziDI5JUywG?= =?us-ascii?Q?gidpp6cz9tyog8n8c+vTtMrY/KnodzMtLX+j5fjDxBu2i3eSqKzOz2AXgYC6?= =?us-ascii?Q?okke3NG5eGk7JJX9aKLzARFKaOy8+ct3NK7aqeHERYja5YMcaC4tezOjkWMe?= =?us-ascii?Q?XVG9pDXtIrAka/9MooxMZmzZq0as3YGnwb8LVZX/R3lANEb/cOvicrC5SG9i?= =?us-ascii?Q?fu11x3FgPxAMDds2Sky+YvzeA/SL/AQxP08Re4SIWEXv2LhDX97v2GPPw3Ep?= =?us-ascii?Q?vH/piDq3nKVKC+JYB+61pPCXhZYYIS4dp3/6O9ZwgfPitjJCyr+Hi3Apd81o?= =?us-ascii?Q?sI/gEDrFBMP4YNHxkqngOEWOjlzedoolWwBL/O2U0pZMLMnEVfl9XH0vu0gy?= =?us-ascii?Q?sZNnopPjPt7AA7eMcsk9TpOdnlrFv5zJKeCC1RcPOWN615h6MwOvcDJhzo7I?= =?us-ascii?Q?neHDQTlNpAkfoBhSW4nLHZshJvcvv4PDJmcjLkevwY++AW82/9QjMooBiIfA?= =?us-ascii?Q?zk7TwL/MMBDi9xhdMn2iawLuQE7S1bSKvbFiK30yvonkJlWCnxnWQZbUXhhQ?= =?us-ascii?Q?APn9AeUC4HDsP7JDBSPe7PMWxrYbjqaiezf/bae+VQB2a98+vEN0bxH5SgQw?= =?us-ascii?Q?zkwsulVy3CrWpeuAVJrvtWGuIJWH1Q8BL1Vj2FZWjVWkbIjZ8/RzE0h3PkHR?= =?us-ascii?Q?J/+js0iwNu0CfweJ26aEsjxdrbbPLhiHJLJhoirx3K7DQG0P8Kqm4gLjAwH1?= =?us-ascii?Q?b5nCs4TsL5n6OOuEUC3F0NlR+82NZYg+yUTLx2tOJLcqr0a/9qq5/hqTOj7/?= =?us-ascii?Q?nk9GqBEzgaEVoZLFgH3h9lRT3xDN4sIq6zPbky1Bzz97h2QXjSb/Og3fK9nV?= =?us-ascii?Q?hlhbSJu2wZy7t4QyvzYbECkGDYBKRy3wpSbxR9C0Z3lYUkTYhcYC6fy5vOkR?= =?us-ascii?Q?VJo4Fnw36cLeScs7JPwrnHPSEUuFg4gSxnJzQoQuk0F7WmI8H8VFwpcIcx3K?= =?us-ascii?Q?T+otNAn0F/sSiuNw46HspnvA83/9JQ1vgvYUP+Eevpc/0uNlKWakXG6YJTmh?= =?us-ascii?Q?Y4sZiczES3xVTlhhHNqXm1vehjDVfwCCtypv0BR3UPT8Mt0Nvcoo8GMatMVs?= =?us-ascii?Q?hkVgkajJ5+GqeYLpY5FkybYMsAlneUgNeDbwCgNJRpN+zX9jKaUlYk4ukNSr?= =?us-ascii?Q?A//vM3zEZ3KbDGkKRNFdL8kyWq42LJ1I68IhTh02rrbaRiqq0XPAMno5jQFy?= =?us-ascii?Q?rCeZSzktLEAyohJgbUV+bxEDgBpNzyqtuQAbhYBG?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d7991ac-2dd0-471c-03d0-08dd8f34413b X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 20:01:15.3137 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: E19a3gsoej+u6u9G1ayqkaDmZN6KcRIQFbnalckHKIe8Ql9RdjWqpuT4I7gzCI2Q X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5865 Content-Type: text/plain; charset="utf-8" During page isolation, the original migratetype is overwritten, since MIGRATE_* are enums and stored in pageblock bitmaps. Change MIGRATE_ISOLATE to be stored a standalone bit, PB_migrate_isolate, like PB_migrate_skip, so that migratetype is not lost during pageblock isolation. pageblock bits needs to be word aligned, so expand the number of pageblock bits from 4 to 8 and make PB_migrate_isolate bit 7. Signed-off-by: Zi Yan --- include/linux/mmzone.h | 15 ++++++++------ include/linux/pageblock-flags.h | 9 ++++++++- mm/page_alloc.c | 36 ++++++++++++++++++++++++++++++++- mm/page_isolation.c | 11 ++++++++++ 4 files changed, 63 insertions(+), 8 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index b19a98c20de8..7ef01fe148ce 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -106,14 +106,17 @@ static inline bool migratetype_is_mergeable(int mt) =20 extern int page_group_by_mobility_disabled; =20 -#define MIGRATETYPE_MASK ((1UL << PB_migratetype_bits) - 1) +#ifdef CONFIG_MEMORY_ISOLATION +#define MIGRATETYPE_MASK ((BIT(PB_migratetype_bits) - 1) | PB_migrate_isol= ate_bit) +#else +#define MIGRATETYPE_MASK (BIT(PB_migratetype_bits) - 1) +#endif + +unsigned long get_pageblock_migratetype(const struct page *page); =20 -#define get_pageblock_migratetype(page) \ - get_pfnblock_flags_mask(page, page_to_pfn(page), MIGRATETYPE_MASK) +#define folio_migratetype(folio) \ + get_pageblock_migratetype(&folio->page) =20 -#define folio_migratetype(folio) \ - get_pfnblock_flags_mask(&folio->page, folio_pfn(folio), \ - MIGRATETYPE_MASK) struct free_area { struct list_head free_list[MIGRATE_TYPES]; unsigned long nr_free; diff --git a/include/linux/pageblock-flags.h b/include/linux/pageblock-flag= s.h index 0c4963339f0b..00040e7df8c8 100644 --- a/include/linux/pageblock-flags.h +++ b/include/linux/pageblock-flags.h @@ -20,7 +20,10 @@ enum pageblock_bits { PB_migrate_end =3D PB_migrate + PB_migratetype_bits - 1, /* 3 bits required for migrate types */ PB_migrate_skip,/* If set the block is skipped by compaction */ - +#ifdef CONFIG_MEMORY_ISOLATION + PB_migrate_isolate =3D 7, /* If set the block is isolated */ + /* set it to 7 to make pageblock bit word aligned */ +#endif /* * Assume the bits will always align on a word. If this assumption * changes then get/set pageblock needs updating. @@ -28,6 +31,10 @@ enum pageblock_bits { NR_PAGEBLOCK_BITS }; =20 +#ifdef CONFIG_MEMORY_ISOLATION +#define PB_migrate_isolate_bit BIT(PB_migrate_isolate) +#endif + #if defined(CONFIG_PAGE_BLOCK_ORDER) #define PAGE_BLOCK_ORDER CONFIG_PAGE_BLOCK_ORDER #else diff --git a/mm/page_alloc.c b/mm/page_alloc.c index c77592b22256..04e301fb4879 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -381,10 +381,31 @@ unsigned long get_pfnblock_flags_mask(const struct pa= ge *page, return (word >> bitidx) & mask; } =20 +unsigned long get_pageblock_migratetype(const struct page *page) +{ + unsigned long flags; + + flags =3D get_pfnblock_flags_mask(page, page_to_pfn(page), + MIGRATETYPE_MASK); +#ifdef CONFIG_MEMORY_ISOLATION + if (flags & PB_migrate_isolate_bit) + return MIGRATE_ISOLATE; +#endif + return flags; +} + static __always_inline int get_pfnblock_migratetype(const struct page *pag= e, unsigned long pfn) { - return get_pfnblock_flags_mask(page, pfn, MIGRATETYPE_MASK); + unsigned long flags; + + flags =3D get_pfnblock_flags_mask(page, pfn, + MIGRATETYPE_MASK); +#ifdef CONFIG_MEMORY_ISOLATION + if (flags & PB_migrate_isolate_bit) + return MIGRATE_ISOLATE; +#endif + return flags; } =20 /** @@ -402,8 +423,14 @@ void set_pfnblock_flags_mask(struct page *page, unsign= ed long flags, unsigned long bitidx, word_bitidx; unsigned long word; =20 +#ifdef CONFIG_MEMORY_ISOLATION + BUILD_BUG_ON(NR_PAGEBLOCK_BITS !=3D 8); + /* extra one for MIGRATE_ISOLATE */ + BUILD_BUG_ON(MIGRATE_TYPES > (1 << PB_migratetype_bits) + 1); +#else BUILD_BUG_ON(NR_PAGEBLOCK_BITS !=3D 4); BUILD_BUG_ON(MIGRATE_TYPES > (1 << PB_migratetype_bits)); +#endif =20 bitmap =3D get_pageblock_bitmap(page, pfn); bitidx =3D pfn_to_bitidx(page, pfn); @@ -426,6 +453,13 @@ void set_pageblock_migratetype(struct page *page, int = migratetype) migratetype < MIGRATE_PCPTYPES)) migratetype =3D MIGRATE_UNMOVABLE; =20 +#ifdef CONFIG_MEMORY_ISOLATION + if (migratetype =3D=3D MIGRATE_ISOLATE) { + set_pfnblock_flags_mask(page, PB_migrate_isolate_bit, + page_to_pfn(page), PB_migrate_isolate_bit); + return; + } +#endif set_pfnblock_flags_mask(page, (unsigned long)migratetype, page_to_pfn(page), MIGRATETYPE_MASK); } diff --git a/mm/page_isolation.c b/mm/page_isolation.c index b2fc5266e3d2..751e21f6d85e 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -15,6 +15,17 @@ #define CREATE_TRACE_POINTS #include =20 +static inline bool __maybe_unused get_pageblock_isolate(struct page *page) +{ + return get_pfnblock_flags_mask(page, page_to_pfn(page), + PB_migrate_isolate_bit); +} +static inline void clear_pageblock_isolate(struct page *page) +{ + set_pfnblock_flags_mask(page, 0, page_to_pfn(page), + PB_migrate_isolate_bit); +} + /* * This function checks whether the range [start_pfn, end_pfn) includes * unmovable pages or not. The range must fall into a single pageblock and --=20 2.47.2 From nobody Wed Dec 17 08:55:13 2025 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2089.outbound.protection.outlook.com [40.107.236.89]) (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 10B9C220F56 for ; Fri, 9 May 2025 20:01:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.89 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746820884; cv=fail; b=JhtQpx7NvUoNleU5zRBi+3TEwan5S0cRyox/wIMSvIuhTVFGSzrWJXxtEA+w1LWGvayOgsCz1yJIExVR+V9VMkvHmfgF+2LobT+dUHFXmP0IG8J0Ioux8qTOhxJCajvThMqz4hDTDmR1pD8N5nuJsP5sHECMdWFFDGtGBoefYb0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746820884; c=relaxed/simple; bh=mfvwNILzQHm+3YbfGKWif/OJvRxvOeFYxr6YBUAsQ3s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=eo6le3vH1o1lKM+Zcqu3gjMSTZiWSWGLvgZTdZ4l2mQp2qReAvCbaxS2hX9dGfZiq7tWCAZ/wjrH1Jn6awsp2ByVLxB9xUVpSZPlSJHWKlu9hprs27Zx1xGRys7XQ5dwkAL38AeUbXtv1c6bVFUb6TI0PE4FELAZVGE+s5Lx3S4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=LtM0JR0v; arc=fail smtp.client-ip=40.107.236.89 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="LtM0JR0v" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NM1V6gHsLcUfDtxU58YUGxhusFD344SZMI74kmQnFLw+RcrsCgELDxwh91VMUsuLxagIyxqg96/WgriLxmXpQMQYGzPwpRZzPcSXCeByBzxZVAnJ/pt0Qdd4mCVFVHZgB+xl11vsDfmSc/8Vu+464eRREUH6a+6qKBqM2SCbS9np9/Ub5b61j5bcl55bPDoYQHtA12YgkOP33/RinkS0NuYIVLt8eie4QuOTdOHJbLqPnrmwxbumEyihNCyqPqrLOcp/u0g9nIWJy7KHV66FH6vrL0e51/o3EAk0hslP2OzPfqEc7zCC1gGb3Dfbwnz3nF9wlSIX0WfP5nBTpSOltA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7OZ7/WIsqPDX1ol75Sgq7QrOKxbU5Qr/pbgfNKeq/68=; b=oYbUikeCwcVOGvQabp7HqUK1Oj23UwGeiud9Kg8elX6a3Hs9f6Q/Swr1ym9SFjtFdSY5NBUhuTkpcN8O8h9IlpgcpUa1g6RhjO4PGHRJAcrMyQFdF89PmQwjI8kKgqPHlvKlu7naxgSxdVypGb6+HLzRRQsscJaywHdxumIWTc510boJkI1FyWYkPd35iZ1W8ehEhnjz3hsk/U+7fwt5TzKgPM8xPsW6wWnNZr+FuSWnUVV85UMNdBeyOExh+UG5OzcraiOqH1WL7gyb/N4zzq2c6VRQAYyVJTplYESyipDHHoIht/pihZAYFrZK3YSiq19wp+ZXNWiuMndfPWeK8w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7OZ7/WIsqPDX1ol75Sgq7QrOKxbU5Qr/pbgfNKeq/68=; b=LtM0JR0vGYw5NZPRFx3g5wrWvhY0ArGez2+PuKdMI+iriR9bq3Bo00ht4ESAfl58maOCsPtVn7Ursj80ij+7zWLIxBOmpRh1aPq82uG8QpaYylMYDG2vky3zOKyeQkWOtupBlpEUCBGCIbaZcSSFt1uD3DLQDrUZG2mVXBogTNkAx27xys0sFaRujrbDyXpz+CdXym1eX1Vsf8DfA/FWUHNpgEr2TDqpdIJ67p9MVSIeCgZBKqUsZg50xgvPmpDZcKa+JPDZXbr/1JYeeHm5ricx/vZyfPQxJZ0LRebgzudM1IWBgKJ8Cr0f3MdNr8M3+hN7ZmcBqBlsW4sAjhxI3Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) by DM4PR12MB5865.namprd12.prod.outlook.com (2603:10b6:8:64::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.24; Fri, 9 May 2025 20:01:16 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a%5]) with mapi id 15.20.8722.020; Fri, 9 May 2025 20:01:16 +0000 From: Zi Yan To: David Hildenbrand , Oscar Salvador , Johannes Weiner , linux-mm@kvack.org Cc: Andrew Morton , Vlastimil Babka , Baolin Wang , "Kirill A . Shutemov" , Mel Gorman , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Richard Chang , linux-kernel@vger.kernel.org, Zi Yan Subject: [PATCH v4 2/4] mm/page_isolation: remove migratetype from move_freepages_block_isolate() Date: Fri, 9 May 2025 16:01:09 -0400 Message-ID: <20250509200111.3372279-3-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250509200111.3372279-1-ziy@nvidia.com> References: <20250509200111.3372279-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MN0PR03CA0004.namprd03.prod.outlook.com (2603:10b6:208:52f::10) To DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS7PR12MB9473:EE_|DM4PR12MB5865:EE_ X-MS-Office365-Filtering-Correlation-Id: b792094a-9bb3-4f82-f328-08dd8f3441fd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?PlsawbOTBnJ38jcX+eExEQaENRGjLIo7yj4SReqrsJuXHMTU1xVLjNt7KslX?= =?us-ascii?Q?qrvGSMycFFE6ifmzhQ4LAnsOQGGuxxJUvLPVksoQ94Ai/dS//qABDSO94f0p?= =?us-ascii?Q?jrfFbWLIUnzDHBFipewNk+rTRaNGGGep+h+iek5EeV+at26bbiKL5oc0fVRc?= =?us-ascii?Q?xZKHc565xEYNVTiNvvUTlnDZda7i4C63cfr5SQfLC4MlGkF8GAulNN/4dWri?= =?us-ascii?Q?pzGPCZZZxWQbKE2FeXyQLEOSsHLK9YQXf7gv9BNk1AhusUJEO28/c2bNPpb8?= =?us-ascii?Q?x284jK7qFP8h6zKWzM/MJyA+hSxDn4vqOQQnbkZUnBcnxB3gVhij6YuRrc9d?= =?us-ascii?Q?tbSU973qA33oIuRYHKOG4zUEvGlnlzVmVkzKvCxA1Osi92/MQ8tFURTjIjV2?= =?us-ascii?Q?E2g3a1A4dqudzHAFz78d1xhHo2YcghiGbt3R7Nr7FkqdgELFb6f7tlUpnHCS?= =?us-ascii?Q?dVf7rbxrg6PREmU2mdp4VbDMEM38qaSd0rulUIPBdSnzzSffRqTYiTRrLtXp?= =?us-ascii?Q?8drNt00xuH4rpJZii98vzOv2liuWU9gTpDB2+UB6j/wcaKSJgDWO1DNu0lmb?= =?us-ascii?Q?NtAHBuAGbt8LpQx1d7dqCgnBEjM6QSJdDf0Bke/49idbqVwkwTr6vT6ej5zp?= =?us-ascii?Q?lDCVoPwzrCEQzkQ1C6IDUxDYvNr7p2MltJxceKzaYE+qRZt/H16Ggz4KwCrK?= =?us-ascii?Q?lBM0vdSF9Un6e9yzBviupFsqcuqmb0sQUcPgEEJCPSkQLKXYdlGUiC8rTU1C?= =?us-ascii?Q?yXjrGsjzuMRqpHc/NcT8XTZNcF6uTa2KrDTdlGIudIkt1IKybAApcEBt5HrH?= =?us-ascii?Q?adWZNUftHQeq5qPbAh6bNqZZeuJEg5nYqGPgTdaVeHM3q0kwaQnpR7JqxE8q?= =?us-ascii?Q?tv4wBEwpR2AStlT53HQtCgHB3yoPgHrBApnWCcv7XsUSAj9ffyjUEm47Ox8v?= =?us-ascii?Q?H3hSQBMWRAj+ei5t4/WSSZYYEeIUJF5gjvey8Nz6O5d03dk9+ErSo+I7WUZN?= =?us-ascii?Q?MZdekczGZg6Axb7Va6T2DSQqyKw2CIrZOJ0BbKVxpL1p9C0gTGJuBPSELz4W?= =?us-ascii?Q?qYrs0Lm32SFm9Kw77LGZQnHzURAC4+AQ7AeGRCxqZ53eDM/JjxzL9NqVKhjI?= =?us-ascii?Q?/rA1Sdyur0tmyTLupMEicGIQDf1tOAFUSPGYOGlmj2mlx++dDFF13Y6sSPmT?= =?us-ascii?Q?qAc947igL0ObdK9wdXIYo5oqNWkqP6nxXBIibiKa/oPrwnNDXB/rIkN5Fv7D?= =?us-ascii?Q?a4u/mRy3UX0VeVWlC3+NXYfqin9TJU3+9I4wAzn3VIoDoJRdxbxKfK8UByLk?= =?us-ascii?Q?IyADEdh6CheGsOL50QQzcbDJvUgzzvnOV33LA3ate0BDkFE1IXgPZfl6tQLp?= =?us-ascii?Q?+CO9d8kJkfXqcvKv6refn6dPJvQIIqPDRT8OA3yE0IH8gk/sPHdNZD29IVLS?= =?us-ascii?Q?gc0c8XaXc1E=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR12MB9473.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Hn5/5rHST2IRM9EbY9+LJFTb/+BNXK2LYuV5Vj2Hqy+kFgkK8rpW8dIaU8Jf?= =?us-ascii?Q?jjHfCgrFng3jTA39PizBkd/4D6/hJFvT6lWEqioNxNaIQOn7+c+MvpymsTs/?= =?us-ascii?Q?uFZYcQOlx5+fCnqRHQhKtIXc5elnLXrJCoAiyqa2mx6hgBhyBHrkZ6Jpc9az?= =?us-ascii?Q?VsMt6+zO0yEAB/nk/rsFbrbhHb0fEyh3mycHcZrGgMessMMfT+BWe78RWY4b?= =?us-ascii?Q?Lxu2CEgTVbUudjhACeJpeQt5nb32U1HpQcPYMeWaTIsz75uv3yuVULbwyRIB?= =?us-ascii?Q?hS75MJ5E2+wf5BWjWmL2NdmU8CPq1KF0kPUN/wuuUh9Eh/+BQJAMZZmZ0WLU?= =?us-ascii?Q?tRGGTfD5QK2JhKO+gl4x9Dluz61VLQJSogj9P1ootclOJjK8e3JZXiQAjKNN?= =?us-ascii?Q?8ybWimd30j52noeE5RQUgW8Q3dy8294W2ZXikJ1r4Z0JiJ3iUbFQuCPFDhhx?= =?us-ascii?Q?WKUhiIkG0djUiP3lzC8xwvtHZhJ4qyQ+1788pn9zC7L54kJJ/PwNrsVw1C3d?= =?us-ascii?Q?g9JMjU7yIFt4l1TDliHVH7zXJh1Xz7BNmvp+nsOaGEJ33jX2kr0RnJ9xJZRD?= =?us-ascii?Q?b2pVan7QfbZ2SUQx44gx6aLLIXx+89xQw0lqolMbO3MlRz/76Zi+qWAXX8Qh?= =?us-ascii?Q?7YrxI1V6e1zeyGRFGZyBY/h7IuSiuDCPBiOwmAfVXhKxah06dy0QTJK97kdR?= =?us-ascii?Q?kDQEns+fkBS6yZLJI3hh1L4P6j5Ulynuvq8uOxLNCCl1zP9bpdclYjK8lGpU?= =?us-ascii?Q?p8A7dQAnniDdJsWjUm9Inpfakq7xsPCquJRnK+XNW2Lqhyi5/N+AKKNXdwKX?= =?us-ascii?Q?yEtF/5EwmbBDaZ3NxIqgijVcJqst1Ygu3QpdzEpRHNc8jbfI6erU2wI4e5Dc?= =?us-ascii?Q?a+L8Qufy7F7L03h4BM1XyDeXiSEGDp3th4CCvhipghqg16G0X5moOMTuKkXp?= =?us-ascii?Q?J6jQQuNUCmfd4Agwrug4aYWxROTais3lig5z5yS3DUL6up1Z3gTw00SQRWVX?= =?us-ascii?Q?jGkbj+pyH6fwDRv5xwMx1S6MiaoCj1Zb4fCtlbLsu7FQvS5t+zGd/CAcmL5M?= =?us-ascii?Q?mAP7JmfuaQyRp9tTlzBrna67CTV66p0LpMzCg29kWiwjDkVyKj/EvxyAPg/7?= =?us-ascii?Q?3lP1WrGddcwX4lsQkJJjl0s2Hy+kmQq/S7azdUhrC/chRbMGEs3NG87j91Qd?= =?us-ascii?Q?CZN+BhuLP/wmGqxETdpGqa4TtspjzGT3yqUX1DYw2Vsfii9YWL+Sul5dg2iX?= =?us-ascii?Q?FKwpFjVdyZBkZ8Y5Z8aRcxvpRqrNLQacGzBCXQVSDsiPl4oIEvF9gbIrmFGJ?= =?us-ascii?Q?3hTQtX8Ytn1Zn3Npxm2NEyrJ8uo3G54ycoSZAjwzUW1HyjJo8pzpwbUPO3Xs?= =?us-ascii?Q?t760rfJH+WLOvUxdggcNJn3YPjCRygbwnvbH5iQ6ymkLZREOzX8ku8jBM6Mg?= =?us-ascii?Q?f5tF+LFmADyLCIVLwKQ2LoVNETFb8gyXhdjBLnawiOzNfNjve0HQ6r3YT5/o?= =?us-ascii?Q?oJmkrxuOLRsowVoCQDpaczfFmha1gGIUx3R9MatvHLU++gyXnzEUp9JXRe06?= =?us-ascii?Q?h0kvhNL9XAI/jlipDnhYpfzrht/anCxEZidZSMwA?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: b792094a-9bb3-4f82-f328-08dd8f3441fd X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 20:01:16.6222 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +AiJ78qe5D1xv2MTzLiA6u13jVyYNwHXam4fALiYi2b+KZ00SBWHt+WjHxnejOev X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5865 Content-Type: text/plain; charset="utf-8" Since migratetype is no longer overwritten during pageblock isolation, moving pageblocks to and from MIGRATE_ISOLATE no longer needs migratetype. Add MIGRATETYPE_NO_ISO_MASK to allow read before-isolation migratetype when a pageblock is isolated. It is used by move_freepages_block_isolate(). Add pageblock_isolate_and_move_free_pages() and pageblock_unisolate_and_move_free_pages() to be explicit about the page isolation operations. Both share the common code in __move_freepages_block_isolate(), which is renamed from move_freepages_block_isolate(). Make set_pageblock_migratetype() only accept non MIGRATE_ISOLATE types, so that one should use set_pageblock_isolate() to isolate pageblocks. Two consequential changes: 1. move pageblock migratetype code out of __move_freepages_block(). 2. in online_pages() from mm/memory_hotplug.c, move_pfn_range_to_zone() is called with MIGRATE_MOVABLE instead of MIGRATE_ISOLATE and all affected pageblocks are isolated afterwards. Otherwise, all online pageblocks will have non-determined migratetype. Signed-off-by: Zi Yan --- include/linux/mmzone.h | 4 +- include/linux/page-isolation.h | 5 ++- mm/memory_hotplug.c | 7 +++- mm/page_alloc.c | 73 +++++++++++++++++++++++++--------- mm/page_isolation.c | 27 ++++++++----- 5 files changed, 82 insertions(+), 34 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 7ef01fe148ce..f66895456974 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -107,8 +107,10 @@ static inline bool migratetype_is_mergeable(int mt) extern int page_group_by_mobility_disabled; =20 #ifdef CONFIG_MEMORY_ISOLATION -#define MIGRATETYPE_MASK ((BIT(PB_migratetype_bits) - 1) | PB_migrate_isol= ate_bit) +#define MIGRATETYPE_NO_ISO_MASK (BIT(PB_migratetype_bits) - 1) +#define MIGRATETYPE_MASK (MIGRATETYPE_NO_ISO_MASK | PB_migrate_isolate_bit) #else +#define MIGRATETYPE_NO_ISO_MASK MIGRATETYPE_MASK #define MIGRATETYPE_MASK (BIT(PB_migratetype_bits) - 1) #endif =20 diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h index 898bb788243b..b0a2af0a5357 100644 --- a/include/linux/page-isolation.h +++ b/include/linux/page-isolation.h @@ -26,9 +26,10 @@ static inline bool is_migrate_isolate(int migratetype) #define REPORT_FAILURE 0x2 =20 void set_pageblock_migratetype(struct page *page, int migratetype); +void set_pageblock_isolate(struct page *page); =20 -bool move_freepages_block_isolate(struct zone *zone, struct page *page, - int migratetype); +bool pageblock_isolate_and_move_free_pages(struct zone *zone, struct page = *page); +bool pageblock_unisolate_and_move_free_pages(struct zone *zone, struct pag= e *page); =20 int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pf= n, int migratetype, int flags); diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index b1caedbade5b..c86c47bba019 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1178,6 +1178,7 @@ int online_pages(unsigned long pfn, unsigned long nr_= pages, const int nid =3D zone_to_nid(zone); int ret; struct memory_notify arg; + unsigned long isol_pfn; =20 /* * {on,off}lining is constrained to full memory sections (or more @@ -1192,7 +1193,11 @@ int online_pages(unsigned long pfn, unsigned long nr= _pages, =20 =20 /* associate pfn range with the zone */ - move_pfn_range_to_zone(zone, pfn, nr_pages, NULL, MIGRATE_ISOLATE); + move_pfn_range_to_zone(zone, pfn, nr_pages, NULL, MIGRATE_MOVABLE); + for (isol_pfn =3D pfn; + isol_pfn < pfn + nr_pages; + isol_pfn +=3D pageblock_nr_pages) + set_pageblock_isolate(pfn_to_page(isol_pfn)); =20 arg.start_pfn =3D pfn; arg.nr_pages =3D nr_pages; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 04e301fb4879..cfd37b2d992e 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -454,11 +454,9 @@ void set_pageblock_migratetype(struct page *page, int = migratetype) migratetype =3D MIGRATE_UNMOVABLE; =20 #ifdef CONFIG_MEMORY_ISOLATION - if (migratetype =3D=3D MIGRATE_ISOLATE) { - set_pfnblock_flags_mask(page, PB_migrate_isolate_bit, - page_to_pfn(page), PB_migrate_isolate_bit); - return; - } + VM_WARN(migratetype =3D=3D MIGRATE_ISOLATE, + "Use set_pageblock_isolate() for pageblock isolation"); + return; #endif set_pfnblock_flags_mask(page, (unsigned long)migratetype, page_to_pfn(page), MIGRATETYPE_MASK); @@ -1819,8 +1817,8 @@ static inline struct page *__rmqueue_cma_fallback(str= uct zone *zone, #endif =20 /* - * Change the type of a block and move all its free pages to that - * type's freelist. + * Move all free pages of a block to new type's freelist. Caller needs to + * change the block type. */ static int __move_freepages_block(struct zone *zone, unsigned long start_p= fn, int old_mt, int new_mt) @@ -1852,8 +1850,6 @@ static int __move_freepages_block(struct zone *zone, = unsigned long start_pfn, pages_moved +=3D 1 << order; } =20 - set_pageblock_migratetype(pfn_to_page(start_pfn), new_mt); - return pages_moved; } =20 @@ -1911,11 +1907,16 @@ static int move_freepages_block(struct zone *zone, = struct page *page, int old_mt, int new_mt) { unsigned long start_pfn; + int res; =20 if (!prep_move_freepages_block(zone, page, &start_pfn, NULL, NULL)) return -1; =20 - return __move_freepages_block(zone, start_pfn, old_mt, new_mt); + res =3D __move_freepages_block(zone, start_pfn, old_mt, new_mt); + set_pageblock_migratetype(pfn_to_page(start_pfn), new_mt); + + return res; + } =20 #ifdef CONFIG_MEMORY_ISOLATION @@ -1943,11 +1944,17 @@ static unsigned long find_large_buddy(unsigned long= start_pfn) return start_pfn; } =20 +static inline void toggle_pageblock_isolate(struct page *page, bool isolat= e) +{ + set_pfnblock_flags_mask(page, (isolate << PB_migrate_isolate), + page_to_pfn(page), PB_migrate_isolate_bit); +} + /** - * move_freepages_block_isolate - move free pages in block for page isolat= ion + * __move_freepages_block_isolate - move free pages in block for page isol= ation * @zone: the zone * @page: the pageblock page - * @migratetype: migratetype to set on the pageblock + * @isolate: to isolate the given pageblock or unisolate it * * This is similar to move_freepages_block(), but handles the special * case encountered in page isolation, where the block of interest @@ -1962,10 +1969,15 @@ static unsigned long find_large_buddy(unsigned long= start_pfn) * * Returns %true if pages could be moved, %false otherwise. */ -bool move_freepages_block_isolate(struct zone *zone, struct page *page, - int migratetype) +static bool __move_freepages_block_isolate(struct zone *zone, + struct page *page, bool isolate) { unsigned long start_pfn, pfn; + int from_mt; + int to_mt; + + if (isolate =3D=3D (get_pageblock_migratetype(page) =3D=3D MIGRATE_ISOLAT= E)) + return false; =20 if (!prep_move_freepages_block(zone, page, &start_pfn, NULL, NULL)) return false; @@ -1982,7 +1994,7 @@ bool move_freepages_block_isolate(struct zone *zone, = struct page *page, =20 del_page_from_free_list(buddy, zone, order, get_pfnblock_migratetype(buddy, pfn)); - set_pageblock_migratetype(page, migratetype); + toggle_pageblock_isolate(page, isolate); split_large_buddy(zone, buddy, pfn, order, FPI_NONE); return true; } @@ -1993,16 +2005,38 @@ bool move_freepages_block_isolate(struct zone *zone= , struct page *page, =20 del_page_from_free_list(page, zone, order, get_pfnblock_migratetype(page, pfn)); - set_pageblock_migratetype(page, migratetype); + toggle_pageblock_isolate(page, isolate); split_large_buddy(zone, page, pfn, order, FPI_NONE); return true; } move: - __move_freepages_block(zone, start_pfn, - get_pfnblock_migratetype(page, start_pfn), - migratetype); + /* use MIGRATETYPE_NO_ISO_MASK to get the non-isolate migratetype */ + if (isolate) { + from_mt =3D get_pfnblock_flags_mask(page, page_to_pfn(page), + MIGRATETYPE_NO_ISO_MASK); + to_mt =3D MIGRATE_ISOLATE; + } else { + from_mt =3D MIGRATE_ISOLATE; + to_mt =3D get_pfnblock_flags_mask(page, page_to_pfn(page), + MIGRATETYPE_NO_ISO_MASK); + } + + __move_freepages_block(zone, start_pfn, from_mt, to_mt); + toggle_pageblock_isolate(pfn_to_page(start_pfn), isolate); + return true; } + +bool pageblock_isolate_and_move_free_pages(struct zone *zone, struct page = *page) +{ + return __move_freepages_block_isolate(zone, page, true); +} + +bool pageblock_unisolate_and_move_free_pages(struct zone *zone, struct pag= e *page) +{ + return __move_freepages_block_isolate(zone, page, false); +} + #endif /* CONFIG_MEMORY_ISOLATION */ =20 static void change_pageblock_range(struct page *pageblock_page, @@ -2194,6 +2228,7 @@ try_to_claim_block(struct zone *zone, struct page *pa= ge, if (free_pages + alike_pages >=3D (1 << (pageblock_order-1)) || page_group_by_mobility_disabled) { __move_freepages_block(zone, start_pfn, block_type, start_type); + set_pageblock_migratetype(pfn_to_page(start_pfn), start_type); return __rmqueue_smallest(zone, order, start_type); } =20 diff --git a/mm/page_isolation.c b/mm/page_isolation.c index 751e21f6d85e..4571940f14db 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -25,6 +25,12 @@ static inline void clear_pageblock_isolate(struct page *= page) set_pfnblock_flags_mask(page, 0, page_to_pfn(page), PB_migrate_isolate_bit); } +void set_pageblock_isolate(struct page *page) +{ + set_pfnblock_flags_mask(page, PB_migrate_isolate_bit, + page_to_pfn(page), + PB_migrate_isolate_bit); +} =20 /* * This function checks whether the range [start_pfn, end_pfn) includes @@ -199,7 +205,7 @@ static int set_migratetype_isolate(struct page *page, i= nt migratetype, int isol_ unmovable =3D has_unmovable_pages(check_unmovable_start, check_unmovable_= end, migratetype, isol_flags); if (!unmovable) { - if (!move_freepages_block_isolate(zone, page, MIGRATE_ISOLATE)) { + if (!pageblock_isolate_and_move_free_pages(zone, page)) { spin_unlock_irqrestore(&zone->lock, flags); return -EBUSY; } @@ -220,7 +226,7 @@ static int set_migratetype_isolate(struct page *page, i= nt migratetype, int isol_ return -EBUSY; } =20 -static void unset_migratetype_isolate(struct page *page, int migratetype) +static void unset_migratetype_isolate(struct page *page) { struct zone *zone; unsigned long flags; @@ -273,10 +279,10 @@ static void unset_migratetype_isolate(struct page *pa= ge, int migratetype) * Isolating this block already succeeded, so this * should not fail on zone boundaries. */ - WARN_ON_ONCE(!move_freepages_block_isolate(zone, page, migratetype)); + WARN_ON_ONCE(!pageblock_unisolate_and_move_free_pages(zone, page)); } else { - set_pageblock_migratetype(page, migratetype); - __putback_isolated_page(page, order, migratetype); + clear_pageblock_isolate(page); + __putback_isolated_page(page, order, get_pageblock_migratetype(page)); } zone->nr_isolate_pageblock--; out: @@ -394,7 +400,7 @@ static int isolate_single_pageblock(unsigned long bound= ary_pfn, int flags, if (PageBuddy(page)) { int order =3D buddy_order(page); =20 - /* move_freepages_block_isolate() handled this */ + /* pageblock_isolate_and_move_free_pages() handled this */ VM_WARN_ON_ONCE(pfn + (1 << order) > boundary_pfn); =20 pfn +=3D 1UL << order; @@ -444,7 +450,7 @@ static int isolate_single_pageblock(unsigned long bound= ary_pfn, int flags, failed: /* restore the original migratetype */ if (!skip_isolation) - unset_migratetype_isolate(pfn_to_page(isolate_pageblock), migratetype); + unset_migratetype_isolate(pfn_to_page(isolate_pageblock)); return -EBUSY; } =20 @@ -515,7 +521,7 @@ int start_isolate_page_range(unsigned long start_pfn, u= nsigned long end_pfn, ret =3D isolate_single_pageblock(isolate_end, flags, true, skip_isolation, migratetype); if (ret) { - unset_migratetype_isolate(pfn_to_page(isolate_start), migratetype); + unset_migratetype_isolate(pfn_to_page(isolate_start)); return ret; } =20 @@ -528,8 +534,7 @@ int start_isolate_page_range(unsigned long start_pfn, u= nsigned long end_pfn, start_pfn, end_pfn)) { undo_isolate_page_range(isolate_start, pfn, migratetype); unset_migratetype_isolate( - pfn_to_page(isolate_end - pageblock_nr_pages), - migratetype); + pfn_to_page(isolate_end - pageblock_nr_pages)); return -EBUSY; } } @@ -559,7 +564,7 @@ void undo_isolate_page_range(unsigned long start_pfn, u= nsigned long end_pfn, page =3D __first_valid_page(pfn, pageblock_nr_pages); if (!page || !is_migrate_isolate_page(page)) continue; - unset_migratetype_isolate(page, migratetype); + unset_migratetype_isolate(page); } } /* --=20 2.47.2 From nobody Wed Dec 17 08:55:13 2025 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2089.outbound.protection.outlook.com [40.107.236.89]) (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 624B525F7AD for ; Fri, 9 May 2025 20:01:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.89 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746820889; cv=fail; b=cbYfu4kLuX0nRKM2Wfctuzn0E172mUv/ZpewGOcwquny9ZaNkwJtjjJBy12k4hflApPBCTjaFream5Iv0qLl+o/xh5qoC0/2BrnPBXfon6eHp315BL5ez0AjGduFYbCJVVl2nshYgq2BZowadHaZwWBRXq9QiVD8Sp2mGNTbxs4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746820889; c=relaxed/simple; bh=iZftCNo827Qq5mW9eg6FOl9YWIyPt6pBWlPJutNzJwY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=cat6JtJ1bgyI9dkWYKGROgTEJqb5eyWnNl4+9G7rmkR8rCwS5kNRkOVBXngYJUaBKGPN/AEOMp/esv2dcKq4plWBETEWFrfECUI3GhnLwJ30inTFgaVxnYNOJ/G2Uq2NR148AhB14lh5WqZEnAOtfrZPC+ADOx9N9bYDMQsyrsc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=jr6mMZJQ; arc=fail smtp.client-ip=40.107.236.89 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="jr6mMZJQ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gREJ1u445N+ANwevj9SPQmfoZiHT/xoMpBrqnL1V9isQkTIEaF5nyxNyvz7NwlX1k2hPjlY+ItHhrIFyzFGIRtj/umoirEjFXo4Pw7hzWdbC/GeoA/wEsAZjicVhN+FrJJtG13Z555mn0fC4hB6oT+MQ5EDxrlYqv4wfXQ84Zv+3Vkc/B+UbwoLlMGeIoA2PCaL9ovwY1nu1wyZMUjnIR7Uen7ui5RT1792gMX+ymF3QmA1UwKEsbbIvwx3ECwTbPR2EImxJB2DVZxBnxwmtAk9i9XDzO/A7B3BXy7hyXnCy+KMcBb/6yQZqtkIfI7rM+XB9zPd2JLARyi8fuuPcHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=i4kR014OWOR8hHD48ehHXTRARKbKLQwqfsrr+83DwFg=; b=Oo2hIleam46jnp0rgSCUTFSHGSpSzr3VAWcO5bKY9jBd08SskBKGWY9OcaegSr60rq1JXUCIpfNCjMSqNt2WlyS4kiEnHEIsUtRwIPn/VRJkAJeZ2xfsI7RFzkulHWhPNLaU5cLVegKTr08j0tPTBB0d+TS9cTpRo1sb7JoknMf+BQmVK09wrWkmm0czjcW36F/vt5rZwZ2rU8hqlY4l9gIt3xtNfBNQpR7y4jdNljFJ0rm+1zMQjv9Tjb/bDYYvolzNKXL6+6EMx2c60ztpjkNSrP9urZf6SATDvfmuE/TRzGzO4LTX+P7jveWOhJYNoQ4vlMW3jzlrAhmuHXM+Gw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=i4kR014OWOR8hHD48ehHXTRARKbKLQwqfsrr+83DwFg=; b=jr6mMZJQb6I+6z57IYpcaKz97ToTNLuKjPpX6dMIpVzrGkiWu0M7fKeHxjTIkqt8SMtHWGZwSVqmEK9buRz8D4v9GvxUThASVjxeLQ3mPjjEXDOzXQDB+viabByqYV3YCoilMVzJVu/SHHUiBoFwe/HzD1b8WUf6T9Zv1T5BOb6pdHQhwecLKA0kwY8uitQ2u42k6PACBXhYdq1I8tV0fjt4rW0emYgZniakLh9Mvgh0fqhTZY7bbTJ9vkd9YkvLlvLmVLe7uuwXSFb3MW5+C2T+uZks3sHwjhJIgh2nldy37Y6gy5OzKhObXprJFYM0XT24Nt81nXee7aGMScefYg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) by DM4PR12MB5865.namprd12.prod.outlook.com (2603:10b6:8:64::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.24; Fri, 9 May 2025 20:01:17 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a%5]) with mapi id 15.20.8722.020; Fri, 9 May 2025 20:01:17 +0000 From: Zi Yan To: David Hildenbrand , Oscar Salvador , Johannes Weiner , linux-mm@kvack.org Cc: Andrew Morton , Vlastimil Babka , Baolin Wang , "Kirill A . Shutemov" , Mel Gorman , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Richard Chang , linux-kernel@vger.kernel.org, Zi Yan Subject: [PATCH v4 3/4] mm/page_isolation: remove migratetype from undo_isolate_page_range() Date: Fri, 9 May 2025 16:01:10 -0400 Message-ID: <20250509200111.3372279-4-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250509200111.3372279-1-ziy@nvidia.com> References: <20250509200111.3372279-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BL1PR13CA0213.namprd13.prod.outlook.com (2603:10b6:208:2bf::8) To DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS7PR12MB9473:EE_|DM4PR12MB5865:EE_ X-MS-Office365-Filtering-Correlation-Id: 17de9c56-e1ef-4ce9-41a0-08dd8f3442c1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?TZ5cL41Jweq7zqEP3Ic+ZVUf/dek6nem5Lil9d+9/Z6OlZbCZaQPSylfKMri?= =?us-ascii?Q?0dVdm1EaiFFq7LdEVI2yFBRKh4euKr6b9hF0/1vg7w3osRQLrzyd2htOFRWA?= =?us-ascii?Q?MDUpb6PWzuxVlFjvchAp98+4VWS2Gf/h6iRN+CLHmvPTWX/DAIrzytChyzTc?= =?us-ascii?Q?ebho1LBeXLTsjXJiBh1woEDcS0BqpUTUJgD9HdgOoItJMCqqS7f9tcJ+myWu?= =?us-ascii?Q?Fq5JqzuZboFgT/mwoPnwfLPtj+V0j1AojbqDhBp6K22NUUnSmsmhpRJcBX+d?= =?us-ascii?Q?3u4uGjc3lA+flRT9qvU/XnHdfHp4xGAl97gCumAw/H/goWs001eYLhNWrHXD?= =?us-ascii?Q?nW7JPshBEBT2ByuSY0TF+wjqnylTYB3qf1HKNYEpIaWVM96SXDcctep+yaVK?= =?us-ascii?Q?7ck9ble2RCSrURS9wGhafBI10TvyJC+A8esI8dI4uXdofrTZn1/jiq4qzfBq?= =?us-ascii?Q?K9H14/OM1sGkh8jQCbfmmrdnKDE2qtmOlm39VtXe04+K1Czvg7kH6UzDh69Q?= =?us-ascii?Q?l39VYJedssztM39PBitbFZCY0MB4jUJLMj8hJ9t1mPq6Qn2hD4M9rALtFA5V?= =?us-ascii?Q?9Lrj3Kf5xUgER9S1I6IVQl1H/YPcAPmaRMCGig+/vnzXEIcUHIZ8pINr4A8m?= =?us-ascii?Q?9lbANZ5eCYv6wIIpCzGh4N5oIKdZC4xhzJRkSz33uJ1gngyJrWLXyJeu9csj?= =?us-ascii?Q?m//Zohs/Rj9UjWgRLwiKIFTTqY8OraXpdTaRtvy1G20Mdy0jqOFzZOyUx7wW?= =?us-ascii?Q?rtR8JNfbHUclK7c5zh0WRJQgUPG3FP0/k0HSDhUKUiRgUacQvTrv3dIvyMyz?= =?us-ascii?Q?5+5znvz6F59ZgqCzkx2LfqdmyEzcNrOBftNmnutWBM9bUShG6RYIKcaQkUt7?= =?us-ascii?Q?PJwfecXpqFEDTh06zHecxMQAwLR3Ov6ILeoeqXMLk9nMrjqFa5/Sp+AgP2R7?= =?us-ascii?Q?hNekXkvpozZtYtZFa0TMooK8Rdkn2o1vJYQOMX9BgW6ZOa0bEYpzH/miCJYo?= =?us-ascii?Q?BTtDNKz8tD+4ybdycwiv/ovM9JwZCiZLPj2Dfw1qGnLPzkKPhbMhEQfhi6Fn?= =?us-ascii?Q?Nvm3OFS4D/vJE2Iam+ph7pI4I2qn/jOQtL3PzEyGX57j2wAnrBECxJLfY1/c?= =?us-ascii?Q?G9REVkibPatfKbvPcLdybmc75XfqKxLO84waxdLoNC1iBZcdyIjBwRNKSHEP?= =?us-ascii?Q?VY2bW+J7TmSakKf57up7jOEoifgL86jhJg5An7IYaUDsY9gpyEQ6MeahrIqa?= =?us-ascii?Q?Bo05q8ZgdgX8kceZlT3KKYKQxyqsLnEMnbMjo52mktq1iteC2Ur6rMq7Jo7X?= =?us-ascii?Q?rxVAJEG5Sx4+c2NwFEGOWPPxTVrHUG4o8b0dEfGHQ68AN15XIBOTBzCrnm9p?= =?us-ascii?Q?HaGbXmuGSphOuo9/KrBA7X3cI81i2CWaD83WaQ6275pucQ1dfw=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR12MB9473.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(7416014)(376014)(7053199007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?x/5y/ZOiqQYwuKPvI5uHs3av8/JhODbAnnFEzxRijUHTnLDc7pH/toSaHmGw?= =?us-ascii?Q?h/gVWjnyKFrNzTDnofkOEna4Ux+NEgRLf+mGegeUg/7+vRNxTyxNcGC/2eMw?= =?us-ascii?Q?+cZOuNUV8+xHrnc2iMlICcwhP7GGU03nwBR3Gqt/2xX+BNoFLvWoCKZpWUnV?= =?us-ascii?Q?upkTq/8TeZB8XXEe/1Gl/FJjTIfLzuGEc7U9pXtsmwYDjQ/ljeB2pqFpcc5R?= =?us-ascii?Q?uYjp1ORXH9pZOaimVIGSOya4PA6NbdbnoLEprlGGC6PqC9+ofKryBnd6DzFr?= =?us-ascii?Q?9jLOFKOMIGfeYxyUaNGUuwZaRSbhrRph2v6Wd7w1nJrJx10cIhB3aFUOqwhP?= =?us-ascii?Q?hvi53KeNbzSVKmjw2cgTgZx4nl9FSPNq4fd/IW+9pta3nvsPl65hL+S9XqwR?= =?us-ascii?Q?DM2EAthFuIVx4cMCn3/ytDCZ/BOw8cYPOz+7m+jk0pvaKITiSEo9UIne4VU2?= =?us-ascii?Q?LizHrWX1+OUM84AUnMDBWS9yvZqQ+gWYzsLIB120+QB6gFVjtMh6qwLa7I6O?= =?us-ascii?Q?UXrdbnKLRB9t5mhcJvxpSHwi0W9b9OIymRZzXwaR4uRD4+TAMxcaOPhibUao?= =?us-ascii?Q?I3zpK/ayambjxe2qbNZFeKkWcEHaM52ZJg83qvxjOxHY7fXaX2EopryA05B9?= =?us-ascii?Q?6Q61+Gxtwn050bH9YhyumcjCdfMgymVeiTonew7HeCyvpJnGoQ/vlBhEKZqx?= =?us-ascii?Q?JlNjRqqYZ3FQze/aKf/glWw96jq1dYbQOh+1DxjmVd1sWrwBamKdbzj2dIfz?= =?us-ascii?Q?overnHKwJr+XZewhFbAhKqouIJNpKGhLL2C3eIJ809SnN9vrhq3FLYMhbZSI?= =?us-ascii?Q?5P2Gdjpbj+pM/MLOrIYcJsxPISRTYmjV25rlfRe35bsQvD7yIUXoU/g9Iurh?= =?us-ascii?Q?1C4vATotOJ1a3r8jsMaMoAEwXE/iH9Zs2Z6hYptkY9hBIl5C/sO1Z3rpDs8c?= =?us-ascii?Q?zh5wMiCqQopNjSth+lLvzkwbQkszIMnR5cOte73CNIC9I1VRkeCXQol3Sx4c?= =?us-ascii?Q?oS7vmWeh85nfbxAvtxUzTomn0thVq/7Sfge3PGpyiDe8E92mEXqNwMOcdT30?= =?us-ascii?Q?wGr48DbH/acUpqvu4eEibDSUiiKoOzEjdgp4xSoNqsX/HXHRUzvzc8EzGwPf?= =?us-ascii?Q?OR626HPkNYJkKvlEOOqdzhfXOmn2Nd5DL85AGitigDcgFP2kmO66L4yYd2KZ?= =?us-ascii?Q?tsbH3NNM9+/UV6/JD786QBN2zCbYexNhgG0MpuhEZzxhiCLScsm78b08Xe+o?= =?us-ascii?Q?CiSmVel/eFi5cO4jsLpMc0pK+MGD+g42wyz4WSrbd5Sl2UTFTTD0dFDTGgwJ?= =?us-ascii?Q?2WT5NldtMsH3d/6LieIodFMbkxYUP4Lt2Dsd8X+dGOowHw2aZTZeNgjfsAqT?= =?us-ascii?Q?lZAX47FdotT/QPMGknBOMkGFyMHm5NRPd4L+CgV6U5Lf9q56nP3be6mYHuJ5?= =?us-ascii?Q?GnGwTSHjsQ+C83h8ZBimrIFm2+OwZBbC9Qm2ZmpiDqWYvnIPGo82UCba8sMV?= =?us-ascii?Q?Nx5m3yl5xt8BiXDun8HstntDnOBBgErU9BG2YnP2EtVH+RWmbdMCF7DJlG8Q?= =?us-ascii?Q?kY0RQMHgoqq5fMF3Y0aHvmC/S6cDMuHCyxlcVIdY?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 17de9c56-e1ef-4ce9-41a0-08dd8f3442c1 X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 20:01:17.8435 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: htojIOSVoBoyExXF1T1VNmQqhXecWkuOvwY7sMUMmLPrpt+f1MfJHghJuFZL/bJ9 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5865 Content-Type: text/plain; charset="utf-8" Since migratetype is no longer overwritten during pageblock isolation, undoing pageblock isolation no longer needs which migratetype to restore. Signed-off-by: Zi Yan Acked-by: David Hildenbrand --- include/linux/page-isolation.h | 3 +-- mm/memory_hotplug.c | 4 ++-- mm/page_alloc.c | 2 +- mm/page_isolation.c | 9 +++------ 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h index b0a2af0a5357..5e6538ab74f0 100644 --- a/include/linux/page-isolation.h +++ b/include/linux/page-isolation.h @@ -34,8 +34,7 @@ bool pageblock_unisolate_and_move_free_pages(struct zone = *zone, struct page *pag int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pf= n, int migratetype, int flags); =20 -void undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pf= n, - int migratetype); +void undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pf= n); =20 int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn, int isol_flags); diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index c86c47bba019..e63e115e2c08 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1234,7 +1234,7 @@ int online_pages(unsigned long pfn, unsigned long nr_= pages, build_all_zonelists(NULL); =20 /* Basic onlining is complete, allow allocation of onlined pages. */ - undo_isolate_page_range(pfn, pfn + nr_pages, MIGRATE_MOVABLE); + undo_isolate_page_range(pfn, pfn + nr_pages); =20 /* * Freshly onlined pages aren't shuffled (e.g., all pages are placed to @@ -2120,7 +2120,7 @@ int offline_pages(unsigned long start_pfn, unsigned l= ong nr_pages, =20 failed_removal_isolated: /* pushback to free area */ - undo_isolate_page_range(start_pfn, end_pfn, MIGRATE_MOVABLE); + undo_isolate_page_range(start_pfn, end_pfn); memory_notify(MEM_CANCEL_OFFLINE, &arg); failed_removal_pcplists_disabled: lru_cache_enable(); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index cfd37b2d992e..8ff7937e932a 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6887,7 +6887,7 @@ int alloc_contig_range_noprof(unsigned long start, un= signed long end, start, end, outer_start, outer_end); } done: - undo_isolate_page_range(start, end, migratetype); + undo_isolate_page_range(start, end); return ret; } EXPORT_SYMBOL(alloc_contig_range_noprof); diff --git a/mm/page_isolation.c b/mm/page_isolation.c index 4571940f14db..7b9b76620a96 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -532,7 +532,7 @@ int start_isolate_page_range(unsigned long start_pfn, u= nsigned long end_pfn, page =3D __first_valid_page(pfn, pageblock_nr_pages); if (page && set_migratetype_isolate(page, migratetype, flags, start_pfn, end_pfn)) { - undo_isolate_page_range(isolate_start, pfn, migratetype); + undo_isolate_page_range(isolate_start, pfn); unset_migratetype_isolate( pfn_to_page(isolate_end - pageblock_nr_pages)); return -EBUSY; @@ -545,13 +545,10 @@ int start_isolate_page_range(unsigned long start_pfn,= unsigned long end_pfn, * undo_isolate_page_range - undo effects of start_isolate_page_range() * @start_pfn: The first PFN of the isolated range * @end_pfn: The last PFN of the isolated range - * @migratetype: New migrate type to set on the range * - * This finds every MIGRATE_ISOLATE page block in the given range - * and switches it to @migratetype. + * This finds and unsets every MIGRATE_ISOLATE page block in the given ran= ge */ -void undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pf= n, - int migratetype) +void undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pf= n) { unsigned long pfn; struct page *page; --=20 2.47.2 From nobody Wed Dec 17 08:55:13 2025 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2089.outbound.protection.outlook.com [40.107.236.89]) (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 6C92125F7AF for ; Fri, 9 May 2025 20:01:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.89 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746820891; cv=fail; b=FedzhVUjhfL880S3tQCzsydvzY9Cf26uX0uj37gKmWFd26YJ6n3jI7+YwI6cw6wInIg1vjQM9/hs54Hyv+eKqYlhRi9qwwJ+v60lMPbLA6u9hL8jYrHanJyTJ1obJoSKLgHGSoVlJY1Kv1oJOkia/nsVu9ksq7XNVdghEpVlo2U= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746820891; c=relaxed/simple; bh=A69B4go+63kFPJ6XmlGmtJ+fKYMjWtG/vFBPpX3e/k4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=mvduSZBLQxMTNpW9q4EdtxBfRLj6CITNQzzkwzfJYvtJGHrj3UbNp4ZP0aEDCsetjwQgIJgRUaQB3a8c0w0UigUhATCLejY5JP6o3CCVs08DcXLskvXwEZjVmnehnstOCNaVHLJuKq5aLBcHtkfc0ixstFS9RNbGjFRvh99c/zs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=al5u43+H; arc=fail smtp.client-ip=40.107.236.89 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="al5u43+H" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=a7h/+XlsryNEmvK5mutVDF2vIAyFOV65ugEh47O6qyVvH4fghxKBi/l2AA8WNssEmBQx63cpOtL3BpeU4TklSouLawPq7q9JLWflh0SLzXob+x808e1RnbO3VzGfpDkfMpPAbka4kWp5B2Ojgr9qGS+7pT8rJfo4jbG9PNfPwliFOJ3nLtICSmguxL/2zvv0/PHVZgroXSR8o5x+QsJoGuUFRM4ubudc9B3Uqbry+7rkp8+zaqFz2i/n+O54A+Conir9GgtSD4oV72vnLL8qo3ip9eQ1aTNg2H3311Rg8g71zDU+BgjhUZCGQTJVdIfrEofgrPYt4j7vRdnx2zVNRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zvjTEbyN5vP8uqEmqNzQrIPg73GWbXUYzgYe/5FpSIo=; b=tjXClh4jmy9SVk3LgcUWtrE0upOlA0jQkB0dRZMFqOFXziF7luyFnu9mRBImdMRZGD83siDTB6WWzRF8Aj/IbR0t8xy2ziZgp1rNvPl3tXlsfRskracZcPfY6Q8HFwfE3NV4/E/2WMssmXrN0TLd1vZ37jXycr8wJUZ11PkRpRX2JEfQWy4rakH/XaS9xcm/Pnwx25eqqTH5dHQau6ebjaxz4i60oFh1xxZ6uUGVmGhKFOoPBZ9aSp7mqvdtUJ15MztW1FZ19w4dXhCQsmegVArbebvQhFmwuvdHBve45USaPJWk1qLAFeuKTn98msDXNMMSsIrEtmqiIlST03O+zQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zvjTEbyN5vP8uqEmqNzQrIPg73GWbXUYzgYe/5FpSIo=; b=al5u43+HlEWMpUlKFQ+iVYIgLfIg3DVEtuuzSebTvk7D0BjKrPB6KC8h4w6EW0oP7osqsoWKwfIXjhBzwBh3YX6vOHR3eNFHAzBdshJqApqAJzfA07ur6/n6xP+UiD8JDkGPr64a+5lPZCtI/yothMomeboJ6yD54WwPWg3wbicNaoOl0NEFm/wff4nSBwy/ovciEP+5f6uqkGvWDxhI+QOtAbGSpHNd8E3XNI006wABib29lu35iPNaQUA7zCkQDmncrKaQyqNDRAH8YhuKywHC2CY9Dqsmj8UNR6sfRAVoEdezCMpPMEfNfQ/Cw2x+ynVtw5Kp2e+qKprjyNAQ/Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) by DM4PR12MB5865.namprd12.prod.outlook.com (2603:10b6:8:64::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.24; Fri, 9 May 2025 20:01:19 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a%5]) with mapi id 15.20.8722.020; Fri, 9 May 2025 20:01:19 +0000 From: Zi Yan To: David Hildenbrand , Oscar Salvador , Johannes Weiner , linux-mm@kvack.org Cc: Andrew Morton , Vlastimil Babka , Baolin Wang , "Kirill A . Shutemov" , Mel Gorman , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Richard Chang , linux-kernel@vger.kernel.org, Zi Yan Subject: [PATCH v4 4/4] mm/page_isolation: remove migratetype parameter from more functions. Date: Fri, 9 May 2025 16:01:11 -0400 Message-ID: <20250509200111.3372279-5-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250509200111.3372279-1-ziy@nvidia.com> References: <20250509200111.3372279-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BL1PR13CA0224.namprd13.prod.outlook.com (2603:10b6:208:2bf::19) To DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS7PR12MB9473:EE_|DM4PR12MB5865:EE_ X-MS-Office365-Filtering-Correlation-Id: 129c15dc-5739-472a-1b99-08dd8f344377 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?daeAftTpw2Ph9MNiPcShfx5vH/0HHwKeON7K2CjcgQwWhGx1InuhOIcEDvvb?= =?us-ascii?Q?yb9lSl/zeGCO1iWpNgx23PhsPOUozomR9v62LHpWrAugdoI/q7BJMhaid8Zo?= =?us-ascii?Q?AgoF5SGEdAOzlgq+UgzWwC6SsjRPsgrrpoHPECVAkoZQjMM55mh5PbHVThzx?= =?us-ascii?Q?nPUvV2elphGuI0LUTX/JVHscaZzym8JxVVmCLP+7m+0oOtXIt3e0GchmxBqk?= =?us-ascii?Q?ytlAWPNwbOnAcHuSvnJ8OMh/C+S5Zye50EweMjBkfJlOo5Zn/RJzL5c63eKf?= =?us-ascii?Q?Kym0E+PQt++JIF/l3l5QPKnBpbNRrtvBGxPyPk5zWfQpL75dyAzhdbfhLtVY?= =?us-ascii?Q?exTY2lPB8lkYRIdRu9CEHhMJg0Z+W1ar6efrr35zLNpYY/qpiPo5gu/EeEJ9?= =?us-ascii?Q?Wzs/GnHfidlZPHUqj4KztG6RI/jxDFFupj2USSt5dsJJYwEwRwX45Idt0lTP?= =?us-ascii?Q?JukJCmGzXPtyjxBMAmQOcrlywU08s/jw6J2eSRhBhgIaDpwXaYPVd8WqcBvl?= =?us-ascii?Q?lutRY4bXUtAjgDdYyl30sqWsLjvQpp/enmzNIIV+NaTRAgh+DCyVSUyfFTvO?= =?us-ascii?Q?iR8nxuf6b+tC7ql2hR2JgHoeljBPrIh8d9h74jRpDkKeCHRoQ+Iul9rM1orq?= =?us-ascii?Q?1qDkr4JrrRsrwDBv7dOlDwx9/67+Ds3tKX1spKcG1m/r7Aa4wRZ+vGlf2HXB?= =?us-ascii?Q?1LnL610zv9Zj0a+cFXcvu5ddaFhTS2LglvGWlnNrYXPUuIOTRR7YMpq+PsRk?= =?us-ascii?Q?UTYCZW2oljkHBuwTF/F765XjINmD4Jl3RRsG3vs/KIkxkNHC9ArJxA0eMBLV?= =?us-ascii?Q?+4QA6MPr3nkdb5HjRKEgD83fYsfcy+u7jAr/CA6c0xmBXpqME/SnDWWwOB4c?= =?us-ascii?Q?MolizANxWrBrYUEc76HqORsgLHrvq6LJoZWPOAvZa+gGUzG7OgBmWT1i3EOM?= =?us-ascii?Q?vNFGwELTCP7pKq7trGBsyzM9BBGKm1Yh+PJRseAVN6xaj8zLAMzic11xGxkS?= =?us-ascii?Q?adSgNOfElO4jYHcn6XkfWhUdZgpcuO2uQEoBB/sT4aszZ88lXAqva0fOsT9O?= =?us-ascii?Q?vgigN9EcgxG8yGFQInGVOr1RHBm3ZecCcjWK2AsI7CHe0EIfLADft9vyFWdC?= =?us-ascii?Q?3vDXSfaPder9owk5noHCHY9JUadK117UqcC7oXLAfkRpbi1cbQ6nRBEZ/Lh8?= =?us-ascii?Q?x5MJCd9kV4aawMBPWCQNsnOmLbW+tbuR8j01Z3CYU5skDmNv0NFRpOQvVZXL?= =?us-ascii?Q?5XMD61eXaS/TljdhrMqB6Lvph1cztJVNp+I1bNQbQXAQPZPKR69j2XRu2DQf?= =?us-ascii?Q?JnvcsLOUV+ktSWATuTeJpn6UdS35jINFjJO3zXxRCL5wAoHXVvyoVai/l5J5?= =?us-ascii?Q?Im4vBmGko9IQP+pFSJPikzEooYeaG4gqSil02pUXsYiURgT3meTyfkknZWnf?= =?us-ascii?Q?TjntDQmv3sQ=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR12MB9473.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ml3BFpUCoChZpXNkxcxXLlHgPFTiBM5D7ZlXl7eWNnFn4jOY8AlXFj9/S241?= =?us-ascii?Q?X+Vh3RBgrWkYeUhTDoLpIQrXlgpeCmM6uk9zrtHWkA6ibp8KUKlod1fhw2eB?= =?us-ascii?Q?TpvwOgCtTrWYLtUUwySupqvm/IlnO2RPszaEoTtDNcQ494AUtawacQr98bZP?= =?us-ascii?Q?LXIYD8S544Jm6J2NZE23mfjrxAe8Xb1nq2M9s0yCHFOivtxrprilif1Nciwd?= =?us-ascii?Q?n9eBNvyKYR1auK+Nxv5dLsL1ZlQRIHJcTm/xn7juYbwtdtLIGmgtb2JJa/4F?= =?us-ascii?Q?xfa/9RR8BYrxfeZ5ceco++N/b7PweRMe5FPUIngS7t6rHgIKu6EwAy9PYb3z?= =?us-ascii?Q?oojjOccnMwdP9W8YtYXbShyxYPA6qJHVqhE44l/oSSarxd1eDryQ0Ffg82Fv?= =?us-ascii?Q?sCAjCfGhD4oJVkht7kMM7gr1WtM/Xyo9KI0cH5dP/qKe4MZFmS1obnder3pG?= =?us-ascii?Q?TIKWq0VcXKWKK7u3GvC5Eodzb1cWNW7gELiAMQp6bUhAr9tcKyEdakbmgVFk?= =?us-ascii?Q?6CkYgv4i7A1FIkr6DP21XlfGC+Gt6GQoHDl0tgqfGNSRrYKBmRw0D8pYB5jU?= =?us-ascii?Q?JDCBBirwHW96X4spKzzElkaF6ROsxeue1z/eJFN6MYZVU7aimO6TgETYuX20?= =?us-ascii?Q?Neg8YLIjoOLfFNUjAaNcotLhex6WA/EE1ezdZQY1bDWWi3n8Q3osNgDprRnz?= =?us-ascii?Q?Ht5EmJ5x06BV4HgzYvvjVh70mQyij4RW2Gdj5R2uCoIsaNZ1SLtQAiDMR+ci?= =?us-ascii?Q?HNFkLnFQBZTUy6c6MKueHX9VR4g0uz1WQjv3B/hZQdLqKyNNUbunJhyAZ8Ix?= =?us-ascii?Q?ua7LHJxANs066teLY4mOQwOe/kOxwSCYv1qLgM7/7SB8btokd76ylkvQNeHs?= =?us-ascii?Q?XP2N1GcCNy67wZbKJnr7oEUKI5nLIWW1q17jQkmQwGKTyJY8XHgphu2WO1Cx?= =?us-ascii?Q?pvGslQQ2o32mjKYa3tTv5QheFinIpYTyAOcgRENose/zv2nenmmvHryyFOXK?= =?us-ascii?Q?TezJTCaGhkKCDap5SRFrAUSNIDJ4CeVb8tttdLoWtZcf8/dIe1Kje+DuRpZj?= =?us-ascii?Q?6f9vhnzKISiam3RIf5Kwg/au5e0p10+EyYjRnnfk3g143SiPNfTe7cAbKDhJ?= =?us-ascii?Q?/ZkMsLYWBvZP/S1/BV044vdkis2xehd9Dhex3AErTd2/BZemKnxldqGNAkCx?= =?us-ascii?Q?fDpbjnI1p6Q0EFgSgZtN2dp3Frda/uBkhKX8uYfLLXdljImyXbKPlfy5koHW?= =?us-ascii?Q?cpalCElDyFPYa3BF3RVUK8gII7pGFwtihiiZKIar26tTTe4XAFqNE0W7nuWD?= =?us-ascii?Q?0COpBZp+9q33tDmG1MOwIsYeFelfIYTLV4ODPfd7deQiBoogV53BVUmmZq6W?= =?us-ascii?Q?3ZNiAAIj+Sa+tPuNyfaVCse8o6bsKmxoEtfbPTQwXh5OR5NSYuL6AzYkUHWk?= =?us-ascii?Q?v3n5w0OEmlXnSaEE+fW6F5q2hTxpMkDQTh2jZyzzt3R2ZhbAu4YUGEjZoO59?= =?us-ascii?Q?Ly2YJnvSx5nyMVwd7ZJlwcrpipd12iwyJQOX6YsE2Ry1R6etBkeRVADVDJey?= =?us-ascii?Q?05EBFJH71YJ1II8IGEU9FiLj9Jjr4BtCb6rr5LSU?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 129c15dc-5739-472a-1b99-08dd8f344377 X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 20:01:19.0717 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pPiq0sQrb1U0CGIM0iw8fzlnzxW+Ue+EDIk47x1Oif1vTE77M19JnDJt3bGQGtgB X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5865 Content-Type: text/plain; charset="utf-8" migratetype is no longer overwritten during pageblock isolation, start_isolate_page_range(), has_unmovable_pages(), and set_migratetype_isolate() no longer need which migratetype to restore during isolation failure. For has_unmoable_pages(), it needs to know if the isolation is for CMA allocation, so adding CMA_ALLOCATION to isolation flags to provide the information. alloc_contig_range() no longer needs migratetype. Replace it with a newly defined acr_flags_t to tell if an allocation is for CMA. So does __alloc_contig_migrate_range(). Signed-off-by: Zi Yan --- drivers/virtio/virtio_mem.c | 3 +- include/linux/gfp.h | 6 ++- include/linux/page-isolation.h | 25 +++++++++++-- include/trace/events/kmem.h | 14 ++++--- mm/cma.c | 2 +- mm/memory_hotplug.c | 3 +- mm/page_alloc.c | 25 ++++++------- mm/page_isolation.c | 67 ++++++++++++++++------------------ 8 files changed, 80 insertions(+), 65 deletions(-) diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c index 56d0dbe62163..8accc0f255a8 100644 --- a/drivers/virtio/virtio_mem.c +++ b/drivers/virtio/virtio_mem.c @@ -1243,8 +1243,7 @@ static int virtio_mem_fake_offline(struct virtio_mem = *vm, unsigned long pfn, if (atomic_read(&vm->config_changed)) return -EAGAIN; =20 - rc =3D alloc_contig_range(pfn, pfn + nr_pages, MIGRATE_MOVABLE, - GFP_KERNEL); + rc =3D alloc_contig_range(pfn, pfn + nr_pages, 0, GFP_KERNEL); if (rc =3D=3D -ENOMEM) /* whoops, out of memory */ return rc; diff --git a/include/linux/gfp.h b/include/linux/gfp.h index c9fa6309c903..db4be1861736 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -423,9 +423,13 @@ static inline bool gfp_compaction_allowed(gfp_t gfp_ma= sk) extern gfp_t vma_thp_gfp_mask(struct vm_area_struct *vma); =20 #ifdef CONFIG_CONTIG_ALLOC + +typedef unsigned int __bitwise acr_flags_t; +#define ACR_CMA ((__force acr_flags_t)BIT(0)) // allocate for CMA + /* The below functions must be run on a range from a single zone. */ extern int alloc_contig_range_noprof(unsigned long start, unsigned long en= d, - unsigned migratetype, gfp_t gfp_mask); + acr_flags_t alloc_flags, gfp_t gfp_mask); #define alloc_contig_range(...) alloc_hooks(alloc_contig_range_noprof(__= VA_ARGS__)) =20 extern struct page *alloc_contig_pages_noprof(unsigned long nr_pages, gfp_= t gfp_mask, diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h index 5e6538ab74f0..7aed5bf18cc6 100644 --- a/include/linux/page-isolation.h +++ b/include/linux/page-isolation.h @@ -22,8 +22,25 @@ static inline bool is_migrate_isolate(int migratetype) } #endif =20 -#define MEMORY_OFFLINE 0x1 -#define REPORT_FAILURE 0x2 +/* + * Isolation modes: + * ISOLATE_MODE_NONE - isolate for other purposes than those below + * MEMORY_OFFLINE - isolate to offline (!allocate) memory e.g., skip ov= er + * PageHWPoison() pages and PageOffline() pages. + * CMA_ALLOCATION - isolate for CMA allocations + */ +enum isolate_mode_t { + ISOLATE_MODE_NONE, + MEMORY_OFFLINE, + CMA_ALLOCATION, +}; + +/* + * Isolation flags: + * REPORT_FAILURE - report details about the failure to isolate the range + */ +typedef unsigned int __bitwise isolate_flags_t; +#define REPORT_FAILURE ((__force isolate_flags_t)BIT(0)) =20 void set_pageblock_migratetype(struct page *page, int migratetype); void set_pageblock_isolate(struct page *page); @@ -32,10 +49,10 @@ bool pageblock_isolate_and_move_free_pages(struct zone = *zone, struct page *page) bool pageblock_unisolate_and_move_free_pages(struct zone *zone, struct pag= e *page); =20 int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pf= n, - int migratetype, int flags); + isolate_mode_t mode, isolate_flags_t flags); =20 void undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pf= n); =20 int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn, - int isol_flags); + isolate_mode_t mode); #endif diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h index f74925a6cf69..efffcf578217 100644 --- a/include/trace/events/kmem.h +++ b/include/trace/events/kmem.h @@ -304,6 +304,7 @@ TRACE_EVENT(mm_page_alloc_extfrag, __entry->change_ownership) ); =20 +#ifdef CONFIG_CONTIG_ALLOC TRACE_EVENT(mm_alloc_contig_migrate_range_info, =20 TP_PROTO(unsigned long start, @@ -311,9 +312,9 @@ TRACE_EVENT(mm_alloc_contig_migrate_range_info, unsigned long nr_migrated, unsigned long nr_reclaimed, unsigned long nr_mapped, - int migratetype), + acr_flags_t alloc_flags), =20 - TP_ARGS(start, end, nr_migrated, nr_reclaimed, nr_mapped, migratetype), + TP_ARGS(start, end, nr_migrated, nr_reclaimed, nr_mapped, alloc_flags), =20 TP_STRUCT__entry( __field(unsigned long, start) @@ -321,7 +322,7 @@ TRACE_EVENT(mm_alloc_contig_migrate_range_info, __field(unsigned long, nr_migrated) __field(unsigned long, nr_reclaimed) __field(unsigned long, nr_mapped) - __field(int, migratetype) + __field(acr_flags_t, alloc_flags) ), =20 TP_fast_assign( @@ -330,17 +331,18 @@ TRACE_EVENT(mm_alloc_contig_migrate_range_info, __entry->nr_migrated =3D nr_migrated; __entry->nr_reclaimed =3D nr_reclaimed; __entry->nr_mapped =3D nr_mapped; - __entry->migratetype =3D migratetype; + __entry->alloc_flags =3D alloc_flags; ), =20 - TP_printk("start=3D0x%lx end=3D0x%lx migratetype=3D%d nr_migrated=3D%lu n= r_reclaimed=3D%lu nr_mapped=3D%lu", + TP_printk("start=3D0x%lx end=3D0x%lx alloc_flags=3D%d nr_migrated=3D%lu n= r_reclaimed=3D%lu nr_mapped=3D%lu", __entry->start, __entry->end, - __entry->migratetype, + __entry->alloc_flags, __entry->nr_migrated, __entry->nr_reclaimed, __entry->nr_mapped) ); +#endif =20 TRACE_EVENT(mm_setup_per_zone_wmarks, =20 diff --git a/mm/cma.c b/mm/cma.c index 15632939f20a..8606bfe19e5d 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -818,7 +818,7 @@ static int cma_range_alloc(struct cma *cma, struct cma_= memrange *cmr, =20 pfn =3D cmr->base_pfn + (bitmap_no << cma->order_per_bit); mutex_lock(&cma->alloc_mutex); - ret =3D alloc_contig_range(pfn, pfn + count, MIGRATE_CMA, gfp); + ret =3D alloc_contig_range(pfn, pfn + count, ACR_CMA, gfp); mutex_unlock(&cma->alloc_mutex); if (ret =3D=3D 0) { page =3D pfn_to_page(pfn); diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index e63e115e2c08..029a65b6ad27 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -2010,8 +2010,7 @@ int offline_pages(unsigned long start_pfn, unsigned l= ong nr_pages, =20 /* set above range as isolated */ ret =3D start_isolate_page_range(start_pfn, end_pfn, - MIGRATE_MOVABLE, - MEMORY_OFFLINE | REPORT_FAILURE); + MEMORY_OFFLINE, REPORT_FAILURE); if (ret) { reason =3D "failure to isolate range"; goto failed_removal_pcplists_disabled; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 8ff7937e932a..b3476e0f59ad 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6580,11 +6580,12 @@ static void alloc_contig_dump_pages(struct list_hea= d *page_list) =20 /* * [start, end) must belong to a single zone. - * @migratetype: using migratetype to filter the type of migration in + * @alloc_flags: using acr_flags_t to filter the type of migration in * trace_mm_alloc_contig_migrate_range_info. */ static int __alloc_contig_migrate_range(struct compact_control *cc, - unsigned long start, unsigned long end, int migratetype) + unsigned long start, unsigned long end, + acr_flags_t alloc_flags) { /* This function is based on compact_zone() from compaction.c. */ unsigned int nr_reclaimed; @@ -6656,7 +6657,7 @@ static int __alloc_contig_migrate_range(struct compac= t_control *cc, putback_movable_pages(&cc->migratepages); } =20 - trace_mm_alloc_contig_migrate_range_info(start, end, migratetype, + trace_mm_alloc_contig_migrate_range_info(start, end, alloc_flags, total_migrated, total_reclaimed, total_mapped); @@ -6727,10 +6728,7 @@ static int __alloc_contig_verify_gfp_mask(gfp_t gfp_= mask, gfp_t *gfp_cc_mask) * alloc_contig_range() -- tries to allocate given range of pages * @start: start PFN to allocate * @end: one-past-the-last PFN to allocate - * @migratetype: migratetype of the underlying pageblocks (either - * #MIGRATE_MOVABLE or #MIGRATE_CMA). All pageblocks - * in range must have the same migratetype and it must - * be either of the two. + * @alloc_flags: allocation information * @gfp_mask: GFP mask. Node/zone/placement hints are ignored; only some * action and reclaim modifiers are supported. Reclaim modifiers * control allocation behavior during compaction/migration/reclaim. @@ -6747,7 +6745,7 @@ static int __alloc_contig_verify_gfp_mask(gfp_t gfp_m= ask, gfp_t *gfp_cc_mask) * need to be freed with free_contig_range(). */ int alloc_contig_range_noprof(unsigned long start, unsigned long end, - unsigned migratetype, gfp_t gfp_mask) + acr_flags_t alloc_flags, gfp_t gfp_mask) { unsigned long outer_start, outer_end; int ret =3D 0; @@ -6763,6 +6761,8 @@ int alloc_contig_range_noprof(unsigned long start, un= signed long end, }; INIT_LIST_HEAD(&cc.migratepages); bool is_range_aligned; + isolate_mode_t mode =3D (alloc_flags & ACR_CMA) ? CMA_ALLOCATION : + ISOLATE_MODE_NONE; =20 gfp_mask =3D current_gfp_context(gfp_mask); if (__alloc_contig_verify_gfp_mask(gfp_mask, (gfp_t *)&cc.gfp_mask)) @@ -6789,7 +6789,7 @@ int alloc_contig_range_noprof(unsigned long start, un= signed long end, * put back to page allocator so that buddy can use them. */ =20 - ret =3D start_isolate_page_range(start, end, migratetype, 0); + ret =3D start_isolate_page_range(start, end, mode, 0); if (ret) goto done; =20 @@ -6805,7 +6805,7 @@ int alloc_contig_range_noprof(unsigned long start, un= signed long end, * allocated. So, if we fall through be sure to clear ret so that * -EBUSY is not accidentally used or returned to caller. */ - ret =3D __alloc_contig_migrate_range(&cc, start, end, migratetype); + ret =3D __alloc_contig_migrate_range(&cc, start, end, alloc_flags); if (ret && ret !=3D -EBUSY) goto done; =20 @@ -6839,7 +6839,7 @@ int alloc_contig_range_noprof(unsigned long start, un= signed long end, outer_start =3D find_large_buddy(start); =20 /* Make sure the range is really isolated. */ - if (test_pages_isolated(outer_start, end, 0)) { + if (test_pages_isolated(outer_start, end, mode)) { ret =3D -EBUSY; goto done; } @@ -6897,8 +6897,7 @@ static int __alloc_contig_pages(unsigned long start_p= fn, { unsigned long end_pfn =3D start_pfn + nr_pages; =20 - return alloc_contig_range_noprof(start_pfn, end_pfn, MIGRATE_MOVABLE, - gfp_mask); + return alloc_contig_range_noprof(start_pfn, end_pfn, 0, gfp_mask); } =20 static bool pfn_range_valid_contig(struct zone *z, unsigned long start_pfn, diff --git a/mm/page_isolation.c b/mm/page_isolation.c index 7b9b76620a96..71ed918deeb3 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -48,7 +48,7 @@ void set_pageblock_isolate(struct page *page) * */ static struct page *has_unmovable_pages(unsigned long start_pfn, unsigned = long end_pfn, - int migratetype, int flags) + isolate_mode_t mode, isolate_flags_t flags) { struct page *page =3D pfn_to_page(start_pfn); struct zone *zone =3D page_zone(page); @@ -63,7 +63,7 @@ static struct page *has_unmovable_pages(unsigned long sta= rt_pfn, unsigned long e * isolate CMA pageblocks even when they are not movable in fact * so consider them movable here. */ - if (is_migrate_cma(migratetype)) + if (mode =3D=3D CMA_ALLOCATION) return NULL; =20 return page; @@ -134,7 +134,7 @@ static struct page *has_unmovable_pages(unsigned long s= tart_pfn, unsigned long e * The HWPoisoned page may be not in buddy system, and * page_count() is not 0. */ - if ((flags & MEMORY_OFFLINE) && PageHWPoison(page)) + if ((mode =3D=3D MEMORY_OFFLINE) && PageHWPoison(page)) continue; =20 /* @@ -147,7 +147,7 @@ static struct page *has_unmovable_pages(unsigned long s= tart_pfn, unsigned long e * move these pages that still have a reference count > 0. * (false negatives in this function only) */ - if ((flags & MEMORY_OFFLINE) && PageOffline(page)) + if ((mode =3D=3D MEMORY_OFFLINE) && PageOffline(page)) continue; =20 if (__PageMovable(page) || PageLRU(page)) @@ -168,8 +168,9 @@ static struct page *has_unmovable_pages(unsigned long s= tart_pfn, unsigned long e * present in [start_pfn, end_pfn). The pageblock must intersect with * [start_pfn, end_pfn). */ -static int set_migratetype_isolate(struct page *page, int migratetype, int= isol_flags, - unsigned long start_pfn, unsigned long end_pfn) +static int set_migratetype_isolate(struct page *page, isolate_mode_t mode, + isolate_flags_t isol_flags, unsigned long start_pfn, + unsigned long end_pfn) { struct zone *zone =3D page_zone(page); struct page *unmovable; @@ -203,7 +204,7 @@ static int set_migratetype_isolate(struct page *page, i= nt migratetype, int isol_ end_pfn); =20 unmovable =3D has_unmovable_pages(check_unmovable_start, check_unmovable_= end, - migratetype, isol_flags); + mode, isol_flags); if (!unmovable) { if (!pageblock_isolate_and_move_free_pages(zone, page)) { spin_unlock_irqrestore(&zone->lock, flags); @@ -309,11 +310,11 @@ __first_valid_page(unsigned long pfn, unsigned long n= r_pages) * isolate_single_pageblock() -- tries to isolate a pageblock that might be * within a free or in-use page. * @boundary_pfn: pageblock-aligned pfn that a page might cross + * @mode: isolation mode * @flags: isolation flags * @isolate_before: isolate the pageblock before the boundary_pfn * @skip_isolation: the flag to skip the pageblock isolation in second * isolate_single_pageblock() - * @migratetype: migrate type to set in error recovery. * * Free and in-use pages can be as big as MAX_PAGE_ORDER and contain more = than one * pageblock. When not all pageblocks within a page are isolated at the sa= me @@ -328,8 +329,9 @@ __first_valid_page(unsigned long pfn, unsigned long nr_= pages) * either. The function handles this by splitting the free page or migrati= ng * the in-use page then splitting the free page. */ -static int isolate_single_pageblock(unsigned long boundary_pfn, int flags, - bool isolate_before, bool skip_isolation, int migratetype) +static int isolate_single_pageblock(unsigned long boundary_pfn, + isolate_mode_t mode, isolate_flags_t flags, + bool isolate_before, bool skip_isolation) { unsigned long start_pfn; unsigned long isolate_pageblock; @@ -355,12 +357,11 @@ static int isolate_single_pageblock(unsigned long bou= ndary_pfn, int flags, zone->zone_start_pfn); =20 if (skip_isolation) { - int mt __maybe_unused =3D get_pageblock_migratetype(pfn_to_page(isolate_= pageblock)); - - VM_BUG_ON(!is_migrate_isolate(mt)); + VM_BUG_ON(!get_pageblock_isolate(pfn_to_page(isolate_pageblock))); } else { - ret =3D set_migratetype_isolate(pfn_to_page(isolate_pageblock), migratet= ype, - flags, isolate_pageblock, isolate_pageblock + pageblock_nr_pages); + ret =3D set_migratetype_isolate(pfn_to_page(isolate_pageblock), + mode, flags, isolate_pageblock, + isolate_pageblock + pageblock_nr_pages); =20 if (ret) return ret; @@ -458,14 +459,8 @@ static int isolate_single_pageblock(unsigned long boun= dary_pfn, int flags, * start_isolate_page_range() - mark page range MIGRATE_ISOLATE * @start_pfn: The first PFN of the range to be isolated. * @end_pfn: The last PFN of the range to be isolated. - * @migratetype: Migrate type to set in error recovery. - * @flags: The following flags are allowed (they can be combined in - * a bit mask) - * MEMORY_OFFLINE - isolate to offline (!allocate) memory - * e.g., skip over PageHWPoison() pages - * and PageOffline() pages. - * REPORT_FAILURE - report details about the failure to - * isolate the range + * @mode: isolation mode + * @flags: isolation flags * * Making page-allocation-type to be MIGRATE_ISOLATE means free pages in * the range will never be allocated. Any free pages and pages freed in the @@ -498,7 +493,7 @@ static int isolate_single_pageblock(unsigned long bound= ary_pfn, int flags, * Return: 0 on success and -EBUSY if any part of range cannot be isolated. */ int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pf= n, - int migratetype, int flags) + isolate_mode_t mode, isolate_flags_t flags) { unsigned long pfn; struct page *page; @@ -509,8 +504,8 @@ int start_isolate_page_range(unsigned long start_pfn, u= nsigned long end_pfn, bool skip_isolation =3D false; =20 /* isolate [isolate_start, isolate_start + pageblock_nr_pages) pageblock = */ - ret =3D isolate_single_pageblock(isolate_start, flags, false, - skip_isolation, migratetype); + ret =3D isolate_single_pageblock(isolate_start, mode, flags, false, + skip_isolation); if (ret) return ret; =20 @@ -518,8 +513,8 @@ int start_isolate_page_range(unsigned long start_pfn, u= nsigned long end_pfn, skip_isolation =3D true; =20 /* isolate [isolate_end - pageblock_nr_pages, isolate_end) pageblock */ - ret =3D isolate_single_pageblock(isolate_end, flags, true, - skip_isolation, migratetype); + ret =3D isolate_single_pageblock(isolate_end, mode, flags, true, + skip_isolation); if (ret) { unset_migratetype_isolate(pfn_to_page(isolate_start)); return ret; @@ -530,7 +525,7 @@ int start_isolate_page_range(unsigned long start_pfn, u= nsigned long end_pfn, pfn < isolate_end - pageblock_nr_pages; pfn +=3D pageblock_nr_pages) { page =3D __first_valid_page(pfn, pageblock_nr_pages); - if (page && set_migratetype_isolate(page, migratetype, flags, + if (page && set_migratetype_isolate(page, mode, flags, start_pfn, end_pfn)) { undo_isolate_page_range(isolate_start, pfn); unset_migratetype_isolate( @@ -573,7 +568,7 @@ void undo_isolate_page_range(unsigned long start_pfn, u= nsigned long end_pfn) */ static unsigned long __test_page_isolated_in_pageblock(unsigned long pfn, unsigned long end_pfn, - int flags) + isolate_mode_t mode) { struct page *page; =20 @@ -586,10 +581,10 @@ __test_page_isolated_in_pageblock(unsigned long pfn, = unsigned long end_pfn, * simple way to verify that as VM_BUG_ON(), though. */ pfn +=3D 1 << buddy_order(page); - else if ((flags & MEMORY_OFFLINE) && PageHWPoison(page)) + else if ((mode =3D=3D MEMORY_OFFLINE) && PageHWPoison(page)) /* A HWPoisoned page cannot be also PageBuddy */ pfn++; - else if ((flags & MEMORY_OFFLINE) && PageOffline(page) && + else if ((mode =3D=3D MEMORY_OFFLINE) && PageOffline(page) && !page_count(page)) /* * The responsible driver agreed to skip PageOffline() @@ -608,11 +603,11 @@ __test_page_isolated_in_pageblock(unsigned long pfn, = unsigned long end_pfn, * test_pages_isolated - check if pageblocks in range are isolated * @start_pfn: The first PFN of the isolated range * @end_pfn: The first PFN *after* the isolated range - * @isol_flags: Testing mode flags + * @mode: Testing mode * * This tests if all in the specified range are free. * - * If %MEMORY_OFFLINE is specified in @flags, it will consider + * If %MEMORY_OFFLINE is specified in @mode, it will consider * poisoned and offlined pages free as well. * * Caller must ensure the requested range doesn't span zones. @@ -620,7 +615,7 @@ __test_page_isolated_in_pageblock(unsigned long pfn, un= signed long end_pfn, * Returns 0 if true, -EBUSY if one or more pages are in use. */ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn, - int isol_flags) + isolate_mode_t mode) { unsigned long pfn, flags; struct page *page; @@ -656,7 +651,7 @@ int test_pages_isolated(unsigned long start_pfn, unsign= ed long end_pfn, /* Check all pages are free or marked as ISOLATED */ zone =3D page_zone(page); spin_lock_irqsave(&zone->lock, flags); - pfn =3D __test_page_isolated_in_pageblock(start_pfn, end_pfn, isol_flags); + pfn =3D __test_page_isolated_in_pageblock(start_pfn, end_pfn, mode); spin_unlock_irqrestore(&zone->lock, flags); =20 ret =3D pfn < end_pfn ? -EBUSY : 0; --=20 2.47.2