From patchwork Fri Feb 28 17:49:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Yan X-Patchwork-Id: 13996853 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 E6652C282C6 for ; Fri, 28 Feb 2025 17:50:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 579666B007B; Fri, 28 Feb 2025 12:50:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 52A45280001; Fri, 28 Feb 2025 12:50:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3A4366B0083; Fri, 28 Feb 2025 12:50:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 20C536B007B for ; Fri, 28 Feb 2025 12:50:05 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C928C160E37 for ; Fri, 28 Feb 2025 17:50:04 +0000 (UTC) X-FDA: 83170091928.20.38EB373 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2048.outbound.protection.outlook.com [40.107.243.48]) by imf15.hostedemail.com (Postfix) with ESMTP id 0D164A000A for ; Fri, 28 Feb 2025 17:50:01 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=GUZm9bPd; spf=pass (imf15.hostedemail.com: domain of ziy@nvidia.com designates 40.107.243.48 as permitted sender) smtp.mailfrom=ziy@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); dmarc=pass (policy=reject) header.from=nvidia.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740765002; 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: references:dkim-signature; bh=cR8+bIIdLQcn9hdN5ELhP92PrX3p5+U/lRHrt5yWPq4=; b=qOYSV9bLEL4fgQUikRzJLGVI+A0wn8rN9jzxJ4ZfoR9YLYv5XNZ7MFklIxYVNDGzkPJRm+ ddmFe2fv1Q+Mpak7HfhBMgeSi+MQt8eOPVO+BKNcLGYBOaHzpIXMthHhxDZfN1dy2LGVjH z4/4EThQUhxOIMJ/saRhPHHDsrL2Q/o= ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1740765002; a=rsa-sha256; cv=pass; b=xfXoKqnhcPi+FDXqVr71UzpxTPLk5R5agY3SHRTcJ+KNQkwrE8CRceUVuwnw6IYDGnNHG8 KHm+ztL2yQaZSScrWPcBQBK/VH0e+cl0L+qTcRHpdy1K/kw243hNumGGQhHwB/0es/l4v7 17DaEKmhJ8/bzplnmU1OvxpCDZFlxIk= ARC-Authentication-Results: i=2; imf15.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=GUZm9bPd; spf=pass (imf15.hostedemail.com: domain of ziy@nvidia.com designates 40.107.243.48 as permitted sender) smtp.mailfrom=ziy@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); dmarc=pass (policy=reject) header.from=nvidia.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RzDdTlz5Mo2QHWqifCZdWvEIRdm0LrQkNKoqVHK1+zDQJ2KNb7CKg0cAmzuCO6Vfs/QP+gg2CamW+9fJGxuK8UJaMP8elYNWS9y/FVSua+VyYVWd1w6dWsye5e2sXOQbsWFyODDKOUyZvIMlnIkG6SI/Nkm6C0eAOabKhm7mS4EAq+QSAlnX5eAYWrFlAwqe74ZxMQexmMD2vH8zEUrdHc65SHd3r9kMfTYOCgOXQfRO4sRP83FLDvEBCm2YL6Ww98LiDhWxmbJdGeiZyZLG6KUMqkAHCGqBZzknduE4MUmVGIijaix+8NwVOP16W+PFsFmmll7jGIKbetJQXAAhSw== 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=cR8+bIIdLQcn9hdN5ELhP92PrX3p5+U/lRHrt5yWPq4=; b=dV1nQ3NFpv+4acigKsUKI9dn31xwOz0jY4SbPDcPOqBObnwCiRXFPj1VFn3Ykh44Z5+8bB5LDWfdhkjTWPW58x550BxXG8u4ls/DAw4lCCXd2/b75XdI3DUX/xrqomKH+DqXz6k2cPidkqX0LgYv8IXwl174mUqgvyLTLBQmK549SIdoHnsh1qydKENnH++CGpnQte360ftp2CTk30tI8QOvZcTk67DTVN5yGXXqx8WLag5BVlK2rU1tcktzN+1cPd4HiTo9OKjlJAEeYsCTXuRO7yvSe/C8xctQ8OiJvIk63E1N3olJDa9JFToVX+MhEyTQ56j6TerQ8EReSgynGA== 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=cR8+bIIdLQcn9hdN5ELhP92PrX3p5+U/lRHrt5yWPq4=; b=GUZm9bPdhWZlJYckNYuO5s4AN7aKlNrNqXHLDD2sWy8aYBI72BaU/0r8hE7Uxe2dZImlJa5FzpDv4CY6lUGJHPsh1LQh7Scd+4zizb4ZbVlNGqqaYiBS4K0HoQVmedVX1oDDNp3Pd/RkatVpjy2hSToc9npY/xGf+sn14lg4bsCrKrldeMZQZxr+SvaCuHYEDEJxZzVFCwxA3zPjqQ6zk8nIkuRdBizwmgmVcITyYakwOZP0eCtH02JbsI8BYvUSB3nXe9dCXRraXywJOtO6vP5jbDf0DQ2DiHz3zTwVKeRX5R8V6Pxrg2AwsSwbqAmuwQM/E1LGPvZgycxWAA0c7w== Received: from DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) by PH7PR12MB6659.namprd12.prod.outlook.com (2603:10b6:510:210::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.22; Fri, 28 Feb 2025 17:49:58 +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.8489.021; Fri, 28 Feb 2025 17:49:58 +0000 From: Zi Yan To: Liu Shixin , Baolin Wang , linux-mm@kvack.org Cc: Andrew Morton , Barry Song , David Hildenbrand , Kefeng Wang , Lance Yang , Ryan Roberts , Matthew Wilcox , Hugh Dickins , Charan Teja Kalla , linux-kernel@vger.kernel.org, Zi Yan , Shivank Garg Subject: [PATCH v2] mm/migrate: fix shmem xarray update during migration Date: Fri, 28 Feb 2025 12:49:53 -0500 Message-ID: <20250228174953.2222831-1-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 X-ClientProxiedBy: MN2PR05CA0030.namprd05.prod.outlook.com (2603:10b6:208:c0::43) To DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS7PR12MB9473:EE_|PH7PR12MB6659:EE_ X-MS-Office365-Filtering-Correlation-Id: 82dbe63d-f232-4167-0592-08dd58205123 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|1800799024|366016|376014|7053199007; X-Microsoft-Antispam-Message-Info: jtJbF/YzNifP8aoiFcrfuUhDB+BHwj5/Vv5kkJTLwdsTrygMbaAbWjnDDb7NWyhbE9aEm60zoR2F735Lc6ocdYWdBTFz/EkofMfb+AJ5kFYWn2uBLd3chzCRInG+XzzhtS5MoKmySnlZ23Ch6Pymp7IdbYjq/PM0c7wPKYrVCFpq5oGQBOarnJa/OGuOUsBR1vJ6sVIqqJiHYKb9NWGFqozj/Q6hqrkiLmudmiCpb2B3YSTlU/G1A+xESmJYVT71J9vK0O0D1WJPJ/KMYvjaXy2fKibEVBFfCtEDF3myOxV8AirNIDKzNuFBNN0EItUCfU3A6VkDLMQ/PcuT6/PiLej/nQKLnbeCoZy/AxBQ4n4gUjFflpEoV+S5VAyLBUbVEBUg5oaCdzcoPR1xDlpHARzLmoRiMUHvC12L+kykymc/Lw1oYYP32gDpArZKceSuA5FWmv7GIcAMvLDWnItU8nqYwPyH8VzDHv5yP7OsY3lHmELFxjWLq5851CBa77OW7isJvK9saxfZTAmc0CuY0VsJjbneKE79X9cFygVS65o3QqJbcWo+mtgRCukf3gBdXE9pkXV5RF3n53cDQnUkoibJNjEPGYWx8XBJrWQh5fSkx+A5h1TnM39/0MwjyHdW98sfCVE39AV/ZvhNMJ8suYi3UFLIIJJp4oxcnpiebE7GtNVSmcLlmq1bIU0KjaX3x3wayWh/2KLI5GPLDlIK6ECTjyYrZbJM9SN0H1DQ2IMGjYqJOsHB0Hns1SryQSagdr6JfWcykUn1RpyXzKn6CzzIV9ACEXSQEI6sSRERiHc957QOcPJ6I7o4K08kEkrXtIq8H+lspkJUioy9eEFqjN00JJS3eRhWCxBBlSzf0t+gtfQ1N+22zNlJiI4thdUgTySdRI/aT/4OxcGlGfdP6ZNvToOpZPD3pOrh/l39nGdtTNMD+hHgPeMO6VL6tVaWb7xcoux577Hkk0Q/PF68UnLE7lMdUq+ATyDnUGRz70jCQB3YvrklWqOJYPKEfcaFIwj1V3aUWRDkUAgwJwk7MAcQGlU7Z0l0I9TPPaLFQA2sIDE6X4XVriJDE8qr4Bvs8vLndlg2tzA90dmUrXs46KAA0nNAevczT4n9AGYTT7b8LGBxozoIZP0Pw06O0LH78mH+HNVNcuVZUffdjyOuXiYpHZWF87IvLXGLzqIalgAFEiRduEO5CwIyu9BVN8+8zlAg04sy2UjBdN/uJQkakQSBaN2Bx4/nXQQmoz/1LAqEXTsBYDZ6SRltC+/8omZx3WxrGm9E6IpVzvWtkCTo3LLvyp4Zs4E/1n+EZ1uSxEB9NKshDON7ql1CEchyohxJHSWT0mXhdevfLCRgTzKh6yczW0xdwHdWxJU+ZxrcP0gjjE0qBsLizZP5oZM7ZJdF 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)(1800799024)(366016)(376014)(7053199007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: d8wp8/1i2w+/A61nz+q4UQTkJLrsBRfJ9EmOj3x2o+MpbuRicKl4nFDJLBeRI5C0bYujx+15whqrUCaB2pN4iMpRPUpNMdu8rPCMR5vWOc/X4ghMm8f72VU0g+z5vFWbgL2/iiQpzTADw/MpUwzwQbB4HjWtCJL+PSSduMjTGJQaf9h0Z0cx2XlCCkCaOm6UxzutZPh99SaAkN6um8oJ+AuX0CYS4P5I+5ipG3zhpWa3qcFA0QP8dZksRQhBwJN6mEfC5Lj2YyOaBFvOBJCSXjKZdnh6s7Olbsan4+eHUy6NaPODMz6s/6Kq1nGVLqPPi6VgxygdgtxROC3TjLTCglbsTtgPsnycHc+dGCEknTRrIxQ6UoysXfBOjxjnS9PseztwZePG7LrbDjKFXEqydDzjh12R8Rwyc+81+yTeD1ax8/rGSVV+qaYRTJ1H9CxyZAa51kQe32yt0RzLxl725kUgkL2nA7XoJ9zPpzglzgqxEqI6xhVwkCmXhLC6q7XQpJL08Qdmrq2jt9R3yvsYaXxD8q/Z97RH6ji0aFCpTasNpt5S+NWQcRs+hKoABL9BJTcgWWmUsetoG2ElF4V1TClWEsTNPwEWGok9SG9Q5mOhDlnIDgZwDToVVOfcUCJ4K21AXiwmXAiLfpoyTF7HY4tmHKPXZgv3cr2KD+QEjJz9YegzX/EUgmjBuw1cR4c59gk77mvHSEDcdymnbRBTVD77zHWZLlOzetpbp7dThvUS8eIUlytHmJN4RP0XDZ6cUwLro5FTVW4jOlHgFBNikhx8/LIrKl0RfZQmMGtd0JPWwoZ5+DTq3Id0tqNMyG5DNfTJUl0mvGjx7rcv7iMuMMNbyOdJeOB9RFsQlbwSmEfDTJH4AX+5r8+U00pZv8uHS/p7RPMbCdLrZ1mQui6vhrpvCbik+Cf2WTOBQjTu8JQ/XNUb2wLaThf6t4j45bc09aor6EbmqmrFOQ1PnAtQXhvm7818wrO5ubW2LQXusjuJVs9TMTleVzc0wbdnJ09H7tl+64OzC1cRJ22CLIDKc9A2o/l/o8IIgIDYfPjcZH8x2cqnkZv6VO4+bbhSOl3Y3TfUwNFH1bTOle5cbYLyN8buc+LSc8hopH6ZHOos8ATeMiZKqYmVTNbgEiNA7C6hDCcCiBRWgEn2XNJ4eO7C5jWOu/s5gfKkl4I5i+cjdqYXvqA8kjF4Yehp0MG+tldZN3vHdy2Y2fmcnhfZLjjgl57NzhtTqGvciwJpimPIH9EsVAACICPWQ8FcISszuvu9gkycPAc0cjlx8w52J88lpwflJsFp9dsSs5iz25pXj6Qb4HJNuuEzAIDzKYbqG5ISoMRf6CtbHie/st4gOtfbyGP59rt7RB8B7Oa28Z555wRgMnR5X4UpLHkoXxfNTxXobHM0PldiwTvuhMgcRXI+BQhpja0EgWq8bIs2qH01LSfCg2CbWz6MakZERZZbbz8/AJZSea9RMZ+PHtDvdfp6TJHkkUHpw+9yy48KEYK4PUAvpTU/ujFO2J34/YXtkjUsMR7HMTESAXhQmZKrlFeMyeaoD9haOXWht8gTF9875Sc= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 82dbe63d-f232-4167-0592-08dd58205123 X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2025 17:49:58.1135 (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: k4h0wDzhOeFwKYIFzkkx3/FyA1Q586q48Wi3D22VZhWs+S1LjSkGqOP+FIqTrWJP X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6659 X-Rspamd-Server: rspam02 X-Stat-Signature: de8hheact5o3a97z4ti11buqiiqywuhs X-Rspamd-Queue-Id: 0D164A000A X-Rspam-User: X-HE-Tag: 1740765001-442071 X-HE-Meta: U2FsdGVkX18pcnr3pmUifthPk64bPRMD8XOuQ1vH7+n577FyCzKDIZCYTTGq3Y+aA6WPC/MYKmilgarGd0c6X+GpVPyqH/Td8H6LQAHf+ZshqKPf/WMtvsgiiuuoNi2QS5saTqzay75tL1mQTMARYdPgY0GJ0AOxQBXD0pFpIow9BYs0qprBasGBM86P6JN+lkOkhNaYYyTCsNFB1+R7P30sjanJZ+9yKABhk/HtGmEhhSu9Xi5QgvGZJ8yPX0GbxRkDFD0yBG2ldWF32ROmiPQBKVzir44AZxdaDvRF55OLBtF8FzSxUMS9A7X4CmJIIHjNBoNzCBu+5+raKzIUVLOrTsXT19HlSXsTqQhl4e840zCFJ6//ZeYrTao+cxh5fKJF8FLcOrd99OqAf/BGlctH9vP7JZQVYsmq9HGDHDAuV2wkD1/PE7n/YgUHedOitLkQA202f5lH7cJKvZe6mJwjLFKVOQZCS3VGup6Q2JKaCm050khY57Fpm6dzNTWAwEonNPlzkfpGXsOkVQhite8ms7xBnmSpEPUazaufz3WrRD1gNQ+8Gpkc4DAuqA5dCvzxavbEeiGJQXr1tRM1n/TjLVENFQD4emEw9AeK+DaGANAvmd+oFcI0hKuV2Ju6GTUI5vY/uI8sQgpveV0cYlOnXSpOTgTiF+b14dw+nzxx95F9/FijGXHKGFPeLrgIbmxYPsL20ZBLh8zhXrvDT2Layh/B/CcsltTnDMqP43BAbzX56++psQl1PEPDk1hBTk5bhsaZIQhXIxQC0EHkaMFtfrTY76MAvgprMQnRzA6DzFxAb6P6nuoMsO6IN3DXM+kwhW5JleRY8LuD3Nkxr8WB7ku66KP2wLBr+ouqkONmVfAg3Fn65QNaDmakx+yoNrWGOvDUS27lnBzY0gGK1vpMFmoOIZ0Xkx23YxEdJmJaPfOYGdpAQHjx5CNFIlBPg0LlMFBDsostzCbxb+X ywUTK6cx Hn2cQaYCIJqqT1Nrk465ltF+8/yUZr/kpg773PwbK59bgau3j9hoJ8dkU0cWekya4bmhwC7EVwhKyBKQc35aRvf2GaS8JklAcGBHKFj+5+dw1OxC3bjyWGMJ0mH6DvzI6MoqmMIr0TFCJUaFfd2Mb8afpFCAoKRNrVu4quz8ykO5o2yqJBwVDeF4pbrGs9T2hTUo/YO4WLSFiKF+GD54kRCm9kWvPyxnDH7UiX+ZjWVcufMNJR8bwaI750uWDalBM2PCXJIEdQDOYMI/gEvC9hbFVtZsly7gSTAy2x4On32Nijqz53o94vwN6vdVftf17oZpGlodWrrcu6MN3buGQ9eP78uos0Ch15ZV8BEISJvkuNZnYSqMUZi1zH80G+Wh99OZ03q/oZqUhpGQPywtY2NbKwUZRa1DG5DbvJxM7nGCFAQCxw7kX+d44rdldN90egAuMTRzLWBGI8fE= 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: Pagecache uses multi-index entries for large folio, so does shmem. Only swap cache still stores multiple entries for a single large folio. Commit fc346d0a70a1 ("mm: migrate high-order folios in swap cache correctly") fixed swap cache but got shmem wrong by storing multiple entries for a large shmem folio. Fix it by storing a single entry for a shmem folio. Fixes: fc346d0a70a1 ("mm: migrate high-order folios in swap cache correctly") Reported-by: Liu Shixin Closes: https://lore.kernel.org/all/28546fb4-5210-bf75-16d6-43e1f8646080@huawei.com/ Signed-off-by: Zi Yan Reviewed-by: Shivank Garg Reviewed-by: Baolin Wang --- mm/migrate.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mm/migrate.c b/mm/migrate.c index 365c6daa8d1b..2c9669135a38 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -524,7 +524,11 @@ static int __folio_migrate_mapping(struct address_space *mapping, folio_set_swapcache(newfolio); newfolio->private = folio_get_private(folio); } - entries = nr; + /* shmem uses high-order entry */ + if (!folio_test_anon(folio)) + entries = 1; + else + entries = nr; } else { VM_BUG_ON_FOLIO(folio_test_swapcache(folio), folio); entries = 1;