From patchwork Fri Feb 21 16:36:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sidhartha Kumar X-Patchwork-Id: 13985960 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 27B47C021B3 for ; Fri, 21 Feb 2025 16:36:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 97422280020; Fri, 21 Feb 2025 11:36:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8FB3328001E; Fri, 21 Feb 2025 11:36:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7275E280020; Fri, 21 Feb 2025 11:36:33 -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 551ED28001E for ; Fri, 21 Feb 2025 11:36:33 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id BA2D41C54CD for ; Fri, 21 Feb 2025 16:36:32 +0000 (UTC) X-FDA: 83144505024.10.F118966 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf07.hostedemail.com (Postfix) with ESMTP id A74C740015 for ; Fri, 21 Feb 2025 16:36:17 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=Ei8HKgFY; spf=pass (imf07.hostedemail.com: domain of sidhartha.kumar@oracle.com designates 205.220.165.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=1740155777; 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=OSOzaBP2cohPw2EjUEbuKxDUw/Doi0XEbeFRJ2RbVEY=; b=cwt9guGmxRTmedB3uzjTU0j1wi/wGuYPVA+0BnJCa+GNMny0cE7JU7PrlFm1CfBuIUxeQh YKY/XFf9ubnqOpcOsnaIWe11LW32tq6ygsHdcgWA1rn3UxAAc9ZtI4z9S9NcluRqcFhRih uT5UQoJtSxcWqDjKwer+8CXXeM3M6sQ= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=Ei8HKgFY; spf=pass (imf07.hostedemail.com: domain of sidhartha.kumar@oracle.com designates 205.220.165.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=1740155777; a=rsa-sha256; cv=none; b=7PqIT4n1XVFBpYYhMkmL27eDBmK5Bh+R04dlnheWvi8LIggpWFGuAmnfk8JdOAcybX906/ y/zB7u81mHM+gS/YFZ3lH8gO7wu8+VBX/6n82PIRuWtu3Tzp9Qqzu/j2Eq6+xA0qjZAQVY QT0j9nJNXZ3NNo7UDAabOOuJOwsRk4E= 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 51L8fcjB027789; Fri, 21 Feb 2025 16:36:15 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=OSOza BP2cohPw2EjUEbuKxDUw/Doi0XEbeFRJ2RbVEY=; b=Ei8HKgFYYeNWmmDPvjg9B uxS5b9LyQpXJBrZOjtYjq2p67cIBhQPktSsvONrPvgNiZxtA/chdsRIzd14HGAd+ LYazWaMTqguu2wbMtCCe4IXYCMn1bC4/sUfuYxTKjUlAYO1deIGQJv/SKrHOeBh2 3hqmw5Vkbn8T/yw2hwrWZYv2WsEDR2cu0Kwab6KoIjUJTaWTd9kvN22mY/2RB/pY oiYPyMhmTctbQKrTYPkLF/GzyqSJ5tC6SHL/4j0FOaNdV9WqLnq7cThPSo18pbnu 9lD/hN4+8w+cjHzMUGnEfiiCoXEjjr41ofSq3cOig0Ebe5fpPr9kwocRLcYB7qRK Q== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 44w00pxkrp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Feb 2025 16:36:15 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 51LG8tCv010613; Fri, 21 Feb 2025 16:36:14 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 44w07gxm75-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Feb 2025 16:36:13 +0000 Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 51LGUIXD005786; Fri, 21 Feb 2025 16:36:13 GMT Received: from sidhakum-ubuntu.osdevelopmeniad.oraclevcn.com (sidhakum-ubuntu.allregionaliads.osdevelopmeniad.oraclevcn.com [100.100.250.108]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 44w07gxm69-2; Fri, 21 Feb 2025 16:36:13 +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 Subject: [PATCH v2 1/6] maple_tree: convert mas_prealloc_calc() to take in a maple write state Date: Fri, 21 Feb 2025 16:36:05 +0000 Message-ID: <20250221163610.578409-2-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250221163610.578409-1-sidhartha.kumar@oracle.com> References: <20250221163610.578409-1-sidhartha.kumar@oracle.com> MIME-Version: 1.0 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-21_05,2025-02-20_02,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 suspectscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502100000 definitions=main-2502210118 X-Proofpoint-ORIG-GUID: QQWwevtEjJ6ySVkZGd0LJ4o6jKJpWsOs X-Proofpoint-GUID: QQWwevtEjJ6ySVkZGd0LJ4o6jKJpWsOs X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: A74C740015 X-Stat-Signature: fooht65c1ttijz15gy4sgrh5dazfxres X-HE-Tag: 1740155777-553773 X-HE-Meta: U2FsdGVkX1+RldUyUpgewk7bG54cjL8Txr6G2byYbogLo+3dYeJ+mbqiLACeQ149uaNveLaZAlrR4PqJav3oZ5vPAga9OxlCHL+oON5B1J1Vx1Pw8hBAFO3rYmwXOEHFbj/I9eHcAq/L3uy/FAuH9NA75XF5UJeafF9rKEO27NArD9igaDeadH5SGTkVQtMMmumWExKs+jqVQ6v2ZGGbuOhQC46Z9wVn30JF96JmeZhs3N3U0Xhdvf0CoT4BsIYhTp9GQxV5bF+27Chl19RvCryPWYEWCWgqvjR2ArvsiAuVeRqVs1jRGjXQdWNTE20jkSkTIsjw363/0FSOC1npEAu6/7levczj+zgXu/gY0t7OtRkjMAvzJKHeRT7EUDS2ORu7r5S/xNIbUT5EDPxOwcAQR9osSkRkxCcLgfm9nqu5oriQqV4Gg211HGylOmGnnrh0Yw5wYrGYCCeXyj8xGeeS/3Uv1mIg5tDWegM5lKHabrVSKiYi5BtDT1R7raVv4qg2I++oBomN5O69I2ZL/KnD57DKOleSj4VDv64VTLIYqMrnlR2z3orylwA/e8tUa81G0+eP8rRke6Z/mknw6dfg+1wz5A+IbTsux6zJCk2Px80fTcG9sWdx+yBN1FgGoi/OAC/85Oy/DQzBkbspJbc5lBP211OKvBm9RdhYjUmvSxw8Omzs3Y8t2RcaDMAjJE/ijroGH8uNlMJTT4IjyVqF17VZc1SqTODzbpgqmYB3nxBtb2cE7xnNFdJNI28+mLK9s3t0M+TfFrcIcxl7r478Z+aKax0AlBajwNerCEEEIaHy6+26o+bUEG+FYckSHSYxAwMQ4vdAki6AZQK+pT0vURHJlQmsobDgGEiGta2Vzkq5d7CH7LSBetdRxB6Vs0GBykDLlXu5sAQZ7qdFUwC0gOkgkV3yxy5TDIgdgiTd539cJfRnoc/f2WrXIKTMMoEuuDGD7DRsbUWbQtG k4PVvJHS Nw9SV5zk8Fe60QrX8p1YMWK6MAXns+fWgrrmJy2A7+EXX1Q/DrGKAZ+9BbnWRBBnXKO2Ov7gWbxYqLc6Ygd5tJWsW+QGMLf1tpHjEC93suhU/uHT/HP/YBp+TSTLbHdiO6xSMwpZPMrIIRkg204AF84pWReGdSn3kGV12H9jjXvpLJ3Y3LfOsvBdTnRqk/bkt5kIdgy/O/rTjjek8YBEYFY9zBA+Wq1Emd/a9b84IT6bHo4d2i0s5FgSiXBVc4Ht4uZaNc2dWDz7GO4+tuebZpoaiLZmGvjzTp4g/ldZ+TvpxRFjEj69KDYLWyOwYrePHRyjHXKXGzUi3OTllNlSV8EWbPC6upLdjOFG0TnO6H0QOdP8= 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. 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;