From patchwork Wed Aug 21 07:45:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuanhua Han X-Patchwork-Id: 13770971 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 1A62EC52D6F for ; Wed, 21 Aug 2024 07:46:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9D0156B00B5; Wed, 21 Aug 2024 03:46:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 980116B00B6; Wed, 21 Aug 2024 03:46:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7D24C6B00B7; Wed, 21 Aug 2024 03:46:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 603E16B00B5 for ; Wed, 21 Aug 2024 03:46:38 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id CFD081A0A3F for ; Wed, 21 Aug 2024 07:46:37 +0000 (UTC) X-FDA: 82475470434.05.01ADF71 Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01on2061.outbound.protection.outlook.com [40.107.255.61]) by imf04.hostedemail.com (Postfix) with ESMTP id 3CD0340003 for ; Wed, 21 Aug 2024 07:46:33 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=oppo.com header.s=selector1 header.b=akldg0gw; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf04.hostedemail.com: domain of hanchuanhua@oppo.com designates 40.107.255.61 as permitted sender) smtp.mailfrom=hanchuanhua@oppo.com; dmarc=pass (policy=quarantine) header.from=oppo.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1724226316; 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=tA9aZraGuDqJxramZ0QgY1FA0Nn7yW99MlzZpYtrJRQ=; b=pkXsG/IYPJH1DzlIKlkZMC27nXft/b2YMW36f499/fTVXo+6B8MWRv8K50bcqaFt8nyz3M kFEF3GhAmmQCdYwKWTwHfklOTFl2Fuq4RlHsVhAZF8kufwnpXChqCQ6rt3MDhOgyVeiujV b93o1+LO2jt50uvfCn0oFiMXKRu4kkE= ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1724226316; a=rsa-sha256; cv=pass; b=1YJE0HcO5ir7CnQU52cWuO0gXvsHkgtPKMv6FJOPz8vNfvBWSZjQUXnKq42qYWv3Bv6sOn oSTcQglfOt3n0lYyHbWZjDi6CVhxjZOXkehcwZxKj34tDC1ugsq2hKXGid6DLyiY+DT8sL 9ohxEkaggE4ddu1Bz8WM+S+msaNDkEQ= ARC-Authentication-Results: i=2; imf04.hostedemail.com; dkim=pass header.d=oppo.com header.s=selector1 header.b=akldg0gw; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf04.hostedemail.com: domain of hanchuanhua@oppo.com designates 40.107.255.61 as permitted sender) smtp.mailfrom=hanchuanhua@oppo.com; dmarc=pass (policy=quarantine) header.from=oppo.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IZMYjB+wZ87DzkUtGT6Gead1/0b8GkPnDsIm4SCNoC+hTQS200kNZQZNZOqsYxYvQVZ9rl+8Oi590DZcRSccsXUHZl0BZ7XxhKhqb+hdKa5oYwyNow9ZOhrSNTvz4hE/mQyzc9/0DFQUjo8rhEeW8+1LubJ7kThOCms9lsALzTqzBtVlxrutdRHW33IBeLb35OOnayuuAlKVVllknP2YcSrsD1vgOvc2CM6iBkxBHmE1fzYDDFB2EQYD3Olhr7wjIwOCkvs10xmXX3OK+dnIqZMpPc49RUKNTuliA9UcEQcL1uciR5plCVyfHynt5PCtfO5d1q6B3FV3Z0mudw2Zew== 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=tA9aZraGuDqJxramZ0QgY1FA0Nn7yW99MlzZpYtrJRQ=; b=TXjnXHWegJXZ/jj8nADnZ6jzvIYiU9PGLeiHRdQyIVGtrJcj5xnxqpEyQU+PLIOMgS4z+UY9Tfy2eUvsR1lQE/Z5/j0ewVmSMqldrnenpAkycRsAX7icuCLeAton9SmxIUTvVXufu0KPUxGBFoGLm7MJAjlBp/P43UqVebcszOAs4qx25U6y1UP9jKyommOaAgrw0LsPPs85b883l5ovxp5x4pXgEcWVaqSXsrA5JVb/M5n+4JRTNqoJEm/RjKvdUv7tnUAWkf89YpESaWYg7mjY+HEXbnbSpL8H+LdDqo7Wq6c3k26Rk6chjrKAvfCDhqTqixuGAOfNM9jsmbS2jQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 58.252.5.68) smtp.rcpttodomain=linux-foundation.org smtp.mailfrom=oppo.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=oppo.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oppo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tA9aZraGuDqJxramZ0QgY1FA0Nn7yW99MlzZpYtrJRQ=; b=akldg0gwoiBYvWfObCVZmQWK2lEU1ip1nfef5OgBYGqO2qvBBYs5PNuX285AHpP+A7LAPFavUyprq9CX+KQCLbzumnmJrB0ZbiehcG307eJIcWN/i7ytqxmzVaf6TDxtMlF4oyScdkhdtSSK9QKwZXuF+t/DvqbfQwAC97SYAxM= Received: from SI2PR02CA0045.apcprd02.prod.outlook.com (2603:1096:4:196::21) by SI2PR02MB5514.apcprd02.prod.outlook.com (2603:1096:4:1a2::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.18; Wed, 21 Aug 2024 07:46:27 +0000 Received: from HK3PEPF0000021A.apcprd03.prod.outlook.com (2603:1096:4:196:cafe::7d) by SI2PR02CA0045.outlook.office365.com (2603:1096:4:196::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.18 via Frontend Transport; Wed, 21 Aug 2024 07:46:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 58.252.5.68) smtp.mailfrom=oppo.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=oppo.com; Received-SPF: Pass (protection.outlook.com: domain of oppo.com designates 58.252.5.68 as permitted sender) receiver=protection.outlook.com; client-ip=58.252.5.68; helo=mail.oppo.com; pr=C Received: from mail.oppo.com (58.252.5.68) by HK3PEPF0000021A.mail.protection.outlook.com (10.167.8.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7897.11 via Frontend Transport; Wed, 21 Aug 2024 07:46:26 +0000 Received: from localhost.localdomain (172.16.40.118) by mailappw30.adc.com (172.16.56.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 21 Aug 2024 15:46:20 +0800 From: To: , CC: , , , , , , , , , , , , , , , , , , , , , , , Chuanhua Han Subject: [PATCH v7 1/2] mm: add nr argument in mem_cgroup_swapin_uncharge_swap() helper to support large folios Date: Wed, 21 Aug 2024 15:45:39 +0800 Message-ID: <20240821074541.516249-2-hanchuanhua@oppo.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240821074541.516249-1-hanchuanhua@oppo.com> References: <20240821074541.516249-1-hanchuanhua@oppo.com> MIME-Version: 1.0 X-Originating-IP: [172.16.40.118] X-ClientProxiedBy: mailappw31.adc.com (172.16.56.198) To mailappw30.adc.com (172.16.56.197) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HK3PEPF0000021A:EE_|SI2PR02MB5514:EE_ X-MS-Office365-Filtering-Correlation-Id: f50ef5e1-ea48-4af9-47cb-08dcc1b55d0b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|7416014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: +lHhGpDOVJ3W/iSj+Osr28etKWP81DKD+g+cAOtlFqBUDFsSLD4Bi2J/2NjsQpiqO8Z5UlcjZB+0ilWSOufRzE+AOSG/qYrKfytVUbQ8t5zbI/SrrTCmHhM7dNdb46XAf8JVRmRNMOckoF7ozz6vNIcTnyDDgot/huSlsRp5Ce8iPIIGAfVuLqZDjqofTzZoiAiy9V+HUV0848h+IJyqn22bcvbOFYX8RIfVRQfEcsjCcePR7viwII6RlQeXThBteozHNW1zJyh/g358EU4OrHk8OneSSOKiJiEflasRFoOCeKXXlX9S7YSR96QEzj79zn1Qmk9r7+F7V+rKrf7PwCFVH0xj+wcOqst0MXCp89tAspsjtXZog4FzKozw3feE1TkVSedImitPFO+9ttvGr7jtWvqnJ3O2ch47h2PMNIpr0RRy8O9hYANNOr295pAi+EXVswc+EFz3HM5yETHGILWuOepbCDZZW7E4fNAqKyBStNcEy2vtbFjbi0rMqqcQBUZ8qxNV1RZAXQfWDgJcViQeLHLNEZ2rPdyDaUdnvrHaUHmDxd/8CNwPVKVjoXdOmkLFdVG6VrMSfb3trEgPgVlrafGicuXFf6pp69AiGuJKsW1kQ44wkoDWXqA5OYO00HSkhZP0DXAX0mLq+MOoYbz98bocSnDYT/hsriWNSFMGPZw3HMte+Ap0z+V9Ez+b5mz0sOq/jMNSUUKW9FJ6nFRgBugDCcMsT90Z/Nfwxx5HhJWGAmQ323ZF6fHotMQPGddT6YTIsggCM36kT8xQbX0YlFzfSN/o6aUxqvIf8BbGiUEgOS5ogz3TAGGdazWfmGAD2zlLAwWeuSEc0RIsMARcWsnsJMI2XajWW5jUugYpj/lJDgsX5NfszNO3gcp7tDUBHpPGYCa1wuxFIyVewr6ZcalWrUw4uUcur2zB/yqNxZlT5hnrwLyBJ42o8DWruM8mFLVbzbViGD9Zz2KkdcOKf3ChsJI0aPjqEphgAAjksHJwNORAjhP98KABzHhiAzNaPJqy0q7heHrxn82xFMX25tg52xJqq2GCwC08LGamuDzr4toZNkv4wE7gzFhMJVC4Ray1im+6iag8diX1LdChuyXELgTW0LEExJXKfWZsKQZZu2Ufv0nBnogLa6HlzN/0sYLlKNj1y08US2EzdVNDgjp2MsLXbMWiL7sBETnsatdsrbystk9dGJMZxBXZr+ItwKuKMTpeeiJXsJ534ZH6snLt6rCJiRiKskkzePsKHPaP5OzSQZBUXNKbpGnUqo36eKN8GYa8Vny+lMoa1HzEznXEIZmNMfqjBx89MS8u8eVTI1inSi4EV4SrnjS/wucGOKNCdtB3YWzck7nBbvFi1rStUONPzVnJvBJqWHP8ctjNPG9H2Y20qrB9Yow3rACxUxBTzKLX60D9fHwmGaeLZZ9hjlDjKn0qUxAMh7C2O0szO1rRm7wt10gCzeIH X-Forefront-Antispam-Report: CIP:58.252.5.68;CTRY:CN;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.oppo.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(7416014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: oppo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2024 07:46:26.5123 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f50ef5e1-ea48-4af9-47cb-08dcc1b55d0b X-MS-Exchange-CrossTenant-Id: f1905eb1-c353-41c5-9516-62b4a54b5ee6 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f1905eb1-c353-41c5-9516-62b4a54b5ee6;Ip=[58.252.5.68];Helo=[mail.oppo.com] X-MS-Exchange-CrossTenant-AuthSource: HK3PEPF0000021A.apcprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR02MB5514 X-Rspamd-Queue-Id: 3CD0340003 X-Stat-Signature: s4a4hjmcob1r9qmihqxzb8brk6mgwyq7 X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1724226393-229528 X-HE-Meta: U2FsdGVkX1+bSZgXClK4r+aM9Jaj1KHSM+cRs8/blAwzrmm5OJxIq6sO8Y06ztkoAbdLMwuQGHUbL43uxpVjc/xMlM+OzGtAQ9sGErmm/24t31e8LFMCelKY5rl+PIGd/vxDp9oHIfCS4Cl6hRxQS1kw/RFlwSkrbyngZ+z1gQsJ3Gta0hkr81RNSPuFC+kAD8lD3+80mUn81eRukddnU2yJa5qvfUeVTup4eHMjL+ZpkSUqrsf5IIkStdf8b5ASZk/LA/KpdgNTOQg3aNPUwIESnJT1+6dWFpYopH/FQtbe2yeYwHaOV63Kog1FfAg0flXUO5KzIH7Xah44NaHlYHSzhPRuwE4oj1EuIGZ4YcoqgnZnH3h8ucb0fxHxrhF20CTI8SJocFW9+S83I7McAMZjUvutxD87jpYhRxKVuFVWxisWBUQHo1APGsHd/uJ7KvZy42mp1ybFc6yDe/Osb0iMG8IOhd0U7K+ukLnBk8+ziiG7IQ95Wh22hzg6v4e0UMkHmHKprt29VsBWfpT45HgpgE+zE4FI5+SuZ7aU6OY7jWT/6xF2ukHIDz49G4aHs4LBF8G/AZ9DlPojdPB+nEHHRRAs1dNjT8T5curXu6f8rg1TB22s/crUsro3mlIiT00yPzf3tKkHonZ4EXtinLkXZWGu5T4Z6nDRv0w7HOtdVQ9pV1+5YIpq0Fqtj/WaatcDWK1D0FcdgRXHQP0IYj9TJ+A3UVyBbyeGOP77sXizcKgNKEXPLpbEfg0cqow47Og6rY07OuSSEWCx84TGRXjd7Ch53xfvPbCl4wRqIJ66GxFu6AojyJPVymAdd98S1FoWQip1sSXAJGMNx3VEyLxazHXn2/arhKH6s9buZyVG5ivZrp0xgjtZmBmE6D9o/k4JSKmxqK5txuFwKgoEDbaHAyLXwWE8rnaz9mBbaIO5APE8uq5SaoFjnAMPLM0cX1UMncEBShseg+SDT4g YZNCdZc8 QVsOiVVBBArS4p5cvswgNoa1A5pHlK3gpVBUY+SWlrfKH+9kpJ+rguxqrIc3py29khF8hOUtnlSPiCy3K/EvVmMdw4WLztZUOyb+kwFQXqFl3j4GgtbCe2J4e1vaxXZ+um5aFcJjhWLp4dr5aNCqpAPd2RJMygTwBAC1mj0sol660KErb7VgEW5n2sc3+F3jeGUt6dh7Xg9pbY8GwoeaM7h+PbwloItbL2ej9XYFXmK+DGf9cP6XMWYWL88nSNtR/S49F0rHWbEq75KU0/HTnHSL940vNgCmsqAHUppeG7GPMLeM51Qd3ie3pLDn7Hz6QFaGjEVErApT+AaAcg/nR9WETMbqxUjdTGx7FPe5Cox6iHTq6lHrQxTp4CETXwUIU/NAUbdgqPCwawlLNpjRDfN3Ckei8wdvYk4QTPzoUr+0zinH7UN/PVJonegWU/jevofmaA8k4TVKYDrOeU4z5dUQSzENH6aO2myGOgRInQsPHYGc= 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: From: Barry Song With large folios swap-in, we might need to uncharge multiple entries all together, add nr argument in mem_cgroup_swapin_uncharge_swap(). For the existing two users, just pass nr=1. Signed-off-by: Barry Song Signed-off-by: Chuanhua Han Acked-by: Chris Li --- include/linux/memcontrol.h | 5 +++-- mm/memcontrol.c | 7 ++++--- mm/memory.c | 2 +- mm/swap_state.c | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index fe05fdb92779..780120f7b9dd 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -699,7 +699,8 @@ int mem_cgroup_hugetlb_try_charge(struct mem_cgroup *memcg, gfp_t gfp, int mem_cgroup_swapin_charge_folio(struct folio *folio, struct mm_struct *mm, gfp_t gfp, swp_entry_t entry); -void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry); + +void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry, unsigned int nr_pages); void __mem_cgroup_uncharge(struct folio *folio); @@ -1206,7 +1207,7 @@ static inline int mem_cgroup_swapin_charge_folio(struct folio *folio, return 0; } -static inline void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry) +static inline void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry, unsigned int nr) { } diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 42c826eec124..fd74a20f23a7 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4574,14 +4574,15 @@ int mem_cgroup_swapin_charge_folio(struct folio *folio, struct mm_struct *mm, /* * mem_cgroup_swapin_uncharge_swap - uncharge swap slot - * @entry: swap entry for which the page is charged + * @entry: the first swap entry for which the pages are charged + * @nr_pages: number of pages which will be uncharged * * Call this function after successfully adding the charged page to swapcache. * * Note: This function assumes the page for which swap slot is being uncharged * is order 0 page. */ -void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry) +void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry, unsigned int nr_pages) { /* * Cgroup1's unified memory+swap counter has been charged with the @@ -4601,7 +4602,7 @@ void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry) * let's not wait for it. The page already received a * memory+swap charge, drop the swap entry duplicate. */ - mem_cgroup_uncharge_swap(entry, 1); + mem_cgroup_uncharge_swap(entry, nr_pages); } } diff --git a/mm/memory.c b/mm/memory.c index 93c0c25433d0..b9fe2f354878 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4101,7 +4101,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) ret = VM_FAULT_OOM; goto out_page; } - mem_cgroup_swapin_uncharge_swap(entry); + mem_cgroup_swapin_uncharge_swap(entry, 1); shadow = get_shadow_from_swap_cache(entry); if (shadow) diff --git a/mm/swap_state.c b/mm/swap_state.c index a042720554a7..4669f29cf555 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -522,7 +522,7 @@ struct folio *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, if (add_to_swap_cache(new_folio, entry, gfp_mask & GFP_RECLAIM_MASK, &shadow)) goto fail_unlock; - mem_cgroup_swapin_uncharge_swap(entry); + mem_cgroup_swapin_uncharge_swap(entry, 1); if (shadow) workingset_refault(new_folio, shadow); From patchwork Wed Aug 21 07:45:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuanhua Han X-Patchwork-Id: 13770973 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 AFB0CC52D7C for ; Wed, 21 Aug 2024 07:46:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DF0246B00B8; Wed, 21 Aug 2024 03:46:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DA1516B00B9; Wed, 21 Aug 2024 03:46:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BCD306B00BA; Wed, 21 Aug 2024 03:46:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 968AE6B00B8 for ; Wed, 21 Aug 2024 03:46:42 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 15EDBA0878 for ; Wed, 21 Aug 2024 07:46:42 +0000 (UTC) X-FDA: 82475470644.21.E18692C Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2054.outbound.protection.outlook.com [40.107.215.54]) by imf20.hostedemail.com (Postfix) with ESMTP id AF09F1C001D for ; Wed, 21 Aug 2024 07:46:38 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=oppo.com header.s=selector1 header.b=Ep8nPDWG; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf20.hostedemail.com: domain of hanchuanhua@oppo.com designates 40.107.215.54 as permitted sender) smtp.mailfrom=hanchuanhua@oppo.com; dmarc=pass (policy=quarantine) header.from=oppo.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1724226320; 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=xqu7mtmRwYRQNWR3puKoVdA/0XNY8g5SYZR3rqVFIPw=; b=WpgEGTw7QJ/ku0OlK2UQWd+D/wXMHprRGaJyOLg6DyDYu9QYI9lIkiUCub3FWktsTzc/0N 1i+c5S9Lj2U9noVKyhx2sLSNsjneXG0Xka5jivMwZCUvwcYMTKJFxw6t3P/8Kor4p/Q8ng 6MkbMCF/pavYk0toB4SrxYhG9Ygn1wA= ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1724226320; a=rsa-sha256; cv=pass; b=mRFyYN017nEynPsNMAEPheZIHkdZvH+qHmA1jxVYODODtMGQA3u+1lB4DaOtjvYCoHqakF tnVCzBGyQSzhzExnBq9PbDvZx2oPbmwNxB0rhT8W6RzuzYMJgzz1hztnasEiVfIuX+RR9T SKHOabSZA/ZuQW3ON4BbC2tuQSTP8rw= ARC-Authentication-Results: i=2; imf20.hostedemail.com; dkim=pass header.d=oppo.com header.s=selector1 header.b=Ep8nPDWG; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf20.hostedemail.com: domain of hanchuanhua@oppo.com designates 40.107.215.54 as permitted sender) smtp.mailfrom=hanchuanhua@oppo.com; dmarc=pass (policy=quarantine) header.from=oppo.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=u6H8vIQhmuWslIKGDnMkpg6mSYkYVoNLvrwqH/t7w9uDIvlO7e5AEAA2LVhi4co9A02aeqobbylGoknxd7Y1yjUE+Ifdo38wj+ErEpT//p/8AOEhAjBZ7BDoTgh1iU3Lh1U95HsPIGaMlJW+NAqAeyNt7j+VBKT1YvdZ3pggqaNYBMnSmAn6qkPscKGGxQvSTYcxLmeJamww28PaFmJ+a1TG1m30SxTTLzGx+JhBzUAmBvwYIq8hPupdKwkUYfsE5lslEoxOIMu85Mx0+i77tT7Qmr8uTqwpqG/YOz46Wy3cJ/4/fEun0Rx5OcydMfe6bFKjKnsbnVewkmsB+y+ANw== 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=xqu7mtmRwYRQNWR3puKoVdA/0XNY8g5SYZR3rqVFIPw=; b=JbmZgnsPlEQb+KoqC8b9E8h4rzA4hmGEx/kJhejaPstyfvJZ+xktuSetHbFbKCjBJqD4ICFImou4EGbcrX3K5gHORsmGwjWLJRowjn14sYgmKb73huJzRpMf4EnfiKTWDgVwd0+33EGUashJXRtwsFvQodSxOAK8uNtQGP71SYte0MUc/g1TXoTf9tMMUrDTU/9p/4VCccxLBMd7vBOKVCpXcQlrYOBAeUSkzRv4j7Az5zdFAPg/kwSDi5Qxn8QxeRkfA4zLJCfb3uM77VD63ft1rt796WTixMhqNr1gtvjawehT/Yl3YxMDfJrsQNc9Q4VzjrNXcyddTHbsNQKNYw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 58.252.5.68) smtp.rcpttodomain=linux-foundation.org smtp.mailfrom=oppo.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=oppo.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oppo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xqu7mtmRwYRQNWR3puKoVdA/0XNY8g5SYZR3rqVFIPw=; b=Ep8nPDWGOePu8JROONE9Mtt3Zazp+Bcx9vObRm7cKs9+Q+Nw7AcI4Abj6OaVUKoZDJo8J3+h8EWqyE733vaQ85AvAn/bugbTFlTI1g/ZpvgNhwQBDtiIEOZ7HFpmBh/4Jr2GKoKsLGPxfx5n/E8/pA2s81lsX+ydOoDEQ2BmNqo= Received: from SI2PR02CA0038.apcprd02.prod.outlook.com (2603:1096:4:196::22) by JH0PR02MB6991.apcprd02.prod.outlook.com (2603:1096:990:44::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.25; Wed, 21 Aug 2024 07:46:29 +0000 Received: from HK3PEPF0000021A.apcprd03.prod.outlook.com (2603:1096:4:196:cafe::33) by SI2PR02CA0038.outlook.office365.com (2603:1096:4:196::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.16 via Frontend Transport; Wed, 21 Aug 2024 07:46:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 58.252.5.68) smtp.mailfrom=oppo.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=oppo.com; Received-SPF: Pass (protection.outlook.com: domain of oppo.com designates 58.252.5.68 as permitted sender) receiver=protection.outlook.com; client-ip=58.252.5.68; helo=mail.oppo.com; pr=C Received: from mail.oppo.com (58.252.5.68) by HK3PEPF0000021A.mail.protection.outlook.com (10.167.8.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7897.11 via Frontend Transport; Wed, 21 Aug 2024 07:46:27 +0000 Received: from localhost.localdomain (172.16.40.118) by mailappw30.adc.com (172.16.56.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 21 Aug 2024 15:46:20 +0800 From: To: , CC: , , , , , , , , , , , , , , , , , , , , , , , Chuanhua Han Subject: [PATCH v7 2/2] mm: support large folios swap-in for sync io devices Date: Wed, 21 Aug 2024 15:45:40 +0800 Message-ID: <20240821074541.516249-3-hanchuanhua@oppo.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240821074541.516249-1-hanchuanhua@oppo.com> References: <20240821074541.516249-1-hanchuanhua@oppo.com> MIME-Version: 1.0 X-Originating-IP: [172.16.40.118] X-ClientProxiedBy: mailappw31.adc.com (172.16.56.198) To mailappw30.adc.com (172.16.56.197) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HK3PEPF0000021A:EE_|JH0PR02MB6991:EE_ X-MS-Office365-Filtering-Correlation-Id: a55ebdac-7426-4a62-ee17-08dcc1b55df4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: 7HxtBgaD2Nbv5wjUXQ73sXq++k9+uy6r0H7cttJHeHhbiIJKfv7V4x0ZOVrjKo4beoiklKX1XsPLC3tkfqUQp/ZIVxDA3pcUhVp4Cmy+XTOSeXORNdNGVbitr8CiCzHmAV+OsCqDuzm2RR1gmIeryY+OeEnhwbqybGV0bin9vQwfHr4VPy/iNOZdZ+Tlkgj5RkhVBNWiQg2wOPZGQPtrWk0T7zaWjsX5Afpptu285/b60lS6hCGYzubbIuWmYIYMIaNeOa83kWZkyN0Jr4nY2oGv4FnZGGclnuTIPs+A10PzQf2jTah7ojpoWEnetvn9VLEjuY2Rsw7G7bH+PobTaRQkBEOUj0OoHlwN/Pvu7gSckXTpyRkQMZKGRIUn5A61ROl88+gwImeUEpnTmjiFdSIjYDcd8ZyC8w6dQBN+wiCzGwbcKz5AMdeoaPMnUeRQvf1bPpFS+eJyG+oVsgtyDP5AuQZ8Hiduoo857UpGcCAqT5G2czaOAdBo2fJcYomeIjaqAGaIPnTamKDSG977U6yp7KJeB+uvKWX+4G+Qorw73NptoYbUy0BQzRtgWKwR1pG9CD/aCqzxG++YEzLTKabKIIvELE1ZHaqGHD8KNMzO9gCADz2gPp/7k8sUluyPQPxXVnSBPvNi/evdMcGRiKZ1lsnuJ9weKq7uaHrPR3tSZu5/x8qyvJkJqXVrNYd/5/1qoHyRSOe0PJ2m2DD6IRKLXcp0Dl0uiugQ3uDrMHxgAErh7SJp+B8XknQTQ9H209vi/60BmkriYLJZFcenZVLeEM382FuF+n3XfgUMeBGf+wmCEr7OdnV1qSoyalhvMS3UsLHDIZ3B4J+zxCOUo3lE1Mu+oedFAKE4ARcu9MbRY22ZwnE8h9mJOIuW546tegudCYQnIAvz84AMdaK9jjmNWhf95uW/TU12NoG5ZgdM5Z6gaafF+ppybEPk/IP0MRV160Isv2EpGBUidCC0ob6oCSa3sJwQ+Ycq5AyvlG97Tf9AtdBPnZxY143PUgCG7nVYaB2o5NfetHjkGKgwH0sIIkQuRc+GoK7LS3MRpA8X4W5f03WSQSqUWq9t5eHiUrU5GU/3fXBu/6rRdWoLhJcrQBVdzQtl68gQzJUPzyW8IC8AYSou41aHLlAfogEGkqTLnXDghP8hbZMDg4iPLpSSxolkxZLQjGQreNLFIPuelmeHwAYELY6kASDKlw4Ahp0Ey4WdCpMQYX6kqhXefsivH1mfvVKdiGSizcQWvd6GVDvI/ZkoAIJnVr4Tepte07a6zjzyJebimcbSvRJx4MfslFlg/yl5XsegqLDd9QvuxYYPv797A6HwCprPKt+QXEmDatByEGIB3z1S9na4dytnx2xdT7Y+hyEQUM6aXTNxX0GRJnuYLedPTX/HdPHZaIksbUX5vPJIWmznwzEfxvNcmZ+8M0zbNlXDCGoiYS3frM0DmLrIYTd1QYllKOhM X-Forefront-Antispam-Report: CIP:58.252.5.68;CTRY:CN;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.oppo.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(82310400026)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: oppo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2024 07:46:27.9341 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a55ebdac-7426-4a62-ee17-08dcc1b55df4 X-MS-Exchange-CrossTenant-Id: f1905eb1-c353-41c5-9516-62b4a54b5ee6 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f1905eb1-c353-41c5-9516-62b4a54b5ee6;Ip=[58.252.5.68];Helo=[mail.oppo.com] X-MS-Exchange-CrossTenant-AuthSource: HK3PEPF0000021A.apcprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: JH0PR02MB6991 X-Rspamd-Queue-Id: AF09F1C001D X-Stat-Signature: r7gmnsdtdj5hasr1f7qor5oy1k4gzm34 X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1724226398-365747 X-HE-Meta: U2FsdGVkX18J6f33QikVwnLIIAhPE+8v8Zq+VXQaBrF7Zz0EGs/E5uDeieqvTV7Zwn1red0e49g/NvqNTq/NZnXB9+h5l18gzYrXSoOoFlfj8EBevxWjXJgcOdBBumI3H+Q6n8xDeHUj2ldGuUHKCOLNKMNx53NxEsKOaMQ60kZGO1Y/Y2X/XhtHvcfD9O4hS85V+kmD9fVyHD+EhSCa13b3MbR3udVf3R7nl1aWQ5e0FzSPGjdjE24WfJBegdc+63nWoUi1GW3dqjUHPY9H/P8EkInHMM41f/8Z77lGZ3BcAKL8Fsq3k/5pUOdz41RBdb7s4h1zd3hgNhpSu7sCm6eFhgBticD5plRT5/wh3vmm6ZsIBcWfHug6XHoahb0x4HeUF3h3YagoL5WxeoGMXMPkmCgaVGYJfRua1Cbd+kAhst5jeF+qhSCxq+7yTdaAh8VuD2exw5URJDojG6txHQ3qHLkaGBAiOUFtnCOr5zaJWXvpeqY2R7Vo8D6KEJ7UcppobPyV/yz3qnX2WHM1Je+dxu2L55xY9k/GAuc6xXea527sGpZec5Kjm29yNhkVsP3z0tMDEzxq36iMnwXXSm5f3SnPVVN6JDZhLTUXHi0hQbcscUPadsA5bfwlkJOfjho7au5y542UTdDvUJe4jg6Ve/LqBO2h2ABZ5Zk+HBYW8gUpZu7iFttVr1o3t5jhX9AnyQsbyd4IqGfuKV8O/fGVgUu1CrubI12Rxq5U9D//VSMdnRG9gvetxD/FDkTmakQliyaRnX5JDRlTuCQp96efytsx0C1aqfhYGaGW6qt7khhNK9Le5y+tikQeMxAaXR8w5c0o3ACg7lmvmwzBIZSL+4y0RvpZS/sjUrmeR62LNhVPBvudCARBR32H+mOOzaN/0Fb1/QJ5d/3tB89DBTC0S09wOZLNUKTQabbedUzbzATfnIsKsEl1/uxf2jRdF5wo1lTfGRx8ojtu2PU voxZ68u5 mv7ShjGA23UoykATzO47sPJxG1e5yBZH7tm11h8MuJu7kspDvcIaJDzSFENvoR8+T5rYUjWWUOUdcNd5Fg9I7wMLpDxjR9oHZpKnqRKOtfPRyCvAh/HoatmUNFkDeJS3Jh44koiIa2mUQItCI9tLIqxf3bCUTqM4hR5LQK2N3VXkyHpviG6q/D22ZUDYyYxosy9SK1tHkXjDgDc3NwwfO7wfedWD+a3v0YqvpC4CmJXrkIjCOkuAD2npBtbF56Py1T4J2jlQY2zJYsIe0nJlGrsr5uwDtDSD4TpQtlFeXZ0gfFiguVGXX2Oz9EmSNZ5CJXkMLusaXn7q3P8jbETwOkr6ThzEQiEp2a+Uxr9rHJIzDJ7ZBxHjO2QveVddW7nm0tNiW29T8diyXb9K4snMwSwy/ngB+9MtxWPvF7LMsq7/W4P9OlGthPRG+d/5x0uVh421Tz8xfIbZlP7gtywgKi+TWJannVn7RGKLhdbQdj46IyM6BZ6M3IAEriTUjkt5NwNZC 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: From: Chuanhua Han Currently, we have mTHP features, but unfortunately, without support for large folio swap-ins, once these large folios are swapped out, they are lost because mTHP swap is a one-way process. The lack of mTHP swap-in functionality prevents mTHP from being used on devices like Android that heavily rely on swap. This patch introduces mTHP swap-in support. It starts from sync devices such as zRAM. This is probably the simplest and most common use case, benefiting billions of Android phones and similar devices with minimal implementation cost. In this straightforward scenario, large folios are always exclusive, eliminating the need to handle complex rmap and swapcache issues. It offers several benefits: 1. Enables bidirectional mTHP swapping, allowing retrieval of mTHP after swap-out and swap-in. Large folios in the buddy system are also preserved as much as possible, rather than being fragmented due to swap-in. 2. Eliminates fragmentation in swap slots and supports successful THP_SWPOUT. w/o this patch (Refer to the data from Chris's and Kairui's latest swap allocator optimization while running ./thp_swap_allocator_test w/o "-a" option [1]): ./thp_swap_allocator_test Iteration 1: swpout inc: 233, swpout fallback inc: 0, Fallback percentage: 0.00% Iteration 2: swpout inc: 131, swpout fallback inc: 101, Fallback percentage: 43.53% Iteration 3: swpout inc: 71, swpout fallback inc: 155, Fallback percentage: 68.58% Iteration 4: swpout inc: 55, swpout fallback inc: 168, Fallback percentage: 75.34% Iteration 5: swpout inc: 35, swpout fallback inc: 191, Fallback percentage: 84.51% Iteration 6: swpout inc: 25, swpout fallback inc: 199, Fallback percentage: 88.84% Iteration 7: swpout inc: 23, swpout fallback inc: 205, Fallback percentage: 89.91% Iteration 8: swpout inc: 9, swpout fallback inc: 219, Fallback percentage: 96.05% Iteration 9: swpout inc: 13, swpout fallback inc: 213, Fallback percentage: 94.25% Iteration 10: swpout inc: 12, swpout fallback inc: 216, Fallback percentage: 94.74% Iteration 11: swpout inc: 16, swpout fallback inc: 213, Fallback percentage: 93.01% Iteration 12: swpout inc: 10, swpout fallback inc: 210, Fallback percentage: 95.45% Iteration 13: swpout inc: 16, swpout fallback inc: 212, Fallback percentage: 92.98% Iteration 14: swpout inc: 12, swpout fallback inc: 212, Fallback percentage: 94.64% Iteration 15: swpout inc: 15, swpout fallback inc: 211, Fallback percentage: 93.36% Iteration 16: swpout inc: 15, swpout fallback inc: 200, Fallback percentage: 93.02% Iteration 17: swpout inc: 9, swpout fallback inc: 220, Fallback percentage: 96.07% w/ this patch (always 0%): Iteration 1: swpout inc: 948, swpout fallback inc: 0, Fallback percentage: 0.00% Iteration 2: swpout inc: 953, swpout fallback inc: 0, Fallback percentage: 0.00% Iteration 3: swpout inc: 950, swpout fallback inc: 0, Fallback percentage: 0.00% Iteration 4: swpout inc: 952, swpout fallback inc: 0, Fallback percentage: 0.00% Iteration 5: swpout inc: 950, swpout fallback inc: 0, Fallback percentage: 0.00% Iteration 6: swpout inc: 950, swpout fallback inc: 0, Fallback percentage: 0.00% Iteration 7: swpout inc: 947, swpout fallback inc: 0, Fallback percentage: 0.00% Iteration 8: swpout inc: 950, swpout fallback inc: 0, Fallback percentage: 0.00% Iteration 9: swpout inc: 950, swpout fallback inc: 0, Fallback percentage: 0.00% Iteration 10: swpout inc: 945, swpout fallback inc: 0, Fallback percentage: 0.00% Iteration 11: swpout inc: 947, swpout fallback inc: 0, Fallback percentage: 0.00% ... 3. With both mTHP swap-out and swap-in supported, we offer the option to enable zsmalloc compression/decompression with larger granularity[2]. The upcoming optimization in zsmalloc will significantly increase swap speed and improve compression efficiency. Tested by running 100 iterations of swapping 100MiB of anon memory, the swap speed improved dramatically: time consumption of swapin(ms) time consumption of swapout(ms) lz4 4k 45274 90540 lz4 64k 22942 55667 zstdn 4k 85035 186585 zstdn 64k 46558 118533 The compression ratio also improved, as evaluated with 1 GiB of data: granularity orig_data_size compr_data_size 4KiB-zstd 1048576000 246876055 64KiB-zstd 1048576000 199763892 Without mTHP swap-in, the potential optimizations in zsmalloc cannot be realized. 4. Even mTHP swap-in itself can reduce swap-in page faults by a factor of nr_pages. Swapping in content filled with the same data 0x11, w/o and w/ the patch for five rounds (Since the content is the same, decompression will be very fast. This primarily assesses the impact of reduced page faults): swp in bandwidth(bytes/ms) w/o w/ round1 624152 1127501 round2 631672 1127501 round3 620459 1139756 round4 606113 1139756 round5 624152 1152281 avg 621310 1137359 +83% [1] https://lore.kernel.org/all/20240730-swap-allocator-v5-0-cb9c148b9297@kernel.org/ [2] https://lore.kernel.org/all/20240327214816.31191-1-21cnbao@gmail.com/ Signed-off-by: Chuanhua Han Co-developed-by: Barry Song Signed-off-by: Barry Song --- mm/memory.c | 250 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 223 insertions(+), 27 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index b9fe2f354878..7aa0358a4160 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3986,6 +3986,184 @@ static vm_fault_t handle_pte_marker(struct vm_fault *vmf) return VM_FAULT_SIGBUS; } +static struct folio *__alloc_swap_folio(struct vm_fault *vmf) +{ + struct vm_area_struct *vma = vmf->vma; + struct folio *folio; + swp_entry_t entry; + + folio = vma_alloc_folio(GFP_HIGHUSER_MOVABLE, 0, vma, + vmf->address, false); + if (!folio) + return NULL; + + entry = pte_to_swp_entry(vmf->orig_pte); + if (mem_cgroup_swapin_charge_folio(folio, vma->vm_mm, + GFP_KERNEL, entry)) { + folio_put(folio); + return NULL; + } + + return folio; +} + +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +/* + * Check if the PTEs within a range are contiguous swap entries + * and have no cache when check_no_cache is true. + */ +static bool can_swapin_thp(struct vm_fault *vmf, pte_t *ptep, + int nr_pages, bool check_no_cache) +{ + struct swap_info_struct *si; + unsigned long addr; + swp_entry_t entry; + pgoff_t offset; + int idx, i; + pte_t pte; + + addr = ALIGN_DOWN(vmf->address, nr_pages * PAGE_SIZE); + idx = (vmf->address - addr) / PAGE_SIZE; + pte = ptep_get(ptep); + + if (!pte_same(pte, pte_move_swp_offset(vmf->orig_pte, -idx))) + return false; + entry = pte_to_swp_entry(pte); + offset = swp_offset(entry); + if (swap_pte_batch(ptep, nr_pages, pte) != nr_pages) + return false; + + if (!check_no_cache) + return true; + + si = swp_swap_info(entry); + /* + * While allocating a large folio and doing swap_read_folio, which is + * the case the being faulted pte doesn't have swapcache. We need to + * ensure all PTEs have no cache as well, otherwise, we might go to + * swap devices while the content is in swapcache. + */ + for (i = 0; i < nr_pages; i++) { + if ((si->swap_map[offset + i] & SWAP_HAS_CACHE)) + return false; + } + + return true; +} + +static inline unsigned long thp_swap_suitable_orders(pgoff_t swp_offset, + unsigned long addr, + unsigned long orders) +{ + int order, nr; + + order = highest_order(orders); + + /* + * To swap in a THP with nr pages, we require that its first swap_offset + * is aligned with that number, as it was when the THP was swapped out. + * This helps filter out most invalid entries. + */ + while (orders) { + nr = 1 << order; + if ((addr >> PAGE_SHIFT) % nr == swp_offset % nr) + break; + order = next_order(&orders, order); + } + + return orders; +} + +static struct folio *alloc_swap_folio(struct vm_fault *vmf) +{ + struct vm_area_struct *vma = vmf->vma; + unsigned long orders; + struct folio *folio; + unsigned long addr; + swp_entry_t entry; + spinlock_t *ptl; + pte_t *pte; + gfp_t gfp; + int order; + + /* + * If uffd is active for the vma we need per-page fault fidelity to + * maintain the uffd semantics. + */ + if (unlikely(userfaultfd_armed(vma))) + goto fallback; + + /* + * A large swapped out folio could be partially or fully in zswap. We + * lack handling for such cases, so fallback to swapping in order-0 + * folio. + */ + if (!zswap_never_enabled()) + goto fallback; + + entry = pte_to_swp_entry(vmf->orig_pte); + /* + * Get a list of all the (large) orders below PMD_ORDER that are enabled + * and suitable for swapping THP. + */ + orders = thp_vma_allowable_orders(vma, vma->vm_flags, + TVA_IN_PF | TVA_ENFORCE_SYSFS, BIT(PMD_ORDER) - 1); + orders = thp_vma_suitable_orders(vma, vmf->address, orders); + orders = thp_swap_suitable_orders(swp_offset(entry), + vmf->address, orders); + + if (!orders) + goto fallback; + + pte = pte_offset_map_lock(vmf->vma->vm_mm, vmf->pmd, + vmf->address & PMD_MASK, &ptl); + if (unlikely(!pte)) + goto fallback; + + /* + * For do_swap_page, find the highest order where the aligned range is + * completely swap entries with contiguous swap offsets. + */ + order = highest_order(orders); + while (orders) { + addr = ALIGN_DOWN(vmf->address, PAGE_SIZE << order); + if (can_swapin_thp(vmf, pte + pte_index(addr), 1 << order, true)) + break; + order = next_order(&orders, order); + } + + pte_unmap_unlock(pte, ptl); + + /* Try allocating the highest of the remaining orders. */ + gfp = vma_thp_gfp_mask(vma); + while (orders) { + addr = ALIGN_DOWN(vmf->address, PAGE_SIZE << order); + folio = vma_alloc_folio(gfp, order, vma, addr, true); + if (folio) { + if (!mem_cgroup_swapin_charge_folio(folio, vma->vm_mm, + gfp, entry)) + return folio; + folio_put(folio); + } + order = next_order(&orders, order); + } + +fallback: + return __alloc_swap_folio(vmf); +} +#else /* !CONFIG_TRANSPARENT_HUGEPAGE */ +static inline bool can_swapin_thp(struct vm_fault *vmf, pte_t *ptep, + int nr_pages, bool check_no_cache) +{ + return false; +} + +static struct folio *alloc_swap_folio(struct vm_fault *vmf) +{ + return __alloc_swap_folio(vmf); +} +#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ + /* * We enter with non-exclusive mmap_lock (to exclude vma changes, * but allow concurrent faults), and pte mapped but not yet locked. @@ -4074,34 +4252,34 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) if (!folio) { if (data_race(si->flags & SWP_SYNCHRONOUS_IO) && __swap_count(entry) == 1) { - /* - * Prevent parallel swapin from proceeding with - * the cache flag. Otherwise, another thread may - * finish swapin first, free the entry, and swapout - * reusing the same entry. It's undetectable as - * pte_same() returns true due to entry reuse. - */ - if (swapcache_prepare(entry, 1)) { - /* Relax a bit to prevent rapid repeated page faults */ - schedule_timeout_uninterruptible(1); - goto out; - } - need_clear_cache = true; - /* skip swapcache */ - folio = vma_alloc_folio(GFP_HIGHUSER_MOVABLE, 0, - vma, vmf->address, false); + folio = alloc_swap_folio(vmf); if (folio) { __folio_set_locked(folio); __folio_set_swapbacked(folio); - if (mem_cgroup_swapin_charge_folio(folio, - vma->vm_mm, GFP_KERNEL, - entry)) { - ret = VM_FAULT_OOM; + nr_pages = folio_nr_pages(folio); + if (folio_test_large(folio)) + entry.val = ALIGN_DOWN(entry.val, nr_pages); + /* + * Prevent parallel swapin from proceeding with + * the cache flag. Otherwise, another thread + * may finish swapin first, free the entry, and + * swapout reusing the same entry. It's + * undetectable as pte_same() returns true due + * to entry reuse. + */ + if (swapcache_prepare(entry, nr_pages)) { + /* + * Relax a bit to prevent rapid + * repeated page faults. + */ + schedule_timeout_uninterruptible(1); goto out_page; } - mem_cgroup_swapin_uncharge_swap(entry, 1); + need_clear_cache = true; + + mem_cgroup_swapin_uncharge_swap(entry, nr_pages); shadow = get_shadow_from_swap_cache(entry); if (shadow) @@ -4207,6 +4385,23 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) goto out_nomap; } + /* allocated large folios for SWP_SYNCHRONOUS_IO */ + if (folio_test_large(folio) && !folio_test_swapcache(folio)) { + unsigned long nr = folio_nr_pages(folio); + unsigned long folio_start = ALIGN_DOWN(vmf->address, + nr * PAGE_SIZE); + unsigned long idx = (vmf->address - folio_start) / PAGE_SIZE; + pte_t *folio_ptep = vmf->pte - idx; + + if (!can_swapin_thp(vmf, folio_ptep, nr, false)) + goto out_nomap; + + page_idx = idx; + address = folio_start; + ptep = folio_ptep; + goto check_folio; + } + nr_pages = 1; page_idx = 0; address = vmf->address; @@ -4338,11 +4533,12 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) folio_add_lru_vma(folio, vma); } else if (!folio_test_anon(folio)) { /* - * We currently only expect small !anon folios, which are either - * fully exclusive or fully shared. If we ever get large folios - * here, we have to be careful. + * We currently only expect small !anon folios which are either + * fully exclusive or fully shared, or new allocated large + * folios which are fully exclusive. If we ever get large + * folios within swapcache here, we have to be careful. */ - VM_WARN_ON_ONCE(folio_test_large(folio)); + VM_WARN_ON_ONCE(folio_test_large(folio) && folio_test_swapcache(folio)); VM_WARN_ON_FOLIO(!folio_test_locked(folio), folio); folio_add_new_anon_rmap(folio, vma, address, rmap_flags); } else { @@ -4385,7 +4581,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) out: /* Clear the swap cache pin for direct swapin after PTL unlock */ if (need_clear_cache) - swapcache_clear(si, entry, 1); + swapcache_clear(si, entry, nr_pages); if (si) put_swap_device(si); return ret; @@ -4401,7 +4597,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) folio_put(swapcache); } if (need_clear_cache) - swapcache_clear(si, entry, 1); + swapcache_clear(si, entry, nr_pages); if (si) put_swap_device(si); return ret;