From patchwork Thu Feb 27 20:48:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sidhartha Kumar X-Patchwork-Id: 13995211 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 DED30C19F32 for ; Thu, 27 Feb 2025 20:48:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F0C246B0093; Thu, 27 Feb 2025 15:48:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EBC326B0095; Thu, 27 Feb 2025 15:48:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D3894280001; Thu, 27 Feb 2025 15:48:41 -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 A998A6B0093 for ; Thu, 27 Feb 2025 15:48:41 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 577C31A1DAE for ; Thu, 27 Feb 2025 20:48:41 +0000 (UTC) X-FDA: 83166913242.29.011FA73 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf29.hostedemail.com (Postfix) with ESMTP id 3666E120005 for ; Thu, 27 Feb 2025 20:48:39 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=gRNNqAGu; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf29.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=1740689319; a=rsa-sha256; cv=none; b=F9KunfTRFAjvuTnzJEB6Dz3U8GJb4gYze+jP7Q6KGX0TIZjmtv3wWIcXjqGDo+Bxrq74J2 1nQDAviFHrSSd5QALiv3SkaO/dlHgPtsigZWM8fZ1L9ypzuAG17QuOywcr7tmxRpoyefzE a0af33iMdQXt+RRdq4qOA8KEv6Nd29s= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=gRNNqAGu; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf29.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=1740689319; 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=9rOxR8xV/873pof+AkJuZwF4Ju77egxXek8DyN5etOw=; b=0qsxhB1owxHAZFfmd+ENaFSnjQP+DZFOgMR+aEIwyw4WR52iHBRzJXNtlj23iyubCbKd2y /iygH1Kk0XApURKYw4gV63XXgQTo/Q1Coku7YslEMqXmAzlmtJvp9qDpDGmSOgcuC9iJ5l QijaSrraXKfPyDMA3UAsMsQbCtbq93E= 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 51RJiY80016056; Thu, 27 Feb 2025 20:48:37 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=9rOxR 8xV/873pof+AkJuZwF4Ju77egxXek8DyN5etOw=; b=gRNNqAGuqrxyrzWhstSKs Ci96yqLVfG0pofsHzOswSLRK9TzfDpUMDWz5XN1sgTWv13nkL3UDSlElBumNqx9e z8xK8lW6MsJESWhaOIbRt8Wj7rpe+i4pWJTCxeDASF03lVxXpxd8Zg2ntjpI3vkv RFgUE+dBNbhv9m1EkfpnT7TK6aDS4syuYOrNrNulgwCTxA5GV+RxoyXA9H1gm4mb SSR4ZES6EujTv7pnRuC3AImP2Hloi3Yh7FP78pyE0kDwultKRTt1Mx99GGL4P2cq xY6YsqRkq2nBd9GdwTLYfQjSDrO/CMCJ4FijSpeashBdkP4xebzgVEFCpNlO8Ii/ g== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 451psf49m0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 20:48:37 +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 51RJGgfJ012623; Thu, 27 Feb 2025 20:48:36 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 44y51dws8s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 20:48:36 +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 51RKhrvo030883; Thu, 27 Feb 2025 20:48:36 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-7; Thu, 27 Feb 2025 20:48:35 +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 6/6] maple_tree: reorder mas->store_type case statements Date: Thu, 27 Feb 2025 20:48:23 +0000 Message-ID: <20250227204823.758784-7-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 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: lKETHqUtyLBnsXDOSH0cE46buP1f3N_E X-Proofpoint-GUID: lKETHqUtyLBnsXDOSH0cE46buP1f3N_E X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 3666E120005 X-Stat-Signature: ugd3m13dimdzoat8znhm6n4wb9qh84ok X-Rspam-User: X-HE-Tag: 1740689319-799115 X-HE-Meta: U2FsdGVkX18gxdGoPU+1PnIL9J6TPrdfbES4kuHoefvxN7J4zXVqHJm8LXlu8XRWq+TcAvoCmaMH/KunFDfYn+vMahWXBjtbuKeUVy2OSUkAfVJzI51bMW1fKhAl0JsifGIMVjEQ3oihUGZLsR+NoCkq6gDQiWM8jdVVkQfXnkknRB9D4Va8lwsq6o/+92iQcF0hGKwWaNkv1tNKA8NN5J4ArYf8hLXkoGmkaAvXkO9KmTYs8+YiDrmkKezUdTf7yz+A+J2AHWyOwRtv4Zvaq/2nGcjaCGYAM0m8oC/avUipZt9UHPrI1fOeoKxpjbC5dee/0L0kEbVF4aYpAlYwEMwyBQZ2wr15XMXTlGMGsgcfW9Hexil5HK0qWKvxOULoVqHVGlp9mJgUqiIiEIeqcDUA9Hckp2RhpTN0oisD94r1AyrabV0Wv5sLFohoSZd04ZEiCKsIbe1/QyAT+IK1ad0sbS4n7N0QbtZDTG2wdUl/WHAPl7JpWL5lDizt6EVjEYGWa89K22Siu7FW9XE8iGsYgeBnppBLVlRdgmWjPLOsNRwl955YqEWcIduIZpL1+akeKujJGCzbXn3iQZbNVM1s+QvteGV2TtcdoPm6ILCX7xp59HMokbvzl5RIPh44QvPxjMzyHNVM4lAw7Zpr/gPLCdvs3PEy87XYcreRmvJ+gB7saOpeVg8foQr8bskPMmmIWLGWOV7Yuh8hr2X+7oppIzoJmySDnspVb5seQB4HT46TyG/hVE7xBJ9Ln4ejf/o2WGveBoo34/ympDJPFaUlNb8RcoYt93EwIV06iiNUC1dBWjJ9MyR2MeOO+RRZk+8I4t80ZbJnQQgR+WbaZrwZX4fK3QdAq1K2OAiSAjeSZLUZwD3Su65pSEa63kIGtScS1eYExVbtuLKe9PACd/Da3de1xxjnesQAwn987eMDg42awZvncX35+xMlK/csDhFFUF1D7bzdZgWyry0 f9qexzYv qju8dUTOqwE4oXju6jL1TWPqMEJm3K1EftmnkosrJCiFEdIJQk0/bKeM2IfmYQGJqBgrc8NE7mZSzmYU+y+NEK1zpoOF5oQlEozHe9G/GBxl8/hV7F2s4GurgJBRBMT8GBMuDbR1T7JqB7h5jw6TbqGJliO0yZVgx2MRJ422wDU2v49ubV6/ju27laZyglkg3cs9jtI4rxGZyROVegejbOqfple2yXTY81omfaifq92dSKtxJkdMrJhG6nofXIOL/1gz1TXS7VuH7SLlNP4FXcx5kvwCHUMHP9LNoI0Ji9lx2CzuK+oT+LTZiArlarFHIytaOA8oPLmc2hBY0A2HFSUbGnrxvNIr0aIv+5BP8Jnz2V6/JphmaMQ8b7YqLRRLVtFWVLaZNLxoDJ5E= 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: Move the unlikely case that mas->store_type is invalid to be the last evaluated case and put liklier cases higher up. Suggested-by: Liam R. Howlett Reviewed-by: Liam R. Howlett Signed-off-by: Sidhartha Kumar --- lib/maple_tree.c | 51 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index d3aa5241166b..776693593ab9 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4093,15 +4093,6 @@ static inline void mas_wr_store_entry(struct ma_wr_state *wr_mas) unsigned char new_end = mas_wr_new_end(wr_mas); switch (mas->store_type) { - case wr_invalid: - MT_BUG_ON(mas->tree, 1); - return; - case wr_new_root: - mas_new_root(mas, wr_mas->entry); - break; - case wr_store_root: - mas_store_root(mas, wr_mas->entry); - break; case wr_exact_fit: rcu_assign_pointer(wr_mas->slots[mas->offset], wr_mas->entry); if (!!wr_mas->entry ^ !!wr_mas->content) @@ -4123,6 +4114,14 @@ static inline void mas_wr_store_entry(struct ma_wr_state *wr_mas) case wr_rebalance: mas_wr_bnode(wr_mas); break; + case wr_new_root: + mas_new_root(mas, wr_mas->entry); + break; + case wr_store_root: + mas_store_root(mas, wr_mas->entry); + break; + case wr_invalid: + MT_BUG_ON(mas->tree, 1); } return; @@ -4187,19 +4186,10 @@ static inline int mas_prealloc_calc(struct ma_wr_state *wr_mas, void *entry) unsigned char delta = height - wr_mas->vacant_height; switch (mas->store_type) { - case wr_invalid: - WARN_ON_ONCE(1); - break; - case wr_new_root: - ret = 1; - break; - case wr_store_root: - if (likely((mas->last != 0) || (mas->index != 0))) - ret = 1; - else if (((unsigned long) (entry) & 3) == 2) - ret = 1; - else - ret = 0; + case wr_exact_fit: + case wr_append: + case wr_slot_store: + ret = 0; break; case wr_spanning_store: if (wr_mas->sufficient_height < wr_mas->vacant_height) @@ -4219,10 +4209,19 @@ static inline int mas_prealloc_calc(struct ma_wr_state *wr_mas, void *entry) case wr_node_store: ret = mt_in_rcu(mas->tree) ? 1 : 0; break; - case wr_append: - case wr_exact_fit: - case wr_slot_store: - ret = 0; + case wr_new_root: + ret = 1; + break; + case wr_store_root: + if (likely((mas->last != 0) || (mas->index != 0))) + ret = 1; + else if (((unsigned long) (entry) & 3) == 2) + ret = 1; + else + ret = 0; + break; + case wr_invalid: + WARN_ON_ONCE(1); } return ret;