From patchwork Thu Apr 10 19:14:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sidhartha Kumar X-Patchwork-Id: 14047142 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 7C548C369A9 for ; Thu, 10 Apr 2025 19:15:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 61FC42800B5; Thu, 10 Apr 2025 15:15:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5D1802800AB; Thu, 10 Apr 2025 15:15:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 386ED6B037B; Thu, 10 Apr 2025 15:15:02 -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 14BD36B0379 for ; Thu, 10 Apr 2025 15:15:02 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A310CC08FF for ; Thu, 10 Apr 2025 19:15:02 +0000 (UTC) X-FDA: 83319086844.09.3869D98 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf14.hostedemail.com (Postfix) with ESMTP id AFF5610000B for ; Thu, 10 Apr 2025 19:15:00 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=hRFyQ+uF; spf=pass (imf14.hostedemail.com: domain of sidhartha.kumar@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=sidhartha.kumar@oracle.com; dmarc=pass (policy=reject) header.from=oracle.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744312500; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=xifEaGxLrCosb9AknfMROurmyL6jhk0BySHE36IGbs0=; b=KN8jWK9uKzYjwFniJ17xS7ws+go5AxHJnj5/BiKZVB89Uegvo7FqxV44mcNviAt1Bifz9W 3jJMm+rK2LgL37uDKeyXdfum+aUXV0mFkq+b77b9K6AznXiu1DNWy7Z49WgSyHALx6tYLh Mfe/MY5ulyomLZpdINQk279SPhZNncM= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=hRFyQ+uF; spf=pass (imf14.hostedemail.com: domain of sidhartha.kumar@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=sidhartha.kumar@oracle.com; dmarc=pass (policy=reject) header.from=oracle.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744312500; a=rsa-sha256; cv=none; b=dmfIC4WCLmg7hYZGZYsI/+BHz+Ad4+Vi267yPdIJQS2mxdPBSuP7hd9ZGPmgr1PCKZuTo3 BLbRKgLIVrsyss4ZaehHjRdwpbIC0olmtwJNh/q0kX2Ro7WXVbV9W9i/I+CYcMvaN910Q+ Av3kIpFqmAHvtJrq2UeP/q+C3uDkEOY= Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53AIH4ZK012989; Thu, 10 Apr 2025 19:14:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=corp-2023-11-20; bh=xifEa GxLrCosb9AknfMROurmyL6jhk0BySHE36IGbs0=; b=hRFyQ+uF6NWCF7Hj3dR9L ICXRyfv0BPgx+0NVG/vKsxa+OE7cMzOody/1zxBtzDLqreW0LBPO3YLNOch5XCzB bmsgBq3F7Fkh1tjS8IzHk5pbFAn2MyYYKcdoCxU0HGzoZdr9MB1mc14uCJNuNxYc jSTbtwBGk+38iSNsBV40LOAvN08BoMNsLM+XNqaIxF9sGo1ZPqDWfWRojVJt+sT2 1DH0JXjF7fk6wnNPyqI1Sv2FCbcnHzQECW4kJHyvz3sA2L+81DsGTadOs7AS5QV6 txUQbqj+7Qu7X7K81OeZjqm0AbsLtAB2FlkSzMDJPuseaKtX99El2MLWlWV9ZvEA A== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 45xk4hr4qh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Apr 2025 19:14:54 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 53AIwiO4023934; Thu, 10 Apr 2025 19:14:53 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 45ttyk1ghq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Apr 2025 19:14:53 +0000 Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 53AJEn8w040606; Thu, 10 Apr 2025 19:14:52 GMT Received: from sidhakum-ubuntu.osdevelopmeniad.oraclevcn.com (sidhakum-ubuntu.allregionaliads.osdevelopmeniad.oraclevcn.com [100.100.250.108]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 45ttyk1gg6-2; Thu, 10 Apr 2025 19:14:52 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com, willy@infradead.org, Sidhartha Kumar , "Liam R . Howlett" Subject: [PATCH v5 1/6] maple_tree: convert mas_prealloc_calc() to take in a maple write state Date: Thu, 10 Apr 2025 19:14:41 +0000 Message-ID: <20250410191446.2474640-2-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250410191446.2474640-1-sidhartha.kumar@oracle.com> References: <20250410191446.2474640-1-sidhartha.kumar@oracle.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-10_05,2025-04-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 mlxscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502280000 definitions=main-2504100139 X-Proofpoint-GUID: lb46VRQHj5gIiT6ZeVph2vTkQyPfrviy X-Proofpoint-ORIG-GUID: lb46VRQHj5gIiT6ZeVph2vTkQyPfrviy X-Rspamd-Queue-Id: AFF5610000B X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 45sxhqy3yj96ijcm84t6z61pskmsctrb X-HE-Tag: 1744312500-367065 X-HE-Meta: U2FsdGVkX1+0stD4ZK2B2Khu2EMz6Q1aEaRedpoCx2nwcNKXDiDXpseKRjt3ZQkRMam16g+ZwHKwHlFGEqHqruyGf3K62n8TR8RxBF3PnBmQRDX+2zJfUTHnHWANKbSK75YZJ6JHNlxt8ru8aDcrDqKhS210xi5jdAj7ygY0gIM5KiI1qjUlPiAVT8ugoN44OQxswRbdttZpfs3hNWws2x/wOotrWSUWCN8JyVX/c1cwXy+1J1LyM/N8fHghJO4PdWZsBU3DWC+O7RZcLlit2ZdURGjCulDaMrr4iKyAr6WLhgovAJ5M36JjA+GnvPOxkuFIBzXa2tghCri13WFGxmnNlE+Oy4BKGzzbGW19JFG/mcud5EoZf7oEYUXEeQlzTGXFjU2emyEnBNGv/yV7af1yIRBQldqmZFATxJXVd0zGv7w0Ksi2O9xkbAphlfIpWfgnqGzoqSg2dMLmn2C6sLndkm1FLqWk/yuZICKTy82y8dMA9R/a1S9tOxmtIBLNKcpgs859m0NK4ta818DWFhUBl1zn+Zqkqn4fPYCPAOtVUO4SdCMerg9A/YVnVIUcDXg1ZHekWONcpDyOV64vhXddo0SbWz6JXSA/EtCUuGZyLL0xsKaiZQXLRHBTT25fapj7Gsz57z3QLlbuAwgR4l0BLEv6qcwoOZg+vwFnYS8Hi/k+hUkspqIfWwkWcQmpHHW16CbZx3wpFZdDKikZFD1DaBHtGaw6u2r18MOdP8Wm9iQR7ZtV0gu4v59t4pksHkYiCkorbtlw8GK8Y7+MhBb7ufOahc7xBgSpn3WfQy8fqDyFj+v4HG09DOCUAUZv2Aih3rSYDBSqAYW9+jRi8+LlKdWEIRCeWR26AZAit2U+58KXpkyb2B+GHbTvEqSRkRJKVxFPq7Qkkbr6aZxn67zPF3PDUlZf8JmJl7xVH4tVjlgxOIX9W62p5zNwTCwPHxWhBzteC/cgJ4lxsMU E9auHcZK jBKwTOXaZMLb0sM9UCYEXimc91FKKF8XDDYqLoXoGmduUAjuiZKVkTvLfFuhieCU5xmklrSsbhUV4TiPnwSGYc0JK+F/hN7QSlsw2jmzqwPchbWeTwl+X+daKpAzf0zn98KJeHRuZh+ssP7znlb2CeUGOc3cZtKkDorHCTrqtVCBF2JIDskbDOAN2czyTFvoE16CKzGf59Rg/MkymW9QWF3NiSyFvZ3fwGkOzJweG6RWADN5df/vz/pxfo8tdBCedjjwN2zvvqV7N+RnYf+ewdFuST99pYIF5qeji 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: In a subsequent patch, mas_prealloc_calc() will need to access fields only in the ma_wr_state. Convert the function to take in a ma_wr_state and modify all callers. There is no functional change. Reviewed-by: Liam R. Howlett Signed-off-by: Sidhartha Kumar --- lib/maple_tree.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index d0bea23fa4bc..f25ee210d495 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4140,13 +4140,14 @@ static inline void mas_wr_prealloc_setup(struct ma_wr_state *wr_mas) /** * mas_prealloc_calc() - Calculate number of nodes needed for a * given store oepration - * @mas: The maple state + * @wr_mas: The maple write state * @entry: The entry to store into the tree * * Return: Number of nodes required for preallocation. */ -static inline int mas_prealloc_calc(struct ma_state *mas, void *entry) +static inline int mas_prealloc_calc(struct ma_wr_state *wr_mas, void *entry) { + struct ma_state *mas = wr_mas->mas; int ret = mas_mt_height(mas) * 3 + 1; switch (mas->store_type) { @@ -4243,16 +4244,15 @@ static inline enum store_type mas_wr_store_type(struct ma_wr_state *wr_mas) */ static inline void mas_wr_preallocate(struct ma_wr_state *wr_mas, void *entry) { - struct ma_state *mas = wr_mas->mas; int request; mas_wr_prealloc_setup(wr_mas); - mas->store_type = mas_wr_store_type(wr_mas); - request = mas_prealloc_calc(mas, entry); + wr_mas->mas->store_type = mas_wr_store_type(wr_mas); + request = mas_prealloc_calc(wr_mas, entry); if (!request) return; - mas_node_count(mas, request); + mas_node_count(wr_mas->mas, request); } /** @@ -5397,7 +5397,7 @@ void *mas_store(struct ma_state *mas, void *entry) return wr_mas.content; } - request = mas_prealloc_calc(mas, entry); + request = mas_prealloc_calc(&wr_mas, entry); if (!request) goto store; @@ -5494,7 +5494,7 @@ int mas_preallocate(struct ma_state *mas, void *entry, gfp_t gfp) mas_wr_prealloc_setup(&wr_mas); mas->store_type = mas_wr_store_type(&wr_mas); - request = mas_prealloc_calc(mas, entry); + request = mas_prealloc_calc(&wr_mas, entry); if (!request) return ret;