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 7C182C1B087 for ; Thu, 27 Feb 2025 20:48:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A517D6B0082; Thu, 27 Feb 2025 15:48:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 98B516B0083; Thu, 27 Feb 2025 15:48:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 82E336B0085; Thu, 27 Feb 2025 15:48:34 -0500 (EST) 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 647626B0082 for ; Thu, 27 Feb 2025 15:48:34 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 20574160D9D for ; Thu, 27 Feb 2025 20:48:34 +0000 (UTC) X-FDA: 83166912948.25.C62364A Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf10.hostedemail.com (Postfix) with ESMTP id F1654C0012 for ; Thu, 27 Feb 2025 20:48:31 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=ohjIdKOS; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf10.hostedemail.com: domain of sidhartha.kumar@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=sidhartha.kumar@oracle.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740689312; a=rsa-sha256; cv=none; b=mFc+gU9Wk9DXCzcn1fMDV8z7e1MXTA8AvEuT410rba1dea9miQz55uNNlGNb5vCn5YolKS 2QZ5JGrt00ou99IZzlJCoKUQiSOzlLvS1WQ0i2GbQDeVs4yahx1U59gj9qA8urTHXQSHBP UQ6WBKWFPpnczIU3Kmqlpg1seMYDWDo= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=ohjIdKOS; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf10.hostedemail.com: domain of sidhartha.kumar@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=sidhartha.kumar@oracle.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740689312; 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=yx9M9UzqVwml5F8oWQIucj2N+1y3Ei0ljrqvD/e/T2I=; b=NXEQaUVlzsJaIqjvDD4Vxv6w3NsiuNpRVJjDlDGcqdrJv53b1VJ+0+rbyMec1XFRD/08pW TrwilyiFJdcZZ7rh6/DlLDo1FQn0OQqHoXZoz5hR1DIibIX9halQGLS2I7TTAjqyHg6SWw +f83zRg4DN5/tKEcjVKKInD2nUksZAk= Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51RJiZYW016085; Thu, 27 Feb 2025 20:48:30 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=yx9M9 UzqVwml5F8oWQIucj2N+1y3Ei0ljrqvD/e/T2I=; b=ohjIdKOSsQO1tLIu9nnUn xhgz+qtJjumTeG7E97FFyIDHSheCZCosT9pJDQBx9QT2e8pKJdseL6qr+iKcWz91 BPe7G2kZHuixpGiy3WnAWOCU39AuSEtEqTNPP9ND+zlyFzFB6JvRsbbctA6ulJbQ SsWtyHBtdPUoIaQNLig6Ttulx5f7Y0/MF6pSuKFjasnfuV1M3v4x29U97FXcsaaT PICh7HFsKGHN5INARpHAADFydfV8PxQBtsujVGtT12IiuboViS2uqpNGew9qgyqY V7DvHb3I5CfO9s+4ONbApCrG2UeqoyUS/LPoiwOgH8Mj8rvm0cbFQS5aVOjVDJny Q== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 451psf49kw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 20:48:29 +0000 (GMT) Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 51RJHgQa012657; Thu, 27 Feb 2025 20:48:29 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 44y51dws08-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 20:48:29 +0000 Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 51RKhrve030883; Thu, 27 Feb 2025 20:48:28 GMT Received: from sidhakum-ubuntu.osdevelopmeniad.oraclevcn.com (sidhakum-ubuntu.allregionaliads.osdevelopmeniad.oraclevcn.com [100.100.250.108]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 44y51dwrvc-2; Thu, 27 Feb 2025 20:48:28 +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, richard.weiyang@gmail.com, Sidhartha Kumar , "Liam R . Howlett" Subject: [PATCH v3 1/6] maple_tree: convert mas_prealloc_calc() to take in a maple write state Date: Thu, 27 Feb 2025 20:48:18 +0000 Message-ID: <20250227204823.758784-2-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250227204823.758784-1-sidhartha.kumar@oracle.com> References: <20250227204823.758784-1-sidhartha.kumar@oracle.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-27_07,2025-02-27_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 spamscore=0 mlxscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502100000 definitions=main-2502270154 X-Proofpoint-ORIG-GUID: 3MQcGoUFxweh2jMn3Ee8qzJHIvxipMUo X-Proofpoint-GUID: 3MQcGoUFxweh2jMn3Ee8qzJHIvxipMUo X-Rspamd-Queue-Id: F1654C0012 X-Stat-Signature: 5nxpcpyab7eey4xh64t6r9xurh1e7u89 X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1740689311-432675 X-HE-Meta: U2FsdGVkX1/rehTcdE6+DP0e5UgFUu3Aw1/AJP0nhXah6GnbC1rKNKbtp8tZezKZTj4hmZmTKXxMP5uLQLsBCrHmgV+960nKz8FX76Cwtqv8TqLM9JVWoSG/Dvjm8zYtaqqfBQPxtFdjwV8SdiTeHVE61IMPGRadLkiFthNbnFaXyQvTBAtGFrbIXLKI7augGKVh1aZiM9V/WK9qQsDDqnn+xi9sobis7o7Ji1RE3+l7e9ljmH3LiZaBC5O3zueclnzgMjyiOaAoPcnNhdu/fahvvSB/tBRkGisiZeLsbuJvA3YALAcg32RJswk0K28ctksLrs4yUT1Tl2wFwYGvgC8WCuQku5AIL+Oc9sw0OryB7NNJPr7PNCjZ3B9PtXaQ9R+MWGtuFLPPlh4C27Kee6Tun47ZU5b1sGK/lNkrIV3JuoyLe9Gg7vp8gf33Q+xeU0kFT48lUv3Je/29ir68HuBJV9d7iqGuTcXwHlHsJqWbsuUZXP4BtI0qcXT3WAiJuRitCUP0THzsXfsFkFg0l3MhwOWejLaC7kQ2Hx79WX1qUQ7xuJqh7ui1dMPZ6bNnzuyZq2n6DPbF5CQrHlrMjCeCHHoE50gu6IIPPiUWZ4mE6t7JTCZocaClaQgMPf0s8jZm5DKX4ER90hMacylsQBevYQbyqzW07Yu+GdqS8GTjbUu/ZZXUb9wxplTw0EEKxjQYTr7aqwnReBOT4urK5o2XIad/AzhTQioMUzKS2LRKw1V3w/T/LBebi3TbRvu4r2e8sMXWGHczlEpamxxBf7pnaX3L4hk+9rgKtf/nbZumuTzMd6KIh9YVZHhPecQlHpHpnVy4cPyEI0VfAo7ViWy0G89SSsaUa/Bg8KqOjpLtnNYT9GJajw/9NTYKRpqYJBloO5eJ90yatilsAvygMuB1u4xhFTPFa5+EQur4uNF+iYTf/qJbHc2nOYGKTm0Ufrhjg0G39BsJUMEK+eW XReJIfud AT1kOaeXtzpZ2149IlfI7bnFLGdGReWslN8oj9Tq2dbYH9mwRE0ANBGhyrFbU8holPz0d/pMxrJR6nkhO0Vxv2rl4jR3TD5EXOZXY/JSgfiVAFvqbI1IgFpZIVl3y37kM/kTphudmcUpbzS3LbvdNW+DCgF2457XU3eSB3PS3TtFcm1oeXTUX6qM0V3CmSlAmmcS9RIz7UTd/d9jSEfC8GRec0mgtH6qeFsm2a+xWlsdwy+cpBUNtvsRI5Wm/8S1BqogPOcPgYZIvxnQbiwUpwmhToUpy/0K6BazrAfqYzzVfcccUXZFN5o3N/7n1TXdW9c11ew1Vw67vyIoHMvHh+K+nOhhxLwOtT2R1 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 42c65974a56c..0410e13a099e 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4144,13 +4144,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) { @@ -4247,16 +4248,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); } /** @@ -5401,7 +5401,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; @@ -5498,7 +5498,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; -- 2.43.0