From nobody Thu Dec 18 14:13:57 2025 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2051.outbound.protection.outlook.com [40.107.92.51]) (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 9DDD522FAD4 for ; Mon, 2 Jun 2025 15:18:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.51 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748877500; cv=fail; b=Qvk3JseYWL9D+Vedan60JoneXi+BVpCFJK6gEBjAOPOfHh8012IGuzVJQ7LoHPtNLnldunG8Bv+Bw9bhHJDhptpPCUFbIAP9h7RW0ts2MDe3pOSy2NNFduDwVyAA6u/BujAh/rHRgCoL7wdC7PG8Wy7YbY9GS/wxMKvGISbPhxk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748877500; c=relaxed/simple; bh=6U9w1dKsYh/DEQW00DsMHKBMT+TqlZMfENr8pBytKIA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=idUwXE/3bDaH9kbrYL/JI356UEgYK0GWRTh5aENvUb931hXJCYJ9MSTJuxisRZU2WTakOQJHteKeKsUHc1ZRFjXgOuXdt0+v8xdL4u30f7KJJqJdrAW3sgUL5TSqDSEQn/nKKmvScNL5Xulh6mbvOASoNgzJbq+veRkN0cyP/Y8= 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=iII7IMNC; arc=fail smtp.client-ip=40.107.92.51 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="iII7IMNC" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=U+ZRbqsmdZg6AgntjK6RN9rddCShrUg2P27jRGZ+esDGwZOiug6SfuY2JagxwO74aKheQli+n77C+noDkYnpIfeLl/PFFMcMXwMGXQTX4wG52UBRjh2Y6g+GdsIlMwj48KHbtIJDTbZ5lscJJbG903fQfQUh9PlnYVv0Pw0m9oJFLAt4QkiKPOLkNYgkJlL4v8ERyMeDzl6loXtoEwmsvs+jGrapFKIuZwjfnmWCMj+Ae+OqZSGr3e0UqV60sDIJP0bFLnORwuRhdo1ZmZa1LPKlibcxl8lFqi+Pdyg9USWAmrxgGxSIrj7GRDgmAfF0kvZ+jWRVandpCYc2WQtD1g== 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=S32XQEizl/6DUk/6LC99drW7fwx9X9K2aG6VfQn+4xo=; b=O2LYdefkCGGsEPb1rmjUgYmn0TVVsP/W7lQNducWiVpoluvYxgch19PQl9l2NjDao5iotH/M3/NGFs4671TzTobP0vfoE8EHKAA0k+mYHSRCnzGIym+2sP+JwdfAijrYPd61yqFAVhBpIK8Py/KCXBUD9e+EjvvAVoT+/wWhLxIZ/uXHV3QOH5GKcHGWH+CpUy53ICuxSqucVrHHFUnp9b4RgkMSIOlMyWSJNFJynDUhmlmB8v7GvnFy1oehFN5TZdiNYwzSjxMBbqcKrcIrjn5lLt1wMVPMF4FBFCVfjcbLCbOtOcyipWkhB9a3ker8VrY3Erl9v9pAvo5BytKZsQ== 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=S32XQEizl/6DUk/6LC99drW7fwx9X9K2aG6VfQn+4xo=; b=iII7IMNCRfI1EmxndS3C/oIvPi9dKqdUlZoGs6x+8MAh/lzfqVMWVrpOXWCAunUB8BTJ6TiZKdKEmZpBGnik0oCtsvvvCTjV0awWi1lX2CeKyb6Qi0fXfn9F21wLxRtAY8K0zXOHqED88T5iRQ1yTtFLXd5rxwSxXtpC7aUuLaFJEFUYG/d80HzVuQzQpSJ3cu8d3ScYfyRBBBYFa/2oB7Ct7iJJrCnVfnqH9yPjGGq6kn5hPfHHsCkK6L2bphVbAVJUCZGATvBhZ6krHC9eisaQ8vnmlzaZbhBReuFZ0AXY7tEAfwUy8gkPdC7g0McnMiDodIzsOIZ//+OpCS5umw== 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 LV8PR12MB9450.namprd12.prod.outlook.com (2603:10b6:408:202::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.37; Mon, 2 Jun 2025 15:18:12 +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.8792.034; Mon, 2 Jun 2025 15:18:12 +0000 From: Zi Yan To: David Hildenbrand , Johannes Weiner , Vlastimil Babka , linux-mm@kvack.org Cc: Andrew Morton , Oscar Salvador , Baolin Wang , "Kirill A . Shutemov" , Mel Gorman , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Richard Chang , linux-kernel@vger.kernel.org, Zi Yan Subject: [PATCH v7 1/6] mm/page_alloc: pageblock flags functions clean up. Date: Mon, 2 Jun 2025 11:18:02 -0400 Message-ID: <20250602151807.987731-2-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250602151807.987731-1-ziy@nvidia.com> References: <20250602151807.987731-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BN9PR03CA0240.namprd03.prod.outlook.com (2603:10b6:408:f8::35) 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_|LV8PR12MB9450:EE_ X-MS-Office365-Filtering-Correlation-Id: 62e5170b-869b-4263-94e1-08dda1e8b082 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|7416014|376014|1800799024|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?OuE0CfSvw+25tfRHyvO7riFbRQfU6oDN5aLuwG6BiJdOGCDQ1NEGBP2u/wAl?= =?us-ascii?Q?cS07iidpebFw7MVxaKyuyose9JDbpRqQO769PsHet6zacLbXjyVKOO1lazth?= =?us-ascii?Q?0pfq7aL1GZN1+ZBoXlqiKdvUCFoJKLWfZB0oBGVasq9iuWblUMh1X6ji/fT7?= =?us-ascii?Q?kLpxYG1WsXDNnv6zDZQTB6I0yZr/hQVsfrOaaXAuY4bfcLYP8IJWc5zuyJog?= =?us-ascii?Q?j+CW9v+YfsFH0lqp47XQ7VXYFRD2M6YzXOrLwyZvZdOR0M5Jg+TuXrK8d2jA?= =?us-ascii?Q?fA75S2J8/J1O6LFXFXdt/1Bz6VDfHrLZYY8/wOySW2Oshk0HHzeIuZdjhgYN?= =?us-ascii?Q?ljiNhdRULS1w1AevnQW69U6x0XE90VvhXjxEnlrPhj6EqnP3YPxWxyl4BZLw?= =?us-ascii?Q?RhRvFJRgqwbMML/OMzfMAmwbDF/cKFCGXOL3lm525vl10lOc48V5QYFZfFE8?= =?us-ascii?Q?AoJWQjPedBqJHSAP5hpT26/THuUT6KcUElaho1JnatqRNpCHVKEjB5ypSWzl?= =?us-ascii?Q?pjRjsWG7TgefUrSegrMBIzrOZIyLvx+n9RJSWlgRntIfbyy0CGZYlhKPog22?= =?us-ascii?Q?7noKDTgm0ieXm1oiM3uB0oaSyVHunduIBhTGR5EoVn33q83zaWqHmr3LYvCd?= =?us-ascii?Q?xAoGyy3l77kvBkQpYT/8vGgS/BRPunwfA8b6oyKSiOeBr9A2rrH1X2/KzZ1F?= =?us-ascii?Q?zt1MzDPEoL2BAk5F8ci3TOa83tw2562NQcTCDPJuwo/N0iFjGAWEVvR0pnT7?= =?us-ascii?Q?ZSRZnFuGiPxlRy3Jd9vdTfUxt0AM4zGUnJbbBwWm9KIdEeJw4FavfGmGYZV1?= =?us-ascii?Q?xYQacNWZtJEjQAcKhL2owD7dh59BagHnyYMBnTwJKdnqjQAknmUQcnv1DUdK?= =?us-ascii?Q?YfTjl0olxawYEM4l4O36x1IufMo+HIVo45XYDX98qmEoHrX5ZhRMLzQO+9lE?= =?us-ascii?Q?hQMh7kZ0NdXcdlKn7+4FWsfkwglDtQe0VGeDMSMQnYhWVR3HCkjyGGvOeUb2?= =?us-ascii?Q?wA1DsMsDt3XnraK/I8lJ2Q9UYbM1KyQ+bdaxZcsUiBna+/O1Ns1EFtaJZ3yG?= =?us-ascii?Q?NPdncf4yIXCQnmPZ9bxlhJEIEfEXMq/ZxJk0joNUoxF6f0oeZWnhkmyb8EP8?= =?us-ascii?Q?6wikthcPFWVe34AdVw9BW1ZQG5iX4yip8kvcRypSDR302AL2MqCwE6ISIPj3?= =?us-ascii?Q?fPXbV3pMB+vBKNpJRDjmuJ0BOTqJFZLu8kETUeK69vK6Lq69hsIOPasF4DV8?= =?us-ascii?Q?aPFSWf4s/xUbc9jb8cIvLhjaesuV+Rc1vDSfTPsgxKJCPsE4SsPjcv5I5u3s?= =?us-ascii?Q?AZg6V358qj3caKPGRXHxGwy/HNauhgF8frKni9GuXo/kvnuOz5gOoXBX4UVH?= =?us-ascii?Q?L6v9g8K+thYJm/HaonCrsclgIHeMcbHO8/YGzXB484TOCzPble3iQHH8P3qt?= =?us-ascii?Q?LVLvBtdQrTQ=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)(7416014)(376014)(1800799024)(7053199007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mbC+Mq4ocZYQ2KDZkAzIroXNoue4lHhUjNZFvtBUbc9EEDOeRQPCVFiQaZ4F?= =?us-ascii?Q?XK0AsWxB+qNjSC81Mx4vZcSuWE3qA5IuNmz3E/Q6QhjfWEcd88DYZTKZLSNA?= =?us-ascii?Q?NAGh4mhfOpp8VNgeYKxZxnSpHwTZZ8w5M7HAdcmOW/vksIU05tTo0KP1Oqqu?= =?us-ascii?Q?3OiL2qtryCbIAxxxbqgRUPTqA0bEJVz0aumbb2enM5c6tLoOqP/HWpff16de?= =?us-ascii?Q?btZnkm2yM640YaxEENKWg+/32/e7AJ7w7WFGwqD6yzMYExGCMxwwnvhqGWnh?= =?us-ascii?Q?bSpr3YMxQLyA12czuGigxr8XNdef8TikncVRmxU3lxqYpWDdyIodOKimwfre?= =?us-ascii?Q?+P9o3PaoZQLKjXZZOncXlOO7Vtkfn+kjStYJhZ6TR56JUdMjzOSQgs1/DH9T?= =?us-ascii?Q?OUKRdAxpml/409g9dyL1O6TBV9IHqodCO3W1YZCabv4WAMf9EYEeIWzR+8oB?= =?us-ascii?Q?zD/OGQr3FK1poh/zQflVB9e+bma8afMWNQOFz+BHgjwEzy6ag8giMVwr/RWZ?= =?us-ascii?Q?o2YWY0NjDxg+fJcl41fcD/ZRjEkRnxwrZMJggT1R0wvY9mU7Uu70w4ggldFy?= =?us-ascii?Q?7w8SXUbxkes2qbIY2VdjdGhZwBs8uCoaFPxFjOMNHkPfpJ1LaJvJkLb/0Mjy?= =?us-ascii?Q?t8dHewMftHK2P6D/nmIQwaEEGrt5sln2FyRYarrGgVw4MJNsLybUW71MqI4p?= =?us-ascii?Q?HiWk8M2Arb21yBZ8VIL9Ly9Tep1DzN6M16FsRDvK74sxb8N8UL7U6iYg404Q?= =?us-ascii?Q?gU2Trxu3JrYFgfsKhie6ey7mYOyS8U9DMKZwq4ghansABi8TioBB92v3i9dW?= =?us-ascii?Q?TgJFcmcat4k0THIspsZvm/abS0Ay+M4o0bstH5ckw/NggpFoRlDh2KacyROK?= =?us-ascii?Q?7loaTJ/Vyg/rL/09GfyWLVSIppESqeRK5ZblGxgO4I06JTtdBVZ49kxZiFSO?= =?us-ascii?Q?vtdpn/J0RRTuTTdMbJXz2Zl/psjPCjK2emdoV6gQepzJNjsZeaBIbhDMqyeo?= =?us-ascii?Q?HqIDlJ76+gAY6wzYlvM5/QZ59P+H0KqF9KvG+xjBk0GkxbFu7kWWLCEACp1R?= =?us-ascii?Q?kFPIRz0LYGUagIT7Ca6xw2FqvPcli9DvFIeMFcJAeFcSsZkJ6LYQzw8AIyBY?= =?us-ascii?Q?9J5HDGAuSc4Sni6GTRMm8cdcn3LlJMrX27Dn4Rh/SzLhY7uZefbHTQzaV+It?= =?us-ascii?Q?d4cDD4SaY1Kfu+43hzXfrGALEnPFytFvovxZx0YG+wKQRX5qrMzxG03yuDIU?= =?us-ascii?Q?5JcNmEsUeTnM9bqMiODSK8j9rtwP+31QbZVhIwJkW7P9amkW9uw1cWZZCwUq?= =?us-ascii?Q?AtSLrWRPHN9TOHIMH/MVwZqiomwcwcc6jdlWpjJf4xnx2YtA+TIudhKyJoNG?= =?us-ascii?Q?GGZtjZQ7SP+hPuX4kyCYEjFcqoNi+4A559wiJTF6kKSP0R0UovkKYp5gKpEv?= =?us-ascii?Q?D5BcVScKE0t2lCAc36ykdI6yqQotmfF9MQMgMPWav2BJuwKdhqkuO5zU9R+Z?= =?us-ascii?Q?qgn0dslR7wrY8zKFeAt22tSYx++CE6geyED4IfUmjMEP4f99ou9ewvu4V6Jz?= =?us-ascii?Q?/DobmoORRdshoZpZ1gsfTzLfW1u8ok/khMD0KFEQ?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 62e5170b-869b-4263-94e1-08dda1e8b082 X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2025 15:18:12.3506 (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: rBKi92CcwJPBaJKhi1DbcqzyyRxGoJbiBytLZPeKUs02i+1LsElBZpThi0oHUM1/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9450 Content-Type: text/plain; charset="utf-8" No functional change is intended. 1. Add __NR_PAGEBLOCK_BITS for the number of pageblock flag bits and use roundup_pow_of_two(__NR_PAGEBLOCK_BITS) as NR_PAGEBLOCK_BITS to take right amount of bits for pageblock flags. 2. Rename PB_migrate_skip to PB_compact_skip. 3. Add {get,set,clear}_pfnblock_bit() to operate one a standalone bit, like PB_compact_skip. 3. Make {get,set}_pfnblock_flags_mask() internal functions and use {get,set}_pfnblock_migratetype() for pageblock migratetype operations. 4. Move pageblock flags common code to get_pfnblock_bitmap_bitidx(). 3. Use MIGRATETYPE_MASK to get the migratetype of a pageblock from its flags. 4. Use PB_migrate_end in the definition of MIGRATETYPE_MASK instead of PB_migrate_bits. 5. Add a comment on is_migrate_cma_folio() to prevent one from changing it to use get_pageblock_migratetype() and causing issues. Signed-off-by: Zi Yan Reviewed-by: Vlastimil Babka Acked-by: David Hildenbrand --- Documentation/mm/physical_memory.rst | 2 +- include/linux/mmzone.h | 18 +-- include/linux/page-isolation.h | 2 +- include/linux/pageblock-flags.h | 34 +++--- mm/memory_hotplug.c | 2 +- mm/page_alloc.c | 171 +++++++++++++++++++++------ 6 files changed, 162 insertions(+), 67 deletions(-) diff --git a/Documentation/mm/physical_memory.rst b/Documentation/mm/physic= al_memory.rst index d3ac106e6b14..9af11b5bd145 100644 --- a/Documentation/mm/physical_memory.rst +++ b/Documentation/mm/physical_memory.rst @@ -584,7 +584,7 @@ Compaction control =20 ``compact_blockskip_flush`` Set to true when compaction migration scanner and free scanner meet, whi= ch - means the ``PB_migrate_skip`` bits should be cleared. + means the ``PB_compact_skip`` bits should be cleared. =20 ``contiguous`` Set to true when the zone is contiguous (in other words, no hole). diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 87a667533d6d..392a03e37610 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -92,8 +92,12 @@ extern const char * const migratetype_names[MIGRATE_TYPE= S]; #ifdef CONFIG_CMA # define is_migrate_cma(migratetype) unlikely((migratetype) =3D=3D MIGRAT= E_CMA) # define is_migrate_cma_page(_page) (get_pageblock_migratetype(_page) =3D= =3D MIGRATE_CMA) -# define is_migrate_cma_folio(folio, pfn) (MIGRATE_CMA =3D=3D \ - get_pfnblock_flags_mask(&folio->page, pfn, MIGRATETYPE_MASK)) +/* + * __dump_folio() in mm/debug.c passes a folio pointer to on-stack struct = folio, + * so folio_pfn() cannot be used and pfn is needed. + */ +# define is_migrate_cma_folio(folio, pfn) \ + (get_pfnblock_migratetype(&folio->page, pfn) =3D=3D MIGRATE_CMA) #else # define is_migrate_cma(migratetype) false # define is_migrate_cma_page(_page) false @@ -122,14 +126,12 @@ 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) +#define get_pageblock_migratetype(page) \ + get_pfnblock_migratetype(page, page_to_pfn(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/page-isolation.h b/include/linux/page-isolation.h index 898bb788243b..277d8d92980c 100644 --- a/include/linux/page-isolation.h +++ b/include/linux/page-isolation.h @@ -25,7 +25,7 @@ static inline bool is_migrate_isolate(int migratetype) #define MEMORY_OFFLINE 0x1 #define REPORT_FAILURE 0x2 =20 -void set_pageblock_migratetype(struct page *page, int migratetype); +void set_pageblock_migratetype(struct page *page, enum migratetype migrate= type); =20 bool move_freepages_block_isolate(struct zone *zone, struct page *page, int migratetype); diff --git a/include/linux/pageblock-flags.h b/include/linux/pageblock-flag= s.h index e73a4292ef02..451b351c689e 100644 --- a/include/linux/pageblock-flags.h +++ b/include/linux/pageblock-flags.h @@ -19,15 +19,19 @@ enum pageblock_bits { PB_migrate, 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 */ + PB_compact_skip,/* If set the block is skipped by compaction */ =20 /* * Assume the bits will always align on a word. If this assumption * changes then get/set pageblock needs updating. */ - NR_PAGEBLOCK_BITS + __NR_PAGEBLOCK_BITS }; =20 +#define NR_PAGEBLOCK_BITS (roundup_pow_of_two(__NR_PAGEBLOCK_BITS)) + +#define MIGRATETYPE_MASK ((1UL << (PB_migrate_end + 1)) - 1) + #if defined(CONFIG_HUGETLB_PAGE) =20 #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE @@ -65,27 +69,23 @@ extern unsigned int pageblock_order; /* Forward declaration */ struct page; =20 -unsigned long get_pfnblock_flags_mask(const struct page *page, - unsigned long pfn, - unsigned long mask); - -void set_pfnblock_flags_mask(struct page *page, - unsigned long flags, - unsigned long pfn, - unsigned long mask); +enum migratetype get_pfnblock_migratetype(const struct page *page, + unsigned long pfn); +bool get_pfnblock_bit(const struct page *page, unsigned long pfn, + enum pageblock_bits pb_bit); +void set_pfnblock_bit(const struct page *page, unsigned long pfn, + enum pageblock_bits pb_bit); +void clear_pfnblock_bit(const struct page *page, unsigned long pfn, + enum pageblock_bits pb_bit); =20 /* Declarations for getting and setting flags. See mm/page_alloc.c */ #ifdef CONFIG_COMPACTION #define get_pageblock_skip(page) \ - get_pfnblock_flags_mask(page, page_to_pfn(page), \ - (1 << (PB_migrate_skip))) + get_pfnblock_bit(page, page_to_pfn(page), PB_compact_skip) #define clear_pageblock_skip(page) \ - set_pfnblock_flags_mask(page, 0, page_to_pfn(page), \ - (1 << PB_migrate_skip)) + clear_pfnblock_bit(page, page_to_pfn(page), PB_compact_skip) #define set_pageblock_skip(page) \ - set_pfnblock_flags_mask(page, (1 << PB_migrate_skip), \ - page_to_pfn(page), \ - (1 << PB_migrate_skip)) + set_pfnblock_bit(page, page_to_pfn(page), PB_compact_skip) #else static inline bool get_pageblock_skip(struct page *page) { diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index b1caedbade5b..4ce5210ea56e 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -797,7 +797,7 @@ void move_pfn_range_to_zone(struct zone *zone, unsigned= long start_pfn, =20 /* * TODO now we have a visible range of pages which are not associated - * with their zone properly. Not nice but set_pfnblock_flags_mask + * with their zone properly. Not nice but set_pfnblock_migratetype() * expects the zone spans the pfn range. All the pages in the range * are reserved so nobody should be touching them so we should be safe */ diff --git a/mm/page_alloc.c b/mm/page_alloc.c index cc9577a27ec4..74cb7696e527 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -353,81 +353,174 @@ static inline int pfn_to_bitidx(const struct page *p= age, unsigned long pfn) return (pfn >> pageblock_order) * NR_PAGEBLOCK_BITS; } =20 +static __always_inline bool is_standalone_pb_bit(enum pageblock_bits pb_bi= t) +{ + return pb_bit > PB_migrate_end && pb_bit < __NR_PAGEBLOCK_BITS; +} + +static __always_inline void +get_pfnblock_bitmap_bitidx(const struct page *page, unsigned long pfn, + unsigned long **bitmap_word, unsigned long *bitidx) +{ + unsigned long *bitmap; + unsigned long word_bitidx; + + BUILD_BUG_ON(NR_PAGEBLOCK_BITS !=3D 4); + BUILD_BUG_ON(MIGRATE_TYPES > (1 << PB_migratetype_bits)); + VM_BUG_ON_PAGE(!zone_spans_pfn(page_zone(page), pfn), page); + + bitmap =3D get_pageblock_bitmap(page, pfn); + *bitidx =3D pfn_to_bitidx(page, pfn); + word_bitidx =3D *bitidx / BITS_PER_LONG; + *bitidx &=3D (BITS_PER_LONG - 1); + *bitmap_word =3D &bitmap[word_bitidx]; +} + + /** - * get_pfnblock_flags_mask - Return the requested group of flags for the p= ageblock_nr_pages block of pages + * __get_pfnblock_flags_mask - Return the requested group of flags for + * a pageblock_nr_pages block of pages * @page: The page within the block of interest * @pfn: The target page frame number * @mask: mask of bits that the caller is interested in * * Return: pageblock_bits flags */ -unsigned long get_pfnblock_flags_mask(const struct page *page, - unsigned long pfn, unsigned long mask) +static unsigned long __get_pfnblock_flags_mask(const struct page *page, + unsigned long pfn, + unsigned long mask) { - unsigned long *bitmap; - unsigned long bitidx, word_bitidx; + unsigned long *bitmap_word; + unsigned long bitidx; unsigned long word; =20 - bitmap =3D get_pageblock_bitmap(page, pfn); - bitidx =3D pfn_to_bitidx(page, pfn); - word_bitidx =3D bitidx / BITS_PER_LONG; - bitidx &=3D (BITS_PER_LONG-1); + get_pfnblock_bitmap_bitidx(page, pfn, &bitmap_word, &bitidx); /* - * This races, without locks, with set_pfnblock_flags_mask(). Ensure + * This races, without locks, with set_pfnblock_migratetype(). Ensure * a consistent read of the memory array, so that results, even though * racy, are not corrupted. */ - word =3D READ_ONCE(bitmap[word_bitidx]); + word =3D READ_ONCE(*bitmap_word); return (word >> bitidx) & mask; } =20 -static __always_inline int get_pfnblock_migratetype(const struct page *pag= e, - unsigned long pfn) +/** + * get_pfnblock_bit - Check if a standalone bit of a pageblock is set + * @page: The page within the block of interest + * @pfn: The target page frame number + * @pb_bit: pageblock bit to check + * + * Return: true if the bit is set, otherwise false + */ +bool get_pfnblock_bit(const struct page *page, unsigned long pfn, + enum pageblock_bits pb_bit) { - return get_pfnblock_flags_mask(page, pfn, MIGRATETYPE_MASK); + unsigned long *bitmap_word; + unsigned long bitidx; + + if (WARN_ON_ONCE(!is_standalone_pb_bit(pb_bit))) + return false; + + get_pfnblock_bitmap_bitidx(page, pfn, &bitmap_word, &bitidx); + + return test_bit(bitidx + pb_bit, bitmap_word); } =20 /** - * set_pfnblock_flags_mask - Set the requested group of flags for a pagebl= ock_nr_pages block of pages + * get_pfnblock_migratetype - Return the migratetype of a pageblock + * @page: The page within the block of interest + * @pfn: The target page frame number + * + * Return: The migratetype of the pageblock + * + * Use get_pfnblock_migratetype() if caller already has both @page and @pfn + * to save a call to page_to_pfn(). + */ +__always_inline enum migratetype +get_pfnblock_migratetype(const struct page *page, unsigned long pfn) +{ + return __get_pfnblock_flags_mask(page, pfn, MIGRATETYPE_MASK); +} + +/** + * __set_pfnblock_flags_mask - Set the requested group of flags for + * a pageblock_nr_pages block of pages * @page: The page within the block of interest - * @flags: The flags to set * @pfn: The target page frame number + * @flags: The flags to set * @mask: mask of bits that the caller is interested in */ -void set_pfnblock_flags_mask(struct page *page, unsigned long flags, - unsigned long pfn, - unsigned long mask) +static void __set_pfnblock_flags_mask(struct page *page, unsigned long pfn, + unsigned long flags, unsigned long mask) { - unsigned long *bitmap; - unsigned long bitidx, word_bitidx; + unsigned long *bitmap_word; + unsigned long bitidx; unsigned long word; =20 - BUILD_BUG_ON(NR_PAGEBLOCK_BITS !=3D 4); - BUILD_BUG_ON(MIGRATE_TYPES > (1 << PB_migratetype_bits)); - - bitmap =3D get_pageblock_bitmap(page, pfn); - bitidx =3D pfn_to_bitidx(page, pfn); - word_bitidx =3D bitidx / BITS_PER_LONG; - bitidx &=3D (BITS_PER_LONG-1); - - VM_BUG_ON_PAGE(!zone_spans_pfn(page_zone(page), pfn), page); + get_pfnblock_bitmap_bitidx(page, pfn, &bitmap_word, &bitidx); =20 mask <<=3D bitidx; flags <<=3D bitidx; =20 - word =3D READ_ONCE(bitmap[word_bitidx]); + word =3D READ_ONCE(*bitmap_word); do { - } while (!try_cmpxchg(&bitmap[word_bitidx], &word, (word & ~mask) | flags= )); + } while (!try_cmpxchg(bitmap_word, &word, (word & ~mask) | flags)); +} + +/** + * set_pfnblock_bit - Set a standalone bit of a pageblock + * @page: The page within the block of interest + * @pfn: The target page frame number + * @pb_bit: pageblock bit to set + */ +void set_pfnblock_bit(const struct page *page, unsigned long pfn, + enum pageblock_bits pb_bit) +{ + unsigned long *bitmap_word; + unsigned long bitidx; + + if (WARN_ON_ONCE(!is_standalone_pb_bit(pb_bit))) + return; + + get_pfnblock_bitmap_bitidx(page, pfn, &bitmap_word, &bitidx); + + set_bit(bitidx + pb_bit, bitmap_word); } =20 -void set_pageblock_migratetype(struct page *page, int migratetype) +/** + * clear_pfnblock_bit - Clear a standalone bit of a pageblock + * @page: The page within the block of interest + * @pfn: The target page frame number + * @pb_bit: pageblock bit to clear + */ +void clear_pfnblock_bit(const struct page *page, unsigned long pfn, + enum pageblock_bits pb_bit) +{ + unsigned long *bitmap_word; + unsigned long bitidx; + + if (WARN_ON_ONCE(!is_standalone_pb_bit(pb_bit))) + return; + + get_pfnblock_bitmap_bitidx(page, pfn, &bitmap_word, &bitidx); + + clear_bit(bitidx + pb_bit, bitmap_word); +} + +/** + * set_pageblock_migratetype - Set the migratetype of a pageblock + * @page: The page within the block of interest + * @migratetype: migratetype to set + */ +__always_inline void set_pageblock_migratetype(struct page *page, + enum migratetype migratetype) { if (unlikely(page_group_by_mobility_disabled && migratetype < MIGRATE_PCPTYPES)) migratetype =3D MIGRATE_UNMOVABLE; =20 - set_pfnblock_flags_mask(page, (unsigned long)migratetype, - page_to_pfn(page), MIGRATETYPE_MASK); + __set_pfnblock_flags_mask(page, page_to_pfn(page), + (unsigned long)migratetype, MIGRATETYPE_MASK); } =20 #ifdef CONFIG_DEBUG_VM @@ -667,7 +760,7 @@ static inline void __add_to_free_list(struct page *page= , struct zone *zone, int nr_pages =3D 1 << order; =20 VM_WARN_ONCE(get_pageblock_migratetype(page) !=3D migratetype, - "page type is %lu, passed migratetype is %d (nr=3D%d)\n", + "page type is %d, passed migratetype is %d (nr=3D%d)\n", get_pageblock_migratetype(page), migratetype, nr_pages); =20 if (tail) @@ -693,7 +786,7 @@ static inline void move_to_free_list(struct page *page,= struct zone *zone, =20 /* Free page moving can fail, so it happens before the type update */ VM_WARN_ONCE(get_pageblock_migratetype(page) !=3D old_mt, - "page type is %lu, passed migratetype is %d (nr=3D%d)\n", + "page type is %d, passed migratetype is %d (nr=3D%d)\n", get_pageblock_migratetype(page), old_mt, nr_pages); =20 list_move_tail(&page->buddy_list, &area->free_list[new_mt]); @@ -715,7 +808,7 @@ static inline void __del_page_from_free_list(struct pag= e *page, struct zone *zon int nr_pages =3D 1 << order; =20 VM_WARN_ONCE(get_pageblock_migratetype(page) !=3D migratetype, - "page type is %lu, passed migratetype is %d (nr=3D%d)\n", + "page type is %d, passed migratetype is %d (nr=3D%d)\n", get_pageblock_migratetype(page), migratetype, nr_pages); =20 /* clear reported state and update reported page count */ @@ -3127,7 +3220,7 @@ static struct page *rmqueue_pcplist(struct zone *pref= erred_zone, =20 /* * Do not instrument rmqueue() with KMSAN. This function may call - * __msan_poison_alloca() through a call to set_pfnblock_flags_mask(). + * __msan_poison_alloca() through a call to set_pfnblock_migratetype(). * If __msan_poison_alloca() attempts to allocate pages for the stack depo= t, it * may call rmqueue() again, which will result in a deadlock. */ --=20 2.47.2 From nobody Thu Dec 18 14:13:57 2025 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2060.outbound.protection.outlook.com [40.107.237.60]) (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 7DCD122FDE8 for ; Mon, 2 Jun 2025 15:18:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.60 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748877502; cv=fail; b=kFu43UCkrlclNfs2N0jiK02TDQNI0l1Afuu3vMfN/JaelrbMBB57Pc9lvOcI4EWZUnwhhuW1Rgsegql+hCkDh/+CLfLVvYq4NpHyZjSCrRI/tUbNA76jzjuMTPlh20j47plHW6JpPKe4RF8zJaCfsECSxXjqapQaUuA3j4feFiI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748877502; c=relaxed/simple; bh=CTAG4sYZwfXNpQc1Ac1m55h4u4WrybEEqbXezJHBoFc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=iQdhc9OnUy31bjfND4RT+nAEtWk5PI98R6SPtEafoYRfewzp6Bvi15cH9tT4DDSAC/yWRYaFVTI091KDvu5upOSQHWZmPImEE7r3EgCVseM5PGqsyL4civRFdAQTgk9Pz4rAZSmKSqivRs7EUyNgO15N1FukBEPkQWfMokmnEk4= 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=MxRNnsOf; arc=fail smtp.client-ip=40.107.237.60 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="MxRNnsOf" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qZl6R6MzuvrqsZfGA0mQLrNUZ5iy8hUvu8mCA9irhUqLSR20j+1IR2E0FQISJuSUZ//Ot1axNAwOkJ876Y/UQ2ORjfrj2MESvb9fmuwW0yHzdONVss3IrhwNkL/LZFRIuRNwUNsrcDR00PLm9iT/RsvbO4QnRxkSUAXEsMyjKrb/EvmydeFSfFNf7UD/4S3HAEZjEe4YyHyohAY8fMD+AI7NbaeRisJEGlzeL8gK1WmzbiMBSWKRuClyCxR9GWURs9i9LKt/JHJfwiKyTpMUMMz8yTOARigRzPr4Q/I98xYQC3ifUNr897KdDE5lh7VslB6XM/A0nkYVxQzso8qPag== 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=fwi20KomilEllyctI1+J40cz0JDU1TIzlORODcSer18=; b=xUvOTJcGp6eSga3oQOLQDRIybN65u/ECckhkzJTElIKYCzWMJgWQnpJtkH0YHPp9gfDL1KukAXV2zS4jXtBt6KNSl2zo6ILLpZKCTGTqOCnE+ylKsoIRFcmsQrt0COFMvytbKUo3HatQVz94D40EdNIAHPjyfWKQGcuKPhhQAa/8wS1Vr5vHEEhz1oAjYZh+gNRuoKdfDN1ZzEd8ri8cgkTVImqx9Jx2n7b8cf0ebM6ykIzeIU9Os9qQiXiNAkwvRmq2uKlUt2qYxZ7UlmqDV0B9CZvB4V2ahcp60YD5bt8K2xseMMzJGhStcWO831GDNJlbuu8EZ/hySajWA+QjOA== 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=fwi20KomilEllyctI1+J40cz0JDU1TIzlORODcSer18=; b=MxRNnsOfgGcjXhgtZ2HG+85PPFbc3ehTOijuPBBT/A435gT0qSYRn3oxhqx0x765GYMv6z0Ywezt7y+yPPzXOt6rqbmKBGAgMFwvldaRUAOuyQbAsmSQUkpIcnJvqwwNN1nt1+W7eaAxpOT/+1zjUIfp8AO9YuhkdEPelbFR3bLZdsE5wlkY8QsCVE2ZK6hGtGKzTlXVN/TQwPLMRdsfs5lmUNtVtTk3+3+6ijiLxfrvFjv7cmmz9qpF0UOYeC2J6A7Ue0eE9rnSURNT+RetNruArqFIYR9TBjmsCcQdBG87xgr95QtKULhXNfTICerzY0omwhRvPWbaTFux0yS/rQ== 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 MN6PR12MB8542.namprd12.prod.outlook.com (2603:10b6:208:477::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.37; Mon, 2 Jun 2025 15:18:14 +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.8792.034; Mon, 2 Jun 2025 15:18:13 +0000 From: Zi Yan To: David Hildenbrand , Johannes Weiner , Vlastimil Babka , linux-mm@kvack.org Cc: Andrew Morton , Oscar Salvador , Baolin Wang , "Kirill A . Shutemov" , Mel Gorman , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Richard Chang , linux-kernel@vger.kernel.org, Zi Yan Subject: [PATCH v7 2/6] mm/page_isolation: make page isolation a standalone bit. Date: Mon, 2 Jun 2025 11:18:03 -0400 Message-ID: <20250602151807.987731-3-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250602151807.987731-1-ziy@nvidia.com> References: <20250602151807.987731-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BL1PR13CA0349.namprd13.prod.outlook.com (2603:10b6:208:2c6::24) 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_|MN6PR12MB8542:EE_ X-MS-Office365-Filtering-Correlation-Id: e5c56996-edfc-4b27-c7f0-08dda1e8b15b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?uenIwWxWfbxLTTe124ES15j0+OTHPY1AKxNQv12YyvSJ+WCyfsSQfRsyXfT7?= =?us-ascii?Q?vj2M9Cg5wg+5KG32Z8Qoei7TKUqkkX+/XCbRPBmfwWkKMcLV7C3IvEbHqMwl?= =?us-ascii?Q?4/ZjwabsFvNYAByT5qX6DjRvBGHetd+7pjeRxFW1VmUvhuVNWkVbJbRMfvOi?= =?us-ascii?Q?Y1Z+IyDlsBB4EbaKzUH1z0vL7T6Wp+/m8+oQvHns89EQoDMsgfzdlD/+q8Tf?= =?us-ascii?Q?eu7F6lMEjfr0BW7fBsjX6yn0K+S/CYaB7QhFiPl7MLnMsKNS47eg+QIirt8w?= =?us-ascii?Q?dv7MWprdsR5J+PocMD6AG8P4fP44JZfPzihVERJ1kLdBUjA8/t+v/bNOED+4?= =?us-ascii?Q?f+hrZV13i1gEPQLIeR+NRD3uFjh7EwH5Rg295PJdcnIMClGJMgHFBdlSfow+?= =?us-ascii?Q?qSWEyU9JJrFeGpJB+z2q3+1TeUbRojGidr8GLlsMWBB27Uaro9LwJlmK1SrE?= =?us-ascii?Q?/ZDiMan7IaXHQ/W85/sARXHcSrdrefXA8i/KzA45BAJ7g6heYyHc3Xx3ZO48?= =?us-ascii?Q?sp6usea5zqOO0Qr2SYWU8YJsI+O1GdB9BX54FkLoCVb1FK8DJM4Rk/BgWpyM?= =?us-ascii?Q?kllBWBQLwBcLZQt23ODjla4x//cqnEsRmIz3wbGTL7xCn6tVgnjtKa8YpLPO?= =?us-ascii?Q?KViPa+s9LOgn/ajroUiscKCn/zZrz+9TYDK6I8Vmi+nXeW1Y9jRYPii+JPTy?= =?us-ascii?Q?x1xMQHieH03VQuuESd0aoxqaHZYyujirkUOHYOm/ORnmqI2FPE9ZbQWRKOTO?= =?us-ascii?Q?nyFN4p7POmgqiO/1hPpa7dSI34Qy6QzgkSzQ83uSUmOLzRaAQbthOJA9wRnj?= =?us-ascii?Q?koUlIGgkcT0+y5pt5EXpn3F+6JOdCE/Pe8wcwu6hCUWfrYdBOIGEtmBOHvR4?= =?us-ascii?Q?llpPdpyBk0vlQq9nNfMnt0xU4fnwymCd+ducluP7gkOAIKileLfPdqnTjmSy?= =?us-ascii?Q?4YIIZcLc3NltkZ19KelBAdWdRsr8++k2Xa/2ZnAVuIJZaVk6K29q0o43fZlX?= =?us-ascii?Q?moolQI4z3/ah1bUtnfv5qLWutGbzAwGbOmJX+b1k1yKVgRAjI0v8TfSfkBPc?= =?us-ascii?Q?wv4Nznul53DlOwPqo3jtWJYeE+cblo8jWuWj8/ycD6NO2GGXLnDmPGCsx99v?= =?us-ascii?Q?ldqhS1Ci+85RI931qp+wMHwL1bu0zuBUjWSX1G09vMrCd6wQeWZ2l7nTgdwm?= =?us-ascii?Q?zfk5hAQ7Y6nOoWw6Z9Ck9uyGltdxkwerJ1gXYCChzW0iErK4U3OTqYoWe6xF?= =?us-ascii?Q?aCrEI7sxLE3Ek/nl2VTz0kWGck9zmf1/D2/UW9Galg/ace/TZm/kF5l0lbFF?= =?us-ascii?Q?aL4YkSHIlePhQ7zyoNX1vMbYZD9kFIHzxEWWgRQtG28eSvd89EvwLQTvZ5h7?= =?us-ascii?Q?dBJHDq71GeEbZgdeWOgjX97epadWuX5+FP+Kw99V/pZ4uMbnz4j6fTHmIfg+?= =?us-ascii?Q?8KnX7v6UCVM=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)(376014)(7416014)(7053199007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DP5Ya1CPGWgUL0w7J08jfSYe7k7F8AIlHfcwE810GaO3oQkT4pLU+bN55sB0?= =?us-ascii?Q?uYh/6c6B9RCzcGgSNZop/JkDPPry3eRqCfcCsRWvv6bwJTE3/kTk4NE+moX5?= =?us-ascii?Q?AQ0rgQb5FbsLa+Hi1sg70ESlXmLyEpRIut64GxMwfAaw0fI5UPx1YrzgUNwe?= =?us-ascii?Q?Y+hDYKWiMoETCXIDVpaRtbUF+WN5sB+42GRp0+Ga3fiytuRWHz9iX7zK1d9Y?= =?us-ascii?Q?tGXfVqa0+TnA7dUh399vn7J5EPaJ606rLCOeIbt/0WqeTLq5g33GCFlJqndr?= =?us-ascii?Q?3ko7w1ReAbiPt+yFKQFxKrpgx7HwMARhhs1BiT3pqCMfwXkI2Ek88dE15F3r?= =?us-ascii?Q?NwXaCNKQKDIqQ8/fLlUGUKTfs735SvhyWx7HhbjUCkQ++VQA2IXkjJLloLTi?= =?us-ascii?Q?/LYklKxPuyMkPg8CJnXarpeCsvQA+Xzn2iDDEBVoK6LLe9B7AyYAzSNyzD18?= =?us-ascii?Q?fRM6O9xF3HEC6MKPlF5zBcHYCeL/tu6hdrtzpPupRE/0yCtWTqyM22ATyxhW?= =?us-ascii?Q?gGwACqlko3TC/wlgFZqocVRhTFWOqwqYo2UW6+YBlMfT7riUwKclNhN+xqGm?= =?us-ascii?Q?CQ1s8bWuvDpHZnfWU4tXrat6fxF/KaVGUrm4dTjjXikNGbM/0HrAFftdhifu?= =?us-ascii?Q?WWTppYYmC846TygqqD25wsZ6GLzdYDyPVtcw1E2p5B7PcPZKF1hJtMl/D/tG?= =?us-ascii?Q?hvjgQl0cyVjZyfwhRHuLyJUKxE/J6p6WdeArQTiFnjIQ1HlPTIm6mf0xDMTr?= =?us-ascii?Q?VBI73TT1kVRoNwbqXTET/CLlMbeVsGkbEX4gnwdeiKzQT58O/dYElXi7Vshd?= =?us-ascii?Q?BG26L/QOxJ2qWO5ExS1OOmaPq7q3IBnzpvTWG7m9syEqkVvyjZ6dF+HysZrH?= =?us-ascii?Q?1XxK8jUzOa9F/4E3hbVwVRb0MfasWFiZe91+GCbp6ilifrzR6PSC9Vpp9PD3?= =?us-ascii?Q?n3ftb1F3L+2bn/c4HKMkgIOVYQkiJKZKjB/x90t8dqdz0rvAb4qw+Oh7Sfre?= =?us-ascii?Q?JcrCck4GA3Mzl527oZBjh1kIZkcUlxFZQD65rbvL+WbZF+HlBVN48ZNsEAq2?= =?us-ascii?Q?GNJ2umEWpMuxZ64PLeWtcnDho/IGFu936KeaM5NLqMIbgUwWwcl7sJYi2k2b?= =?us-ascii?Q?KdzBIwObOHCAJRmlMlOLai1Bt9REEKlY/u0TrVRI4il6kR1bAP5WPLjLjfcd?= =?us-ascii?Q?rP+eLYqW43qQzAPla2g/s7RsFV62SVWa+/FSDdkycl0wzoA7BGQeraQmSINE?= =?us-ascii?Q?SGvwZsV7n7GfWrd3CYAFG0BTGVhQGquKWQ2TPUePJtrr2XW0IctUjU9LrQrn?= =?us-ascii?Q?yX5fZ+RtYVZFQ5/9K3wkiBaemzcSeL7RnIot5nrcerdCjcJARoqiBidFTe14?= =?us-ascii?Q?CcPwNokNqdXVX0ehGyw/WftfnNrxLZCSMRJ37/sYmwSIbb7/jjl7/20qcG+1?= =?us-ascii?Q?APAJVN+P+G2eN+o8RGz8Ifyf2hQmk3ifHXRkf5fkZKcz9Qk/Mhe4+/0jxaKg?= =?us-ascii?Q?JDG8tOQHZIoQviw9KwlNm9m3WEhwO0Du4IG7U17vC0FWAwtyEwOBi/oidnin?= =?us-ascii?Q?pLj4rxbUgUV0UOrR7DtPQsuk37RHhza73WRhUDfh?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5c56996-edfc-4b27-c7f0-08dda1e8b15b X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2025 15:18:13.7363 (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: TQlJDvyyzLPhRS1r08k4Toz+yrZWqe88pTBjN5to+zY6l06fzD2bleKthdxglFyd X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR12MB8542 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_compact_skip, so that migratetype is not lost during pageblock isolation. Signed-off-by: Zi Yan Reviewed-by: Vlastimil Babka Acked-by: David Hildenbrand --- include/linux/mmzone.h | 3 +++ include/linux/page-isolation.h | 16 ++++++++++++++++ include/linux/pageblock-flags.h | 14 ++++++++++++++ mm/page_alloc.c | 27 ++++++++++++++++++++++++--- 4 files changed, 57 insertions(+), 3 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 392a03e37610..0a5cdc52b405 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -79,6 +79,9 @@ enum migratetype { * __free_pageblock_cma() function. */ MIGRATE_CMA, + __MIGRATE_TYPE_END =3D MIGRATE_CMA, +#else + __MIGRATE_TYPE_END =3D MIGRATE_HIGHATOMIC, #endif #ifdef CONFIG_MEMORY_ISOLATION MIGRATE_ISOLATE, /* can't allocate from here */ diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h index 277d8d92980c..fc021d3f95ca 100644 --- a/include/linux/page-isolation.h +++ b/include/linux/page-isolation.h @@ -11,6 +11,12 @@ static inline bool is_migrate_isolate(int migratetype) { return migratetype =3D=3D MIGRATE_ISOLATE; } +#define get_pageblock_isolate(page) \ + get_pfnblock_bit(page, page_to_pfn(page), PB_migrate_isolate) +#define clear_pageblock_isolate(page) \ + clear_pfnblock_bit(page, page_to_pfn(page), PB_migrate_isolate) +#define set_pageblock_isolate(page) \ + set_pfnblock_bit(page, page_to_pfn(page), PB_migrate_isolate) #else static inline bool is_migrate_isolate_page(struct page *page) { @@ -20,6 +26,16 @@ static inline bool is_migrate_isolate(int migratetype) { return false; } +static inline bool get_pageblock_isolate(struct page *page) +{ + return false; +} +static inline void clear_pageblock_isolate(struct page *page) +{ +} +static inline void set_pageblock_isolate(struct page *page) +{ +} #endif =20 #define MEMORY_OFFLINE 0x1 diff --git a/include/linux/pageblock-flags.h b/include/linux/pageblock-flag= s.h index 451b351c689e..1cf5f0fbd627 100644 --- a/include/linux/pageblock-flags.h +++ b/include/linux/pageblock-flags.h @@ -21,6 +21,13 @@ enum pageblock_bits { /* 3 bits required for migrate types */ PB_compact_skip,/* If set the block is skipped by compaction */ =20 +#ifdef CONFIG_MEMORY_ISOLATION + /* + * Pageblock isolation is represented with a separate bit, so that + * the migratetype of a block is not overwritten by isolation. + */ + PB_migrate_isolate, /* If set the block is isolated */ +#endif /* * Assume the bits will always align on a word. If this assumption * changes then get/set pageblock needs updating. @@ -32,6 +39,13 @@ enum pageblock_bits { =20 #define MIGRATETYPE_MASK ((1UL << (PB_migrate_end + 1)) - 1) =20 +#ifdef CONFIG_MEMORY_ISOLATION +#define MIGRATETYPE_AND_ISO_MASK \ + (((1UL << (PB_migrate_end + 1)) - 1) | BIT(PB_migrate_isolate)) +#else +#define MIGRATETYPE_AND_ISO_MASK MIGRATETYPE_MASK +#endif + #if defined(CONFIG_HUGETLB_PAGE) =20 #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 74cb7696e527..5de23eba0db8 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -365,8 +365,12 @@ get_pfnblock_bitmap_bitidx(const struct page *page, un= signed long pfn, unsigned long *bitmap; unsigned long word_bitidx; =20 +#ifdef CONFIG_MEMORY_ISOLATION + BUILD_BUG_ON(NR_PAGEBLOCK_BITS !=3D 8); +#else BUILD_BUG_ON(NR_PAGEBLOCK_BITS !=3D 4); - BUILD_BUG_ON(MIGRATE_TYPES > (1 << PB_migratetype_bits)); +#endif + BUILD_BUG_ON(__MIGRATE_TYPE_END >=3D (1 << PB_migratetype_bits)); VM_BUG_ON_PAGE(!zone_spans_pfn(page_zone(page), pfn), page); =20 bitmap =3D get_pageblock_bitmap(page, pfn); @@ -439,7 +443,16 @@ bool get_pfnblock_bit(const struct page *page, unsigne= d long pfn, __always_inline enum migratetype get_pfnblock_migratetype(const struct page *page, unsigned long pfn) { - return __get_pfnblock_flags_mask(page, pfn, MIGRATETYPE_MASK); + unsigned long mask =3D MIGRATETYPE_AND_ISO_MASK; + unsigned long flags; + + flags =3D __get_pfnblock_flags_mask(page, pfn, mask); + +#ifdef CONFIG_MEMORY_ISOLATION + if (flags & BIT(PB_migrate_isolate)) + return MIGRATE_ISOLATE; +#endif + return flags & MIGRATETYPE_MASK; } =20 /** @@ -519,8 +532,16 @@ __always_inline void set_pageblock_migratetype(struct = page *page, migratetype < MIGRATE_PCPTYPES)) migratetype =3D MIGRATE_UNMOVABLE; =20 +#ifdef CONFIG_MEMORY_ISOLATION + if (migratetype =3D=3D MIGRATE_ISOLATE) { + set_pfnblock_bit(page, page_to_pfn(page), PB_migrate_isolate); + return; + } + /* MIGRATETYPE_AND_ISO_MASK clears PB_migrate_isolate if it is set */ +#endif __set_pfnblock_flags_mask(page, page_to_pfn(page), - (unsigned long)migratetype, MIGRATETYPE_MASK); + (unsigned long)migratetype, + MIGRATETYPE_AND_ISO_MASK); } =20 #ifdef CONFIG_DEBUG_VM --=20 2.47.2 From nobody Thu Dec 18 14:13:57 2025 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2051.outbound.protection.outlook.com [40.107.92.51]) (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 DE35822FE0A for ; Mon, 2 Jun 2025 15:18:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.51 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748877502; cv=fail; b=JVG9aHV3hOlnlIBPj4RhzYSlsEtx2tIz+VxcZMZtgQ1mr3i6H+GAsn4uJYBC9D8mmjQa0flf62QShjo3voGnipn6Go1uVT+yG7FGZi/R03w7LETvFgDDtcpcwqgleL2xdazlgaP6k/jHxk0n718NBnBG39opkS0QHTpzUjqBZ3A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748877502; c=relaxed/simple; bh=axbLy5kfGy7ERP+dTcLFkmbbXM7Moc9wuXGtzPhq7Xs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Yo+dyhhmQL1zquahBrzXzFgxW4I8TIc1I6kgabVYZxPuL5zMRfcR70BFFam0REjdby4bDuuEmTP3G9PtqgY417I3X7QmzFspyWqVPxzmFhsbzsDi0IJRB5hVW+QYn2mmRax0T9H+OOoRJN2+oarvS8n99hVxVlNrqtcO9Y2Czac= 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=U1xFUs9b; arc=fail smtp.client-ip=40.107.92.51 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="U1xFUs9b" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MtFlOIQI0S6JHqKzQnlM+Egg26AXIeghYtzNExiotf9S8ppGM8iiA3YbXZ9jvkc8whdY82fNr273IxO+zZ+6nzaIvgUwMAuqT8XEESeVFDXyTjrWY1WoNBjObzc6l5exDrYpVH/PC+UOVF5RYTtJjSjE/7hM8z/IQ60Ir50VDECD5YyfSRNLD6pXwb8VkO/U7uZiY4o458cdEvVmYCb+r2brAeuFLoUqp7quG+GJwJSoiOhrowkUur9tg0YrFiasOtsC7NnehYzzDv77iqXAJXHc/kf/543DGz6rwk1Sj3FlCjdfqvPyI+wxRDD9UU/pt1uqNnALU/2A8oGSnHlwrQ== 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=cHKcI/NcdlxqGUi8fUIpIqJzLD2YbZ+F2c4iWBCvJbw=; b=ii3y2Nq8JAINc+sBABGrp3yTM6iWFCsSDCtSdL+9HEc//4GRX6HFkenhWWAp/TTtzv0THggjPndLNQjxlGhTWuFz0RKVXOZhahLuvcTAMY7of9Hd5s1k0nWoUbKuAfOrFCJudoEl47ALKRtD63NV7lptFKDydccmp67bHXuxRxYWt+oVO28ov6kauj/hTC16hv6R+qE4fYTPunhspE8UjKJ5pMT782WnhZROO04eQ563oS1+XubbfUuRJERY0V4udSefJVe8a9aVpyWmMfayu0f2vVyLK2KrAd19xEzbwwjYVGq67TxIcONl0IVeNtv5+p4xVLby8IgX/hzYivCYgQ== 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=cHKcI/NcdlxqGUi8fUIpIqJzLD2YbZ+F2c4iWBCvJbw=; b=U1xFUs9bTTLR7EhJAXHVshyR7S3R3iTbEdifxHy5KE0eWCQ6MIfZZDj6upTkyxkHvbCVWXLT7DdhZrfbMVhoeUhAzyqQZzgGLcbqFWDXF16un8vDNKbSqCJ85zXkzqD/uj5lrTUoZa2KOk7doZUNzu32afBfq00VUt57J58VeASKJMfupfIad5kfOB8QIet2AJ1Gk98DW/9CMeJ6gDF0nj8Z7Gg/xpyqCjYBDV3gEideeX25aU2lDbaVVycAnOwxUXWKuB/Y7TzWEbY60a/OyPvuD6Hif9dtckjprPnWuAY2Nyfup/DQoHlmaUk75Lg2zIgBScDtbTX+M2I+V8PJOw== 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 LV8PR12MB9450.namprd12.prod.outlook.com (2603:10b6:408:202::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.37; Mon, 2 Jun 2025 15:18: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.8792.034; Mon, 2 Jun 2025 15:18:15 +0000 From: Zi Yan To: David Hildenbrand , Johannes Weiner , Vlastimil Babka , linux-mm@kvack.org Cc: Andrew Morton , Oscar Salvador , Baolin Wang , "Kirill A . Shutemov" , Mel Gorman , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Richard Chang , linux-kernel@vger.kernel.org, Zi Yan Subject: [PATCH v7 3/6] mm/page_alloc: add support for initializing pageblock as isolated. Date: Mon, 2 Jun 2025 11:18:04 -0400 Message-ID: <20250602151807.987731-4-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250602151807.987731-1-ziy@nvidia.com> References: <20250602151807.987731-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BL1PR13CA0345.namprd13.prod.outlook.com (2603:10b6:208:2c6::20) 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_|LV8PR12MB9450:EE_ X-MS-Office365-Filtering-Correlation-Id: 750aabe6-8ed0-4de2-4ef8-08dda1e8b21d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|7416014|376014|1800799024|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?hxx1DPpqulA5k4FvIhMIfoBzmuUpSMEHNK4U+VTvRNkiNU/Setioo700UNB/?= =?us-ascii?Q?ahI9r1JIt1LBULhrRQH7wIvugUBb4tWPHGlsDSaTVDugqLWqrHebOEo5qTGb?= =?us-ascii?Q?GDPRfaEGcFDAF+y2Nvlv1A/7/8x9iEdeYFDHddyee0bPDnpos79GK5kXycK7?= =?us-ascii?Q?BnPcUiij52+w0wNEvdrESsx0+2K5UH1Vz6v9Whx8DWrRXdpsdixiz1Vh052y?= =?us-ascii?Q?K+qdOb1PhGu+FJ+3h4VmnNHHr4lMZ60aJ4Z8nOqikZ5oebp1hdjVyAcE7rhE?= =?us-ascii?Q?SgcmWnErQ3dSFIMcVGqoiMKB6kyQunwchHieKBINjZKkcQZtIfEZJb9K9Ks3?= =?us-ascii?Q?p1hAobtZg+/HoEexoq/yQgDaLJfxg8WutJ34xvlN/fvM64vkI9yhvOOgUS/B?= =?us-ascii?Q?o5W3DzMVDRnh9jG5QacB8aRjLt2dIZ3DFfkRbW49OMew3nSJ1FHUvZ7K+HFl?= =?us-ascii?Q?N3yA6z95NRd100psCXZPFL7YdJCIQmCn79qt1OYdECNiYjzda9foeWc/+VP/?= =?us-ascii?Q?nCLGkoDOywhBHxH4x4WUqj1VD/6cHcFRAE2LvztA4JlFqYpIjmE2UNAM+GFU?= =?us-ascii?Q?ntIdojzy7eaVu+JtTO3mCiPTM+6ConY2gZpSOMYus/hynzEfIBOjVJ9zGXs1?= =?us-ascii?Q?8ht/5qwWHXw7YtkXHM81okhm3GBAEcMaSKdpdcWPP9w7/RZGhAD3VqQ4j8ne?= =?us-ascii?Q?NWuumiW/lorWZIl447xQNzXLkdOesM82uEba1sOqcG+qlrd0JbjQF3f8olDN?= =?us-ascii?Q?I0mgP0O9BAn3xTTC6rqOO6bX4y2Mvxs3aBdPZ8Iv9TyHfe5kk79D+q0KJ4VE?= =?us-ascii?Q?pJhtyEokTWQ3AiSYwFZmzOdnK9QN6+Ll80DO0pDedkarbVNrRa+yTu5tQYry?= =?us-ascii?Q?6cvkoZT0RRzGmlv/OsYr14dGGOSvmrCmAF263nq0srVHzi8nUGG3j3D9btBx?= =?us-ascii?Q?6SoJFHZUasBjd3oLYnYIWWtxXvqq+jx2vBl6DKiZorvNuxxLmrNN0SWoknPI?= =?us-ascii?Q?TmV196iczKZer4aTIj+5Czp1j8EE00WhFQeULV9G0EkNV35U1Ixd95RaDWAq?= =?us-ascii?Q?nnjTVJvBW/5SE8NoCOSaKrZk7tdfsRm/soPljYv4ms7Lc6i28vhdfJkinXlV?= =?us-ascii?Q?shmSfi26MexcbqW1hHNY1f3MlkX83gb/JNPa41Of/NktHxxGnPsvkbEDByQ8?= =?us-ascii?Q?EkxWjqPWpKQaJYQgzFQcpby0LUOW7aaT8GfWKTNPcrUHbred3Fs3zJwpimY4?= =?us-ascii?Q?08FZbuY2t0fT3s/Le91qgDC0QuBJp4t2/mm8efa5Z0MgLn+RgQ5nkTUCiBT7?= =?us-ascii?Q?Oby809btRn3mUAXzyhqCz9EVYmIEW7UXt0VG4Ul8VUOvk6SIdjCEDOMZau6T?= =?us-ascii?Q?W7qTvis+7MRldNIYzVW3K7wyeUGfmXJEtfxYBYshQ2DU2kh5YYJxjl32pxXS?= =?us-ascii?Q?9cyJ5y5XyH4=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)(7416014)(376014)(1800799024)(7053199007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2eTrf7SSvyJW2aIsztvAWO2sQrxJxgK4IEXMOY6ds7lhHKqLeRq6q5eKifeT?= =?us-ascii?Q?lzl27tIgdg4castnBGpdorUZjjjsr40pwkLEitjKAzLucwR8OOh+56gxvWMT?= =?us-ascii?Q?O7YNxPKuOkDnkENjycgbU5ZNHFPKqSBQ87chdpp3bKN8bz7qNsXSKMbXahjp?= =?us-ascii?Q?y1LD/b77+D47aGMG/4cPrZrOtYSzEsPLVfBYd39yITgkz6ZzA1G7zlUn2Cnj?= =?us-ascii?Q?+BpxFuj2kt862HPZgZHBAXoIAtxymcUGdkvzzKq9+KhEkQbQh7l9E7nro7lr?= =?us-ascii?Q?12mGAQ1Sm3Rl5JXTtKZ4TW7pqpX3cdqMdGrtXEvbdbJ/apVkVZLtykq8NBCE?= =?us-ascii?Q?L/lHOBLc3ctX1rBXp+He3Dvh2NthgQV7CFrnjpugG6yBlp5uXqBfau8JbRII?= =?us-ascii?Q?q4gCTVDnz+Cv6G8QC9QlbQWivt7WVuPjA/UXX9izukyGa8JPFjOU4j1Auv2k?= =?us-ascii?Q?anxWxvq0GD4s9Fw1BHmq8d5+zW/UreNp9DG0+r/ACAWWiOmHlw2VEjIJhRX4?= =?us-ascii?Q?cgSsVHeMBIZgkwCaBIJW86lL3vxLVbV5eO9r4rjY99yS+hby4MWXzpbXLo8b?= =?us-ascii?Q?s1LHViW4jMPhfA1Ixy4+Rp5QPFoMI32b2riEcqMIyBVLlxajkMoFfbda+LX/?= =?us-ascii?Q?hiPe9X4mpuGGamdLKWMIvlC+bHY6j/Gx2LIESLM4b/ng8lhhAhhaSeAWqxOE?= =?us-ascii?Q?Jhf1vslXjkvsOl7xgGBkGE7MlVF1vsHkonUyxL1HRaZE/up11FVe88LQsfcy?= =?us-ascii?Q?cbtraPZFxTCwqJMCW9cSF2kcZHzymTvr5bvxorV82A1qd6QWG2y9q/wg8WBa?= =?us-ascii?Q?QAN9gFAJ2t9KpDvVcoFUxdt6Evm+qnHBTPCt02NSxJCYafBWX3pvIlwL+9tq?= =?us-ascii?Q?QqPg5cZlQGfsWvtsioGxFgt0BPxACpI4ptWbsQPC9FgTC68jO9XUZ4fCn3gJ?= =?us-ascii?Q?oCmCJgyZFCIkiKGTTtgaxzjdKogH7Z5AYQy4mhBLox73+28u33nNrxUo9mK1?= =?us-ascii?Q?9Ggc5dAgJCroSBtS2bKVAyDoLH0Y3ARFaNvAXvNw5G0yE76VA1WkZjQB0fLj?= =?us-ascii?Q?IDBdSFiW1IBE5fqrv7yDQgTw6Mbk4wwTj11ZwQkNaX9ht9f27FBlBdtZ8JdN?= =?us-ascii?Q?R01IfoXa8rGk2MUe0KyhmpPRpk9MKPfczrwM19CUVw/53qnZ9NCwxzaepLTk?= =?us-ascii?Q?5emd7HwmiSNLiXyZecxmeP51jCUkQ1gfLl1APZSXlrpZqWEtMxTHtxuyXTzP?= =?us-ascii?Q?ZVWEAEtwW79nvT7DJwJlzXLaItQcU00nHt3kVZ5e3swR/oUtLpv4Xp7n7MQo?= =?us-ascii?Q?PAD8ceBCtSv31RAxMWSSwmpEkdImvUDrJ6icULRRi1ZkcYyun+Vx0qQUjZU5?= =?us-ascii?Q?JrkIhkZ55RTbiqvtFVgM9Bb0Yok9km//HfOBEJeYaBncEH6rJZTr5My4rr46?= =?us-ascii?Q?U4hnXPvidU23YUDFJdYuYbkgthRYckvLLTQEnTjZ045xg9ZqvQeiYh9TPA5N?= =?us-ascii?Q?TsAcvqI2oOaOSnxPtc5wj6BiPcvCeCMrZwJm215hJ/qpow+ZOrH7WQ5K16xg?= =?us-ascii?Q?S6j+3ncXmb4iUU+CMyNFOL+Ctp8WhYrCcvy9Fv4w?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 750aabe6-8ed0-4de2-4ef8-08dda1e8b21d X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2025 15:18:15.0448 (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: btfPM/r3+/NlNlXAVO+6BAxWiXW439Tdizqt8l/jV2957nM/AniykbiGc98FhCQ1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9450 Content-Type: text/plain; charset="utf-8" MIGRATE_ISOLATE is a standalone bit, so a pageblock cannot be initialized to just MIGRATE_ISOLATE. Add init_pageblock_migratetype() to enable initialize a pageblock with a migratetype and isolated. Signed-off-by: Zi Yan Reviewed-by: Vlastimil Babka Acked-by: David Hildenbrand --- include/linux/memory_hotplug.h | 3 ++- include/linux/page-isolation.h | 3 +++ mm/hugetlb.c | 4 ++-- mm/internal.h | 3 ++- mm/memory_hotplug.c | 12 ++++++++---- mm/memremap.c | 2 +- mm/mm_init.c | 24 +++++++++++++++--------- mm/page_alloc.c | 24 ++++++++++++++++++++++++ 8 files changed, 57 insertions(+), 18 deletions(-) diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index eaac5ae8c05c..23f038a16231 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -314,7 +314,8 @@ extern int add_memory_driver_managed(int nid, u64 start= , u64 size, mhp_t mhp_flags); extern void move_pfn_range_to_zone(struct zone *zone, unsigned long start_= pfn, unsigned long nr_pages, - struct vmem_altmap *altmap, int migratetype); + struct vmem_altmap *altmap, int migratetype, + bool isolate_pageblock); extern void remove_pfn_range_from_zone(struct zone *zone, unsigned long start_pfn, unsigned long nr_pages); diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h index fc021d3f95ca..14c6a5f691c2 100644 --- a/include/linux/page-isolation.h +++ b/include/linux/page-isolation.h @@ -41,6 +41,9 @@ static inline void set_pageblock_isolate(struct page *pag= e) #define MEMORY_OFFLINE 0x1 #define REPORT_FAILURE 0x2 =20 +void __meminit init_pageblock_migratetype(struct page *page, + enum migratetype migratetype, + bool isolate); void set_pageblock_migratetype(struct page *page, enum migratetype migrate= type); =20 bool move_freepages_block_isolate(struct zone *zone, struct page *page, diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 8746ed2fec13..afeae59b29e1 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3319,8 +3319,8 @@ static void __init hugetlb_bootmem_init_migratetype(s= truct folio *folio, if (folio_test_hugetlb_cma(folio)) init_cma_pageblock(folio_page(folio, i)); else - set_pageblock_migratetype(folio_page(folio, i), - MIGRATE_MOVABLE); + init_pageblock_migratetype(folio_page(folio, i), + MIGRATE_MOVABLE, false); } } =20 diff --git a/mm/internal.h b/mm/internal.h index 6b8ed2017743..c43180bea6b4 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -821,7 +821,8 @@ extern void *memmap_alloc(phys_addr_t size, phys_addr_t= align, int nid, bool exact_nid); =20 void memmap_init_range(unsigned long, int, unsigned long, unsigned long, - unsigned long, enum meminit_context, struct vmem_altmap *, int); + unsigned long, enum meminit_context, struct vmem_altmap *, int, + bool); =20 #if defined CONFIG_COMPACTION || defined CONFIG_CMA =20 diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 4ce5210ea56e..16e3ad874144 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -770,7 +770,8 @@ static inline void section_taint_zone_device(unsigned l= ong pfn) */ void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn, unsigned long nr_pages, - struct vmem_altmap *altmap, int migratetype) + struct vmem_altmap *altmap, int migratetype, + bool isolate_pageblock) { struct pglist_data *pgdat =3D zone->zone_pgdat; int nid =3D pgdat->node_id; @@ -802,7 +803,8 @@ void move_pfn_range_to_zone(struct zone *zone, unsigned= long start_pfn, * are reserved so nobody should be touching them so we should be safe */ memmap_init_range(nr_pages, nid, zone_idx(zone), start_pfn, 0, - MEMINIT_HOTPLUG, altmap, migratetype); + MEMINIT_HOTPLUG, altmap, migratetype, + isolate_pageblock); =20 set_zone_contiguous(zone); } @@ -1127,7 +1129,8 @@ int mhp_init_memmap_on_memory(unsigned long pfn, unsi= gned long nr_pages, if (mhp_off_inaccessible) page_init_poison(pfn_to_page(pfn), sizeof(struct page) * nr_pages); =20 - move_pfn_range_to_zone(zone, pfn, nr_pages, NULL, MIGRATE_UNMOVABLE); + move_pfn_range_to_zone(zone, pfn, nr_pages, NULL, MIGRATE_UNMOVABLE, + false); =20 for (i =3D 0; i < nr_pages; i++) { struct page *page =3D pfn_to_page(pfn + i); @@ -1192,7 +1195,8 @@ 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, + true); =20 arg.start_pfn =3D pfn; arg.nr_pages =3D nr_pages; diff --git a/mm/memremap.c b/mm/memremap.c index c417c843e9b1..3319e7cc2898 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -254,7 +254,7 @@ static int pagemap_range(struct dev_pagemap *pgmap, str= uct mhp_params *params, zone =3D &NODE_DATA(nid)->node_zones[ZONE_DEVICE]; move_pfn_range_to_zone(zone, PHYS_PFN(range->start), PHYS_PFN(range_len(range)), params->altmap, - MIGRATE_MOVABLE); + MIGRATE_MOVABLE, false); } =20 mem_hotplug_done(); diff --git a/mm/mm_init.c b/mm/mm_init.c index 8684fa851b84..6e753ca2c338 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -685,7 +685,8 @@ void __meminit __init_page_from_nid(unsigned long pfn, = int nid) __init_single_page(pfn_to_page(pfn), pfn, zid, nid); =20 if (pageblock_aligned(pfn)) - set_pageblock_migratetype(pfn_to_page(pfn), MIGRATE_MOVABLE); + init_pageblock_migratetype(pfn_to_page(pfn), MIGRATE_MOVABLE, + false); } =20 #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT @@ -874,7 +875,8 @@ static void __init init_unavailable_range(unsigned long= spfn, void __meminit memmap_init_range(unsigned long size, int nid, unsigned lon= g zone, unsigned long start_pfn, unsigned long zone_end_pfn, enum meminit_context context, - struct vmem_altmap *altmap, int migratetype) + struct vmem_altmap *altmap, int migratetype, + bool isolate_pageblock) { unsigned long pfn, end_pfn =3D start_pfn + size; struct page *page; @@ -931,7 +933,8 @@ void __meminit memmap_init_range(unsigned long size, in= t nid, unsigned long zone * over the place during system boot. */ if (pageblock_aligned(pfn)) { - set_pageblock_migratetype(page, migratetype); + init_pageblock_migratetype(page, migratetype, + isolate_pageblock); cond_resched(); } pfn++; @@ -954,7 +957,8 @@ static void __init memmap_init_zone_range(struct zone *= zone, return; =20 memmap_init_range(end_pfn - start_pfn, nid, zone_id, start_pfn, - zone_end_pfn, MEMINIT_EARLY, NULL, MIGRATE_MOVABLE); + zone_end_pfn, MEMINIT_EARLY, NULL, MIGRATE_MOVABLE, + false); =20 if (*hole_pfn < start_pfn) init_unavailable_range(*hole_pfn, start_pfn, zone_id, nid); @@ -1035,7 +1039,7 @@ static void __ref __init_zone_device_page(struct page= *page, unsigned long pfn, * because this is done early in section_activate() */ if (pageblock_aligned(pfn)) { - set_pageblock_migratetype(page, MIGRATE_MOVABLE); + init_pageblock_migratetype(page, MIGRATE_MOVABLE, false); cond_resched(); } =20 @@ -1996,7 +2000,8 @@ static void __init deferred_free_pages(unsigned long = pfn, /* Free a large naturally-aligned chunk if possible */ if (nr_pages =3D=3D MAX_ORDER_NR_PAGES && IS_MAX_ORDER_ALIGNED(pfn)) { for (i =3D 0; i < nr_pages; i +=3D pageblock_nr_pages) - set_pageblock_migratetype(page + i, MIGRATE_MOVABLE); + init_pageblock_migratetype(page + i, MIGRATE_MOVABLE, + false); __free_pages_core(page, MAX_PAGE_ORDER, MEMINIT_EARLY); return; } @@ -2006,7 +2011,8 @@ static void __init deferred_free_pages(unsigned long = pfn, =20 for (i =3D 0; i < nr_pages; i++, page++, pfn++) { if (pageblock_aligned(pfn)) - set_pageblock_migratetype(page, MIGRATE_MOVABLE); + init_pageblock_migratetype(page, MIGRATE_MOVABLE, + false); __free_pages_core(page, 0, MEMINIT_EARLY); } } @@ -2305,7 +2311,7 @@ void __init init_cma_reserved_pageblock(struct page *= page) set_page_count(p, 0); } while (++p, --i); =20 - set_pageblock_migratetype(page, MIGRATE_CMA); + init_pageblock_migratetype(page, MIGRATE_CMA, false); set_page_refcounted(page); /* pages were reserved and not allocated */ clear_page_tag_ref(page); @@ -2319,7 +2325,7 @@ void __init init_cma_reserved_pageblock(struct page *= page) */ void __init init_cma_pageblock(struct page *page) { - set_pageblock_migratetype(page, MIGRATE_CMA); + init_pageblock_migratetype(page, MIGRATE_CMA, false); adjust_managed_page_count(page, pageblock_nr_pages); page_zone(page)->cma_pages +=3D pageblock_nr_pages; } diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 5de23eba0db8..92a368d38d77 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -544,6 +544,30 @@ __always_inline void set_pageblock_migratetype(struct = page *page, MIGRATETYPE_AND_ISO_MASK); } =20 +void __meminit init_pageblock_migratetype(struct page *page, + enum migratetype migratetype, + bool isolate) +{ + unsigned long flags =3D migratetype; + + if (unlikely(page_group_by_mobility_disabled && + migratetype < MIGRATE_PCPTYPES)) + migratetype =3D MIGRATE_UNMOVABLE; + +#ifdef CONFIG_MEMORY_ISOLATION + if (migratetype =3D=3D MIGRATE_ISOLATE) { + VM_WARN_ONCE( + 1, + "Set isolate=3Dtrue to isolate pageblock with a migratetype"); + return; + } + if (isolate) + flags |=3D BIT(PB_migrate_isolate); +#endif + __set_pfnblock_flags_mask(page, page_to_pfn(page), flags, + MIGRATETYPE_AND_ISO_MASK); +} + #ifdef CONFIG_DEBUG_VM static int page_outside_zone_boundaries(struct zone *zone, struct page *pa= ge) { --=20 2.47.2 From nobody Thu Dec 18 14:13:57 2025 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2051.outbound.protection.outlook.com [40.107.92.51]) (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 E031A233140 for ; Mon, 2 Jun 2025 15:18:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.51 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748877504; cv=fail; b=EcBsMFmzN5i7SQDRKWZxzO9nXFG6p41pGyzhEOWkFee+KkRPftdgdHKMKDVUHUamolpOAfpkix+7NqIIkNDf+uI6M46GoFAocFs/FTZc5QYTVP6UKmJQ460faKGlYG4VIvgoovX0myg95cUYLb+UhArxshe6qg2eTaFTIy5J1+A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748877504; c=relaxed/simple; bh=LhxcHub0OtdzSA45orzN+aD1TFgllLctkqv00XizHAs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=p13gGw8YTyBeUxWPekgRQ4aynhgC0wE/H9iFEb9fD59P+su6+PAStO3yzCGAwm4jkw8Fz3iuTf1T/DBD0IFeuh1+okncktoiwgEjte9LjSn2027ymScydLO8kl8+EK4BDlswYSaaHafS3SVRZ4mpFX/1e5P6g7axQ/0bueMS2GE= 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=i85XzaV4; arc=fail smtp.client-ip=40.107.92.51 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="i85XzaV4" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cNBMk/mBRNNTwO4kTfCbF10u+ptOZVoOz00eBGxXxPPBt3+OJii+whb4Ll1KR0JApKWRdZiJfOgWhEORhhYRyRULJj3q8indCIhCHyXEiVEVm6vPJQ4Nwlp7a4PmDBCO7qigUdmjJzTdFpKQdDkjsaaEthGHH1FhKat9heq/RO8zKlxIhFlLah+Uz+SRHNcdMrlaECqjzv3+0XLI35+eIKsQ+LpuHzWTQ37l1lC+UQmrUW65E+e9QNz2WKm3tS1hePUFHL52u49PI3nD8WkSrdJuYkVLVHn3/NwoTI2cw+cYi/oS7cSn7dYRqjij46vIuSxJkeLY/UTEwu499c0LtQ== 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=nHSzkPLbidH6Z9sxeXvVezSWHaVdGptkKez5GwKTgDg=; b=Y/HOOO66Wbwtrk+4DgfgaXcSyz6cJkT8Y+WMJfbOVY9uNaVfO9gLPtQsyvqacwEmD6JhwlMf3Ty0m1+kBWKztdq7fs3Xe5AB5xvjIF48Ecu1IDVvksQ9zwjadC5K4uWnDUMmABOsElf2OcWir2BE7mvjj26FX+zOJFkn2d6L7lwOia5G8SMmjfpG1E8ZujD3ySIXPPaXw6/QL4yI63SvhZQVPQwuyZfW0x7OfcfmWQZAiEswFGTIDSWTfAA+/+o8H3dVlaOZ4CWnFp5Dx7IYaaRTbjGGEKX5dlkVLtNc5wO2NT2942aDDCMNRbZp3tPPstvdy/8v2lJW9dMoi5fAJA== 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=nHSzkPLbidH6Z9sxeXvVezSWHaVdGptkKez5GwKTgDg=; b=i85XzaV4+I6JonNMhumg3Y+ecmLZhgX/JLE7dTWBU3CKajkuJf1y38tEouHVlb2auv+t7kWH1WwG7M7rRpyrt5X3la/l9XrKIrJ1hP3sJKRfD416KD3dhFW4m6wgQXIHhRu/GHwXPjOnwPLclsdwhiH9T5BvBnndC70C2a0ADhxeRlW249UCOWb6sT/romVl28iedV6jEQDBvENJUDkWVAZgwrkx5inUopV/N96tGD0QB9zyAMu0IqZSP1NadoN5x/+cl0oS6vIQDTGRcYq3Mxr+461ZHqQvvkHCeXkSrO1qcMHGnk7+GBbR27wQ7d8DgPpyMR3pxkw9nSIWcyCAdA== 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 LV8PR12MB9450.namprd12.prod.outlook.com (2603:10b6:408:202::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.37; Mon, 2 Jun 2025 15:18: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.8792.034; Mon, 2 Jun 2025 15:18:16 +0000 From: Zi Yan To: David Hildenbrand , Johannes Weiner , Vlastimil Babka , linux-mm@kvack.org Cc: Andrew Morton , Oscar Salvador , Baolin Wang , "Kirill A . Shutemov" , Mel Gorman , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Richard Chang , linux-kernel@vger.kernel.org, Zi Yan Subject: [PATCH v7 4/6] mm/page_isolation: remove migratetype from move_freepages_block_isolate() Date: Mon, 2 Jun 2025 11:18:05 -0400 Message-ID: <20250602151807.987731-5-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250602151807.987731-1-ziy@nvidia.com> References: <20250602151807.987731-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BL1PR13CA0353.namprd13.prod.outlook.com (2603:10b6:208:2c6::28) 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_|LV8PR12MB9450:EE_ X-MS-Office365-Filtering-Correlation-Id: db9c2edb-b1c3-4b90-e20d-08dda1e8b2e5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|7416014|376014|1800799024|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?UXudf3ZSr4f8W/3FDR3UGP3UpbSECyTEYOCPcgd8Y1eu3D94uwAvT+ydFxXf?= =?us-ascii?Q?lfF7WRKH8HJuthKTScL7AfvG97jpsauAMGhAjNXHwnUDWOWDI4NL+vb9KPbg?= =?us-ascii?Q?07bdRzvv2A8ujsCFB/PlYSiGdu2ODinPmYkeTymJnmwRL2mKzxr/iL9Ys6H5?= =?us-ascii?Q?1G1FaPEjF/d2qpeUi6O656U3sXS1ILArkDdgNIxF999jNZMjjBcg80id70kU?= =?us-ascii?Q?/Tzd88FzP1TIbEazpIVMjYN2PTdXLelWKUZkfeMw39plWG0fo1sGb8KxogR1?= =?us-ascii?Q?pQobqBBpHMoEdAs+kv6GoybMXEwhx4EqAQs/UKaugV3nvI6YweNEUVmLzQfp?= =?us-ascii?Q?9q1Js57x+yDxexEnKHUmphN6nNW2hxulcU2PINP6LvRgtw1pCSCiLtsQ7z+T?= =?us-ascii?Q?TZ1PPXYXb8bnN/bor69L1q6Zi8Mn5eQ29++AHblFi0+vlqtNFKVlQIggLoIA?= =?us-ascii?Q?j6DhdT4sPDXGC231R2ZlSi8oiFatVt377g1+QorwKisSBiOCr3m1OCfzEhUL?= =?us-ascii?Q?4NuHDTD6FLc/mvI9H4xuq1nfvcy508ZEDkZ+k2S/8Pbw2Ipa63wlilaK3Oq+?= =?us-ascii?Q?tqZrjNRWTsDJpObVzLeGPYk/BhpFOLIfTTe6yZsg+p9MtazAr9ZvG8FMsHhj?= =?us-ascii?Q?4vHyaB9ZQm1JVRJnV85FSHuc1B+F3mCCPBsylWrO+ubo6xFgQFrELClXpA12?= =?us-ascii?Q?JwiDWe5JHSkC5nJADpRfUoFCdn+hN9aoPUoYG7W78NRh/OhK3Jh3Q5W8hsA0?= =?us-ascii?Q?B/1iMjzeSS2IBHMBDue9nqw5o9m7MW03uMomqGkCm9GVGv2X26pFb+tEDcM/?= =?us-ascii?Q?GZTqpMNjHXe+/s9GqmDmaujvQ7Z2f3G/etXuIh+CaOxkumxw7SW0CEuukdY6?= =?us-ascii?Q?kUabeOLkBIIhoqOv7xwgdTGlQ/VXax/0VeJ9XbVZdRVd4Mi/qvX7W8LCLiuN?= =?us-ascii?Q?XpHAyA0X5Dj0zw8Jg8OeoBNq0vi7qGVJyOviE3LwQuK9r7KLR3bOB7sSduxx?= =?us-ascii?Q?AInheSFEK8lPtvnZLRYbLBPkzMbfemH6KNliN0pr+eW2oKa0hMBcRRTDB2ZA?= =?us-ascii?Q?NglnDLCU40orCsYa22lna3FU0MPgB4uTJvnvGtO61qsQlV1JYScQeYQzGG4m?= =?us-ascii?Q?kBuM06aV4zjBC+f7vfQ7Ji4heuHPo+hBKpyW0pZkxuLkgU8CK2D6EQ1sMSP3?= =?us-ascii?Q?ees4p9pt2zh/db588xLVvfM54qjvYUp3lotz0YvU3ZghTa5yZuqoy41/P88i?= =?us-ascii?Q?JNIZ70EYYtW5ycgj6I8wPiZfmhxbCN6P1x/FIU6Jhg66CA7Mk5UW6J8yWzaQ?= =?us-ascii?Q?SVs5Fff0iOdT/8VYj59pGMoUCQX/2ZzJnhiNOv5ysK8ydih8booBwNpPQRPQ?= =?us-ascii?Q?kw5NTwez9jYTAycPMNJ9E6jEdFQWuHriW8bFG/XZ+m4jjyL+ho38B6hdI6Ld?= =?us-ascii?Q?sPGZI8qOgHk=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)(7416014)(376014)(1800799024)(7053199007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?uMBP8EEhrNWYVZJJjsZgpb/YrWyzkBEFUtBaMdE66V0fs/4JY2dTwt0s2Su2?= =?us-ascii?Q?mIDpQCckvinwYsNFaQwWOsTDEOwaMEnS1wvru/QW2GuaGn7pKYP1EhKlYYcp?= =?us-ascii?Q?7Jb3r7QsY4t92FQdHcu5k6aWle9LKeE1DnJ0ukzla8oCA04Hl9epZMwzKnuk?= =?us-ascii?Q?aAsnCOa1DEus93ztAVI+9Z34KeYpXfgVlGjbcSi40GARAVTNe25vMUCjzs/T?= =?us-ascii?Q?703wYM56Ilx8SfwpqLrw2I+D/SgBcPIpjGyw/yTempZTRmD/9zKjV2zDcAxh?= =?us-ascii?Q?5yNvo8Bu6s65LtQrpY5/Xg3UakyNJP69MAIMNC9ZtNK5QzbkES4DqKiorFZG?= =?us-ascii?Q?Y+NpaodbaOQnlb2tqdW+nEjHIH3WFHRhSblvLKmGxmLzIropxxgjMIHhwdKM?= =?us-ascii?Q?iUDBr1s7LKaZjF7QfY4/zvYKT1NjlQZWD0/WAk6jL4guZk+zxTixjBqu3SIb?= =?us-ascii?Q?ymfPA42DmaObkMA3h5f0qwoGXoiThf11HmmPtEPSR19RkhLZwekUYxXW+tZm?= =?us-ascii?Q?RKbHCQt/KD5eB4NDU+aKvJ5LemZi4NkdBWSxUoLSK4AwyL4EVj99ca035EQt?= =?us-ascii?Q?hDbmTCSi66dBmx6kv+zhCqCzQsRsLF0B0n/jPjQmj/fJHR65itPXfxUswQV5?= =?us-ascii?Q?j/DSU3464uSxPYH+guePj1ESkkT5ZkqrOtmNilE2sICtV3eASbKbeqNwc5of?= =?us-ascii?Q?r5VWxNKnWaDXMhLsTMyui8Gd7Ft0Dq3fRjUsszk1E+pByuDekf+iD5l91k5l?= =?us-ascii?Q?tiSOqX7v+YO/y5ihSeCWMwiYJEIOD3UFKx4wFkapJxaLXHJEPm03V2LwRNho?= =?us-ascii?Q?R+SE1KeD/I1jQPrhzPRW55Xey9bd+uKYWcRWbq465pE8pZ0BW3GfLwSStYC7?= =?us-ascii?Q?WDd6pk6mSWk8WKW6+aE5kcdRwqXhPLYQDpM6TEGmEqe8jnWvtG/ibDU4aGWH?= =?us-ascii?Q?WnTyjMHOKvOoPvvd4Sq16gO6xJlKAHI5yZeX8ddtdlRKNe1uCpxdpEbBy9Bq?= =?us-ascii?Q?tCGTZrrJ5maka+/RhxqKnnSQ+gz2b1072ZYYDWJQf7tTzoEnrXstMfAw0BMT?= =?us-ascii?Q?M/h6NsY92tKP8puyli6IiiGXWWbi95QRnSTs7QTZ3hUSp4+dfQ4Q8LocQm/0?= =?us-ascii?Q?Bm7iFh2YsEHeIGcKlMynqO3v20HwNnri7lpL22GjZi3CpksfW9m0hnyq4wf9?= =?us-ascii?Q?HAbz3cU3/jeG9qwtbTYh8sw3zExS7khzUKdTA1jkzvi6xVzrrlJLfAhMSs1W?= =?us-ascii?Q?dlYPG8OE+JMbiBXlwKF1FaCxAcq/57VXeHKR9aRPcPNIWGlxZYTQlpKfgBfj?= =?us-ascii?Q?fE/Gdv4ZcO6meFeRBOfe9duVw+0jmAjVefy1ms/wL2o13ZeN0T+XaOosJrvb?= =?us-ascii?Q?GdyqGLyloVJnn8XCbeO2PppEM4vlCWktGciosx1s/x2d0aliU1wXDAwlO0jH?= =?us-ascii?Q?DUg5cDu7dyiK4IbKistvkQF9DVLjxCKDnIF18czLN9gRAMvu2dPcXUyvGgOv?= =?us-ascii?Q?OGatgGrm8t0eJJFpjXaioc13yII+0MWRYNC5gtfgydQ+F/xLnLdAkY/P4Pek?= =?us-ascii?Q?Q00tEboat8d7BtyxfjuD6Us8Kj3jVc+LriUeks3a?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: db9c2edb-b1c3-4b90-e20d-08dda1e8b2e5 X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2025 15:18:16.3470 (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: 5yOvZnF/ayaIFYu7faFraGFsRrgxOPV2/zXAnrEm8IB5rvUThEOeojlPk0cEM39O X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9450 Content-Type: text/plain; charset="utf-8" Since migratetype is no longer overwritten during pageblock isolation, moving a pageblock out of MIGRATE_ISOLATE no longer needs a new migratetype. 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(). Add toggle_pageblock_isolate() to flip pageblock isolation bit in __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. As a result, move pageblock migratetype code out of __move_freepages_block(). Signed-off-by: Zi Yan Reviewed-by: Vlastimil Babka Acked-by: David Hildenbrand --- include/linux/page-isolation.h | 5 +-- mm/page_alloc.c | 80 ++++++++++++++++++++++++++-------- mm/page_isolation.c | 21 +++++---- 3 files changed, 75 insertions(+), 31 deletions(-) diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h index 14c6a5f691c2..7241a6719618 100644 --- a/include/linux/page-isolation.h +++ b/include/linux/page-isolation.h @@ -44,10 +44,9 @@ static inline void set_pageblock_isolate(struct page *pa= ge) void __meminit init_pageblock_migratetype(struct page *page, enum migratetype migratetype, bool isolate); -void set_pageblock_migratetype(struct page *page, enum migratetype migrate= type); =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/page_alloc.c b/mm/page_alloc.c index 92a368d38d77..6ddf4fd6b2bd 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -525,8 +525,8 @@ void clear_pfnblock_bit(const struct page *page, unsign= ed long pfn, * @page: The page within the block of interest * @migratetype: migratetype to set */ -__always_inline void set_pageblock_migratetype(struct page *page, - enum migratetype migratetype) +static void set_pageblock_migratetype(struct page *page, + enum migratetype migratetype) { if (unlikely(page_group_by_mobility_disabled && migratetype < MIGRATE_PCPTYPES)) @@ -534,9 +534,13 @@ __always_inline void set_pageblock_migratetype(struct = page *page, =20 #ifdef CONFIG_MEMORY_ISOLATION if (migratetype =3D=3D MIGRATE_ISOLATE) { - set_pfnblock_bit(page, page_to_pfn(page), PB_migrate_isolate); + VM_WARN_ONCE(1, + "Use set_pageblock_isolate() for pageblock isolation"); return; } + VM_WARN_ONCE(get_pfnblock_bit(page, page_to_pfn(page), + PB_migrate_isolate), + "Use clear_pageblock_isolate() to unisolate pageblock"); /* MIGRATETYPE_AND_ISO_MASK clears PB_migrate_isolate if it is set */ #endif __set_pfnblock_flags_mask(page, page_to_pfn(page), @@ -1923,8 +1927,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) @@ -1956,8 +1960,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 @@ -2015,11 +2017,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 @@ -2047,11 +2054,19 @@ 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) +{ + if (isolate) + set_pfnblock_bit(page, page_to_pfn(page), PB_migrate_isolate); + else + clear_pfnblock_bit(page, page_to_pfn(page), PB_migrate_isolate); +} + /** - * 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 @@ -2066,10 +2081,18 @@ 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_isolate(page)) { + VM_WARN_ONCE(1, "%s a pageblock that is already in that state", + isolate ? "Isolate" : "Unisolate"); + return false; + } =20 if (!prep_move_freepages_block(zone, page, &start_pfn, NULL, NULL)) return false; @@ -2086,7 +2109,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; } @@ -2097,16 +2120,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_MASK to get non-isolate migratetype */ + if (isolate) { + from_mt =3D __get_pfnblock_flags_mask(page, page_to_pfn(page), + MIGRATETYPE_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_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, @@ -2298,6 +2343,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 b2fc5266e3d2..08f627a5032f 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -188,7 +188,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; } @@ -209,7 +209,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; @@ -262,10 +262,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: @@ -383,7 +383,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; @@ -433,7 +433,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 @@ -504,7 +504,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 @@ -517,8 +517,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; } } @@ -548,7 +547,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 Thu Dec 18 14:13:57 2025 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2051.outbound.protection.outlook.com [40.107.92.51]) (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 15B1B23371B for ; Mon, 2 Jun 2025 15:18:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.51 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748877507; cv=fail; b=clKghgREW2v0FjwwGK8ehOcgn/NfnPyF1PeWrrVr+QJtzI/uic8Q7/B+IQCgi9q3fvWyUY942ktJpCVI8xaWQ8wMI3UiCpXZ/ZPrRinTC2GX07S8Y1XthlYug+E5qrpt2fYbOyVV8MzG/lyMdbSLNwfYYxXGwGoPO2ZrowshA5A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748877507; c=relaxed/simple; bh=mGHan1f3pvsQ3eX/Uo2gFvcOfPdp8iVlcI8dL4nzZHc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=tpdiP6AtfthRmCo7SnPKMorSU0LH4mfyPv59euEmBEfQ4CU1ykj6ERUJ8XDSQ2RHW7FxQ8yAKFM9azvGft4YCmwL7XEOg15GX/hH/KKNeEVAimIItEMW3ofkemNmypis7GNCUPD4kDHcmntAVpAi6FF2kpN/mxEi32QAEyPq0OQ= 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=VRd4Lq5G; arc=fail smtp.client-ip=40.107.92.51 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="VRd4Lq5G" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KBNWaV30ylZnvYX1F+hb9jkrSKGkaGCoUGzbdQrPjY30AuRG3stxuHh/wijdDmGegaoFRWpH/HwTmJcQkWvF4xC+ukovv/UCOSL5lZGZrJbK2NLDHo7gt1yo8lGxC5puX/mHQAC04jG3sPdDBk6ZfVxlXhlWf2qFGJuy8BncMc0fy8IPP3htun1Piudg7uO4A8giDC2MbGGfdiAl6149t9TEJ6WLZiAFliQRcWMq4Me4cPbfPujkxTF8crZRVzsVTyYTaaSDC2iJ05h/KgbLiKJyr1ESyKZ86nAMQJQocW+H+6XxhnXAd7POPX2PUYPrh6W7Ke61c1D6yH/STCDMWg== 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=6Ca2y4Ll6GhldlIIPPkaafx8RWllJVTRpRpAU6TyVdY=; b=Vej2X+5CDfilVqhAYp+xc6Wo5IOX7RQYoPYk1h1lrKdHGNaMEwTBoOOAGUA5TDqVZUz2K3Z3SZep6b02+yKign7ovOIH5ESJvwmoTKO9bii558l66HmLMBlJJXfdVjLa2im1x4f5CEGNk5RWKlpmgQ4f8BukUjteyjuo/M408mWhbSt1v+54Hd3wld7xpdP4820pvxsFQsvjVsiYl/59lkvfMHGjx6uwuvT8Mg2eCgG7JQDSTweBezl1LEp7oOTZH7qcqvyg1Pkxgo0fYZziaMKTtbucoHz5W8gauyJl5EwZm7dUwgK2N8pR5/zehQQlIW3MoTV1O7xA83JQYMhj9g== 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=6Ca2y4Ll6GhldlIIPPkaafx8RWllJVTRpRpAU6TyVdY=; b=VRd4Lq5GpmikyJ8F8ZbSVJa5KPp+sPq2weodNv41i5ocTYNKR/u79slIjieB6dcnGckXwjEu2dH8JLaugAzWXO0xen3b9Dx0vX4kOiwmnXqyHlAnKMSJRbLVEHXxxE8U87gw+qH6cWuJVuVhI7Qhk9ZaPkMllJeyC8DHiTKDeaGbt5umMY4URuqqDSVBCyqXLwtfIPzqxosmWrc8M0iURPu7HfhpjVBmc/qaDQ9RjqLm10eFIb1yKeBDSqbVkAZmwfvfre42k7s2P2xB0Hn1AEdmCHqUHRYQKNLEwP3gmJ45CVMa80RRIhbqJFwekg/0lphL0Y3WwdEb/DMijJEZXA== 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 LV8PR12MB9450.namprd12.prod.outlook.com (2603:10b6:408:202::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.37; Mon, 2 Jun 2025 15:18: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.8792.034; Mon, 2 Jun 2025 15:18:17 +0000 From: Zi Yan To: David Hildenbrand , Johannes Weiner , Vlastimil Babka , linux-mm@kvack.org Cc: Andrew Morton , Oscar Salvador , Baolin Wang , "Kirill A . Shutemov" , Mel Gorman , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Richard Chang , linux-kernel@vger.kernel.org, Zi Yan Subject: [PATCH v7 5/6] mm/page_isolation: remove migratetype from undo_isolate_page_range() Date: Mon, 2 Jun 2025 11:18:06 -0400 Message-ID: <20250602151807.987731-6-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250602151807.987731-1-ziy@nvidia.com> References: <20250602151807.987731-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: CH5P223CA0016.NAMP223.PROD.OUTLOOK.COM (2603:10b6:610:1f3::21) 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_|LV8PR12MB9450:EE_ X-MS-Office365-Filtering-Correlation-Id: 1d6b2981-0daa-4222-67e7-08dda1e8b3b5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|7416014|376014|1800799024|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?1m+XJNLvhZZ4lWueaJl6mcjUnKGa4bjkCrIfwx1+YXBadvIAGqyOb46BuED+?= =?us-ascii?Q?BSxT09gFH3+gsHsAgLdh8X2dvxa9QiGaFRrhEruNA+EnepJbOYBfjRcbkmnv?= =?us-ascii?Q?3gw7g7CD5vHo5jZug0Sk/1MQY81Z/V9uG/kQALLNL0UWvDbytsfNcUAyMbgE?= =?us-ascii?Q?dBARS42AcCLmp/apX0cwMfGEEPEkPNX6IBu8i6Ow40eoqaXJWnuPb6MZ64dm?= =?us-ascii?Q?fTVlB5UFTnSgFw0gbGed9L+/PyJ6sG/Oy2QJ0HkZOoB77V/X0VdpRgLulNKX?= =?us-ascii?Q?y/0R2c2opMl6sQq+6i+Ec/pjhcwGUYQjkcBUOt6KiAAycIYMfwM0rO2F9fo6?= =?us-ascii?Q?Bd7ffKOc6psuPKoAKC+khv0nbqEgytx9U1vkdBJbumGd7H5+wohme089QCPo?= =?us-ascii?Q?a/8S5gaygfYitYyVfB3s5SPE7vyor3vza+UfGghcrmwAKsJJ0kGQr6vZXTjY?= =?us-ascii?Q?Ev8cwDKt+cve8qLJXT595XyFEjNRxYlFVLb+9TW5uvNhuNF/EtNneHtEmD+o?= =?us-ascii?Q?Ck+N9058aegWax7WylePBDoDTUOKclS2kVmLgmo0ZPMHWDm+DXt7VCdCcVoL?= =?us-ascii?Q?8MHwtl0kpr2i4RULYXnuOjL2nvTqFId5YPetxwcs/HA/X7sq5ePqDyQu+Fbv?= =?us-ascii?Q?PS/hXCKlstdUMXB5kPorNPAp9IkuyokfzA39CysJNhTq0x4di7fiBjjzJ3hU?= =?us-ascii?Q?2a7heGfyTtWtn7A89pK7D4FEmT1nvEtVVe3DkwlP05WToVFDkDoXZ5d6wkFL?= =?us-ascii?Q?jdnKmMCn9+MZM5WQsff/usu38v6uLrTFyAneHYAYKELSOLMpTZnQBqY6wwmJ?= =?us-ascii?Q?gRKnNdNrWeIf9xHY632nrfBBteVl35w+VCp6V85JoPHi4Iw86YogrwtdkKql?= =?us-ascii?Q?/71wEbWcQ3bsMXDzJDtB3qpyWrEATJKE1mk7Kh1IiBGaftbvc2Hr63Zp8RF4?= =?us-ascii?Q?JbAEppWBWcq97H3mOEP7qBA86U1tAW4Qj6uAe9e/QzCLFF1B6mkSE6UCX3qd?= =?us-ascii?Q?os8vENVKhmPfhp7ULWwiFYIOFg8rMm5YSufrkgBxmteZOtlXbwpMDQPgtqRs?= =?us-ascii?Q?SadW6iKFbpVwgZIkF95FcsO0sbwl/tcUVx3+HKVHhu5vnLy60bHvJZB6Ysg4?= =?us-ascii?Q?hBVwQyZkjZ/TqHQWBUWlfVq8ioXAqVdPICFprIKuIk9c3OPEzDphEoPTezoE?= =?us-ascii?Q?SOTx5MVDCS4l+dmrtwDenknNJgOla78gxzYB6XTUZ0BayZjiqzVWgdYqeLjM?= =?us-ascii?Q?RI69QLlTSnREOp89pssUfUhti0MeJjJvtM/TuelhPl6rPAoWxICdQBxRhYSB?= =?us-ascii?Q?8omMgLGLXJcAGs0zysWqIfjApEQlwehB3jenbzGDlDQSEV9CeZV9W24JeIy2?= =?us-ascii?Q?t9vUVbHniaZB0bzkkpZOn6U0TbI/no6K7eyr2iWpzh6zfwGNIgpm+F5/UlFC?= =?us-ascii?Q?bM9yaI/9yts=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)(7416014)(376014)(1800799024)(7053199007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?O+wkiiAL1N2WYP3jZDjf3qzzm61OLVfDkguQyxOrzbDQh4laeCv0355eANwq?= =?us-ascii?Q?JnMe20F04x1W/A+GNiujaLDUFwMf7r60VCFwR7aOBrsklI8lfllLE0MHcEVB?= =?us-ascii?Q?iSa7yMBmyZ17j5lhTyOjJ/DKxA2x/QEuWFH8hLRI94sHKJRwqZnCahb+cAUW?= =?us-ascii?Q?CkX5lmk1VdoSxLhd4zlM7YAdBEIatskKK2NjEOIzh2V4Rsik4kZCmbSXa8+i?= =?us-ascii?Q?dJE/NpeGJPMpvGKY/TPZSCwVtO5g5enPfLCZs+OS+ErM05vkU+KDBSAs1PTt?= =?us-ascii?Q?/+OQf2yK8RtMsvYQKcYALrRJFXP2WIcQCNBZl9jhapL2jicfGPEB3wiZVPxW?= =?us-ascii?Q?4qZ3yTlSjji2ykhPK+gOjSCMw+xRjhlkUNwxCifLDiYYROFozn4Wc0s3ZN+y?= =?us-ascii?Q?iTEVppz+3ziq1yQjSntyNyi3O4tLhGaDTa5/90octMzuf+2pGH/pFlzcyYs9?= =?us-ascii?Q?zFCpfG1wgQB9+g74KQ4wU+4s+lIpI5sikiHBWuqchbq3jo8Rtj7I3DSywl6U?= =?us-ascii?Q?EH3UqvERCuSbxaDSlvwwJB1/qdV9dizQrZO/rAijL5ZtGzhl9M8yCtmtPwLN?= =?us-ascii?Q?4oMnxkyKvlpd/AXnHUECyqMn5lY8dzGwxXNOVdg6AM5HnFNnoXgOWvQCi21X?= =?us-ascii?Q?6FfBYMKMrMQNy35chLzMICopzt8kQp6GX8whiXJpP7tRdaddqBLNwmQ5B4iA?= =?us-ascii?Q?93w/S5/06/JKZF6NU1WXBDI3OELJsaRoZmpxspkQJlknYr2EKcet/MEtjWd+?= =?us-ascii?Q?Ne7orecv46q/YNMfk5yc1HPi/V9ArfSoRyuYUZPG4XPkh7zK8NO+DhJHG7XL?= =?us-ascii?Q?CsqB/VYyFjXq9aCE0ZSKRfPLwHgTPlcFiWbEmIkVsubnx8S86pTLxZqFqq8v?= =?us-ascii?Q?bVOQ9UjAES+nAgLr577MD/Q6w7zrAXLO/yoZCZSdykOuSGRvC6Hhq8Gga+zr?= =?us-ascii?Q?6J/qBVdUmmgOK5Jsw/XxUoLWqsDOTeuoJGpBv1vs5yWckLzDggQqHBoF+FaS?= =?us-ascii?Q?+eadDEPNNO7nyoD56kVh4jMnGiZNF08Usy1kM6m7z3v5JIRBJ60MjZsfc/fd?= =?us-ascii?Q?PjiUcrU7Ey7GDWV0/HhXgphUAdjkMNvoZ7jg5UQj01zQiHqNpYRpcVyDRmVS?= =?us-ascii?Q?0qf1ehNN6Iete8l9ThtCV8UoGUKs/epso1ToXDo+rA1wCojVRUXSqZUwVc4t?= =?us-ascii?Q?5UXehS/C9DNDHc25Al8EifDl1QY6nuCkQrcumBrYUrctn+UbIzgemI0cQxOR?= =?us-ascii?Q?hTzIXZrMsCo0YrLU4guMQGVrwJWcb+2K3URdtD3eQcN/WpWyRKw/y3sNv7sL?= =?us-ascii?Q?GNrZkTC6ADZ24xGtUWCKeGRwDs0RCXBNVgbYECfBpVy3Qp6hJOPDYqx7x0Mk?= =?us-ascii?Q?U5Hkfmletwu8d4rZDPjDmnL5FNa8x5oX0UYZOo8OazLiWc7R56DSObAximC2?= =?us-ascii?Q?ThwvU2PoBw5UGxdGlL+X4TKR1x0cExrpAV/7w4j6/nEjSAnSh/Iuav6kL5cU?= =?us-ascii?Q?kW+Ifd8lvFmwmC7I3iZ+Was9Jx3n8r7Ez0x/edp58BSESqhndpViGnWpxHMV?= =?us-ascii?Q?wjz99h6g/6k/3fQd0jpoQmgNkYOukd7bfOk7xsJY?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1d6b2981-0daa-4222-67e7-08dda1e8b3b5 X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2025 15:18:17.7183 (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: 3EdNi1isNKDfqHpsqjP/kZr+cjIGXDQrcRea01ImS4FFCkbdK/GKv+rMh5HkmkJ/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9450 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 Reviewed-by: Vlastimil Babka --- 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 7241a6719618..7a681a49e73c 100644 --- a/include/linux/page-isolation.h +++ b/include/linux/page-isolation.h @@ -51,8 +51,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 16e3ad874144..4626064705ac 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1233,7 +1233,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 @@ -2119,7 +2119,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 6ddf4fd6b2bd..ccb21af002b0 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6986,7 +6986,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 08f627a5032f..1edfef408faf 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -515,7 +515,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; @@ -528,13 +528,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 Thu Dec 18 14:13:57 2025 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2051.outbound.protection.outlook.com [40.107.92.51]) (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 39C21235041 for ; Mon, 2 Jun 2025 15:18:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.51 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748877512; cv=fail; b=uJTMUM+zF4MLDz6cJZV9YlDRKynV45FUWHeMWBR8CpXlcXD5VzpE5UqtRc0yuUenH9ySmhl/yjAfpIg9wsjn9mk5u1Un4xtQ2CCAcm1w4vKVc4LlAd6psbNciH2RYALybktIJvyGND5BvzONdCtsiHq/QkH8pXgHo9VroTsgZnA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748877512; c=relaxed/simple; bh=Am2frd/TRJXCIdlvXfNFm9iMtGdI/cmrUOReA72IND8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=odZpb0AwvSFMn6rg5whrPzNvW7ehBUR1zTc7PR4eBGWvV/7l2PNkAzGrJnplsB9MYK03lc/U0o0KKW6xkIMJDcQH8Ul2tzNTyajtqC0aIKvTngjlL5qOp29f3fJdeduXhHcfhBGIm8WpUiJ3QkFbt/Rg3pDzdH4MHdZ7q0OEUM4= 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=sXdqc8+w; arc=fail smtp.client-ip=40.107.92.51 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="sXdqc8+w" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bF+N0M6qB0aep1ZgFArtL8b4L7xQ3byCXiE86BpmPFfWNJriqC679+DDnhgQV9g/O1L0t0rLDnSw76SilRV262rCp5Wu0xgi3/2SFetRkoDqLQZKXoqgaRXr7HaiZmzCffipu0kZx1R0T+f9s1NFaWLojZjXjHcpvjs7IE3pVDUMHJVf6kn9kXCnEU3jW0sxZ6bY6GEcieyEN0KmPt4nR/vyP3xHuDMJmZnxsBj+aWnQU7giID0v++CagZoYXejtxxKHp6I5AjrI/S4uQTJqOO8FRb/KSydrqKoiNY4M4DXNguMIZIwqyhw62GFKoADjIQwSY90xIMPB/lanFkqY0w== 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=qZeTqg6z0kj0O+HI8GmQzwxQO6usyTldHlTsCtq7P5U=; b=TC3qe5trIYSQ3xy6vNMs/4sylMItvo5jtZMEQMjpdYYKwX4YBMnYIPS3qG36JN8RqIvMi2WkPXiPYB7zZvJtnEWxSid4hsILFt/RMZXoXf3qXyxeniwaBa7Lfq5FBv84qnQq3Xbgeyj4DQGlT/B4xhDLwJoAxm+Vr2liB7FRVs35NoqABDbQGVEXY/eAXGRMoj83jaoglYt76uSJrb7jWtqSjeBScw9c6y9DDFU/rIPz366ipjj0hHz2uqCBYR67043K2iC9h8QgShQxTG+lvQlER8sYZbi1QL/1ZBgKdvsuJKf543UYN8lGw0NtnpVPAfI1k4jtZ/7KHJxFecGRJg== 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=qZeTqg6z0kj0O+HI8GmQzwxQO6usyTldHlTsCtq7P5U=; b=sXdqc8+wWKgoytkRkRPELQ8ymAwKyB/r8IxU2+B/1vV2tCcmif7RgvFO4zSwjU1CHF/U7Ck507CNxqTZOUfWiG6/RV5IWN0xPMNifqHAdGi5njmwjglww9l3V8EvWcR8aar+dser9GUOlNEaFnqxfQ4jjK3g8ZXktZMhjk2/KJU9aB2ubjwHDfcbUuPkXEsyKJw6AMG2PHFg/dZn3dERGU4D/YYEqneCf1UG7X8vuMu0uR+R0LmG8JDGT6g302fiE4sl6q1m32gIkxQT0TDi7+HwLNThntjsCDmknqm/s5wce1HDCla9K8x7BanNgvHJuR9KfTK5CZk4qPyw4l+UVA== 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 LV8PR12MB9450.namprd12.prod.outlook.com (2603:10b6:408:202::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.37; Mon, 2 Jun 2025 15:18: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.8792.034; Mon, 2 Jun 2025 15:18:19 +0000 From: Zi Yan To: David Hildenbrand , Johannes Weiner , Vlastimil Babka , linux-mm@kvack.org Cc: Andrew Morton , Oscar Salvador , Baolin Wang , "Kirill A . Shutemov" , Mel Gorman , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Richard Chang , linux-kernel@vger.kernel.org, Zi Yan Subject: [PATCH v7 6/6] mm/page_isolation: remove migratetype parameter from more functions. Date: Mon, 2 Jun 2025 11:18:07 -0400 Message-ID: <20250602151807.987731-7-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250602151807.987731-1-ziy@nvidia.com> References: <20250602151807.987731-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BN9PR03CA0265.namprd03.prod.outlook.com (2603:10b6:408:ff::30) 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_|LV8PR12MB9450:EE_ X-MS-Office365-Filtering-Correlation-Id: 956319f4-deed-41ba-3e09-08dda1e8b4ba X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|7416014|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?5wa3GNdiopInYjLcWSD3eZsjg1yU7XrkWd1O/UWY6YC1QQYElbHZJpvc1hqj?= =?us-ascii?Q?1sBhLYat35ETNQoMKXJqRU4k28ZCdqAn2F0kG8LaJZ++j8KUHqGTtiOi6shS?= =?us-ascii?Q?EgHHkcV7sn906XnpRQTlRnSadPo16Pa4TUdf/r5vy6qfJCy786EbsSBHVgSi?= =?us-ascii?Q?S5/EjWzokIytYXXfkWRTmXIQdGG0vHKH7n6GRElZBWkFF8DCwiFpxr6xKrtw?= =?us-ascii?Q?zBQjlP9sU53IdI5jH8YrGEFvon1lmxMJdEFhMFVk7gAj9KCwqTTmanQAk1ej?= =?us-ascii?Q?PZARlbMwDVLi8JZLPVnQVgvzV5TDC9Ey856ndH7aCRqlEeOI5lgEx+DGQHZO?= =?us-ascii?Q?6XO8OtbuwMFFl6gRf3CRQxjskTuUAc6YXW5y16FOg4TY9MivOkZd/ltLYJPH?= =?us-ascii?Q?KDiIv66zWnjp8srJSygJzCiEGl/DCfggC0OCUY5RJiajaa8Akb0n3GJqO9DY?= =?us-ascii?Q?UUb91qVHWDkoScjtdydnvk1nxA7dQQNV4TbdJnoxwVjGxtvgAoGbCzKQiUsV?= =?us-ascii?Q?NMcalidWQ3/85t/m6nLhLOT5o0BarRP9YrtuYmHIRDVSIOILVbynWZFQs+5B?= =?us-ascii?Q?tAEXK9AHIReoK0qaHrl4qgrV6jo/S06sS3LyD/YD18EnRX//mJZrqKp5xYqP?= =?us-ascii?Q?hbX92eDcvqyLLWad9usQbcuBh5fCaZDqUScRZKeCPjf7XM6dFbneA6IPwNF9?= =?us-ascii?Q?9BVxXuyw3Ad+KeU4+KLvMRK+bnzuBw9OsaTFFsbEHktT1ILtBA+CZNbep+2Z?= =?us-ascii?Q?kItzMZ1szqFQyvuj69sSsbwXzdgpxVweZB5WqOlvGn1VxjIkkXJG2HSPOOEU?= =?us-ascii?Q?IuSZt9PkLElgh9I3hF8qu+aw5s1PJMuogLLavkWGG05aEGaQh/3X5YEVrirZ?= =?us-ascii?Q?CW0uKz6zW0hzQ0H0VLmEpaFZusC7Jg8mLxR7P4r70HvNjg4lS7udce1xF9fn?= =?us-ascii?Q?jdt+5uCILu2sCQWkHy5AGUSw9p+vYWktYqbq3bPygrc1+CvbbbeEkyBTJrkt?= =?us-ascii?Q?5B0Gv+8LlMWSOZ3IkTobPwzDN+YLASHJajn8Xdl7tPKwPRFQM3Il4Q4ChhF7?= =?us-ascii?Q?UK4rhkqQXalFHHPxfJgLHY3F7LJLfvzK5XcVb9nnvmKqq6+rA9p6vfipYdpu?= =?us-ascii?Q?8GGy7V2sAKWztVVyuCOKHUTsgM4MDOyqTjKhpPOKCJ4wAzI7sYG4bbP0jU+Y?= =?us-ascii?Q?BL2COAbOoh74LBPbwl/U2aTGRV+2lX625Uz+Rhw5WiFEJn7X5wcATJTBtFmc?= =?us-ascii?Q?Q0ATjLWgdg/xqsx9qKnx4yQUtErHi8tc63Mk5lNsSHMEnJ4xQ3Nq/njYbjrm?= =?us-ascii?Q?y+64LJ0mTJ1L8ExiygZoUi3Z3Z0i+abT/OOb++Q2eoACOo4B7BwjVqGF1elz?= =?us-ascii?Q?bxa4GfP9h88ykXFKmWk0j/KgvWloY4Fu0eJuG+nTZFOET19DEFdblK+xqXlc?= =?us-ascii?Q?6wfoyH+J4GA=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)(7416014)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xsLSekf/zJmrmIIFHD2xl4TNkPmnfxcxehsgIwGlNHK4K10GFpNZS69Br41j?= =?us-ascii?Q?fIxnsMiiuYnIQ0rKXLmmNYD1RhNgMcuJy6teNvpzcfSyXgLiydWvUg8oyBmL?= =?us-ascii?Q?8UsMlFntTIWwTfyVP6nMj37T2rQkq+BbrN7U5HnPD1okfs62a/7ojJRmXfG0?= =?us-ascii?Q?cNbmEWBkD8xr6+9Fgt/ASnnNDyfp/iLrsWuPUjvn7CxqYrfR2voOe2usYUPx?= =?us-ascii?Q?BqvZG+7Gf6KwMaYMx4yAXA1LKvduyFhx3OGr08VW4HMDb7iSYQ8tML+1csVC?= =?us-ascii?Q?F5plhbV4ZoBLNKIVbSZvNli9L09ONg0yToQ0bsRwWdMBpjOxGJrNuBWojMqB?= =?us-ascii?Q?zqTOmzmhSUiNRuoRuqrMhwb/G83Kz8DdBQQv4et/VPZjypEo4BRgd7IkbT77?= =?us-ascii?Q?fcjGFo0VwQ3FU70H9F04Vk3dQWJDRj9RtJqiRCX3WuSsi5McpbEN7vnZSpYH?= =?us-ascii?Q?WtRL2aP27fBJ4JwhE1xwTv31uufPkq70CYJT+cFG4I84ngIHs80mqSG7Q9gn?= =?us-ascii?Q?QLHQgNfA18T/ZgsqdwhJhSzlDphyrH9AyNYGMHECnjdIcW1sYFPeXOsH0sD8?= =?us-ascii?Q?crZOcHJVCe1JeEpc6tMRgYCQKa2AKD4qJPkTlcAPXdXJ8NiugWIUCaJa71Lg?= =?us-ascii?Q?jfYkxy5kEv6SJngQC3UyJIXpY6xW1AdPdZZV3NGt1vLvzLDbm+39m2dyNMKY?= =?us-ascii?Q?+jNUS2wz3rus8Id48g6Tug16p0+eG6rWAN4sfOTIuhUQzUk4LlVU71ONUSnE?= =?us-ascii?Q?uJB9HhiFLWqM19an7w4RoOsQgPb1F1RVtSCidnVe8HITvNwL+xzxrPwEBxtY?= =?us-ascii?Q?GQ7qG2W7Afp9BiGdwzhvaE8AmDUyOW66RMue+4/y9iKV0LlPI5rQs3bZSFe9?= =?us-ascii?Q?vACe9z0PcZY7dJIkh7fdcgabIiqHiITDp/40d4Kp8puFpLz5Xe6qVM91kFys?= =?us-ascii?Q?J1TLuui/EfARypLlxzbMdFTX+COuitiFdEP7FMvJldwa3Nylc7tcTcMf1fNI?= =?us-ascii?Q?mC2CSgyF31QYpzcVIGukGbnA3vNd2F/56I4FsWUpMMiYaOu9NJ/zHra8Mkpm?= =?us-ascii?Q?cJuPFWIXANTESI8w//sl/NylV3SSnBrVBpDMDhlpva820cK5/Wo6sItwhIQz?= =?us-ascii?Q?mZ2mlAC4NRY+Rvd7kB0Cr4EpDB98Im71owHjDm2cyw9LkbVLLx7AMoZq2kgT?= =?us-ascii?Q?rYBVxaNs9u0lPrXCGU+f8skWy9c/6IxY8s5XgWTSmJqLObm35gpOjfRdkft7?= =?us-ascii?Q?OJcX0WZdsrq3SAEkLvb4R/2kzisSFbVGSZkz2yFp+0Mk/KNfBlr7KFxk3Bba?= =?us-ascii?Q?cENFM+flRNnabySQLqVTGTuPjouy2lShr/0Ms/NuyZDpXXs6hOzm8/1WOlxx?= =?us-ascii?Q?GQD0Pi2HOT9Zy+mkQNvFm3d4vKktvGmd69q8c6RNRSzVpfUvtpBLGxjqCALG?= =?us-ascii?Q?7npDkqKmZuu1FD0boIpx02baDnC/YkmkgiwAQWJe0Xc2nHrmvkxQKgGRR41e?= =?us-ascii?Q?XFcWWPrtuyjb02dMzxX7wJZOuBk3QhadekhaIhuy7HPdi4rsxWhhjbRMy9J7?= =?us-ascii?Q?o+/O5MXgAWcjYw+W7k6JHWhf6bIOpD1E5Bzptw+8?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 956319f4-deed-41ba-3e09-08dda1e8b4ba X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2025 15:18:19.4227 (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: bi4BBf/DK/DHF7mf9wNkeQXcbaIFPBfld7z+72lke3HEreh0H6Khe9RarwE3yzeG X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9450 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 PB_ISOLATE_MODE_CMA_ALLOC provide the information. At the same time change isolation flags to enum pb_isolate_mode (PB_ISOLATE_MODE_MEM_OFFLINE, PB_ISOLATE_MODE_CMA_ALLOC, PB_ISOLATE_MODE_OTHER). Remove REPORT_FAILURE and check PB_ISOLATE_MODE_MEM_OFFLINE, since only PB_ISOLATE_MODE_MEM_OFFLINE reports isolation failures. alloc_contig_range() no longer needs migratetype. Replace it with PB_ISOLATE_MODE_CMA_ALLOC to tell if an allocation is for CMA. So does __alloc_contig_migrate_range(). Signed-off-by: Zi Yan Reviewed-by: Vlastimil Babka --- drivers/virtio/virtio_mem.c | 4 +- include/linux/gfp.h | 18 ++++++++- include/linux/page-isolation.h | 7 +--- include/trace/events/kmem.h | 14 ++++--- mm/cma.c | 3 +- mm/memory_hotplug.c | 6 +-- mm/page_alloc.c | 27 ++++++------- mm/page_isolation.c | 70 +++++++++++++++------------------- 8 files changed, 79 insertions(+), 70 deletions(-) diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c index 56d0dbe62163..535680a54ff5 100644 --- a/drivers/virtio/virtio_mem.c +++ b/drivers/virtio/virtio_mem.c @@ -1243,8 +1243,8 @@ 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, + PB_ISOLATE_MODE_OTHER, 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 be160e8d8bcb..17b92888d6de 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -423,9 +423,25 @@ 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 +/* + * Pageblock isolation modes: + * PB_ISOLATE_MODE_MEM_OFFLINE - isolate to offline (!allocate) memory + * e.g., skip over PageHWPoison() pages and + * PageOffline() pages. Unmovable pages will be + * reported in this mode. + * PB_ISOLATE_MODE_CMA_ALLOC - isolate for CMA allocations + * PB_ISOLATE_MODE_OTHER - isolate for other purposes + */ +enum pb_isolate_mode { + PB_ISOLATE_MODE_MEM_OFFLINE, + PB_ISOLATE_MODE_CMA_ALLOC, + PB_ISOLATE_MODE_OTHER, +}; + /* 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); + enum pb_isolate_mode isol_mode, + 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 7a681a49e73c..7ed60a339a02 100644 --- a/include/linux/page-isolation.h +++ b/include/linux/page-isolation.h @@ -38,9 +38,6 @@ static inline void set_pageblock_isolate(struct page *pag= e) } #endif =20 -#define MEMORY_OFFLINE 0x1 -#define REPORT_FAILURE 0x2 - void __meminit init_pageblock_migratetype(struct page *page, enum migratetype migratetype, bool isolate); @@ -49,10 +46,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); + enum pb_isolate_mode mode); =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); + enum pb_isolate_mode mode); #endif diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h index f74925a6cf69..e0bcbc43a548 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), + enum pb_isolate_mode isol_mode), =20 - TP_ARGS(start, end, nr_migrated, nr_reclaimed, nr_mapped, migratetype), + TP_ARGS(start, end, nr_migrated, nr_reclaimed, nr_mapped, isol_mode), =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(enum pb_isolate_mode, isol_mode) ), =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->isol_mode =3D isol_mode; ), =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 isol_mode=3D%d nr_migrated=3D%lu nr_= reclaimed=3D%lu nr_mapped=3D%lu", __entry->start, __entry->end, - __entry->migratetype, + __entry->isol_mode, __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 397567883a10..23aa35193122 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -822,7 +822,8 @@ 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, + PB_ISOLATE_MODE_CMA_ALLOC, 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 4626064705ac..3eea3008727f 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -2009,8 +2009,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); + PB_ISOLATE_MODE_MEM_OFFLINE); if (ret) { reason =3D "failure to isolate range"; goto failed_removal_pcplists_disabled; @@ -2069,7 +2068,8 @@ int offline_pages(unsigned long start_pfn, unsigned l= ong nr_pages, goto failed_removal_isolated; } =20 - ret =3D test_pages_isolated(start_pfn, end_pfn, MEMORY_OFFLINE); + ret =3D test_pages_isolated(start_pfn, end_pfn, + PB_ISOLATE_MODE_MEM_OFFLINE); =20 } while (ret); =20 diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ccb21af002b0..02a0f5621d10 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6695,11 +6695,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 + * @isol_mode: using pb_isolate_mode 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, + enum pb_isolate_mode isol_mode) { /* This function is based on compact_zone() from compaction.c. */ unsigned int nr_reclaimed; @@ -6771,7 +6772,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, isol_mode, total_migrated, total_reclaimed, total_mapped); @@ -6842,10 +6843,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. + * @isol_mode: allocation information used for pageblock isolation * @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. @@ -6862,7 +6860,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) + enum pb_isolate_mode isol_mode, gfp_t gfp_mask) { unsigned long outer_start, outer_end; int ret =3D 0; @@ -6878,6 +6876,9 @@ int alloc_contig_range_noprof(unsigned long start, un= signed long end, }; INIT_LIST_HEAD(&cc.migratepages); =20 + if (isol_mode =3D=3D PB_ISOLATE_MODE_MEM_OFFLINE) + return -EINVAL; + gfp_mask =3D current_gfp_context(gfp_mask); if (__alloc_contig_verify_gfp_mask(gfp_mask, (gfp_t *)&cc.gfp_mask)) return -EINVAL; @@ -6903,7 +6904,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, isol_mode); if (ret) goto done; =20 @@ -6919,7 +6920,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, isol_mode); if (ret && ret !=3D -EBUSY) goto done; =20 @@ -6953,7 +6954,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, isol_mode)) { ret =3D -EBUSY; goto done; } @@ -6996,8 +6997,8 @@ 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, PB_ISOLATE_MODE_OTHE= R, + 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 1edfef408faf..ece3bfc56bcd 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -31,7 +31,7 @@ * */ static struct page *has_unmovable_pages(unsigned long start_pfn, unsigned = long end_pfn, - int migratetype, int flags) + enum pb_isolate_mode mode) { struct page *page =3D pfn_to_page(start_pfn); struct zone *zone =3D page_zone(page); @@ -46,7 +46,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 PB_ISOLATE_MODE_CMA_ALLOC) return NULL; =20 return page; @@ -117,7 +117,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 PB_ISOLATE_MODE_MEM_OFFLINE) && PageHWPoison(page)) continue; =20 /* @@ -130,7 +130,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 PB_ISOLATE_MODE_MEM_OFFLINE) && PageOffline(page)) continue; =20 if (__PageMovable(page) || PageLRU(page)) @@ -151,7 +151,7 @@ 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, +static int set_migratetype_isolate(struct page *page, enum pb_isolate_mode= mode, unsigned long start_pfn, unsigned long end_pfn) { struct zone *zone =3D page_zone(page); @@ -186,7 +186,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); if (!unmovable) { if (!pageblock_isolate_and_move_free_pages(zone, page)) { spin_unlock_irqrestore(&zone->lock, flags); @@ -198,7 +198,7 @@ static int set_migratetype_isolate(struct page *page, i= nt migratetype, int isol_ } =20 spin_unlock_irqrestore(&zone->lock, flags); - if (isol_flags & REPORT_FAILURE) { + if (mode =3D=3D PB_ISOLATE_MODE_MEM_OFFLINE) { /* * printk() with zone->lock held will likely trigger a * lockdep splat, so defer it here. @@ -292,11 +292,10 @@ __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 - * @flags: isolation flags + * @mode: isolation mode * @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 @@ -311,8 +310,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, + enum pb_isolate_mode mode, bool isolate_before, + bool skip_isolation) { unsigned long start_pfn; unsigned long isolate_pageblock; @@ -338,12 +338,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, isolate_pageblock, + isolate_pageblock + pageblock_nr_pages); =20 if (ret) return ret; @@ -441,14 +440,7 @@ 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 * * 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 @@ -481,7 +473,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) + enum pb_isolate_mode mode) { unsigned long pfn; struct page *page; @@ -492,8 +484,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, false, + skip_isolation); if (ret) return ret; =20 @@ -501,8 +493,7 @@ 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, true, skip_isolation); if (ret) { unset_migratetype_isolate(pfn_to_page(isolate_start)); return ret; @@ -513,8 +504,8 @@ 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, - start_pfn, end_pfn)) { + if (page && set_migratetype_isolate(page, mode, start_pfn, + end_pfn)) { undo_isolate_page_range(isolate_start, pfn); unset_migratetype_isolate( pfn_to_page(isolate_end - pageblock_nr_pages)); @@ -556,7 +547,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) + enum pb_isolate_mode mode) { struct page *page; =20 @@ -569,11 +560,12 @@ __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 PB_ISOLATE_MODE_MEM_OFFLINE) && + PageHWPoison(page)) /* A HWPoisoned page cannot be also PageBuddy */ pfn++; - else if ((flags & MEMORY_OFFLINE) && PageOffline(page) && - !page_count(page)) + else if ((mode =3D=3D PB_ISOLATE_MODE_MEM_OFFLINE) && + PageOffline(page) && !page_count(page)) /* * The responsible driver agreed to skip PageOffline() * pages when offlining memory by dropping its @@ -591,11 +583,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 %PB_ISOLATE_MODE_MEM_OFFLINE specified in @mode, it will consider * poisoned and offlined pages free as well. * * Caller must ensure the requested range doesn't span zones. @@ -603,7 +595,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) + enum pb_isolate_mode mode) { unsigned long pfn, flags; struct page *page; @@ -639,7 +631,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