From patchwork Fri Feb 21 16:36:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sidhartha Kumar X-Patchwork-Id: 13985956 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 936E0C021B5 for ; Fri, 21 Feb 2025 16:36:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 999DA280016; Fri, 21 Feb 2025 11:36:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9218C28001B; Fri, 21 Feb 2025 11:36:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 79CE1280016; Fri, 21 Feb 2025 11:36:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 52A0A28001B for ; Fri, 21 Feb 2025 11:36:21 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 13FBDC1863 for ; Fri, 21 Feb 2025 16:36:21 +0000 (UTC) X-FDA: 83144504562.04.24E55B2 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf13.hostedemail.com (Postfix) with ESMTP id E2ABF20019 for ; Fri, 21 Feb 2025 16:36:18 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b="UDUou/wa"; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf13.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=1740155779; a=rsa-sha256; cv=none; b=VVKHlS5Jf4YhF/5ajrOBOmUriDzlAVWzeRa7Uk5W2Cp4t/Qi/BvjOhT+FU0jewGMrKlA7y bm/3phkj5vsf+Of1PfpO5JJjLWYUAhjcVK3yP0AcQ+vnuxm1FIwaYO7rwDfSxNvQam3o3R J60CPwTiT1356JoLva/EmF8tPQ0+tPQ= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b="UDUou/wa"; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf13.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=1740155779; 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=Qas138Lb390XmRj9bcmiwXwau4wNel66xSmLqMbrZnQ=; b=bvSAIVH4S4uuG4WB+FkXJy+agGnS8CuHDfwcv1vsbFsXbiWT0n+iVCAtAYhLGNqQrV0rf6 ja4XtJoSgad01v1y8dGAIcnzFuNbtQGxUa5fWXS02HU/qWsB6CdD+wVxqxGlm4xJXEExE0 gGst9sCjXBPgkhN1MvcicSur5R3x+Bg= Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51L8ffb9016642; Fri, 21 Feb 2025 16:36:17 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=Qas13 8Lb390XmRj9bcmiwXwau4wNel66xSmLqMbrZnQ=; b=UDUou/wao6D0tTHRZf2ud oy9fa4P3FIJEoE8a/7gu30ltSLHv4RDE1afSZm2FDB2ZwfsL0VJmFQMP+0OpsTK5 YRucFDuch8EebCYq/fB1c0tY0WrHc3+9EMzHVOEIbX55o/D8CJ8t5xoEn8ZWbn4R m/X4BK60rMrcFMmhFRSjhXXm3ASqyU0oqq3oJkwDn4tKaX+4Oj6whCY7llfH36qP Ai4kTntWW15NdB0oPKQUS7b0P3pSNMaPeJ6iLsT9SfBdsB8O5K9WFNTMWkvhgIrn NonI0NQP3JTlxru2TTada43mrFQheWKFs4kC4KmSoJccOKj0Fakuymcm6vJUB+Z4 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 44w00npkv9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Feb 2025 16:36:16 +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 51LFnZkJ010522; Fri, 21 Feb 2025 16:36:15 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 44w07gxm99-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Feb 2025 16:36:15 +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 51LGUIXN005786; Fri, 21 Feb 2025 16:36:15 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-7; Fri, 21 Feb 2025 16:36:15 +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 6/6] maple_tree: reorder mas->store_type case statements Date: Fri, 21 Feb 2025 16:36:10 +0000 Message-ID: <20250221163610.578409-7-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: XIKLV5z05go6Yij8Q-abTzXMl6Qq-NEQ X-Proofpoint-GUID: XIKLV5z05go6Yij8Q-abTzXMl6Qq-NEQ X-Rspam-User: X-Rspamd-Queue-Id: E2ABF20019 X-Rspamd-Server: rspam12 X-Stat-Signature: xkex6eyeew1wahccnzih3o3gnr3pgnxk X-HE-Tag: 1740155778-204389 X-HE-Meta: U2FsdGVkX18WzzlkKyKu7uB6n7KROs0tLoh2SUfjXfhtFDUaDdsixISsYPYFhaU4aNI+69i7dCT3Iju3QjcPHziOJRy7Dv0yn7zX5XV3ftN1lnxj2OppAGpEIFEhwLOpejUFECNUq4dJW8nPl+So+SW3ndDq0SvOaTrpWmWPKyAr8GJH+CE9XdUkanaS0Md6eo7OZlXhJJTB/9cZKSmjnB5+liUiVlmxxJ0zAjvsNWgLS3EW6Rs+ByaxKjOM8zMvQnLI07puE0N8pFqjOSQn/TDka8gTiWgPZoMN7LgDcSTc/MI6ZYbB+LDsz2FPlXdAkL0if1JwqMVx651TEbHn0Sxmt0JYFknE3uJHD5OSkMoWAKG7a1nt7TzTKZDcm913NqAJnfnffzvGHjsSs/gUNkCQiv1KoIuZEiUE9RpHZFmmW46d/MfCO2UEPPuDbvHza5DUPxUwiopw5mMCbPCnXxZhCrwYtU7WWHfjIPYoCeM3mDMZzwz1DPPlWo3pF8t1uFhaKV/WH9GoaoU0eMHlXPg0dhoipLQ5ZTT0Qw2jGR6cI5mc0BiEoWXc/Jx44SQWp/auvnYOzqzMpSiGkHnqp8Wu2l3M69ctMQINXkSYwQNqNWavEiomdipcKcT7I6/eVTzBvmSNXchBv/Ec3fk6WfALelCjN1XwngG2bNEqKNkQoZkYXjUyPBG29x3DXtHYvxw6tuJ51ID2QY4DBye6YoRjEmU9rbo+MWeDe2D9yRUp+6HjhEfMDPa6uXqsTwX0oNHG0FH0HH9OhUVmLU2vJPzPns5tjc0KdeHN7CCsAAep0LosjLIDckh6QlH1ouygAXN/AuInfsbTP+dR5GYj1dpasQLBREyCMSrtJ+Qy1X+kN4+2CUfG7ZgK6fA2pNRADmMDt2LPKPqk4ZgKhmyo9WAjnpK7xUSEJUKp8bS9r4YqEnbsXkRhwI50/nGFWoftVdmgzdowhVExHL5a/e+ Nq9jZjND ezzAW8Ds6pZHlLVa5zrAUtTwO5Eknu+VIKdQ+4iBjIu9kRkrngWShBcZYKuQzmX/b34Lc9csz2kzzaJex37vQv0nEt48hN8plJvbrYFiIfQMcURJt3rgK+K3KwJZPewFaMSEEs0yyia0qxgcsYUZMvUnWnxCM1eal6VINWYTzoZ9//OoU1B0ysGr4/6dE7ZnL0NxXmgRRA4BK2pVuQDu4U9T+p2a1VDgQkSPE7qyPKqSHM+G+jkbP7y+BjQB8Ti4G5bzufsVZiQfInV1ByUCP6xQusdxG0udQKS8PhCK97qISrntSjoLzytMLQnOvgLbN51ks5CkxnVrG6aaMD7q+AMv/gvp4f/CYnUeQWyffikeRSx4= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, 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 Howlett Signed-off-by: Sidhartha --- 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 8fdd3f477198..36d7d7a27e32 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4091,15 +4091,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) @@ -4121,6 +4112,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; @@ -4185,19 +4184,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) @@ -4217,10 +4207,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;