From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9228FC5AD49 for ; Mon, 2 Jun 2025 23:54:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 318C16B036E; Mon, 2 Jun 2025 19:54:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2F0236B0370; Mon, 2 Jun 2025 19:54:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1DFD86B0371; Mon, 2 Jun 2025 19:54:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 03FFA6B036E for ; Mon, 2 Jun 2025 19:54:29 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 87D0B1D77D8 for ; Mon, 2 Jun 2025 23:54:29 +0000 (UTC) X-FDA: 83512117458.07.A93271B Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2073.outbound.protection.outlook.com [40.107.223.73]) by imf06.hostedemail.com (Postfix) with ESMTP id B8CC5180004 for ; Mon, 2 Jun 2025 23:54:26 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b="BgixA/0b"; spf=pass (imf06.hostedemail.com: domain of ziy@nvidia.com designates 40.107.223.73 as permitted sender) smtp.mailfrom=ziy@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1748908466; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=6Ca2y4Ll6GhldlIIPPkaafx8RWllJVTRpRpAU6TyVdY=; b=s4N/1xALCZfsoOPwYkCF5y/wJAO6qa0AhOdEGzJpJRr/pJ7we6mBv5q7/1Uj6kUGma9bjq 6lB2ZyyYXh2t/U4S0LWZn8gxOjpc2iYQOEQCc1fTx2GJzdzu2zoQVfzmvmHF4bDUMRwNws ThFZHnEzY3ece90Z4TKYdiK8CfeS5zU= ARC-Authentication-Results: i=2; imf06.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b="BgixA/0b"; spf=pass (imf06.hostedemail.com: domain of ziy@nvidia.com designates 40.107.223.73 as permitted sender) smtp.mailfrom=ziy@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1748908466; a=rsa-sha256; cv=pass; b=5YAB1S8uVHfLEmK3gRiW84DGXoa5sdlyEkzZ1nJGBof2ZbLHGgERaO1aoRelzwlReHMc9i gKnqA5KhVFXvSPNW1+zWoqVjPckapa0giwhkhsHFIp7P9tXO19OTrzUZLZGSSRkk40qZUQ aleBCNtONXN4XqYeWP8orhPLZeYcX2k= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GEryMbA3bFzBPn/MXAaoGUwAeGQstNUdQno88q9kr/bX7e7D7eyABdJi/hVC5GWGpNdlAurp5wcqLITHP/+D627DdXyGl7I9zIdHr19RkwAfAWpFWfBi0PBs9HV/k5ImP7/14lPPzXAb/x8ahAy8JoGXYmJxLD2EPaGTh7ZkSuyK9eD6YaBcWu+DHfUugRA88bHPWG8zu02dw7PQUPz0DGM2atNmT8Vf9pLrw7uYW2gC4wwtm2cSZlfHbmcsSNeoq4GZuPChMgugMuoV49eqf8g9357iJTIFkyCVOzmC9Obn4iCrXdVWaFD1F/dxfSPhqJhYb8KoS2s5tCrT20w6Hg== 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=p9SXYJAXwWny08uIQn7v2pN6wC2s/UtZEFmudIjvXACxlbnm5eu/u3VOtsWI68YfSaTR9Wr/pzCS/JFlyVaehrFRHF7NyzkeDv3lrX6ing49BwKi2RQTTXDbhHBimnHTQT/ybM7hX9lJCWXu6DnnV7tYYd4qnL0nTSUGI9MNsLVtz+A8KX5yVk7dHzeGkv6YMAHCtjWUnDUCn3hclrP/azf2i5OCF+feZJOpllJTDdWfGE7s2CG0skulUCrmJtWu+EJld78dLGtn/99bcuMHSS0kLD2MbG09pAXj14hJkcZ1T7FG72X7YAjt2xTy5A90QFc+4+TBOMo9T7o/FcrjJg== 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=BgixA/0bLrhWgblthHMjAyLwEjNdfQDs1SBEySHOsyiVmBJvt/hGRZtYBpiaxk5NVpM8CWM/DcgGrvy80hGoFaCKNkOX+/wqPU60++bjUkYF5OmP3Yit2SPtKP8SuD8UFkT6+WbQo368+CdZDSSSDBqRDe8HH6L63A9+MhHT9WAI6ht6NawXiZr/HKQFypbufjJtnyOfaGe9/6vQORM769d2MauyctXkMKGhAks9amydsztW/G/X1ZsEUdQ9ozBWoA10mbfNOv+egOC2Kt4XW5HSaHmvYy00M7gp4lNd5/a862pG0Rp2gAOzyUTdoo6VuEogF2h7ecguX6Hh4Lp5LQ== Received: from DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) by LV2PR12MB5726.namprd12.prod.outlook.com (2603:10b6:408:17e::9) 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 23:53:04 +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 23:53:03 +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 v8 5/6] mm/page_isolation: remove migratetype from undo_isolate_page_range() Date: Mon, 2 Jun 2025 19:52:46 -0400 Message-ID: <20250602235247.1219983-6-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250602235247.1219983-1-ziy@nvidia.com> References: <20250602235247.1219983-1-ziy@nvidia.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: MN2PR13CA0025.namprd13.prod.outlook.com (2603:10b6:208:160::38) To DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS7PR12MB9473:EE_|LV2PR12MB5726:EE_ X-MS-Office365-Filtering-Correlation-Id: 7890dfa1-65a6-4a16-2159-08dda2309d48 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|366016|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ZfXnRBnj7zMaO4WIDvlWEjGgY20euaYjOl9eOBzdQj3bP/cP1Gy7/NNLbsY8?= =?us-ascii?Q?DiqBDg1YZXydCzdOfdMgqnjS+EesPOcrOqQWiqfq+w/wQkQ4etI1IwQJC5LM?= =?us-ascii?Q?sgY6NYwxHgJeLh3LWCgSdaJxKTjMP6o9wRVxndSz5BdwdDU9diTHmOmkOT7d?= =?us-ascii?Q?6cEd0aTjZueHZMON853Hsxq293SPp0+5cPV37liqDQFBmukJUA0bfYEARoIJ?= =?us-ascii?Q?UoFSvOHM9QzdA3DocGQictdDh2ILRLtgbYHISJIPTdt71fNXtovzpjedmkFW?= =?us-ascii?Q?zCx1KRGTEhvCEaXGlrnbrWgkFyKESxaWhjaokmfhKueyrMI+pnJe/Ygto6Yh?= =?us-ascii?Q?KHAOAjCtwmZD7QFzGyTdfsIvn5ekeEFbVlS05/vCRET6GqYQdMm35gxqS+t5?= =?us-ascii?Q?D/xI++3obZmRwSP9b9vfSCJrHruwI8Sduy0smidlKhguJSipaAWGujiuC1jK?= =?us-ascii?Q?JjohPZKdryJBkdZl3po9CnPhy4b9Tr2nTY9PLqmPINgD2bJJiJRklpmJ4xh3?= =?us-ascii?Q?F/9GuAJYdbTFshPKdJyNshMxxxeBAHt9voLQtJWJTd0yKiIeTjt9SEmc3Qpm?= =?us-ascii?Q?jdwtQI9lO/+KqksdwmOu/4+WWS8eY9esPOiF+E/cuaxD5c8OY9phIafYXazr?= =?us-ascii?Q?DVBIwQwZpY904dR3fFosJOtBOgWdsV18OYAyq1Rfj/s2HZiK44+LTCNa944Y?= =?us-ascii?Q?9WGGVWAt5WZIz9Ig3GY5r9Mr+Od6Bt/d+k14AyxW4UBhMDJ1Jejvf6+Ay9mD?= =?us-ascii?Q?eGaboMz3eSIr3NFOIgaVJPQwVa7CK6LqniWK3ORo5ZktIrl0BXppy+wIg3QU?= =?us-ascii?Q?0hy9unLuX77etouolxOukVacMo0J3NXYKWbQVCkiIhGBBILbM24hA1eYDKEM?= =?us-ascii?Q?f+c+S9dTVdbHVXgsFKa8FYn86tJhQyN3N3dmcW9TWobx6ECsrfkqAVtgTBS1?= =?us-ascii?Q?ml2c4/p7nfFk8Dc58PXf3eJamZiKy/g1806iUKHmjsguByII4Rpcr561X56n?= =?us-ascii?Q?wfaelFQXpvxZ9J4esSpxKCVQ85sSFyEvKDhTigPLDFcelS2/E2VHitTDE1hJ?= =?us-ascii?Q?QhjiMm6leERcAYCJ7bSsDqf8Knw+DXfaAr/qFPOVw0EgiCRq+1s8OUNs0RCe?= =?us-ascii?Q?REvQaDh36TkvXLrCngo/XmrvVgOoX/xatSX//xR0BkQzY8sIX3jvmqDINPXv?= =?us-ascii?Q?yetyvz5dGHrYq0RYbk+U0LxXLF5QTRxFi/sKHotsvJE/FHSjD+QPtfv+Du45?= =?us-ascii?Q?xPsY9dBwjzAzhziWGgT6AqLcy/nVpb3tSBNKB/xDWE4PBULJUVGgiCq9dL3v?= =?us-ascii?Q?/DToiW0ppCKyj1iCuAf0NZlVbut40yz9z2NQvyrpF89eyM5bkVJD3A+rQmC8?= =?us-ascii?Q?iK+meJeHqAt/VpXxvP3Zbb/kB34qpgSH2HxAX3NvtdleDFu/qGIGzwymYWYV?= =?us-ascii?Q?5rdgaYi02lA=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)(1800799024)(366016)(7053199007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FF7Rbg+InB35HvmCmg9K2gA9kAwIpTuLTh0zQja1pcBXq3X+b+tZ+re1esWO?= =?us-ascii?Q?29+uKbIPBYhUNj36y4z9XUHQm1P3fRhSjHtwhZA5PyoiiJDLwycXdn7SgjJz?= =?us-ascii?Q?Yu6n8uPbjJIDfdjzLU7LoG6dyTsSNG6/+teyY7wdWSYZGXycpJU9yrjaoyxQ?= =?us-ascii?Q?uR5BQ5VOeFf3iAZVCvCXbOfvRqai70m2uo7tq0OT5aNCs1PsUl83avJ52JHE?= =?us-ascii?Q?RYq6aYNi5p62hG14pQGfPOBp3Hnerdtk/6RSYkCF3h1X5p/oS8JtOKdRjH4z?= =?us-ascii?Q?garw28BNE6P2WMO+GR6nnEZk2vk06evo2nr6Do4NYxGjeLEDMn+x8HrkEPN1?= =?us-ascii?Q?j/tSSux3oP3TPy5WxXzEV+ekJeuyryH6RERlJzH1Mitxe3cvNjTl/NBd/3QJ?= =?us-ascii?Q?iLHAswuukIXGuWdronc/8e3uwZaTeaVI3oOMgWazVzVUkjudUPebpSryg486?= =?us-ascii?Q?ZR6/S6kpmYVIL5IF8J8oKF57CHrIvuSwkRBpNwTWGygSneM1viRzhlYjgHK3?= =?us-ascii?Q?HyM5Ug2YwExyHsvbqvy95i4+/U+OI4XoAPi3YZI6G7WJruTSqvbR4avTTWNq?= =?us-ascii?Q?1tkKLEWjT9kCw3Y5rlsvkwvkOAPnk+UHx5lvyUNfiz8uvS2Kf9ToFUui4R1h?= =?us-ascii?Q?DavS/jTYJ46TmBAol6g9VAK8a0vYZQWUheEF0pQ/0t23dzyUD3bsuWnC/Vd6?= =?us-ascii?Q?6SpIaNhAvP5wqJpLc4qU+OuW7pbbZo98EslyDSobaXtLF65ucYGnqoGhkbSL?= =?us-ascii?Q?iJjJ4LKmaMc0bxAyrz3SD+dWXascqxhsauy32YlcnyRM1O494HV1pjPECow6?= =?us-ascii?Q?Wngo99n3PxCZ/QhtGz7kB+c25VVFG101bgZSZEDNsWUZGjOgqJaxCisL8LCq?= =?us-ascii?Q?uRKenRH1FVH1eAGY4U9aw3vGGtT/QRn1AgDIcWKdGr/Yke+V3Sa8HTq0MOY0?= =?us-ascii?Q?aV0KZWL9PEZpQvz9y3i8Y4OCtoMvOqkqpdfP7zK7rks4RShc9kvnyxDCThXA?= =?us-ascii?Q?CIVLf6Qczb3ORe2Y7r4F5FUQsu2KcsNcravrQJaIF22Twl8Gb45NN5EaEwpk?= =?us-ascii?Q?AKhg1MSyc3ukVyQRbK//I2bX6YzIrzovRSurVIa5a5mtROPLArzHKFjYXjrp?= =?us-ascii?Q?OkHpe6HxTPLfMXJfeJ8PzkJYv1scWAEp4wvknL9UnMUSCpFbAzx5XWzbP/WU?= =?us-ascii?Q?0grUtxF7ZghIWUO0OG4xKFNgc9Rvm/jLSwxu9ShSPQoNdTDklfmBM3D7s5r+?= =?us-ascii?Q?UG+MVqaA9VNq22sztqg/U5UjMoN1kCD0+Vl1XYA1nD8+yNGTchumwld4F9CY?= =?us-ascii?Q?4ZYTfsxm+rgMm7NrTwHToRWFwra8/VwFwYXLZvl6cuVYBApyfjWhEnaGRBFt?= =?us-ascii?Q?NqfVOuhkAa+6PIfLt4ATbe7NDp/E7WXDJR4cSPxILLI8PPvgt8WuBptfoyhS?= =?us-ascii?Q?VX2zuP7SDVBW0/h6IaR5BrxDVop8u1mQ1ngiqYcsDbqjNosmRjA4SBr2COoP?= =?us-ascii?Q?I05r5bsbn8ZoO1ZRfdv5G86ycwcmW/4bFVmbAgf2U1gvhdWLuMo+H9ia2ohp?= =?us-ascii?Q?gfOD41Uz/vkgCWmVMJrfEWtix2tq2c540q63SPOO?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7890dfa1-65a6-4a16-2159-08dda2309d48 X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2025 23:53:03.8621 (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: CjB8QaowE56MSoeBI7GDoVh+654go96YEska1vgTQd/UvfNE05EBb8t1DvNulq/m X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5726 X-Stat-Signature: 5inp9bc73e3ni47ajgj3fr6e5q8mi6z5 X-Rspamd-Queue-Id: B8CC5180004 X-Rspam-User: X-Rspamd-Server: rspam02 X-HE-Tag: 1748908466-723376 X-HE-Meta: U2FsdGVkX1+SGWrVGyTbqWKprwaWp8Vl7TyAbKA27qTSJI4ymvQu8ySvWN4OjilVz8DDawzk6lEcZn5qdeipt+LpDfUpkBxV81Or787stfZ9J/zhRIUhk+ECf2KY3nIqGwoVZWwlh3rbUcpa3cBWDSm1ux0k78Ru8VzecHu7w3RVZ8PyDXLD7sfr1+8Tcbq7vIshUTCQUogk5pSuyslqRWHqMtePoxtl+K+p1BuxovGJcpDRB/a8CtuTIskAgZiDrdR40U+kIsbuA8dN1iUPuliLd769dQOAFtukQ8R3g3dWczdY6YcX49u7ZpP3muiKixk9GMpuKDOlqZfUr1SEnSbMvcxTQKP4JwsnwaqGleSOF3hOxO5tmgfbu7OEeSOGs6t6jLPVxbzGXghqM8OsDu958rGagKbc9mbJK/jtrBBHGuGzgRSmVxTtqw33xEJvpgm9jA5RW81WUZ5UjyraZ7vFTDh8or4vR7SQ/XR3HvKVjVDcBMXQFKZAOEMDIe7oUiIKb8IrvOfgHhKX5AbIFPwcIFeh6OTmZERQ0knpMOhb0xJ4eBg8wUtw95BR+t3SNrwqe/YctE/tSSqv7gMP8h+6D7f7WGTtmk/vvIn2PFplLGfdKL0e8AdvrpdDuHjZ0JnwjliS3WYZypytZiXHRWufmWkZ1I8YGygjHfKYjFmswGykzyPJcyzAXj8gClHUTjUmjNyqnhhcnV70ckSmif+3b0NyNw0UfjacIZCnfm9WuPNu+S6t0rNstUecL/tihVpBKGIWqP/5Ly2/MuGZHJDMEhoY6GtAglNKiO8Lwal/RFbuH0aH1tKeDycq8mKQeGVwzUiiC8XLJKo2y7Bysh3QFZwMDVbIumrZJghaB3TgkU3eZugeQzY5QdMM25PdHS3vSARFCNwC/jTGdK0sePMY+5m8lElLbzNOrs34owoqN5Fm9JbOFp2vw7ehi1ZrLaZg6S7JtVmT0yf22Uc gzaY5W8J wB99tsILZTIVUKV8WPhraZKbpc1UyeRDAI0X8g4EdnA7zSOE7/9knRSd9F+hZODmtx2S4suM1V1iKBsBVMdZQ/qWLrwqAcVxhJFMEtX7B/n1D37LVh+63zfyevbFc/Uq1peNNzCIVo5PttZi5d0jNwoPjsIIQVWYLe+H97T4ayyX+gKz+gP/7oj7h//03t3uiEN7GMxr5o7cct16LN+9eaJCEAsk27E/tvVSSvoTwbPGB2ydXfwGTEThtLPhOALPtwA4NgW/kG6L15mXuh5sNIg7FfmWJtAlyTcg0o5KKmw8mOn1MRp5QtAlSnLWw8PU0E+wGwCXuoI9MKGYzojZMzbISJXvXAFVVJ3XrxlPGD4z+9H69DIrLZjBY2yPCtTJW0AVZqu+i1wUcngtQX3AsiXp0LGUFMvmuQvyYVTAYl6dx8svOuem7kWKfmNn2pSVsquK4XhC8YsSXXU8+2DZnjgWVOYO+QBOja1F6mTGTuLG+s3Adrrtw9rG9jTqQfMPx4Gjr X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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_pfn, int migratetype, int flags); -void undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn, - int migratetype); +void undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn); 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); /* 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); /* * 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 long nr_pages, 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, unsigned 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, unsigned long end_pfn, page = __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 range */ -void undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn, - int migratetype) +void undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn) { unsigned long pfn; struct page *page; -- 2.47.2