From nobody Mon Dec 15 21:43:11 2025 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2072.outbound.protection.outlook.com [40.107.243.72]) (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 D151428FABA for ; Wed, 7 May 2025 21:11:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.72 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746652281; cv=fail; b=SUXdo+MsJsA/2Zr/ULhMUhzPiZh+7+WWoe6i9QFvoPUpEK0HHh0mR4vrht04IYBHRrFihee2ibsUHNo/EJRyUIReuHKNpnYBy5XTtaEV6GMeS/+Ng/k1UYYU9k/Njud/+Hy+ZQO1QnKpFpXPELdTs72GZxt0/Zywb45RXEFl5vk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746652281; c=relaxed/simple; bh=PcyjqwWP4580JRgYXEGoKdyrIlA3ARXJF6pi2hIReME=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=QaqlHYkgQC0wJG/eN+LN/reJnFosfytAir7Tn39N68iWSC7xsN4jRQFcZHg9pFyH9teJvJQSv4QjkhtgN2McyzfLsWzzBc5ijN34MzUM57vv9Q/rmnoJcVoBhlvWsnLojJ1WISpCVIDEqpFtU3Z3Jui6ivHwZhooQjrulyYvQds= 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=Brtpqoxt; arc=fail smtp.client-ip=40.107.243.72 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="Brtpqoxt" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Y0QorKW9WK34aiS5iuyO593K5hSKnszFXaAj7JXZy9RO5NpDIQx2Tr+5svop1olCo8egIEO3057efBXZKE50CEGC7ZTczZyrX1m47JKBmL1o8nhqylAAuxxp9vlVhLYKkYXHfSc3Tj53d3ohk3SLqih6TcM8+U3CD+pn+9K1YHxxCiF1QCaJXYt8cxXeuGEzxbGk1HDfKdt0gpuDNgaS42XGLwhb2EXpNfK+TLgxMowBph7bq8MyasPIkBJ9NOTutLtx7wWHj+QnuvUKQyhltEB5Ah7yRENFCJh5zfudhEePzJtWx7SYg4D7j6KQ2W9ScgGkVbAHMupfRO+IUgSNDQ== 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=OqSBdB+ndQIH/ScFGeGpnzkQXhF3T8QlfM6Qxz04vIQ=; b=azIsjTHaLE2dYVD9NufvXXJPYrgVyBEt0gN47gOMXAqZH3Y1zR3Aef8GwHdRvcmREiVhbFOO5DUyvpiHFva3VmttFoBQHVAEIwfvCk7YzFFWy9pYYNCBo8oQQ3ZZFnPkLUPqgvaLSakLYjDoHpRLM49tDBjYn+bGczeVAHtokvcavE8Y3TmQ+0304DWozgDnpq5Y3vt0LpMaJwghQwzBuxFidPAyLs4cxMGCkRW2Czw7D3GKFSCnJoAuVZK0dxfW8TR8Sc5g0pGouC80BFzmcLBtCj+KleumaMIaO9WRda75r218bTRTrWiGT4mhh+b6f4d5NCSNvMl/iMJutjbAIQ== 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=OqSBdB+ndQIH/ScFGeGpnzkQXhF3T8QlfM6Qxz04vIQ=; b=BrtpqoxtoiOj5X5zxO3DDY3cd8UN/Xdx8eoKDTG1VEazL1DGxJjJf4bNU3D+2YgX5OH2udVIFXIOGp7p0vmACDt+Q9dUIXYp1jC4r2TyV19ogMxA5rb3Lv/AXy7DhX10c98oodNIeYN0x9OFEBcPmu/20zgklFK0OUx31hFC8aG546I9Tj0Qh1RKNRaQIfDBZMDHrz2pIP7db811SugrBXUeCAl3PYiqmV384ZF8i9hBwiWB7dccZRitb32VhiIFoISvXcUb2tdhUcIz5N6BUAkR0/1fcpSdq2Fho9SeLmGbmc6AK5Q/EQ6FnLjHJ90ODJTyd73FxJ5otH8QTrXMCg== 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 LV3PR12MB9236.namprd12.prod.outlook.com (2603:10b6:408:1a5::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.26; Wed, 7 May 2025 21:11: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.8722.020; Wed, 7 May 2025 21:11:12 +0000 From: Zi Yan To: David Hildenbrand , Johannes Weiner , linux-mm@kvack.org Cc: Andrew Morton , Oscar Salvador , Vlastimil Babka , Baolin Wang , "Kirill A . Shutemov" , Mel Gorman , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Richard Chang , linux-kernel@vger.kernel.org, Zi Yan Subject: [PATCH v3 1/4] mm/page_isolation: make page isolation a standalone bit. Date: Wed, 7 May 2025 17:10:56 -0400 Message-ID: <20250507211059.2211628-2-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250507211059.2211628-1-ziy@nvidia.com> References: <20250507211059.2211628-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BL6PEPF00013E0E.NAMP222.PROD.OUTLOOK.COM (2603:10b6:22e:400:0:1001:0:f) 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_|LV3PR12MB9236:EE_ X-MS-Office365-Filtering-Correlation-Id: ad7a58a6-0c50-4efc-ffdf-08dd8dabb217 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?47WSR0Rsh4HuTAW+cEbC+3m0v5p7Pw3ij2krDgNkKs8g6F+C6MLFEaPw+25G?= =?us-ascii?Q?EHzwIAR62b9GtYIDKyjuP6aqC4tX77d/uMdVvGS1XHbx62tBhgJ7m0LB6g+S?= =?us-ascii?Q?mEI69kbIATwzr1V/DgLBOlIp7p+4gKyv1ZcMI+rifYnT4xzoEHaUzC/p2fpj?= =?us-ascii?Q?WR4D+7w+jnnc8JXw5T+4V7JGobxQSIw8NbmoKqdhH29MS9LGWwmmzhg70g8O?= =?us-ascii?Q?73Qjo2gUjNGGmX1Sr8A37wN+Vo+Da7iYSxmMN9Nbs4d2Nn4WIZOGmkmZ6Rks?= =?us-ascii?Q?A+QxAdHiTXjeyvhZynHHJiO9G8UCtoNh+ix0pbrCX/XPpwPl39SalQQLVofC?= =?us-ascii?Q?EZ0FaqaAITQ5YYY/91t9U7iLrgnxlvz/p0Csel76TSM4d6CVfxAdiO9sSNsz?= =?us-ascii?Q?zbYflzwn35gJ+1ZBHKH/8K2aKMTVntGLuLskMDb918a0BuOnxEzjv9hyNyEW?= =?us-ascii?Q?bTAeref83iWyK/TNoCcPzG2H+WvNt/VsCRwiavcGIqt04R4ZHXUA4S7YAeOd?= =?us-ascii?Q?aZsPra+zVV/sRi7e1GdvWlG/lkdxrFuQ3WcsrlStcqjU8IdxW87nXKAo8qGA?= =?us-ascii?Q?GlI+GmfeUU3ZhLnfQVvAwNUrdq851bllagrLkvl4GNz5v8W6faS7uqe1mrT1?= =?us-ascii?Q?tFWd8t9Y2Jy+PAvwFfEnob7I0SoN7ZA+vEWcxaxq8lV+3yXJpnJECmSxHls2?= =?us-ascii?Q?xDZMu3/a0wohSjQ9Dx4AODcZZ+p4Wlw6RG9nTuRoT+khDMF55QY7ZIfYjgVw?= =?us-ascii?Q?kfL6/kJQc8XeIo1R95fqbzMC7NBYYEh+6YoHizbgIp6QwUqmiYZmVfBqvbq1?= =?us-ascii?Q?jb5A8MI6cwicmjrah24ZlvNcCKd5AAAA31aYJ5OLtiBb+MHlAphS3BaxeO9P?= =?us-ascii?Q?My44X6qO4QHm5Vskj6njj3C35p5cBhxXso2qjlrqxvx0qo/Pw+PWOFF7wQ5K?= =?us-ascii?Q?1Ln1/Hhs9aIOxyHiu9ctk0ks1Z00tPik7SLmrTZSgIfibL+qF2UIWFYhMRio?= =?us-ascii?Q?jZ8Nb/2lGoj4jNzTocTvPrX1rNhioV3z5b16RfYpeVk6TYR2zFkTezn9mvEc?= =?us-ascii?Q?YqaEqgQm72bv5/8jYQRPGmjAVE8I9yW0oUtRqxsnSijULnKeS4czSEUTkCWq?= =?us-ascii?Q?ZDy6W7ZHWwBi8jfgktHFKAlrFdnXq6iuRYEQXKSJGzZsKax5QwPZa1HCLafK?= =?us-ascii?Q?fk6g2YuvRm/h+kjNIS+gJP7S7eox0f1gNcRMStdnKjv3bklN0yHPZxtZRpt4?= =?us-ascii?Q?sAlpQIzWwta21aaB/xSmHNZ8FnU3QkLyxgojei7V7CXMh0hH+aHFgaHpp4Mb?= =?us-ascii?Q?1Rq0Zrf1FJPrki8zEjpDEGO1YgnfYO68IWKhgK0MNrmdcsDXyK2lKyl6aLnX?= =?us-ascii?Q?/aOhP/BsTLOzfDES2QKeoLaoO6vXkGDp9rWaSIyY3X2LUEstR0BTaFCnoiD/?= =?us-ascii?Q?AHKAXtzhPLE=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)(7416014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HPIWziGMHdMeYCMMEHvR1zznzpNuQllh6j0LQCiFlrWeiROgnofz2cs4dWKN?= =?us-ascii?Q?giVvAA6wYEbkzXNEpc9ieOYiUGDYkMYEcxn3Y87tTEBS/X1nNPLmL0Bn1Byf?= =?us-ascii?Q?WQoomZVK6tgKhF5iF/qcZ4dJLbUMuXE+zATEGWtnP330Z7NBBehC226+5uBB?= =?us-ascii?Q?ezmP6pGCoMJaVouUN9p2SKRaFafJqst2BgZkkA5iAZl02iIYodhwo8KXg0l6?= =?us-ascii?Q?bdSq16p1czZuZLwHAmEqrwMwQslozWvk1Rf6BmNJhxAOPmY/oCmLJ1OBbLUQ?= =?us-ascii?Q?xyD27hK/g4DRVrfdToLigE44U3FCPzhCzA4XAyy4t6D/iPRLNvfM/UXL6U1Q?= =?us-ascii?Q?Y6idBC0waVCR1PD+uf0aADvk1lNQcoV5NAswdaPa+lpf1k7Xm85jBje6UIMa?= =?us-ascii?Q?WEHoEId/vNVZw+ykd67PEjj7Gq8Ow39qrYXi8kF2OV8HRAt6dFPHbadvhCfo?= =?us-ascii?Q?ZSYgIlu9rc18TbljZM/gRUAVvOSHIFvA4+sEB3GVQYrf/7+CWfLICgTI9gFm?= =?us-ascii?Q?YyutEmAnYRdfCl5Awu8GZPgI2BR7BT5cCTav760NV8A5I5FXEdqtmju7f6x+?= =?us-ascii?Q?V51/9p0lwZtw+j6ug5DtUVTyE9ViHT4i6TPSU5Kh8QSNld18KyQTRovgBlZV?= =?us-ascii?Q?7UajGkiwR7Yi3RM4VCq3grcySdZvi7znaZbl8mdvcn8YnNDNnjET5XRZvYEC?= =?us-ascii?Q?JOP937Rc0lsdGMaL81Es2AwyYOc/GHxA8xoH1oR1LbHotoS1u2cqUlE5ZrLg?= =?us-ascii?Q?JSNRwYiSnK84IHM3YW6OGEz3GySaSVAp6DTISHe511vf7H4XxvGgI9hsH0kw?= =?us-ascii?Q?YFJ41b4RS2QQuQN0uk6WhxwycaMfsF8NgtLwjVsc17Gl4tKX/uXEFTvwHaki?= =?us-ascii?Q?vpuR/69Fszb+xOjyMGJ75xcu2FeNg63CuHZsOo2ZXslhHX7wO+ypPmEMkN1V?= =?us-ascii?Q?JailB2/xcj4jjVkRS1fSx6+9y/4UL9/OufgUW+ITLOrHnPmtxWWXa9Jky09T?= =?us-ascii?Q?STfqx7UJg48OCefpBpPp3+hTfkDA0jgqYq3rKPGOxSRrWDQgz/R5BKWyYCeL?= =?us-ascii?Q?5dM/Td3QlN57Aqs8ouMbOXyg9+fZscFsyoUKCMO0rD3kacBzv76VCvDjCf8i?= =?us-ascii?Q?OyBqmCJZSOTJf2In49dPB+6NHkd+Ke5SWt904aLMQvbxq5mIS7Cyn/vT4YVi?= =?us-ascii?Q?9zvB1HLRL5iY779/iT63ghjYx5kkleOJUUkb1MtMgjwnADMKKNUAxKwyNl81?= =?us-ascii?Q?PqltWanEkd6RR8XIsNAra5QUhFV8hdvxhawDz+85LCDRciWYx+gMmzgtzdU4?= =?us-ascii?Q?sVKEwoq9CW3kuHsM5+KA19L+HPcTpbHqvUwWzVRbknxk9Wr5XxCvEb/4yS5L?= =?us-ascii?Q?5/2Gs4iOmRB6/hjlmbpcPNqYenIRzRcjlrxP84P+W5oBzpMSMYGnwzqMvgQe?= =?us-ascii?Q?nybSlDJd0Hc0tGn9yF/Mmxlv9OJfIVYBvAR4TigR9hMvQlKamLEWZYjYazzu?= =?us-ascii?Q?1tSsacmgQ3S3IZfpWorXdSe9HxuuoUYaT3UCh60HOvh+bFWbUEmrHb+ukV+B?= =?us-ascii?Q?JNR5/llZf5LJt3Om0k4ngfFeUDHG2MOj8pn6hQ6M?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad7a58a6-0c50-4efc-ffdf-08dd8dabb217 X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2025 21:11:12.4439 (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: byhiS2kImxSUAWfpP2mVLCPoho2ogMVTKrc9ISBcAIV0wjZe7L2lLtmp+X6xKW/+ X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9236 Content-Type: text/plain; charset="utf-8" During page isolation, the original migratetype is overwritten, since MIGRATE_* are enums and stored in pageblock bitmaps. Change MIGRATE_ISOLATE to be stored a standalone bit, PB_migrate_isolate, like PB_migrate_skip, so that migratetype is not lost during pageblock isolation. pageblock bits needs to be word aligned, so expand the number of pageblock bits from 4 to 8 and make PB_migrate_isolate bit 7. Signed-off-by: Zi Yan Acked-by: Johannes Weiner --- include/linux/mmzone.h | 17 ++++++++++---- include/linux/page-isolation.h | 2 +- include/linux/pageblock-flags.h | 33 +++++++++++++++++++++++++- mm/page_alloc.c | 41 ++++++++++++++++++++++++++++++++- 4 files changed, 86 insertions(+), 7 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index b19a98c20de8..9ec022a0b826 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -106,14 +106,23 @@ static inline bool migratetype_is_mergeable(int mt) =20 extern int page_group_by_mobility_disabled; =20 -#define MIGRATETYPE_MASK ((1UL << PB_migratetype_bits) - 1) +#ifdef CONFIG_MEMORY_ISOLATION +#define MIGRATETYPE_MASK ((BIT(PB_migratetype_bits) - 1) | PB_migrate_isol= ate_bit) +#else +#define MIGRATETYPE_MASK (BIT(PB_migratetype_bits) - 1) +#endif =20 +#ifdef CONFIG_MEMORY_ISOLATION +unsigned long get_pageblock_migratetype(const struct page *page); +#else #define get_pageblock_migratetype(page) \ get_pfnblock_flags_mask(page, page_to_pfn(page), MIGRATETYPE_MASK) =20 -#define folio_migratetype(folio) \ - get_pfnblock_flags_mask(&folio->page, folio_pfn(folio), \ - MIGRATETYPE_MASK) +#endif + +#define folio_migratetype(folio) \ + get_pageblock_migratetype(&folio->page) + 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..51797dc39cbc 100644 --- a/include/linux/page-isolation.h +++ b/include/linux/page-isolation.h @@ -5,7 +5,7 @@ #ifdef CONFIG_MEMORY_ISOLATION static inline bool is_migrate_isolate_page(struct page *page) { - return get_pageblock_migratetype(page) =3D=3D MIGRATE_ISOLATE; + return get_pageblock_isolate(page); } static inline bool is_migrate_isolate(int migratetype) { diff --git a/include/linux/pageblock-flags.h b/include/linux/pageblock-flag= s.h index 0c4963339f0b..9fadae5892b2 100644 --- a/include/linux/pageblock-flags.h +++ b/include/linux/pageblock-flags.h @@ -20,7 +20,10 @@ enum pageblock_bits { PB_migrate_end =3D PB_migrate + PB_migratetype_bits - 1, /* 3 bits required for migrate types */ PB_migrate_skip,/* If set the block is skipped by compaction */ - +#ifdef CONFIG_MEMORY_ISOLATION + PB_migrate_isolate =3D 7, /* If set the block is isolated */ + /* set it to 7 to make pageblock bit word aligned */ +#endif /* * Assume the bits will always align on a word. If this assumption * changes then get/set pageblock needs updating. @@ -28,6 +31,10 @@ enum pageblock_bits { NR_PAGEBLOCK_BITS }; =20 +#ifdef CONFIG_MEMORY_ISOLATION +#define PB_migrate_isolate_bit BIT(PB_migrate_isolate) +#endif + #if defined(CONFIG_PAGE_BLOCK_ORDER) #define PAGE_BLOCK_ORDER CONFIG_PAGE_BLOCK_ORDER #else @@ -105,4 +112,28 @@ static inline void set_pageblock_skip(struct page *pag= e) } #endif /* CONFIG_COMPACTION */ =20 +#ifdef CONFIG_MEMORY_ISOLATION +#define get_pageblock_isolate(page) \ + get_pfnblock_flags_mask(page, page_to_pfn(page), \ + PB_migrate_isolate_bit) +#define clear_pageblock_isolate(page) \ + set_pfnblock_flags_mask(page, 0, page_to_pfn(page), \ + PB_migrate_isolate_bit) +#define set_pageblock_isolate(page) \ + set_pfnblock_flags_mask(page, PB_migrate_isolate_bit, \ + page_to_pfn(page), \ + PB_migrate_isolate_bit) +#else +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 /* CONFIG_MEMORY_ISOLATION */ + #endif /* PAGEBLOCK_FLAGS_H */ diff --git a/mm/page_alloc.c b/mm/page_alloc.c index c77592b22256..acf68ef041d8 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -381,12 +381,40 @@ unsigned long get_pfnblock_flags_mask(const struct pa= ge *page, return (word >> bitidx) & mask; } =20 +#ifdef CONFIG_MEMORY_ISOLATION +unsigned long get_pageblock_migratetype(const struct page *page) +{ + unsigned long flags; + + flags =3D get_pfnblock_flags_mask(page, page_to_pfn(page), + MIGRATETYPE_MASK); + if (flags & PB_migrate_isolate_bit) + return MIGRATE_ISOLATE; + + return flags; +} + +static __always_inline int get_pfnblock_migratetype(const struct page *pag= e, + unsigned long pfn) +{ + unsigned long flags; + + flags =3D get_pfnblock_flags_mask(page, pfn, + MIGRATETYPE_MASK); + if (flags & PB_migrate_isolate_bit) + return MIGRATE_ISOLATE; + + return flags; +} +#else static __always_inline int get_pfnblock_migratetype(const struct page *pag= e, unsigned long pfn) { return get_pfnblock_flags_mask(page, pfn, MIGRATETYPE_MASK); } =20 +#endif + /** * set_pfnblock_flags_mask - Set the requested group of flags for a pagebl= ock_nr_pages block of pages * @page: The page within the block of interest @@ -402,8 +430,14 @@ void set_pfnblock_flags_mask(struct page *page, unsign= ed long flags, unsigned long bitidx, word_bitidx; unsigned long word; =20 +#ifdef CONFIG_MEMORY_ISOLATION + BUILD_BUG_ON(NR_PAGEBLOCK_BITS !=3D 8); + /* extra one for MIGRATE_ISOLATE */ + BUILD_BUG_ON(MIGRATE_TYPES > (1 << PB_migratetype_bits) + 1); +#else BUILD_BUG_ON(NR_PAGEBLOCK_BITS !=3D 4); BUILD_BUG_ON(MIGRATE_TYPES > (1 << PB_migratetype_bits)); +#endif =20 bitmap =3D get_pageblock_bitmap(page, pfn); bitidx =3D pfn_to_bitidx(page, pfn); @@ -426,7 +460,12 @@ void set_pageblock_migratetype(struct page *page, int = migratetype) migratetype < MIGRATE_PCPTYPES)) migratetype =3D MIGRATE_UNMOVABLE; =20 - set_pfnblock_flags_mask(page, (unsigned long)migratetype, +#ifdef CONFIG_MEMORY_ISOLATION + if (migratetype =3D=3D MIGRATE_ISOLATE) + set_pageblock_isolate(page); + else +#endif + set_pfnblock_flags_mask(page, (unsigned long)migratetype, page_to_pfn(page), MIGRATETYPE_MASK); } =20 --=20 2.47.2 From nobody Mon Dec 15 21:43:11 2025 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2072.outbound.protection.outlook.com [40.107.243.72]) (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 C774928FFE5 for ; Wed, 7 May 2025 21:11:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.72 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746652283; cv=fail; b=e/lxduLR0KgIx1+MEM3zHjUXIrQzIT1FDH703U1ttUUqU+8eQAbCbkoedyTJrZqTAbiZ9Qf8iNubIUlQIZFilFcETs+IUEIYXMR6QsOqCrrUShlXesVQ9CNK0OhDrYtmjwNt2L4YO1Q1Lc7YGfUTzfbjed5s+cFUTJlL4Yw8a/w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746652283; c=relaxed/simple; bh=x7cBj8NKCF6JUUECk7d9g6a36pv/OzJ90PTpffSwrEI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=C3ENvfdaFXkVjeiKujXOxBDN08Q5r00fJT31cN2LHZ+1jdNxwqGzWE9OeLLinlHL4iXPij3gYjY16mfcFkrPH4ep8mrLtjObPidA/wKTjtCLvHhoD73uk52ufTqHXdnul7qQq/A2xKdA+A6nbA3SJeoM3bRWE2k1sKExKdpEYhY= 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=bfS2PNIt; arc=fail smtp.client-ip=40.107.243.72 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="bfS2PNIt" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gAUY88Ztu0JCaOqp8bpinJnaMQb04QaSr+Aag07N/TXWAoief4h4vvjWSEYBVNqxPlVWdkENKnsCj5M86v9aZacMREoZ8kYP6f6O/kmqlu+rZnUWx5ar7/jjC8H39J6yrfDkaqgRbKkTq7NbNOta4IWBsK2U5uDBdTGSHM7o5NOHaxli2cjDknSCqcM9g4kvC6JtpHMJdp1Cab+fChCDxutMhBT5j/0i9BPaJf5Mn60ZU/yAmktSab2W8XaFAPUcpn5IwunGezs8Ag+pZ1IdiS2Lu4D7C9cIO9/qHlLzi4T1ZWODd6sB4Ex7b4d+EjjABqRwTw/KOcLdCz6E5NWJqQ== 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=qzF8ufaltHRAQkyS8p1M18gw6jY/H1TjtpborJvdGJE=; b=ebfIP3hPQcDr1dkVBTTejj0NTMTORUfOh/Box05Cf6G8BzTYRNgOoBPg875uT+TAiwBE7sDF/STPUoJNxtgqb+ApRp7eA+gjVK5XfYtBJA/JAhXAI489EecqlpMbBMxSnHffeg6WrVGII1uCzfBXeqA63oqFQ1sro4syKd0TVHMizZ9cV1DPxRSQNXUFvOzyDBFN4cIw3S/y1ODCa+Du26EgaRIPc1GrntlvjAgwSugKJFO5QQMV5H8qiUgGGe0eEeQDe+vF49JBWgg7ZiWUbo3zRpssdmuqcZQkyiHEhFHVu1VuHGXicNzubmP0JyqPPcba+tUHhJPn+Rf6KyxHPA== 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=qzF8ufaltHRAQkyS8p1M18gw6jY/H1TjtpborJvdGJE=; b=bfS2PNItIV02N4KtMM5/JM44we1AcEoE2HEPsg0a+MINadZq91BIzedtu/uFuo/xbgD+qHIl60g27z2pxHWqlkdXXUUEXK8wdBtRHfsBhEZjzafKd2wCfQC7PyVG0m4QX8iufTds6WcJkOzJ2v7d98djBwQa+lq39n8LqViiX4+AdA64O9GfrE2ilw8hhPagb+bn60Ul/5fS8Q0hohPE0ofFhrNSJLN1lt3d4+EcJhfURd03c5rPdGrZ2y4QgqSkJ4xXEB1THr5QpzhAdXzoCqCHK2f0+c9trHVQounzppncacKBAfRMvuyRG3zbGhC0No+cAG1oPJWcYY3JbXTyzw== 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 LV3PR12MB9236.namprd12.prod.outlook.com (2603:10b6:408:1a5::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.26; Wed, 7 May 2025 21:11: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.8722.020; Wed, 7 May 2025 21:11:13 +0000 From: Zi Yan To: David Hildenbrand , Johannes Weiner , linux-mm@kvack.org Cc: Andrew Morton , Oscar Salvador , Vlastimil Babka , Baolin Wang , "Kirill A . Shutemov" , Mel Gorman , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Richard Chang , linux-kernel@vger.kernel.org, Zi Yan Subject: [PATCH v3 2/4] mm/page_isolation: remove migratetype from move_freepages_block_isolate() Date: Wed, 7 May 2025 17:10:57 -0400 Message-ID: <20250507211059.2211628-3-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250507211059.2211628-1-ziy@nvidia.com> References: <20250507211059.2211628-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BL6PEPF00013DFE.NAMP222.PROD.OUTLOOK.COM (2603:10b6:22e:400:0:1001:0: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_|LV3PR12MB9236:EE_ X-MS-Office365-Filtering-Correlation-Id: 8e8ba573-92e9-49ad-3a33-08dd8dabb2f9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?uqJ8F78TJoeWL3KhEf90Y2uYQ/yV+j1tx8SvJIc/bUuDcapm9EGrhy3/BgS3?= =?us-ascii?Q?5baSQtSBcUbrflRYVkU2G5MXNUZXNxiefpDX9rMPLUOnE3j43ENhkJ7EsQSu?= =?us-ascii?Q?WP9lQKBWWjgVzQxdlcjjKuoGmVvaHC+/gCj6AfyzDl/pOhLa5wogxIJpdfvl?= =?us-ascii?Q?wdZpXcEjFDZjupot2kw+bkuqlImqLj47F0j26CLu4lHFXLbfxf0owxMlUY01?= =?us-ascii?Q?353puxc37NO9VhWB27OGktgzG7xxH7SegAa9TDxwRwn8j8ewe/CEqyjaQHVy?= =?us-ascii?Q?N++pTJq9tk6hJnh6Ok2K2F7PiixJi0oWVi6mDTSjCoXpzcqWtWZgXq+L55is?= =?us-ascii?Q?VNWK9Qp20CAe167xfbZANd/QSEPNGJY5YBxPoif0Tul6hzpamXGXGTfcolVQ?= =?us-ascii?Q?LpcxmM63kGco2TvYmsTAAlpBqZoz2XG0cgCtqM/HiEEGlMNUsFwjTGNvyu+r?= =?us-ascii?Q?63DCE9nnnbbNwM2Iqzd9Ou4h1zL7GxVnAr0jRIXI74iTOdtbgZF485wRv5uH?= =?us-ascii?Q?jH/9sfFoATVZoty/u66lmBsUWtI82jb7Evmv3Ff31O7Toj+nuVkbT60Mg2bZ?= =?us-ascii?Q?GNXbw+bRV2xgEffeuzii7M6FUicNiLzTUK86oIVlclLJzVJ1RVUZTPPc7A41?= =?us-ascii?Q?O50IEe8aC6zVpmBx4VS9D58JDC3Z6kswfCLHAmfPpTb2Fhfdf9tQDPtTUJIz?= =?us-ascii?Q?x7/O7AfFv+stFHN4RwVsOlwEJp+TiqICvAgYB+AJfL+I/1SlTsy/HZXiliBB?= =?us-ascii?Q?aG0Udyt9H/NOThYUFJSmUEX/J0f7sZze2rm0749URexxSgj/pOudCCX3kOXT?= =?us-ascii?Q?G5+e8e84mYdEKpuPhiGd+9PZUvzQiqJwHug8oUfq2uU8A6Vp5DQh07JYUarR?= =?us-ascii?Q?7+17w6Bktwzwg/igEDfJ7G123Gagq2IQknwkICyFEMKS7/wv2TDKAvedu7PB?= =?us-ascii?Q?0bjMzsG4pcFHujDvGaTv91bRIXcXEiWt+O8lpw6F6yQPLjVUv89m8Q2/g/sr?= =?us-ascii?Q?lWIgXaLDoNVBtTBphKXV3PB02iDEgGhQ3OuMwtv7tvbfS3KkSiKwTw2YVSdx?= =?us-ascii?Q?qaOKM85n4ScFNHvmUJYe1/JdxCCnJY78lbyQ/HCnJoAsleC1hiNGN0tspJtE?= =?us-ascii?Q?wyCG+Zn39V9Z8b1RKhmlapU+1mx03i7D/A4t0K26KYKy74nN+ypnvH5M9E4z?= =?us-ascii?Q?YSjii24goYi6YfLD0Fgi0I/ajQdsz8XPbbV4wumcllR3Dc+e+DcmZWlskFhI?= =?us-ascii?Q?exTJKKF6XM4qhNdK9Ij/cvJ1K3VN8i/hxyB43F271sToploJxBM04cuowuhZ?= =?us-ascii?Q?QvvtzcpRg7bRAKTD6Pf+3PSvkTW7nvEdjZBZQC7h2sHN6RjdEInQKXufmIGx?= =?us-ascii?Q?d8cN5G6f0NlNxsPvcZxSBoKAs/3sWCZWb8uFWF15PgyF0uKdAEPfCrCLvZ0+?= =?us-ascii?Q?Y8t33SrBP08=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)(7416014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?esoRvZo0PcDucXUg6L+wm8NV9Y+AG8bCqygPyvM5VoncSv6LQpn+jNtYsBUx?= =?us-ascii?Q?UPQzqc63bebmoZkXdFWdB1eqtwemDwdoS2TvRAkfSYUIE2Tmzpsh/NR1louM?= =?us-ascii?Q?JnQ3LDx6fPt2MWdQ6bVUM6ob2oo+pjbcXqgEgB0gRhcTc/XvCz2S87Z5PAHE?= =?us-ascii?Q?AYy/h7D7WutbMf2rUY2CBEHsj5A1xENZkM7XLZD5P6eAhjRDeTd2dytrntWU?= =?us-ascii?Q?qUemgabm7DqucJ0veS01va1dD+CSySsDUvThxehkKi+nE3fjrnaz1fTcQjYg?= =?us-ascii?Q?ftLlJFMjopwcBz4vPTs+YuOhC5AK/WueoJYF4YMLcUmP3jVug0AtbyWakD6D?= =?us-ascii?Q?WeMZ1CVCDaPEpvqabVqs0X0oqskVIvt3Yc0vTF+nXDI+YqgrerZzmo/bcz86?= =?us-ascii?Q?JFs+hr4AmNpiF9FjaZxSOY9coymtWdohqcJi+Vkn+EH3jqn0Rh8KXP0qCQeC?= =?us-ascii?Q?MWnA5iz8Qvq8gPodUAfVA3etTzK6lUwwkhqWn4H9hT+yiU8AfwjBzBA108/P?= =?us-ascii?Q?X18pF8LdHILu0f6WNKbjcOT/05GdF+WctlSMR+rsBbVFvnCF6+v580HxoMl2?= =?us-ascii?Q?pahmh6K/qDCTeV/3Vbcw1g8EYEyPpKLmbPzXtnB8yvQE3PZeXBeVLihml0t6?= =?us-ascii?Q?c/2UKcj7xn6UVYcKkgRVBg9rnZpuMqXbbrxzGzJP6WYnH8cvXrmSLwuXJXWV?= =?us-ascii?Q?7HQwVD8toOHQBDhZiUPr8Aa8GbCfjXTwMleFgjMWImNy1uxuAAau+Mphqrkd?= =?us-ascii?Q?wEqMDbeKA4N5aboF8p1UOJOHx7Fb1GVakG3TApI5LhnaMbOAx+sbG26cnq+V?= =?us-ascii?Q?EyJuYs3Hi5BLGPtBhwvaq6pO8N88lZB5k7pZATV83TsKgl1URAu8KEZoQQVi?= =?us-ascii?Q?LrGVk+NrY4JziIcjpDOR9OoMqDzzvXVZT7MNvXM5nbCKZTZct6C9jo6iC5+/?= =?us-ascii?Q?22MgQ3XNjG+FJtYDbiaGIog72QiZ+xyA71jjOLi/+e0xtX2pzA65mEY4Qjqp?= =?us-ascii?Q?fPZ0E5c8NRYmTTyMshDqRbCdRxVy2s5ucq72q0ju2yrg54CgNBZmFXNv//A6?= =?us-ascii?Q?r65gAWmKu3iXQGIQJrznyRosGXiBfYmh+8MJWk9gMqdndPBaFDnWNCZT0hlc?= =?us-ascii?Q?DK5xh8DzbQKwnv1ZZvSqAtAh8rCpYA0xA3ShSipe1ZgXsDSbZKQDDAW4yaOV?= =?us-ascii?Q?arIcn3n/YN4y+waqKkVqJpIYxx9r+ZKn1KhPS4UCJoWblqieGtzoJgAMh31a?= =?us-ascii?Q?6fqswHVXhPPVA2Kyx7jiwAHv4QXgQt74VQ3JncG8UCDUybBZXfYG+sopSBk+?= =?us-ascii?Q?ijWUTdXpRdkHsdJADylk7C7xYOiSmE0RHuooK/NhWvfy7yHISFQVtauUt+hl?= =?us-ascii?Q?9VC2LbM4EC/I99Jx0ahTtDILpVlZgzRrsKYrBAkhEaa507o2Jf1BSdZ2rg6k?= =?us-ascii?Q?tkJACaxWd4WxR2CWwWkZqaxzCMDl/Ivs5m/V+JvHEGB9dkrMVcJDRJUkMTFf?= =?us-ascii?Q?MZ2xY1rZVlzODkJB9xVp2gnAMPHQSRZu5Gm2F/Ers7DvXQ9gIAyQ0YObZ3YD?= =?us-ascii?Q?c9Kt3p4hjQk35E02wxNtTBvly7n/6UqBiz29qND3?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e8ba573-92e9-49ad-3a33-08dd8dabb2f9 X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2025 21:11:13.9176 (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: IqO9V5rxdjxcWnQ+oeYtzFsVR9VFEmOA5DJG1z0MgQh/dlC3kgV+t26ldqDgKcqm X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9236 Content-Type: text/plain; charset="utf-8" Since migratetype is no longer overwritten during pageblock isolation, moving pageblocks to and from MIGRATE_ISOLATE no longer needs migratetype. Add MIGRATETYPE_NO_ISO_MASK to allow read before-isolation migratetype when a pageblock is isolated. It is used by move_freepages_block_isolate(). Add pageblock_isolate_and_move_free_pages() and pageblock_unisolate_and_move_free_pages() to be explicit about the page isolation operations. Both share the common code in __move_freepages_block_isolate(), which is renamed from move_freepages_block_isolate(). Signed-off-by: Zi Yan --- include/linux/mmzone.h | 4 ++- include/linux/page-isolation.h | 4 +-- mm/page_alloc.c | 49 +++++++++++++++++++++++++++------- mm/page_isolation.c | 21 +++++++-------- 4 files changed, 55 insertions(+), 23 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 9ec022a0b826..b88b98fb8a54 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -107,8 +107,10 @@ static inline bool migratetype_is_mergeable(int mt) extern int page_group_by_mobility_disabled; =20 #ifdef CONFIG_MEMORY_ISOLATION -#define MIGRATETYPE_MASK ((BIT(PB_migratetype_bits) - 1) | PB_migrate_isol= ate_bit) +#define MIGRATETYPE_NO_ISO_MASK (BIT(PB_migratetype_bits) - 1) +#define MIGRATETYPE_MASK (MIGRATETYPE_NO_ISO_MASK | PB_migrate_isolate_bit) #else +#define MIGRATETYPE_NO_ISO_MASK MIGRATETYPE_MASK #define MIGRATETYPE_MASK (BIT(PB_migratetype_bits) - 1) #endif =20 diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h index 51797dc39cbc..28c56f423e34 100644 --- a/include/linux/page-isolation.h +++ b/include/linux/page-isolation.h @@ -27,8 +27,8 @@ static inline bool is_migrate_isolate(int migratetype) =20 void set_pageblock_migratetype(struct page *page, int migratetype); =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 acf68ef041d8..186d69c9f049 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1948,11 +1948,17 @@ static unsigned long find_large_buddy(unsigned long= start_pfn) return start_pfn; } =20 +static inline void toggle_pageblock_isolate(struct page *page, bool isolat= e) +{ + set_pfnblock_flags_mask(page, (isolate << PB_migrate_isolate), + page_to_pfn(page), PB_migrate_isolate_bit); +} + /** - * move_freepages_block_isolate - move free pages in block for page isolat= ion + * __move_freepages_block_isolate - move free pages in block for page isol= ation * @zone: the zone * @page: the pageblock page - * @migratetype: migratetype to set on the pageblock + * @isolate: to isolate the given pageblock or unisolate it * * This is similar to move_freepages_block(), but handles the special * case encountered in page isolation, where the block of interest @@ -1967,10 +1973,15 @@ static unsigned long find_large_buddy(unsigned long= start_pfn) * * Returns %true if pages could be moved, %false otherwise. */ -bool move_freepages_block_isolate(struct zone *zone, struct page *page, - int migratetype) +static bool __move_freepages_block_isolate(struct zone *zone, + struct page *page, bool isolate) { unsigned long start_pfn, pfn; + int from_mt; + int to_mt; + + if (isolate =3D=3D get_pageblock_isolate(page)) + return false; =20 if (!prep_move_freepages_block(zone, page, &start_pfn, NULL, NULL)) return false; @@ -1987,7 +1998,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; } @@ -1998,16 +2009,36 @@ bool move_freepages_block_isolate(struct zone *zone= , struct page *page, =20 del_page_from_free_list(page, zone, order, get_pfnblock_migratetype(page, pfn)); - set_pageblock_migratetype(page, migratetype); + toggle_pageblock_isolate(page, isolate); split_large_buddy(zone, page, pfn, order, FPI_NONE); return true; } move: - __move_freepages_block(zone, start_pfn, - get_pfnblock_migratetype(page, start_pfn), - migratetype); + /* use MIGRATETYPE_NO_ISO_MASK to get the non-isolate migratetype */ + if (isolate) { + from_mt =3D get_pfnblock_flags_mask(page, page_to_pfn(page), + MIGRATETYPE_NO_ISO_MASK); + to_mt =3D MIGRATE_ISOLATE; + } else { + from_mt =3D MIGRATE_ISOLATE; + to_mt =3D get_pfnblock_flags_mask(page, page_to_pfn(page), + MIGRATETYPE_NO_ISO_MASK); + } + + __move_freepages_block(zone, start_pfn, from_mt, to_mt); 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, 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 Mon Dec 15 21:43:11 2025 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2072.outbound.protection.outlook.com [40.107.243.72]) (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 B845729008F for ; Wed, 7 May 2025 21:11:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.72 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746652285; cv=fail; b=pvcxPQbPtRY02GQ0vb736z81LX7GzX9bPow+L7JwMHNavhJHkYBQO/F+V5lA74roQ9KeBE58nSN/WtwecK0Bjpq9b9K+aR2xQMNMffRSpfJ+reMMjhpburPT4Evc811/9BQXZf3MwrLihETyHJLG42F7Dy7EAoRgTi7Y0bOe788= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746652285; c=relaxed/simple; bh=DoZgv6Bqai26VE2+plQKVw+cuOAHrVIM5pkgkeANtko=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=M+HnwetUOac/XfspFgHZeD8hJiuG2YjwG0rWxsUwJUi77R4VZyMFg5zlbIvgHg3rrQuvqvgAQjodeOtUxJ04ysOE+sgi2kACtB4OOdIqZ38Ft7mD6F0KeGP2R3rWx44OSpznGXWi5WOs0VQLIKE76qmtGc0yXGkqZW2jbCGMK0A= 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=fpnuVN3X; arc=fail smtp.client-ip=40.107.243.72 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="fpnuVN3X" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=zNR+OEem4qnhxz/Fr1Y0RXd43OYJL10D3gCmXGBsmk14zchD32lT7fhj4l4Xb7lsf44FglS235i6qOJd64VxGNZN7swG6GVq89pFbMFJShLvfZ7auIh1EEER+sQlVsko7DztrPgu7YQtshybKnS0spixMIJl4f1Ie9WZfVhvCBaHVe/e1jnMesiuoD0umHHptyX8aOCMb5AORkMV2jBev4KatU82vJUpzvJq8/6Zgl9D4fxF9p3AxXyyzBk2Xq0M/SoxtubwvHKgzJb25ebZ5SDacec+eh9u5gKmp5Lr2EdUD3u8b1BsL1/SHYKa0nD3SwVV+hVVQXP9OPc6hunNwg== 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=KwrAHuO0Wr5qgKfaaa+2KGs6Aes3eMCe78w5CYxZd4E=; b=jq4nKKtRTxUG3EbygLBR5zhoGYn09Ch0tSTr49Z+9Z1GbEr1n6tWFhevDOLqFJ9ipiwelaKzTpr7rT+fEKUqAG4aiE+7E7xbkXX5YOnJIP3txaysfkViCdhS+uCvJKEGZ8nBfxFVwzvlWXzU31dowrSM+kHDp5syU9fMumx28VQdBbSU9SVhpEIwKP6teUF9X9ldRqKjtQj2ucv3Qv4Xqd5Y7cIhlVSHOf+UfuXFwI6WcprwagywdMGdGrEZo6Vtp+qVO/xepp6DlxW4n6jklLM9WeyXnZxpwpphA/cfnjBVc6GgvGTLc/rwwTJ5/6xN2x2yKFoetF5eNp9v+sPvUQ== 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=KwrAHuO0Wr5qgKfaaa+2KGs6Aes3eMCe78w5CYxZd4E=; b=fpnuVN3XRP1RrQjJkF1RWi6MSahBYexFTAbLc8o5GlCWSJOCcc9da58xz0m+8EgC+nyo/ETuT3zYW3w2LeHAU+UAdfpZl5GPjMU2/DkD3iFDqWsZ+5x3wnvv3nf+nuy5KtU0spRmXD6Ra62WadsQQJkTFvzWFgLRpt+HQqH5SeZMJJ4bm1lymTIa9Mu1DH3YY/QV8VdtQOTsVdAT0IhfOYQHWK6sWgl6HxCT1lgO9zmX4jlStXaSDrsiYsnFJi8aSbDwEQDBxTvkNyaMRichi20PWpczzijjIb1KOSH/Gy4A9eXlfVI0no9a0vcw3nF/OHOd6bexVYyqcoLc9QIQBg== 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 LV3PR12MB9236.namprd12.prod.outlook.com (2603:10b6:408:1a5::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.26; Wed, 7 May 2025 21:11:15 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a%5]) with mapi id 15.20.8722.020; Wed, 7 May 2025 21:11:15 +0000 From: Zi Yan To: David Hildenbrand , Johannes Weiner , linux-mm@kvack.org Cc: Andrew Morton , Oscar Salvador , Vlastimil Babka , Baolin Wang , "Kirill A . Shutemov" , Mel Gorman , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Richard Chang , linux-kernel@vger.kernel.org, Zi Yan Subject: [PATCH v3 3/4] mm/page_isolation: remove migratetype from undo_isolate_page_range() Date: Wed, 7 May 2025 17:10:58 -0400 Message-ID: <20250507211059.2211628-4-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250507211059.2211628-1-ziy@nvidia.com> References: <20250507211059.2211628-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MN0PR04CA0023.namprd04.prod.outlook.com (2603:10b6:208:52d::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_|LV3PR12MB9236:EE_ X-MS-Office365-Filtering-Correlation-Id: 36221ec0-fac9-4904-3822-08dd8dabb3c3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|366016|1800799024|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?XXJnHFx8OTKk83X5FtKdB6EpwQ2xCn/qf+9iLm1zkq9p+WIvh5o19YzAijnn?= =?us-ascii?Q?ycqoyBCKTJb1B5+gWukNJkmaeyKfcp5j4cRNmCjzolCOz1ebpXpQeMzjMSeB?= =?us-ascii?Q?LmkvIjTx8qXCDEYXbNAyjCZHugEWFBThooWjDzdD+eNCAbxfJt8cBzZptJ0f?= =?us-ascii?Q?FaofgizIvtRX5PPAJBE9UmeqCBDMygR3mPUiqTh+Pvr6+f5P+3yJpB1eem+p?= =?us-ascii?Q?YsVMbLIrmw77OUv1rfGg+cTzQ6IlfNIltywFF1gIAMHxLgaNtOfLpWaX3OqO?= =?us-ascii?Q?mmtCla3lhrb7EJLP+i+cRgNuirRQCQhrK7GRtFILawDx2DeANReaO0PX+DtT?= =?us-ascii?Q?vyzkaY7ftEWHJpKTEf921MSC5mWMbJmldlwvYPImIDlu58+NLlL7IyNFUmid?= =?us-ascii?Q?5+kVWWZyoGRfGk4LUj1LyVUJH2ziDINaE28QWnCuZajFJtJG3WcoTZXVxUCV?= =?us-ascii?Q?iYHgB3hXDsCgenr5b3kViUuLyK4aWCp2rCQnyQKRvdgY/CTxvad6meVox+2V?= =?us-ascii?Q?bfZK0Dygw0SA2/yTeQfVIE6RRHSluuGKz2navluaT2eH/HU+xdRadmt5V/qp?= =?us-ascii?Q?akURcUDurcSzzMLLMtnkZrsJCp1BwVTTWxK03Z6bnjvkkfWbqYzYj2vY3Wly?= =?us-ascii?Q?9wYP4k2liTlnNPbcSCpe2kyVLmnCxyz3nqz3T27Smx9qEWN7yjJFJ0BI6Qi0?= =?us-ascii?Q?wY/m1EfCvMLkfpd/flfHpgFeA3byQ4tMTZxEB94dkWzL574fCcN4tg09CAnZ?= =?us-ascii?Q?x4CToWVcVIT+RmzwHkTLUNkBXydQRrPlT4xc94C48FHfW2u1FNvbX25wr13/?= =?us-ascii?Q?oYsdep7AJ4gxurRwEvTnNSeG9HY5/ixrGV7AuDg6VRK978qgr2h2DYtw1IUf?= =?us-ascii?Q?aWpCcQVfnSf8GJ8dLHKEiA0W50wcSAXKBO5zCYbk+JvwVF/EQxbh32oTAJLX?= =?us-ascii?Q?NiLeKi/8zPQwddnoJCcP3CXyW04s5q/1WlKdlQv2PAkW37J0c55hXWutRKqh?= =?us-ascii?Q?h6sXv3u5ZdZ+XUy7mT5i9ZctDRVVdfs0YzsotXBZm0XOFCsjcSaIhPXRcsAX?= =?us-ascii?Q?zSil2KdSBcnL8qbHWiWPZ/pQZO11BObD4xy5IoTgXSrt3BmOlGFdWnZCHzPt?= =?us-ascii?Q?UfCVlwUGoHcFNzRq2+itabRx2YVhMC8Qwh182S1ruJ+fZdPMq3mi3ZoDB/Df?= =?us-ascii?Q?PL2SxTA3QtpSeYUeTFrBIKz2fcpQ3QzLdfpPviWU8pA7hjzAQtgt2auZXl/n?= =?us-ascii?Q?sSwVFFvhdl8JirQVrKFvn55Co14PJ66OV+hxr7zxWt3I8Aoo51d9JAAfu9xo?= =?us-ascii?Q?Bg16B1PbRd6VVRCt407556ONRH2RGMPWskFTJ3pC+pEIUIowjXFKVMNm5jM2?= =?us-ascii?Q?/VT16pjl1XEaN1dZh9YRQTOb3goHyuNW52ysLztVA4WULTcZhmFDwbN7eb1g?= =?us-ascii?Q?EFNZowUwAro=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)(7416014)(376014)(366016)(1800799024)(7053199007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pZgx8+LN4YzpO2ThlXkZGjIYUqW7aw33EA7Gyn87MNyAa2liopTQUS7j2QtA?= =?us-ascii?Q?lmtcVoYlNgfAYwwv9HpfZlbf9QeQpIj3eU4ZqVOZFiiL2Bb7Vrm/9rHinJ7G?= =?us-ascii?Q?UQNCwKtp0JZvNFlOa463rUeb6rblh2Yt9YPMr18RDuULBDNSwrjpEmL4mMoT?= =?us-ascii?Q?ICjWVXmLi4jTKILDy3rg7aXgBcJcEa0kFj+dNUxuHxdiMxGkkf6PnO3hvhA1?= =?us-ascii?Q?GeXMUvqRa7g3xIaNBBL39g0LoWtfMk2PC5entNAf3t8G86zAV7fTLLWd/dHy?= =?us-ascii?Q?O0B6ueO4/JmDx96hXq7UUDrnjBVompIBU7oWeEhnUBz2gGwecLrSPSdOUJJK?= =?us-ascii?Q?rmRVZhTbmfHlF8Ylpa7o0wWMh1osMCt3x1BeCr8Bf9VmOFd83pa5bGqg9Qgl?= =?us-ascii?Q?lFJDJHykj7zzL7O1ySfwGt77h/xLD5q3S83dznEeuAY47jBO3ZYGpF04WWyu?= =?us-ascii?Q?zJZgo22TVVP/UK+SmzctHXxlDIaIudIgU3Eo6tgB+7DwpthJ4bjq40yaBw60?= =?us-ascii?Q?mC6bSMKKig0u1z707a8Dey2cBCs6jHofPKwv6WvmhDGMwETuWtgDcNsrPAfY?= =?us-ascii?Q?JDs1JUZmDm/DTp+RPlWEDrNtS/lEUuu7xptiWpYKgEwXYrrHQDE10rQ8CjKr?= =?us-ascii?Q?VOoYutKn3DFcISqSur2orR0Kg09RxGwaV/+pOd8soMv1U4UgvB8JuWKWsinJ?= =?us-ascii?Q?OXDCEHyQQ9JroodqKGC4VZ6I2BHQ95uN+Y9opAAuulApAZwrMNxaP5X32JiC?= =?us-ascii?Q?Qp0evLZoks6kWfvW6vQpn605EtQ1jtsOkVO82hiAUyQDvY2aXF7Bb409UxbL?= =?us-ascii?Q?1htFgwKwjq3o5OBoGX9u922GpaK8vrA6+rAK+amhIXmn/C1gCRLzzL3leUSk?= =?us-ascii?Q?PUnY/bkMrKGxM4zfvyv+kZ9P0Npu5Kzj8FNkmLiUWGu6ndy1Fv8Eim8XOVW9?= =?us-ascii?Q?8AkvNY9NLvdkfkyFOS3J5tl9qY835XiHTUNRrGiQypoNeBxxU1DqvMgDncmP?= =?us-ascii?Q?sEM78ABKdIDfA8flDb5TLvFxgBaxWOL5Mz3tNTIs6s6gqatbKNDBU3b9JP4K?= =?us-ascii?Q?NDNeCam7JCwfZ258jYlJTl7nciFZ4UfZJNuKqc7uFZM8OCZmvkbb9ZK90g2k?= =?us-ascii?Q?1pzyr0yX9sVSCOqtiD2dssal1MKjPY1vjHHp8a2C5uxkCUnI1nBmS4pFKQKP?= =?us-ascii?Q?038fNf2YtZhu+T2gF/y8078wZKPbtmI0Bb5HrfYQL3RqU58+gLC4OiLU2D4r?= =?us-ascii?Q?G/6KjCsVrPHODBo9dVwfBG1QRRVmO3pVYg5T5Lu82Hyer93BxrhO5EYFbkEB?= =?us-ascii?Q?Xs66y6PSW88k0Y71PnyyX98nbesGt5UdqcQ8Ry8MXsjwFhB1rxGVV6reFVUZ?= =?us-ascii?Q?0wYI1mMPqjYAnji/G9CUmJPctGYvygwPV+/KSXNqGZ7ZifLq7C4jLRH3n+zd?= =?us-ascii?Q?hAZXAxMWgzUJC6xs1E9wXd5cnDiXHOTucQnbybjryXpSS2APCXAx6KMyQks4?= =?us-ascii?Q?w9Heg/Mx2S6FCtK3JOnd4qkiU7/ue9rTRFy4SN8uTdvKJ/VFEL9x5IEsGVkK?= =?us-ascii?Q?vra8UzPTWxgg1qtAZJ1IYsTYxWRZoyXlTBiznZVR?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 36221ec0-fac9-4904-3822-08dd8dabb3c3 X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2025 21:11:15.2542 (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: +TvhFSCvUs/SFLTCpWTSQMOZiOdylRhRhD7L2r9vkqJPy/36qwCUHhXHMis4xgis X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9236 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 Acked-by: Johannes Weiner --- 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 28c56f423e34..b8b44d3aacd4 100644 --- a/include/linux/page-isolation.h +++ b/include/linux/page-isolation.h @@ -33,8 +33,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 b1caedbade5b..673d41a06da8 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1229,7 +1229,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 @@ -2115,7 +2115,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 186d69c9f049..b905ed13c908 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6888,7 +6888,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 Mon Dec 15 21:43:11 2025 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2072.outbound.protection.outlook.com [40.107.243.72]) (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 9AC402900B0 for ; Wed, 7 May 2025 21:11:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.72 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746652287; cv=fail; b=RjfZKnA7IbHyeFU9sd9U3lqY3ZK71aDjOMYDc3AtjELRYV7gUt5Hz4JE+3dVIveBTLW970FzNDQc/WCrQMTBio59vfPQ4O8V7OTTSuA0dxEhMK1SkD+cSUkR58nGQnYuBBoQCnUZSznBLZ4f0gH7wr2YX0YGwESSK+LSdiv4kFg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746652287; c=relaxed/simple; bh=YX2ilG7b5+ccimaE0oqE4d6VXV6BBFdn5+InT/cqpLk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=cbDtazoajM4o54pj3xRficLGANrPXnk5OvekG5bhKrMfDSnPK5h3QUxmfWnhngAeVUoyGijMj3rg80ozFFBBlJiF9ilnuQh0i3EPn25q7BQtyol0I2IJov2Yshu48HVGPneolDxxQYpj93GFUgc7iheIvbLRemIbsudMB+H41fI= 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=RimGh36Z; arc=fail smtp.client-ip=40.107.243.72 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="RimGh36Z" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=o7Z3jVKBUfbgVQ5Lk6RLPfUXZ+t2rjLFrbeDRsTd27dH8+ERc1jgqhAPTWkyK+y9isbQCbRwmxqW6lR1c729bFB3kXgocWsa1tIN1+laDu4VpPFQQQWIGWsoC5tBDYEBQIWIZe/7VfJaL8wzyvK1Mxafu17dgtvpnuoMTY2SlT0GImWQhc8NLwwT2bgRjUV4A0gGJpDDeCLbmORVLzPcJxllEao+badwmcKUJbt974LJ0p5KqntynqJPIq0Pt1Pt4zdgTwL9EnITGxTBbU5Vq4oJkA4PrDGVyj7G3JumAfGbiJMNRjXe6x195UImAB2kdZBq/OTp06tZG5lWttbcYw== 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=lbtlnInJIQC7BY1Q9h0WU6XySLUIe+P7UaiMHycPBbQ=; b=XrUF1GgoDphkuVTpmOy9BQ+vEqVZpMMyX/je1pNK6J3bC3sbStslaXI04VLGdIlh2OXir371oV2+zq0r87Ov2rzBIMwH1v+e89lDf12wmC0pqUyiWyAQ7jD2R/AAfmSq+zbhkdZJ0VCXZPAeKNr3DUMELhf8yhtbML1GvSBJK6BmqyO52LZ40q5A6em3jMT34zywb5Q6SkdST8opF97MHTSsOAfxw+pDWDBxqQt0tPpy9ncdcWFqptVPodqKsaZuH6PWawmNWCEJVJDPQ9cH9Xk3BUazb301MCCeC857BLsqw0X+UYrEz31j85b+WYLMCRY/JXrnlyJI6/L7eyK+Rw== 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=lbtlnInJIQC7BY1Q9h0WU6XySLUIe+P7UaiMHycPBbQ=; b=RimGh36ZBIv2SyJEwdMbOag046Anavj58TM87yX2rdCWSlTakXeCBKNA7vwKHlTuZ5b3iY+k6qh8xLzJe/U2YrIVIY0K7zHyxXRr3eEzS+iia8RDXOVREjdu/GPMrwH8a9K+SqO5ZhMw5cMF+2sXoP8QdJPiXi+H3fwAztkc4BOTQg7L7oBWanNmR5XxKWfa3MK9HcVXOmv6s8CTCTjtOJovtG5nGLPgYz4VHA1CvVQSrrFHpJ9J3HMz9ExlX/w/YABMNMF2jXvanB8vhOEl/Y4Y6L0dlRraCfg9ASjMJXQqTzTeGBQubkftSnvQsxFrRNSxaqtBBueoduGf/ekjUg== 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 LV3PR12MB9236.namprd12.prod.outlook.com (2603:10b6:408:1a5::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.26; Wed, 7 May 2025 21:11:16 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a%5]) with mapi id 15.20.8722.020; Wed, 7 May 2025 21:11:16 +0000 From: Zi Yan To: David Hildenbrand , Johannes Weiner , linux-mm@kvack.org Cc: Andrew Morton , Oscar Salvador , Vlastimil Babka , Baolin Wang , "Kirill A . Shutemov" , Mel Gorman , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Richard Chang , linux-kernel@vger.kernel.org, Zi Yan Subject: [PATCH v3 4/4] mm/page_isolation: remove migratetype parameter from more functions. Date: Wed, 7 May 2025 17:10:59 -0400 Message-ID: <20250507211059.2211628-5-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250507211059.2211628-1-ziy@nvidia.com> References: <20250507211059.2211628-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MN2PR16CA0059.namprd16.prod.outlook.com (2603:10b6:208:234::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_|LV3PR12MB9236:EE_ X-MS-Office365-Filtering-Correlation-Id: 37d23303-a59f-4b00-7ac9-08dd8dabb476 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?z3P5rtxIKhLFkmMJoqZY5GppStor2VzlSsmZYNjDjbfNgEvvkXRF9u3ajU56?= =?us-ascii?Q?1MPr+cAuFXdowPwlmjNuazJFZXGf8GRYgUwjWgUkXsryPopG8NGXNWpvbYNE?= =?us-ascii?Q?oy6VfTKzytvpzuRr2ZSSAxNcl11WWNyk7GEDY2NeLplXCyW52vWAfqgV/9hq?= =?us-ascii?Q?xJ0n+I1fn4ScmsJcN2kkXZ2V7qDEGjqjeSpzEhT37u0vIEg7If+ymNDSFqYv?= =?us-ascii?Q?5vEVu3Ph0neTQQp3mmN70Ka4WTNQiEXYrjjjDh7qBTjGAGqqbBxcQyQ7BKqV?= =?us-ascii?Q?IOhoeQ1VmuWyViix+rs7ufxLZmmLqkFbRh4k6p4xr8ee98FQbqH4d2Tu49Yc?= =?us-ascii?Q?r59CUBLWeYGxUK7zFIbpi2d9ZRB9EBV4YJCwtNDGphRFHNlQ7fNngKg+MfBG?= =?us-ascii?Q?vKtZavrHEaOSCvgSZuyBerZ6sUpGdBlJEaK6KJTiWBTNq/D3iolseQQx49D2?= =?us-ascii?Q?wpIA+f+Bcm7btsg2xvYbfnG1gX3VCGkfBD2Xz3zM3h6HRAunicIcDI5YCIry?= =?us-ascii?Q?s9pZMtN5e/ftQQl3meVDHoxbce0bimexfT0GzeL+zuYjq79d0sKbP2wqbsaL?= =?us-ascii?Q?MJ9I2NlbALvZ7YgnQn/R7/ppa1eAizLsaRgwfxgvNGQz8wUin4gqnZV59Pts?= =?us-ascii?Q?BafcK904C1+mNRqyCpWw61irbnjpHwDFwLTrWgL+3Mxh+E1gX7wF+KLmSGto?= =?us-ascii?Q?xvNmzQDMwZhohRlazBXyEDTv774zxpRmH7UAFK32ZE1zYLcxYzqFWdk/oCv4?= =?us-ascii?Q?zHJw30Gzg+4mjwrY2G6q6b1QvmFkmBHTGNBeXenTQpa6e5luP7/7IEp/M9fa?= =?us-ascii?Q?848GnPnSZraNBahkMo3Ivyb+UV6+UkxONknmpxZtRRRD1ckN0V1mD+lw5n/G?= =?us-ascii?Q?zg5hDxyPvyc4Fty2gPECMu5NU2zNdmsBCCGfsOYSUQ1LBHPu1hCSegZBHnJ6?= =?us-ascii?Q?NBMifCZ90a37aupwM7wmNALy+L7u3rRpmeUjgNi0EhANo8yLnrwXwXSM4Pdy?= =?us-ascii?Q?tuP+2yU2H+yiaZjZsvOyQGdl5UA7D1F72CGVhkFifyy66p2NWnu4PUMkRBBI?= =?us-ascii?Q?a3cOmINx4QPeN99+KUvJR3duBYmDW9FalJL8wQJANplnfkglQtOpDrumCqhA?= =?us-ascii?Q?lTepYhaea7XFAOSKRJqG++CfhI95ueN+5uIGT06PP+RcO/v9j2mHASa+mFM6?= =?us-ascii?Q?SlxfNUfMevBRBafdempxCsHf/0CeRHxxmckw2QXqBkGPfeo1TlGXrpL/aGw/?= =?us-ascii?Q?WS+uS4t/kLl+NaFAvkxsZWpbbWLkk2iuwNOugCayssVIIwkg35Q5ejylNpGg?= =?us-ascii?Q?5bAaDfKjRcUHCl7zn1T+PCjvwwVYw/irp1jbhWz0CAWh94+HVlOiw2TtSG/U?= =?us-ascii?Q?DTRw+uFQ9Efabg/Qo7fA0dXFLs/lCTQ1QmxH9IpBUxWhHLbUIHXcbRotwF9m?= =?us-ascii?Q?tEIGsi2eCag=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)(7416014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RKRxpUnITVvbU88trhHXXslUwbVxc7V6Frgmo830W5BG64I9vYnloevCyZtK?= =?us-ascii?Q?YTbJ4R9PvSr5P5wUhFxW6Wpj6AuAVl6LInfcRW0cJqG6/GYIMTRYTRfRTpp3?= =?us-ascii?Q?lDyyCKoRPsSt5ahnrNgXeICsHDtNnw6kE2fiu79XfyTgFcXdWzBo6ZovmX61?= =?us-ascii?Q?ZUURNsH/RKrdE0PGlRqfCeRj/NjXw3KHGiAJEgmzGXRrBEBSkK0e4ny04L1C?= =?us-ascii?Q?BaY7kUO21/o6j3zLJoUyzR7Y2fHQk0DPEitovy5oUCmhXa0MhdoNoKf8Wc9g?= =?us-ascii?Q?FtKrcxa1XxEc8XHuq4gL0HZf3Ab88viFO0MD37gh2+kw4bAqEZBCnjUvIp6c?= =?us-ascii?Q?vdn0M1n0QAp6HwTQJwZUExlFuj5pC11v0sxU6TfPFAgzID+El2mn2syDSIRC?= =?us-ascii?Q?hSlsrDxBQlHGAmb+57qgx2K8Pw1ngtQ0ItEFxlRUKJH8u3QvYpuQAj2q54NP?= =?us-ascii?Q?k+eS7l/UrHAuEeznLp5rMoGej98X6wQXLPRMrMlFf1LT5GmZuqhHuj+7wDOf?= =?us-ascii?Q?s0E5sVBk41tviY/uvnIByZgNmNqubsxaCwF0qrm6YKacaTljOKjlCL3PNp8I?= =?us-ascii?Q?FIROp+MRUCSwvto5B+vzBSoTeie0TcTqIBXjRHkiaPJxI1Ivo6D/30RcDgux?= =?us-ascii?Q?hfyBJ3troBx+cKvxA5PN6TryXwVBO+nZ2y7df9ub4bFMq6m806MkxGZ7apZK?= =?us-ascii?Q?HbAVvHTiEHMNzOPyyC9vtlZTW3zakLwAGLt36D4VwSW0qZRBDMZk7rAwTZpq?= =?us-ascii?Q?yM2fH/SZI30QLF8fBr7ep1SqjJ+6Z1wCCaEueW5IiFvF8nP20FAjMGn/6ekg?= =?us-ascii?Q?XDBSfPFS1OFyUJbp+kCFjIhD5Dyh1TiY1F1Zm0pVMErDqBjqL1k2dmmUwSQH?= =?us-ascii?Q?Scd3Yc2FfQJcw8HUCqZVsU5F/1TRuxYAd6x+5QYMggjN3Qt6xby5/9V5UIck?= =?us-ascii?Q?9OaeDkvMKdk5L6IAGZ3FX106uh1Tozo+z4OF4aY39MLgQvwb1moxgr1uAS0g?= =?us-ascii?Q?Ae+heT7DQM43iLL3HJzQSihT7qtoydHwckPoB9ReZEZe3IEv9JZDbOZQy2hl?= =?us-ascii?Q?qmx967ULyj+RQXtb4zbj0hitfcTIknzEiFzeDYAQJX9VE4p3VO1C0kcLLCWT?= =?us-ascii?Q?qWEzhOGfQJ9qQmVGz+mNMkXwLRiwqgToo1mRbG+PUzNHFpNxnejWiGEQ9ELv?= =?us-ascii?Q?rEWU15aljVozBvVMuZoFFuFmp/VuHJabOlmHFtICNbyWQ/jBZIVt2Z0ju1z0?= =?us-ascii?Q?kZ+yGY0b9Nu0PNgOdB26WEKgaqvy3xOyavhEZAyWeXlnP1ff0cMzO8gKZJkC?= =?us-ascii?Q?td+Nb+wintOfhRlPQsF6pGCMR+yDVpoWQiFasoVCHApcYy21Rl6ezd81Oa1Z?= =?us-ascii?Q?yI2wtyfo0Av3bflOq+86E+60p9ZnWki0Hc5L0kkhlOKzCnm8b9iTDmgFEKQB?= =?us-ascii?Q?iKe7BM/gA7N3Oc65kRZeWLM2XRuRBziV9PflgR8hpu4/IeoSGv145EDD4xiz?= =?us-ascii?Q?RO7N4b2JpVqIVuqhnSnVY/oa7MylNXHLGVsw4kCj1ANgGaMpWoBKsU5TKiFB?= =?us-ascii?Q?yPgNcldF4PjcvM/lDhnzxZigvBGv+UkrBx6udoPW?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 37d23303-a59f-4b00-7ac9-08dd8dabb476 X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2025 21:11:16.4799 (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: VkrhcGhlkEAIuZnHGVvjMEcDDhYKM5zuVmpqb6Fy7uoCqMrji/Np1r/2CRjXc/GZ X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9236 Content-Type: text/plain; charset="utf-8" migratetype is no longer overwritten during pageblock isolation, start_isolate_page_range(), has_unmovable_pages(), and set_migratetype_isolate() no longer need which migratetype to restore during isolation failure. For has_unmoable_pages(), it needs to know if the isolation is for CMA allocation, so adding CMA_ALLOCATION to isolation flags to provide the information. alloc_contig_range() no longer needs migratetype. Replace it with a newly defined acr_flags_t to tell if an allocation is for CMA. So does __alloc_contig_migrate_range(). Signed-off-by: Zi Yan --- drivers/virtio/virtio_mem.c | 3 +-- include/linux/gfp.h | 6 +++++- include/linux/page-isolation.h | 15 +++++++++++--- include/trace/events/kmem.h | 14 +++++++------ mm/cma.c | 2 +- mm/memory_hotplug.c | 1 - mm/page_alloc.c | 22 ++++++++++----------- mm/page_isolation.c | 36 ++++++++++++---------------------- 8 files changed, 50 insertions(+), 49 deletions(-) diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c index 56d0dbe62163..8accc0f255a8 100644 --- a/drivers/virtio/virtio_mem.c +++ b/drivers/virtio/virtio_mem.c @@ -1243,8 +1243,7 @@ static int virtio_mem_fake_offline(struct virtio_mem = *vm, unsigned long pfn, if (atomic_read(&vm->config_changed)) return -EAGAIN; =20 - rc =3D alloc_contig_range(pfn, pfn + nr_pages, MIGRATE_MOVABLE, - GFP_KERNEL); + rc =3D alloc_contig_range(pfn, pfn + nr_pages, 0, GFP_KERNEL); if (rc =3D=3D -ENOMEM) /* whoops, out of memory */ return rc; diff --git a/include/linux/gfp.h b/include/linux/gfp.h index c9fa6309c903..db4be1861736 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -423,9 +423,13 @@ static inline bool gfp_compaction_allowed(gfp_t gfp_ma= sk) extern gfp_t vma_thp_gfp_mask(struct vm_area_struct *vma); =20 #ifdef CONFIG_CONTIG_ALLOC + +typedef unsigned int __bitwise acr_flags_t; +#define ACR_CMA ((__force acr_flags_t)BIT(0)) // allocate for CMA + /* The below functions must be run on a range from a single zone. */ extern int alloc_contig_range_noprof(unsigned long start, unsigned long en= d, - unsigned migratetype, gfp_t gfp_mask); + acr_flags_t alloc_flags, gfp_t gfp_mask); #define alloc_contig_range(...) alloc_hooks(alloc_contig_range_noprof(__= VA_ARGS__)) =20 extern struct page *alloc_contig_pages_noprof(unsigned long nr_pages, gfp_= t gfp_mask, diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h index b8b44d3aacd4..709a807202e9 100644 --- a/include/linux/page-isolation.h +++ b/include/linux/page-isolation.h @@ -22,8 +22,17 @@ static inline bool is_migrate_isolate(int migratetype) } #endif =20 -#define MEMORY_OFFLINE 0x1 -#define REPORT_FAILURE 0x2 +/* + * Isolation flags: + * 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 + * CMA_ALLOCATION - isolate for CMA allocations + */ +typedef unsigned int __bitwise isol_flags_t; +#define MEMORY_OFFLINE ((__force isol_flags_t)BIT(0)) +#define REPORT_FAILURE ((__force isol_flags_t)BIT(1)) +#define CMA_ALLOCATION ((__force isol_flags_t)BIT(2)) =20 void set_pageblock_migratetype(struct page *page, int migratetype); =20 @@ -31,7 +40,7 @@ bool pageblock_isolate_and_move_free_pages(struct zone *z= one, 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); + isol_flags_t flags); =20 void undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pf= n); =20 diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h index f74925a6cf69..efffcf578217 100644 --- a/include/trace/events/kmem.h +++ b/include/trace/events/kmem.h @@ -304,6 +304,7 @@ TRACE_EVENT(mm_page_alloc_extfrag, __entry->change_ownership) ); =20 +#ifdef CONFIG_CONTIG_ALLOC TRACE_EVENT(mm_alloc_contig_migrate_range_info, =20 TP_PROTO(unsigned long start, @@ -311,9 +312,9 @@ TRACE_EVENT(mm_alloc_contig_migrate_range_info, unsigned long nr_migrated, unsigned long nr_reclaimed, unsigned long nr_mapped, - int migratetype), + acr_flags_t alloc_flags), =20 - TP_ARGS(start, end, nr_migrated, nr_reclaimed, nr_mapped, migratetype), + TP_ARGS(start, end, nr_migrated, nr_reclaimed, nr_mapped, alloc_flags), =20 TP_STRUCT__entry( __field(unsigned long, start) @@ -321,7 +322,7 @@ TRACE_EVENT(mm_alloc_contig_migrate_range_info, __field(unsigned long, nr_migrated) __field(unsigned long, nr_reclaimed) __field(unsigned long, nr_mapped) - __field(int, migratetype) + __field(acr_flags_t, alloc_flags) ), =20 TP_fast_assign( @@ -330,17 +331,18 @@ TRACE_EVENT(mm_alloc_contig_migrate_range_info, __entry->nr_migrated =3D nr_migrated; __entry->nr_reclaimed =3D nr_reclaimed; __entry->nr_mapped =3D nr_mapped; - __entry->migratetype =3D migratetype; + __entry->alloc_flags =3D alloc_flags; ), =20 - TP_printk("start=3D0x%lx end=3D0x%lx migratetype=3D%d nr_migrated=3D%lu n= r_reclaimed=3D%lu nr_mapped=3D%lu", + TP_printk("start=3D0x%lx end=3D0x%lx alloc_flags=3D%d nr_migrated=3D%lu n= r_reclaimed=3D%lu nr_mapped=3D%lu", __entry->start, __entry->end, - __entry->migratetype, + __entry->alloc_flags, __entry->nr_migrated, __entry->nr_reclaimed, __entry->nr_mapped) ); +#endif =20 TRACE_EVENT(mm_setup_per_zone_wmarks, =20 diff --git a/mm/cma.c b/mm/cma.c index 15632939f20a..8606bfe19e5d 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -818,7 +818,7 @@ static int cma_range_alloc(struct cma *cma, struct cma_= memrange *cmr, =20 pfn =3D cmr->base_pfn + (bitmap_no << cma->order_per_bit); mutex_lock(&cma->alloc_mutex); - ret =3D alloc_contig_range(pfn, pfn + count, MIGRATE_CMA, gfp); + ret =3D alloc_contig_range(pfn, pfn + count, ACR_CMA, gfp); mutex_unlock(&cma->alloc_mutex); if (ret =3D=3D 0) { page =3D pfn_to_page(pfn); diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 673d41a06da8..155f0b4ff299 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -2005,7 +2005,6 @@ 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); if (ret) { reason =3D "failure to isolate range"; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index b905ed13c908..f2c148a3675a 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6581,11 +6581,12 @@ static void alloc_contig_dump_pages(struct list_hea= d *page_list) =20 /* * [start, end) must belong to a single zone. - * @migratetype: using migratetype to filter the type of migration in + * @alloc_flags: using acr_flags_t to filter the type of migration in * trace_mm_alloc_contig_migrate_range_info. */ static int __alloc_contig_migrate_range(struct compact_control *cc, - unsigned long start, unsigned long end, int migratetype) + unsigned long start, unsigned long end, + acr_flags_t alloc_flags) { /* This function is based on compact_zone() from compaction.c. */ unsigned int nr_reclaimed; @@ -6657,7 +6658,7 @@ static int __alloc_contig_migrate_range(struct compac= t_control *cc, putback_movable_pages(&cc->migratepages); } =20 - trace_mm_alloc_contig_migrate_range_info(start, end, migratetype, + trace_mm_alloc_contig_migrate_range_info(start, end, alloc_flags, total_migrated, total_reclaimed, total_mapped); @@ -6728,10 +6729,7 @@ static int __alloc_contig_verify_gfp_mask(gfp_t gfp_= mask, gfp_t *gfp_cc_mask) * alloc_contig_range() -- tries to allocate given range of pages * @start: start PFN to allocate * @end: one-past-the-last PFN to allocate - * @migratetype: migratetype of the underlying pageblocks (either - * #MIGRATE_MOVABLE or #MIGRATE_CMA). All pageblocks - * in range must have the same migratetype and it must - * be either of the two. + * @alloc_flags: allocation information * @gfp_mask: GFP mask. Node/zone/placement hints are ignored; only some * action and reclaim modifiers are supported. Reclaim modifiers * control allocation behavior during compaction/migration/reclaim. @@ -6748,7 +6746,7 @@ static int __alloc_contig_verify_gfp_mask(gfp_t gfp_m= ask, gfp_t *gfp_cc_mask) * need to be freed with free_contig_range(). */ int alloc_contig_range_noprof(unsigned long start, unsigned long end, - unsigned migratetype, gfp_t gfp_mask) + acr_flags_t alloc_flags, gfp_t gfp_mask) { unsigned long outer_start, outer_end; int ret =3D 0; @@ -6790,7 +6788,8 @@ 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, + (alloc_flags & ACR_CMA) ? CMA_ALLOCATION : 0); if (ret) goto done; =20 @@ -6806,7 +6805,7 @@ int alloc_contig_range_noprof(unsigned long start, un= signed long end, * allocated. So, if we fall through be sure to clear ret so that * -EBUSY is not accidentally used or returned to caller. */ - ret =3D __alloc_contig_migrate_range(&cc, start, end, migratetype); + ret =3D __alloc_contig_migrate_range(&cc, start, end, alloc_flags); if (ret && ret !=3D -EBUSY) goto done; =20 @@ -6898,8 +6897,7 @@ static int __alloc_contig_pages(unsigned long start_p= fn, { unsigned long end_pfn =3D start_pfn + nr_pages; =20 - return alloc_contig_range_noprof(start_pfn, end_pfn, MIGRATE_MOVABLE, - gfp_mask); + return alloc_contig_range_noprof(start_pfn, end_pfn, 0, gfp_mask); } =20 static bool pfn_range_valid_contig(struct zone *z, unsigned long start_pfn, diff --git a/mm/page_isolation.c b/mm/page_isolation.c index 1edfef408faf..d1ec98fab6a4 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) + isol_flags_t flags) { 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 (flags & CMA_ALLOCATION) return NULL; =20 return 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, isol_flags_t isol_fl= ags, 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); + isol_flags); if (!unmovable) { if (!pageblock_isolate_and_move_free_pages(zone, page)) { spin_unlock_irqrestore(&zone->lock, flags); @@ -296,7 +296,6 @@ __first_valid_page(unsigned long pfn, unsigned long nr_= pages) * @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,8 @@ __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, isol_flags= _t flags, + bool isolate_before, bool skip_isolation) { unsigned long start_pfn; unsigned long isolate_pageblock; @@ -338,11 +337,9 @@ static int isolate_single_pageblock(unsigned long boun= dary_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, + ret =3D set_migratetype_isolate(pfn_to_page(isolate_pageblock), flags, isolate_pageblock, isolate_pageblock + pageblock_nr_pages); =20 if (ret) @@ -441,14 +438,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 + * @flags: isolation flags * * Making page-allocation-type to be MIGRATE_ISOLATE means free pages in * the range will never be allocated. Any free pages and pages freed in the @@ -481,7 +471,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) + isol_flags_t flags) { unsigned long pfn; struct page *page; @@ -493,7 +483,7 @@ int start_isolate_page_range(unsigned long start_pfn, u= nsigned long end_pfn, =20 /* isolate [isolate_start, isolate_start + pageblock_nr_pages) pageblock = */ ret =3D isolate_single_pageblock(isolate_start, flags, false, - skip_isolation, migratetype); + skip_isolation); if (ret) return ret; =20 @@ -502,7 +492,7 @@ int start_isolate_page_range(unsigned long start_pfn, u= nsigned long end_pfn, =20 /* isolate [isolate_end - pageblock_nr_pages, isolate_end) pageblock */ ret =3D isolate_single_pageblock(isolate_end, flags, true, - skip_isolation, migratetype); + skip_isolation); if (ret) { unset_migratetype_isolate(pfn_to_page(isolate_start)); return ret; @@ -513,7 +503,7 @@ int start_isolate_page_range(unsigned long start_pfn, u= nsigned long end_pfn, pfn < isolate_end - pageblock_nr_pages; pfn +=3D pageblock_nr_pages) { page =3D __first_valid_page(pfn, pageblock_nr_pages); - if (page && set_migratetype_isolate(page, migratetype, flags, + if (page && set_migratetype_isolate(page, flags, start_pfn, end_pfn)) { undo_isolate_page_range(isolate_start, pfn); unset_migratetype_isolate( --=20 2.47.2