From patchwork Thu Apr 10 19:14:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sidhartha Kumar X-Patchwork-Id: 14047146 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 144DEC3601E for ; Thu, 10 Apr 2025 19:15:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9A4C42800AB; Thu, 10 Apr 2025 15:15:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8969A2800D1; Thu, 10 Apr 2025 15:15:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2273F2800AB; Thu, 10 Apr 2025 15:15:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id DDD192800C0 for ; Thu, 10 Apr 2025 15:15:02 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 7C4261605B6 for ; Thu, 10 Apr 2025 19:15:03 +0000 (UTC) X-FDA: 83319086886.27.3EB32F6 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf09.hostedemail.com (Postfix) with ESMTP id 82EEB140006 for ; Thu, 10 Apr 2025 19:15:01 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=fj9P3Wg7; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf09.hostedemail.com: domain of sidhartha.kumar@oracle.com designates 205.220.177.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=1744312501; 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=zWlQ0xIqmwybEu+J7v33mBZJCqNRUP8L6NFstG34c08=; b=4gxDfJhDJQRUULJyLSdYAlEjELFTdWowrMCw0n2h4WEr5kJarcr9RoHYLjkAMDZalM86wj Lr3XrgSopJ3mTRZm3vYxtTjZsjOy1jzpVle0lpB4NQozpBY5Jrm2EYwaY+m0QA8RLUDQ+l dO/+LQbqHIxn9PJbRgysK0RxEz2+KRA= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=fj9P3Wg7; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf09.hostedemail.com: domain of sidhartha.kumar@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=sidhartha.kumar@oracle.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744312501; a=rsa-sha256; cv=none; b=g+HC2JKV55lZwUaHTmYMou5teFX55gCVpZIJmy3LxJlRcxePux7oSS128EOonw/79vaYqc z6y/XxkQ4v3kO+AmjAuVewJpFVaW0YQk5so8LsKm7+kz4bCIkqVVRLoEXnTkREiFMDx8Ur zGAPW9uXEyDTq30UNzt0Ou5iBSKBDFo= Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53AJ71BN029309; Thu, 10 Apr 2025 19:14:57 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=zWlQ0 xIqmwybEu+J7v33mBZJCqNRUP8L6NFstG34c08=; b=fj9P3Wg7WQF9LKYDJwqO1 Um0VyKZvueVYbtKgCajE2cIuBVTzk+J57OFgSaVWeKjcmWmnicVCeWwLMo2dOpmZ R9xxiW4hlactsgtxbqyM7aTaWDaedAvBuOYZYRq+2xAfW5Dui6SwOcCGERTYUlsH +V28WGh69JztY/cSzzJvCoM0P4TUVvFNOq+ryjWH1W+dq6hQsH+j2b86F4ARWJZ7 eTb6VPUi/B8rGGH8TS0zqxR+HoBDIRKeP3eO3nMYsaD1MwDOw5WNNcUKQbYxKo6r mz0ivu4ERPoB6H7s9kqFHuyfE50GoFQHGVlmcvzkSV43rDlHTIDpgA4XXzxYUkWE w== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 45xkuy00h9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Apr 2025 19:14:57 +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 53AHe4Fc023813; Thu, 10 Apr 2025 19:14:56 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 45ttyk1gkc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Apr 2025 19:14:56 +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 53AJEn98040606; Thu, 10 Apr 2025 19:14:56 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-7; Thu, 10 Apr 2025 19:14:56 +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 6/6] maple_tree: reorder mas->store_type case statements Date: Thu, 10 Apr 2025 19:14:46 +0000 Message-ID: <20250410191446.2474640-7-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: AuQSBcultmD_cCUSWfwdXLuB5k9yBpJM X-Proofpoint-ORIG-GUID: AuQSBcultmD_cCUSWfwdXLuB5k9yBpJM X-Rspamd-Server: rspam01 X-Stat-Signature: mcwnom3mm3ng7cz9icp5dabsm6jfprce X-Rspam-User: X-Rspamd-Queue-Id: 82EEB140006 X-HE-Tag: 1744312501-219939 X-HE-Meta: U2FsdGVkX19lqkYLF6MLahxyqiczEYSe8X4j2sSOwVCXDJURl9+3i4SA+PrsdgDLCatxHX3erbe91NPVVbw9/xrRLnNlTUNyaaSGmbv5bbvrwpapP8roq9WR6f2gd18ICInEhRky7qTF6dR7pngK8YTtTVRWd088C+A9w9vM9Z8CDdXCrShczG+E8+EWG+uM1m3ZislNhQyqc1S8bDrXsTp1g/nUKvMS0iiTDc5/xALRtWGdpy9ACJnCiZ9R8Ra4zM1/K8qCn9FPh1uZqIbEPVotiud4nKy3bwoT+hP/wy/AX+BIAlMoDnPqbuk0QlfiNwzyTOUKfub2lSZ0rTYzuinKXIHk7zlyLz+6himIqMBfTHjCYQLVm8nutLgaZ8kyLMSsqd5Q0wtCgyuOGHqDA7gr52gi1cC5I9HwL0Z1QxxB1xzS1l3Zu3he5fYmBlc/v5bHNge4BN+AMO1jN91WcvFbq4gum6uxCYdygxyxZ4A8AvVD6mHKwf6ePKtWX6/VvemSXzvIHGo0Ie3xxi8ImX5fMObXHWxTi2kPvGtHpUJUyBfDdu0OHWtjvHM3qAXxzwDysLSVIQOqVD2rLrmGikL50ZAW2XxJvPy1Y1u0x8+lsuOQMdwp70IMrpJeNhAp70K1v97EBYGUQ7t1xzIsw2g9lRpl5cfsEHX4/RSpu2nbehM9qS5QyUjioDh6QSTMjG9yARdYczKX2SlbBIlPKTZcfcmVIX1vz5p6cFeJbp6bdcvUdDTuuGZiGjTlenX15pgY4gHNiR6Mplp7IG5o5IJAR7zcEkwW25bykuoAaL9hSqYe6Xvg9z/Ma45T9nQtHLnfYoXV9TUAsNdhIlv/2AvBY5MAWTygsShpqqn2sW4osb3OjZ9ysCJpsL+svtxaUaHkzLPsFmqGu3427u2f3HlYFk89lhMT1xMyQaIZvjBB7QvrY4EqPjDKSPdppiew5H3ejFR55wfam0I+K6T KMpCyXK/ w6CdIUZljwZU7MpEyRXTxyAo+9bsO4oYs0NLTjNwedJWWLSaBSpUjekepNxcC/dlTgOSD8fNRWk98u97iTDKxuqL000Og3u/QyXQpDFZbxDFhWt48yOBq+46d7OZspcvzj88sPw6zepQh3ZwOvsVFowv56uszYRCxkTGlJgSrvXE9VjoVDJVVaPbSri9HJjpflYJ3O5c28ESH6zSmwPTcDQMtP9u7HeyVXmKTGKoJEossmMTsvCjRIDvLhG63BF8lOC2Dna/LjBDvx4BRs9WbThpzU3PiAUV4sODsg8090Tc7wGIg2GuUHUrFiPaseje69u6++ieD6GSodtI= 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 aa139668bcae..affe979bd14d 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4083,15 +4083,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) @@ -4113,6 +4104,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; @@ -4177,19 +4176,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) @@ -4209,10 +4199,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;