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 A5AA3C369D3 for ; Tue, 22 Apr 2025 11:42:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 664726B0011; Tue, 22 Apr 2025 07:42:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 615046B0012; Tue, 22 Apr 2025 07:42:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 48E386B0022; Tue, 22 Apr 2025 07:42:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 2C1396B0011 for ; Tue, 22 Apr 2025 07:42:06 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 9FD76160D5C for ; Tue, 22 Apr 2025 11:42:07 +0000 (UTC) X-FDA: 83361491094.03.4AA0230 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2059.outbound.protection.outlook.com [40.107.237.59]) by imf03.hostedemail.com (Postfix) with ESMTP id A50382000A for ; Tue, 22 Apr 2025 11:42:04 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=amd.com header.s=selector1 header.b=MecoZ7XJ; dmarc=pass (policy=quarantine) header.from=amd.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf03.hostedemail.com: domain of shivankg@amd.com designates 40.107.237.59 as permitted sender) smtp.mailfrom=shivankg@amd.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1745322124; a=rsa-sha256; cv=pass; b=W1KcqibsrRNVcsn7Tw5rbVRKvfZfvonOal7LVCA3lPPUPfZ0sE1obyJLjgCTuX6jHTJMPy MQxqus/+3LJ+Ic8wWYtPZ9F6KOtVlI1l4mfbuChVz72W4tLs2dBmsgjGFXa3gB3lzSJI58 5mCL0viT6IHl4U1183MUt/daVHCmFiQ= ARC-Authentication-Results: i=2; imf03.hostedemail.com; dkim=pass header.d=amd.com header.s=selector1 header.b=MecoZ7XJ; dmarc=pass (policy=quarantine) header.from=amd.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf03.hostedemail.com: domain of shivankg@amd.com designates 40.107.237.59 as permitted sender) smtp.mailfrom=shivankg@amd.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745322124; 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=HWzgdUvOUbxWo4OQPGsZvYzJ3arlF3NrDj2ScVqvOnM=; b=6VldW1ug36cVsffFTFyikFmwOiphq7XWXOEd47MwQZJE3+XC6PKkJJYoOZ5alJfjFLlqWh G+5rLe8QA52QmnoGWF/WMO3NpbALynA4LfjdS+4oXfkAqrjrt2sm7H8xHA2ZqissbW6swx xtZBgZItErs8GNuf3SN4cAaGuS3xTSA= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZCpP1NJKaUoOo3NKgu96Rj9vFZpaqXY+tuCdLzu+ZZmoK8Ia96Gm2aktdWkn0yke2WKpx/6DHO5VdPqf01P9NRHXrq6yGXT4p+e5W+rmZWmfD0ofIdNcmFn3hnsCp+8Ub0Q3WO2xPZHomACkh8MFOBaEEubLngx/Xby0vjhqgNvxhADCAXYRF2+VCFFDnSMP8O4NP5Eip04y0vokKKYGWZLK18DGHxLo8GrybypO9RdpZAs6r2TQ/9iGDPZQUETZUT24uluLjLlLvYbex2yZhdZ7uRXjY/ZK8p7B5bskQBzUbK09AfmDzFSnKJr4mABAYWIbOGx1AX8fkLblhJWrNg== 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=HWzgdUvOUbxWo4OQPGsZvYzJ3arlF3NrDj2ScVqvOnM=; b=KltJ64x5qnBwJsE8XSjgdFqnkTZ1IULzCSQdRu+oIdktMhzgctckGFFCsaDFaY2wsxmO8B2UgWm9GtZ7QiJrOyAa2XpenHeIINep18VvgzD3vES3wiP5yru7gIg8ACUaVv/mvOc/M0eP9KGQfcHJlTvvkep2GGgQ9vy/FfyVhINhE56apHHtkfRlDQC4yUQHOZ3wAkVjc5cW0xC7C2ikRNPyWNJrvexL1VBof+TJvtL55NvD4eO+o2I/u2p3qegFr5AkMnf5cwD1kg4DJZ9N6U/r61lX5eAXqt+3Oip8fd6v63wOO1HD8MhZIn2Y096OTvbRNxom/OGb5TxT95jJLA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HWzgdUvOUbxWo4OQPGsZvYzJ3arlF3NrDj2ScVqvOnM=; b=MecoZ7XJ895JIyybZsCDPUbNocaqPFsVJ3LaG5dAQaVILSMnVGAkPLSYMBoyT+2zmKH3So+WHacX6POoLU6CUaDgSPERYJin+2aTWcIhl7oX8YMRGa9PTu8desw3E6O3TWU1lQuZ8Bz5ysdfAfDOe3ft+1O8vdTldMqn7cctFbg= Received: from BY3PR03CA0029.namprd03.prod.outlook.com (2603:10b6:a03:39a::34) by LV3PR12MB9142.namprd12.prod.outlook.com (2603:10b6:408:198::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.23; Tue, 22 Apr 2025 11:42:00 +0000 Received: from SJ1PEPF00001CDC.namprd05.prod.outlook.com (2603:10b6:a03:39a:cafe::8d) by BY3PR03CA0029.outlook.office365.com (2603:10b6:a03:39a::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.33 via Frontend Transport; Tue, 22 Apr 2025 11:42:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SJ1PEPF00001CDC.mail.protection.outlook.com (10.167.242.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8655.12 via Frontend Transport; Tue, 22 Apr 2025 11:42:00 +0000 Received: from kaveri.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 22 Apr 2025 06:41:55 -0500 From: Shivank Garg To: , CC: , , , , , , , , , , , Subject: [PATCH V4 1/2] mm: add folio_migration_expected_refs() as inline function Date: Tue, 22 Apr 2025 11:40:03 +0000 Message-ID: <20250422114000.15003-2-shivankg@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250422114000.15003-1-shivankg@amd.com> References: <20250422114000.15003-1-shivankg@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CDC:EE_|LV3PR12MB9142:EE_ X-MS-Office365-Filtering-Correlation-Id: 57385a36-b3ea-4794-4676-08dd8192b1e0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?NjIifRqHkFn6Lg2SqtPAatU1CXGC134tRSNeEhCuF3wDpYeRVaH2EoOXpxb0?= =?us-ascii?Q?LBek2ScHpaAa4OfKC2/FwFwr7iFbGFVggtsrQqALNJjJdrSFheacoYxtX+zm?= =?us-ascii?Q?h7bUDKRu0duosWXLzYX74tXRuBeKIuU1+5okFy7ZsGm4416NkaO6Ldk73ICz?= =?us-ascii?Q?LYOTcFGci18anK8IiPTy0remPtDPLcDyUJbSiGwEoR8aVm6M/8v3P38pyw9l?= =?us-ascii?Q?eDtszQQC8rwTM7IIzqTq+TbLA0qh+S16oBaAp4Yffn+559TEEyagAu7JGShR?= =?us-ascii?Q?8FSpS+IexFz3aqgDaNs5AGItUbtDGl+g/6hye1PvWgX6DAY2EMmvhWwPKU9i?= =?us-ascii?Q?qRF3BZrVzMIZZGsMuESRY8TcxxsNIO2hxauy/YrkbIesmAW5Lc4L9e5emsqt?= =?us-ascii?Q?fDMbGIlqEOiCga1nqFpPfMcG2USoUV97ITPchpR0x+SbyjFZMcbfpXplwN+r?= =?us-ascii?Q?6M0TarFWK9BmeBa0vTiqB0s+ZODmePB8qOqe7ZJkCOTpMA62HcN7uZntBXfB?= =?us-ascii?Q?EFLycdEbVvn+bB5YJk4ad+qO7PJFeU9CFjoXeDjht5/Mwk8x/K33u4FoaLCQ?= =?us-ascii?Q?5puMbFZ18mYvwY6YrDTCQLfxhsAwEeJGzmEWA2XyWj9M7mhbNO9+Wvqs2INZ?= =?us-ascii?Q?DVvqYHXhprLVw+FHDm041s6nKf83QVkF3tSzHxliVJ93ucOAV6MkRRD1zf+P?= =?us-ascii?Q?CwTGViTNSavR+Ppg/C8lWNHDjULAtxSPMHX/hWbdlmS0/lUfc8/bLOxTPOWo?= =?us-ascii?Q?1prxd6ItvqcXGXLNh2Wy2K4JgtvmFRd1IlpA3o9OYkjKZ8kPJ/joEDjqOHbL?= =?us-ascii?Q?bV/ij8/LWlNvMFSO+vBVdH+bBTvWluqqQ7Tx1s/G08BTmqqg76g3LngtG/nr?= =?us-ascii?Q?knRKIeZ31oyD9ZNIDBAWinlGUsgCNFwhtXIvMli4z+rRgRopM5mMVJJw4rP6?= =?us-ascii?Q?0KQqtgP0JR3WcgSdyNo11fKrXppHTgOdc18AK+nEMe8P7Eckdh7QeFoRmqZp?= =?us-ascii?Q?npyK4tyqoVZbMLGkflsPVNTTUXNT9JKl3B5fYq0xEY57jo0N5nTlLIjhKw1A?= =?us-ascii?Q?O/VlSig92P6+0HhD9nFRWZmPn6mzNqjH7SmU8vXJtLYaGsX3Noko7ls55MKV?= =?us-ascii?Q?UF0cgOOBMCk2AcMC9oF7pJwlcPH+zeFYeis1NeirokBXslYWRvNlPu8q73hr?= =?us-ascii?Q?3h02SbJ1j0t8MssNLQYnkFF3p20pmJsHFZtp1RR5Eu3j8kiBrMdvCfcEnnKq?= =?us-ascii?Q?YqiO13qYht7dqKKwgAZa/hG4mHLJjDP+xIUMr4y7P12cZ7qLQ4h2LenJ8fJ8?= =?us-ascii?Q?kPME4nx5yRqhm0ugOs45NyhOj/wd8pGXNYYT9yV2Lo0Awa6dxU0ebpM7Htnw?= =?us-ascii?Q?4s4JUDTHSVBNjigm3PcIqeu1FLL+08U+hUACzKoyYakibaJQDXacywmG4TQv?= =?us-ascii?Q?coDDF1NWaHGt0atuTZwTf0h7Yx+Y+zppyXKc+Jka1dWvKStO0fXsRJjJoeFq?= =?us-ascii?Q?dMjd4spn6OWWsPe8eCeNL1YnPKpCs2QfuaLC?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(82310400026)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2025 11:42:00.4545 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 57385a36-b3ea-4794-4676-08dd8192b1e0 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF00001CDC.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9142 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: A50382000A X-Stat-Signature: nc7x331x9gp5ncx6u8iyywmmkm38rubw X-HE-Tag: 1745322124-217273 X-HE-Meta: U2FsdGVkX1+xDpS9xKM7Aj3kyqF40iauGS1YeSrFGeEy+aOmePro48etTweverCyeXGJPmOf8SpSSa09ApnA5TP1vfp+yPUkvIQLLXjJt09/IKR8uGOh74mlxIkYxTKO1B0jXTf87L1sSohn2msMgKkJIH/lCi/sBo6+psyPtn2Mv8+W1FwzTUz80nnnvtzGr79A+JhuZNIqSgy3yQBkVxHxi6RiXMGE79OvfoU9lDoOMscfagqsPKG41qItftG+lyUkcQVsQnYYtr7swUfrH+QEFEXUkOWtdsIXHlr8TeuaML8HtHKIKkYd60RVshNwOSx8mTNd6JE4ajzWFCsoPGVAwrh2UE4EFN29cPuEQbR17w8rI4XdQoyJ641K//X2Q5FAGkXbJ6MbO7xW3wMh2HiDsu/ka+8PSrrSEuwsppIt87dbUASyxBN+WFDICPQ1ydzU/3T4x9Es2yij4wk7P1r54lG6YCVOPrxq/W5sIUJpaQbS7bkgc5ixcLSpyJaGFOKJlOK1wdPGCEcLwfwHt2Ff4VVlXTUVLuJjDzlv3FYrJ2A0/eU5bTYV+Uxai/4sDHjAN6YbSyFEZazzMWhzSHq7NSdUf2R+WOkydLjeytSgnx3qbuy63rMmuZv3m694qefVbHU0cgfrCGQ7eAtHHx9iN1x/cpggMe1XWbRZCjtDPzcpUJQNtnMQYnTQdBd1Sr8nc6qWgTR2DeSKZy5QRLOL1CjeL6PBFN+KLm9yYTcMk4aTNkZ6yTauj67lkGGJlRUaTxEkrP5MdigiYjGfi7xQDoATNHlO5ziFUyLgnhTW9aM6KKN1pQzlYPsHcqD8D29XX3bnA6/K1mxLVNdAw8iXSs07XCB0IwR5nQ7+kWP4JP+hZCYTcGgYMJrHvRSCejrxFHsv7G0WnvlG5tIcSwQ91lDxgtcZbCg6owdEtFqqVREPJEXlC/ungIxHObz/KN7Xn1UFMxXX9J7qbcQ HE+19Iqt nz2DC8H6tifbTImpz0imO+ak+7h5fGJaYOkK/IIQu3ZUTR49a9AQXuAzUcVg/Ln8k6/mBYUT73D1BIgQcHr1KouIxu1Sr8VSHB89BUJ+Z/PjqNeivt4/3UKzjxHmWyAqYdo9zNlX0d5hQkpxr7jrh5wCbsQSyM1Aijui6OCjNln6RkQd8wd92AJdDxFDJaSiqHJl9C5vOanZFGCmFL6L5ffYOWGhGWVFzmamOUC9P95GdUqipScuSNcvu/9LsIDMcCV7xkB9iHhCRx1cFQfWWYPWss7X5Io8MIiYU04cQgSm7skqChe+KdxN9zfE/QYuhFGm4DptQ8kA0vULCquWlT0ynljnNRibLwvApq1wnyVE3/C3Snb+ZHT4JwnjU7VFSwu/Bb5fzfroPdGD8iI0d6/5mP3aUKxjJQ2Bt8PUa+A7saOMyKuHGrgxblyv4wLBtImC+WkXuiyv9zUW06H4MmaE/RQ9wFl7EqMoCmZMHfgu/4pk21kBzMX9g95sS8SG8Sz80oqtu/RC7mwfosWVj6L3Dndc9zeqFUbhVkKBT7DG/kC27515CpheKEpnWK/+jIU1N6KToHiFKbyt3E3qD8piK+IMde/xm8R89EFwVPVNtudnV1fhaYasaKwZ/XZSKPcjCZ/y+mMEsOFM= 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: Rename the previously static folio_expected_refs() to clarify its purpose and scope, making it an inline function folio_migration_expected_refs() to calculate expected folio references during migration. The function is only suitable for folios unmapped from page tables. Signed-off-by: Shivank Garg --- include/linux/migrate.h | 26 ++++++++++++++++++++++++++ mm/migrate.c | 22 ++++------------------ 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/include/linux/migrate.h b/include/linux/migrate.h index aaa2114498d6..083293a6d261 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -60,6 +60,32 @@ struct movable_operations { /* Defined in mm/debug.c: */ extern const char *migrate_reason_names[MR_TYPES]; +/** + * folio_migrate_expected_refs - Count expected references for an unmapped folio. + * @mapping: The address space the folio belongs to. + * @folio: The folio to check. + * + * Calculate the expected reference count for a folio during migration. + * This function is only suitable for folios that are unmapped from page tables + * (i.e., no references from page table mappings: !folio_mapped()). + * + * Return: The expected reference count + */ +static inline int folio_migration_expected_refs(struct address_space *mapping, + struct folio *folio) +{ + int refs = 1; + + if (!mapping) + return refs; + + refs += folio_nr_pages(folio); + if (folio_test_private(folio)) + refs++; + + return refs; +} + #ifdef CONFIG_MIGRATION void putback_movable_pages(struct list_head *l); diff --git a/mm/migrate.c b/mm/migrate.c index 6e2488e5dbe4..6c785abce90e 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -445,20 +445,6 @@ void pmd_migration_entry_wait(struct mm_struct *mm, pmd_t *pmd) } #endif -static int folio_expected_refs(struct address_space *mapping, - struct folio *folio) -{ - int refs = 1; - if (!mapping) - return refs; - - refs += folio_nr_pages(folio); - if (folio_test_private(folio)) - refs++; - - return refs; -} - /* * Replace the folio in the mapping. * @@ -601,7 +587,7 @@ static int __folio_migrate_mapping(struct address_space *mapping, int folio_migrate_mapping(struct address_space *mapping, struct folio *newfolio, struct folio *folio, int extra_count) { - int expected_count = folio_expected_refs(mapping, folio) + extra_count; + int expected_count = folio_migration_expected_refs(mapping, folio) + extra_count; if (folio_ref_count(folio) != expected_count) return -EAGAIN; @@ -618,7 +604,7 @@ int migrate_huge_page_move_mapping(struct address_space *mapping, struct folio *dst, struct folio *src) { XA_STATE(xas, &mapping->i_pages, folio_index(src)); - int rc, expected_count = folio_expected_refs(mapping, src); + int rc, expected_count = folio_migration_expected_refs(mapping, src); if (folio_ref_count(src) != expected_count) return -EAGAIN; @@ -749,7 +735,7 @@ static int __migrate_folio(struct address_space *mapping, struct folio *dst, struct folio *src, void *src_private, enum migrate_mode mode) { - int rc, expected_count = folio_expected_refs(mapping, src); + int rc, expected_count = folio_migration_expected_refs(mapping, src); /* Check whether src does not have extra refs before we do more work */ if (folio_ref_count(src) != expected_count) @@ -837,7 +823,7 @@ static int __buffer_migrate_folio(struct address_space *mapping, return migrate_folio(mapping, dst, src, mode); /* Check whether page does not have extra refs before we do more work */ - expected_count = folio_expected_refs(mapping, src); + expected_count = folio_migration_expected_refs(mapping, src); if (folio_ref_count(src) != expected_count) return -EAGAIN; -- 2.34.1