From patchwork Wed Feb 26 21:08: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: 13993193 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2050.outbound.protection.outlook.com [40.107.94.50]) (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 366C625742A; Wed, 26 Feb 2025 21:09:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740604144; cv=fail; b=bUIjQfITRgD70C147llnhTqloV170QdPUcMzy9U0KG8uXIPkaSEdR2YkSzA/a+RAcubFdaIP9XbZjFhDaYAG5hzTIeK17zEERhkUuYptymNSuPfgR3cfN2FVyJ1/e1kwWmVFPSRzOepbw2UEquxEuoaRu9U9aog+2Pk+OhoHoYw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740604144; c=relaxed/simple; bh=tlm2VNS1EKfhhTqc7giLlVer/ws1SPEtt8uKbdQnKfw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=YfeaZzzyuU6nxSsd7GZ57n75W6aCTj6SwcoLy3CWFlSK+1ZypBnmApX4kqekPleEQEsJl1eqxR1dnvaS4iorOtgW1xsO1LczJ7t0Qs9lZzY5Egy5HoAdsD7m6/CVKVkvHKbvjG2CUZzM4/XT14ydcdQHZRl5rh7koX9Yb9jYyws= 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=iSamyKXN; arc=fail smtp.client-ip=40.107.94.50 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="iSamyKXN" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RSs8FkFzh9wqoJ2bz6eT9sd37vEFPP8JEASxTvdVW7Iu/ydpd5OP0j9jW4sTRPiCbdnHn6NT9uShHcx/ebXX0JWXBkTtpiu63Hy3IRVu65QJHis+ETf3I+gbJJLX7WlADkcAwkbYSS60OYXjWKrRz/6fSaMWGha/IyWQVpLu3L/QAg5LOubHE4db+IwAip2g2G7AJ/ziRgC7wAvINkn7ZJV6Vm9ILwvad61y1wPc7ELhDVtShX66nzMjufKpNETqmu4cg5nVcmJ49l6jCryA5byIZ9ZAKHKl3Y3S27NESJyM4wJRkWXecJBzuyeQuZ0UfM1ELuISEziXzF31jK1GMw== 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=2QqGevh41/tC3V+T2ChKF52ncLDVut8qgSqk7CzqYxg=; b=G6LlY+za9Cr8Mc999SHTbddlJGnNVQWOA36CDxmjSXBgcDk3ooBGQzMCD7dm+4NIkJlLhmwbar8pvy9BNnNw0U5PpflYouXI4zmuhtFQdZ1D61R0tQuKHRpuTKeofOVB73C2ejHvCcob0noM1IJRSKSY8IVs+fLpMlIUoIY9N0OjT2NeluiqLIC1UL/0wrQ5x7N40FvVCGm0nAT+WczXFEEaDOkllw3bSTIJUhmlXEmzzG7LkGx4Tx+ivYe4RyNzA59jrQ4dhi5mTc+fAhMURDgBKy5L5mG43XuOA0q6b+9iual8xAg3RS1ZnzSojx19HcRdryivwyYAvYp02n/Fxg== 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=2QqGevh41/tC3V+T2ChKF52ncLDVut8qgSqk7CzqYxg=; b=iSamyKXNsbx10zig6Z1AYEJuqsls/aCp9b1riCo5TXqTrPp13rulSdNb3DeIKEwRQ1MJzq3fDps9zLIkHIxLR65Eg2/BDld6/qjEwTkCq1WPmNmo+Nw6QakrYiFvaOho9yxNx4vgZWq4JUbHmedmCuXqiugbA8oHo3nPv6pd9w85DLPIIvzmk+JNoPd9InP0zL6SJwtN/LcMPNn2eLRrqdAYFrbgigX+IqJwx8KorxseyyJ8wTtmorRnZ5oglSnwaDHPv0PFoah4y0C6bjjdgFvYenvOFiC8L9+sBUnU7rVA73Pr2MuSQ/EVwduMHrRNXCKNnqS9w8K7Eq9Sg10FHw== 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 SA1PR12MB7221.namprd12.prod.outlook.com (2603:10b6:806:2bd::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.20; Wed, 26 Feb 2025 21:08:59 +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.8466.016; Wed, 26 Feb 2025 21:08:59 +0000 From: Zi Yan To: Baolin Wang , Matthew Wilcox , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Cc: Andrew Morton , Hugh Dickins , Kairui Song , Miaohe Lin , linux-kernel@vger.kernel.org, Zi Yan , David Hildenbrand , John Hubbard , Kefeng Wang , "Kirill A. Shuemov" , Ryan Roberts , Yang Shi , Yu Zhao Subject: [PATCH v3 1/2] mm/filemap: use xas_try_split() in __filemap_add_folio() Date: Wed, 26 Feb 2025 16:08:53 -0500 Message-ID: <20250226210854.2045816-2-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250226210854.2045816-1-ziy@nvidia.com> References: <20250226210854.2045816-1-ziy@nvidia.com> X-ClientProxiedBy: MN2PR14CA0007.namprd14.prod.outlook.com (2603:10b6:208:23e::12) To DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS7PR12MB9473:EE_|SA1PR12MB7221:EE_ X-MS-Office365-Filtering-Correlation-Id: 97cebf45-10c6-44ee-1896-08dd56a9c9b8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|7416014|1800799024|7053199007; X-Microsoft-Antispam-Message-Info: 2Xp1VGrxgI/mBcNCel6SzLdW/odQZvizBGyEr0O7+j/B2oefxtEYhwbm7ToQO2DdEPw0IGwedcvxzxU1HlRiyCsHgEWTWcd8l4UddvF5K9r7c8ZPb9AJh0sywssaKCm/FXdLLfQ5oC0OFxwFY0pq6NPgKGbPAk4Zq0vZ/ocxWPc7GJ929bFPFK+eG2Wlr5X1v2doxSwCj+zkHtxcptBqCFSTre/T7S2V/DTQitPBPILW3InNNbZjHJAdeTlY2O3doIPm0IqVSK69ppFuVjHu93Bus4/npA9i57oLUKW5j2O73xTvMc4mM4u1RNKj4WdFuYOX7m2Qt4AjzBZ9T3FgajofNyCZCoN8FIGa2WmLfY67zLNWknyMLv8YHNf8CBrYbdo9KTraO7mYujoKdlghMRFXBEQs3A//HE1Y1/Vtdbekg1SSOfsDpmAc93l9f5URFnUJm2BSMGzjWwTP6SCVumWlv59tlHaVmW7h+AtFSRK2xmG3uGRe/McZnPFzyUAvRZS4qBsgIfl1fVLZLyIQwkMRWTd9wxyH+FhwzxfWc7YiGG02mWnIItlMHAvqYeFURP0kPXSIrD00Q2Ub7KJ5cKgamu+X4W0pngrViVPXVe+dAKmFQPbfBYasR+SAEyf+ow0FEvg1FRw5SR7j0M2eCamLmhFbP57ZpIc3J59zbrecK8OVAauq9CWOFvVb7wAB7QeW9G949j/i20LwEovjXp22DBaLHkVD5ZunWWZi6CgKl3aQ9GkCESDC6FWNJddy/VlAc5EojIhEAKMXavrEG2INWq1ueBYYG1K/K1cZca2I/brp5DfIrEwRkHaPUmsYNnIbxlzyO9QTJUe9INwEfOlhWWxf8TAOGN5r5mb0CYnL4qI0jP8KwUh0k1n5dSJp5dvhx+G+mIjHVNXV5Q2mmSn0pyI2CKYI21qoxh+eR6n/r2f2W83ejdt21zQK7RBBh14jq1fDWxBC6QIUllGv74KBIUA51kycrdOtMrvcn5pVkr68HH+yqdbw6bwe32akzG3Pe7VfrikVgGj57E6/wJ1iqsCPavLE9o9LQTCu16GzVRzM6ilW6dBXuGEZAXdNQsUukvH9l74OC1uZuHy6/ZukxOOQ98C4BLRvhT7qOUkWzjolUrNKSAdsfUUZpZfPvepQADfeHAYQO5P5FzZkMgA0zltkCHwlRfzSKLRGMo5okMcjXIa3YUkmPJcdeBNBBSI5/2hBh9PcBiEQE2o0zwoovaUtLIQqiEIcT+H0BNrv4RkbNm2osy7luaXul39ij+2f/AWblbY/mSBoSaKO++CIEb2YbC+xEvwg5x58f4siByhR1mdZ9J2IduURjtNCwpRB8SE6Qk3TYzccSpwauy76v14IVkAhyaHKwKw3twICwjnPwzc/4lK2HkusU3Dq 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)(366016)(376014)(7416014)(1800799024)(7053199007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QIC+fHEY65P34XFGRPq+XpFgKmkoUOusxc4Ir879CjMH0s48lB6Sg67aVx2o1rKnExKIDC9OaSF+jnCMrscZuMin1k/pU1oa0VQeNK18vR5vfOFuUllY7jLoLBJudUJvJ4U1aF4PmIdxmLB8Z9fYnIk1hdYGUyETo2niVXsvWo4IWRFa6qObTsxQMbahewIvqi7UNE8G0KSEYb7dUGgUwzp305eUkCKc6hGwMTv3zVekT2roGGcv/rCsFr6LLVSfhH72Ig4i7sKzUwCdCqJ2a8qGVw2DDWrUxKSw5/mk/riD7nS16tB/iC+cwr35IiWdUjhQue9N0dkXANWVR7k6248A2uxbcMkh0nCpqterr+SD8JSxAzYQHEBLy/txbp+Q4ljTEjCZgif0iJvjMwFMKMRIYUVgR46IPs0mmDnl+8BtdCbBhBGNjUQSR6MXnHC0TPAtI7zF751pSVbddJLtFM9OALqL+jNsbEbE1iOJWETi4JmS6J+CfZgtHmqiswsx7x26aaEO13xLtknpBkT4voMo+Qb8m2cpZi9zYmwia1EytWu0+MuwOOWDHQfZR5msk6ogryjgw3QWn43/zIrtHb0H0AIhJFKuzK7ekwTtMWiWezmMtV5qNvKhb9TTf2x9/j6ehbUPITHIe+MxEoy1nueQ4kS887P1FB32P0BtdEBzS4O9ZWOpEwkyKgOw5LaHjkFwN7VCqhdq65GtbOXR9raP7OrLl1vYJWpNyuR8T8brHfcvFjR3FGVw9HdP7+nJAythgzxxe/yvM/XhXp642w0KKiqJF9h9WF3hxUhROK2ZnkXyZ1xHi7+wmePqi8LffAh9wANEfTiT4d4TvTJbbUjoxYlvvGAkVL7zgKiQeU97fqxuAVoMk5kjdGLPEBt14p0LuoMzYH9YqZpfC3Ef+BtHlvDm/LXGJUNwX/VZ02YlLkNyVN8mBAmogricTd3kdt+6glmuR8roTFjKaxN4lUi9L4rnbIrf0Hvw3v+kxcO+RpBYZazn0s1c9O4ZrALqeWHW195AOUo7zsyQpN5rLTJDSf44+7JZMu2lysOWZl2KtPObrgNQ0ZPHnmVjsH6x6Y+BTjkYZRw7r8ysy6E7C/uf8xAKN+ClStdhtLpCBxDO391KqOwvW/Znd5GDbSLTYVBKTAB5+LjFzlyEdMBhDvPxRG6R0S6hM/PMzToBS1hqURE+5ltrWYa1s4tUnzHr7EnFxdJd95e0K6sZ8OTfZ7dMu7O4DfIBshMGWL0RXjxdf0ngXg4HOknkPEXcv6tESpon4PI63SuxmXHAjRuT3PHL2UhMQivnn3OCxaBB7Dqkbgi84PRUQnLoX86G1TYRF+4ybOTz0+BHJ0JvwI7mF4ne1XT8uvZrefqtP07tBWuoA3wHve7usHRf11FgB5CuIiXUypSR3HA9LiebRAXZGZG0HoSMdeie8YSX88e3EZnWCco3hbIY+2JE5dk3eXUdjTxSRFEc7yQIXW3cgyJ5uuOvQRO60qpMq3xgW6NGgFWGW+jFMeMjdSn0Rcpc2iq80OBtCqMGM3JMAPuuMAQ6ns349JXlAe2P6hBHmyXIOj7YIi294FIGZsnnWnoSBOfn X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97cebf45-10c6-44ee-1896-08dd56a9c9b8 X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2025 21:08:59.1894 (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: RSB3yRZN0E8MJZjC/wqlnI7b+V4Yjdys4o1QK7H87J4Vx/1xGw7wMzkg/RSM6NfW X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7221 During __filemap_add_folio(), a shadow entry is covering n slots and a folio covers m slots with m < n is to be added. Instead of splitting all n slots, only the m slots covered by the folio need to be split and the remaining n-m shadow entries can be retained with orders ranging from m to n-1. This method only requires (n/XA_CHUNK_SHIFT) - (m/XA_CHUNK_SHIFT) new xa_nodes instead of (n % XA_CHUNK_SHIFT) * ((n/XA_CHUNK_SHIFT) - (m/XA_CHUNK_SHIFT)) new xa_nodes, compared to the original xas_split_alloc() + xas_split() one. For example, to insert an order-0 folio when an order-9 shadow entry is present (assuming XA_CHUNK_SHIFT is 6), 1 xa_node is needed instead of 8. xas_try_split_min_order() is introduced to reduce the number of calls to xas_try_split() during split. Signed-off-by: Zi Yan Cc: Baolin Wang Cc: Hugh Dickins Cc: Kairui Song Cc: Miaohe Lin Cc: Mattew Wilcox Cc: David Hildenbrand Cc: John Hubbard Cc: Kefeng Wang Cc: Kirill A. Shuemov Cc: Ryan Roberts Cc: Yang Shi Cc: Yu Zhao --- include/linux/xarray.h | 7 +++++++ lib/xarray.c | 25 +++++++++++++++++++++++ mm/filemap.c | 45 +++++++++++++++++------------------------- 3 files changed, 50 insertions(+), 27 deletions(-) diff --git a/include/linux/xarray.h b/include/linux/xarray.h index 4010195201c9..78eede109b1a 100644 --- a/include/linux/xarray.h +++ b/include/linux/xarray.h @@ -1556,6 +1556,7 @@ int xas_get_order(struct xa_state *xas); void xas_split(struct xa_state *, void *entry, unsigned int order); void xas_split_alloc(struct xa_state *, void *entry, unsigned int order, gfp_t); void xas_try_split(struct xa_state *xas, void *entry, unsigned int order); +unsigned int xas_try_split_min_order(unsigned int order); #else static inline int xa_get_order(struct xarray *xa, unsigned long index) { @@ -1582,6 +1583,12 @@ static inline void xas_try_split(struct xa_state *xas, void *entry, unsigned int order) { } + +static inline unsigned int xas_try_split_min_order(unsigned int order) +{ + return 0; +} + #endif /** diff --git a/lib/xarray.c b/lib/xarray.c index bc197c96d171..8067182d3e43 100644 --- a/lib/xarray.c +++ b/lib/xarray.c @@ -1133,6 +1133,28 @@ void xas_split(struct xa_state *xas, void *entry, unsigned int order) } EXPORT_SYMBOL_GPL(xas_split); +/** + * xas_try_split_min_order() - Minimal split order xas_try_split() can accept + * @order: Current entry order. + * + * xas_try_split() can split a multi-index entry to smaller than @order - 1 if + * no new xa_node is needed. This function provides the minimal order + * xas_try_split() supports. + * + * Return: the minimal order xas_try_split() supports + * + * Context: Any context. + * + */ +unsigned int xas_try_split_min_order(unsigned int order) +{ + if (order % XA_CHUNK_SHIFT == 0) + return order == 0 ? 0 : order - 1; + + return order - (order % XA_CHUNK_SHIFT); +} +EXPORT_SYMBOL_GPL(xas_try_split_min_order); + /** * xas_try_split() - Try to split a multi-index entry. * @xas: XArray operation state. @@ -1144,6 +1166,9 @@ EXPORT_SYMBOL_GPL(xas_split); * needed, the function will use GFP_NOWAIT to get one if xas->xa_alloc is * NULL. If more new xa_node are needed, the function gives EINVAL error. * + * NOTE: use xas_try_split_min_order() to get next split order instead of + * @order - 1 if you want to minmize xas_try_split() calls. + * * Context: Any context. The caller should hold the xa_lock. */ void xas_try_split(struct xa_state *xas, void *entry, unsigned int order) diff --git a/mm/filemap.c b/mm/filemap.c index 2b860b59a521..cfb49ed659a1 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -857,11 +857,10 @@ EXPORT_SYMBOL_GPL(replace_page_cache_folio); noinline int __filemap_add_folio(struct address_space *mapping, struct folio *folio, pgoff_t index, gfp_t gfp, void **shadowp) { - XA_STATE(xas, &mapping->i_pages, index); - void *alloced_shadow = NULL; - int alloced_order = 0; + XA_STATE_ORDER(xas, &mapping->i_pages, index, folio_order(folio)); bool huge; long nr; + unsigned int forder = folio_order(folio); VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); VM_BUG_ON_FOLIO(folio_test_swapbacked(folio), folio); @@ -870,7 +869,6 @@ noinline int __filemap_add_folio(struct address_space *mapping, mapping_set_update(&xas, mapping); VM_BUG_ON_FOLIO(index & (folio_nr_pages(folio) - 1), folio); - xas_set_order(&xas, index, folio_order(folio)); huge = folio_test_hugetlb(folio); nr = folio_nr_pages(folio); @@ -880,7 +878,7 @@ noinline int __filemap_add_folio(struct address_space *mapping, folio->index = xas.xa_index; for (;;) { - int order = -1, split_order = 0; + int order = -1; void *entry, *old = NULL; xas_lock_irq(&xas); @@ -898,21 +896,25 @@ noinline int __filemap_add_folio(struct address_space *mapping, order = xas_get_order(&xas); } - /* entry may have changed before we re-acquire the lock */ - if (alloced_order && (old != alloced_shadow || order != alloced_order)) { - xas_destroy(&xas); - alloced_order = 0; - } - if (old) { - if (order > 0 && order > folio_order(folio)) { + if (order > 0 && order > forder) { + unsigned int split_order = max(forder, + xas_try_split_min_order(order)); + /* How to handle large swap entries? */ BUG_ON(shmem_mapping(mapping)); - if (!alloced_order) { - split_order = order; - goto unlock; + + while (order > forder) { + xas_set_order(&xas, index, split_order); + xas_try_split(&xas, old, order); + if (xas_error(&xas)) + goto unlock; + order = split_order; + split_order = + max(xas_try_split_min_order( + split_order), + forder); } - xas_split(&xas, old, order); xas_reset(&xas); } if (shadowp) @@ -936,17 +938,6 @@ noinline int __filemap_add_folio(struct address_space *mapping, unlock: xas_unlock_irq(&xas); - /* split needed, alloc here and retry. */ - if (split_order) { - xas_split_alloc(&xas, old, split_order, gfp); - if (xas_error(&xas)) - goto error; - alloced_shadow = old; - alloced_order = split_order; - xas_reset(&xas); - continue; - } - if (!xas_nomem(&xas, gfp)) break; }