From patchwork Mon Apr 7 18:41:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sidhartha Kumar X-Patchwork-Id: 14041524 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 1B97FC36010 for ; Mon, 7 Apr 2025 18:41:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 173026B000E; Mon, 7 Apr 2025 14:41:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1087A6B0012; Mon, 7 Apr 2025 14:41:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D1C496B000E; Mon, 7 Apr 2025 14:41:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 927A86B0011 for ; Mon, 7 Apr 2025 14:41:19 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id CEE50578EF for ; Mon, 7 Apr 2025 18:41:19 +0000 (UTC) X-FDA: 83308115478.19.A1EDF5A Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf11.hostedemail.com (Postfix) with ESMTP id D3D5040007 for ; Mon, 7 Apr 2025 18:41:17 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=Ja+q7cue; spf=pass (imf11.hostedemail.com: domain of sidhartha.kumar@oracle.com designates 205.220.177.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=1744051277; 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=+W7ISdG8szb9zeJ330uZlJcsSPgv9PK2sFXgns5vqWg=; b=cnFqg3Iy9oLVoCPCS9c9Mz/kVTZi40noQSPsBjrsOl+2vQSyN+LiDuNgZYzo4Jxa6PjPH1 3eYNfCdhlyEzO9RjVQeXwtXEBOX4Q+zDmC9J2Z7Lk/2J0fnPeTq8u0M/odrH9RujrtDER0 0MhGiROf2TAkHqE/OFLeYKx9L0XC8l4= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=Ja+q7cue; spf=pass (imf11.hostedemail.com: domain of sidhartha.kumar@oracle.com designates 205.220.177.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=1744051277; a=rsa-sha256; cv=none; b=bljbNrGyHtAYdU/M5a73n5ZWyAY8L4twByT11muXbHLhHt4dRI/zlVczEZUnStqj0tFu06 gPkwh6f5WLoWa1H+2DZf6xbfJr3aVdftsTlQV7wGOr8IyLmU6pKBHcaS4zMvktyg9+3+p3 lfNrqp/PZVRVXW4ZGBiZWojwO5aG9Ho= Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 537H127F016641; Mon, 7 Apr 2025 18:41:09 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=+W7IS dG8szb9zeJ330uZlJcsSPgv9PK2sFXgns5vqWg=; b=Ja+q7cueKl5J+zWvTjdt9 8eAZR1+yo0XRy5GEVRw3njJXDoAMZXHgkVTzHhvjDprVluZo9N57QsGSKyWLey3y dv+p+ag9up2cDcgR/6OO652Z/GqhRk12sgfmuaiKC791SY4cnoBwiKzc4RpiucAl 5dqdKzgvV0SVeFA3RwFMKEHJBtYcYgXzVJR7dOhilu1VN1Bk4lBCbQ5OBtxUUOiC kYa7SXnDAkUeTXEdPxSxQ3uYHLYltpHGcigllgUasoYlZX+cN1Sk/4x+6+dpaX/c XfKORTv1RSOhriGLM68X/fs6NsogDfBb9ird6/P7BVpMz28OJAb5Fh6FRA3e5a8A 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 45tvjcua7g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 07 Apr 2025 18:41:09 +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 537IbAYh023937; Mon, 7 Apr 2025 18:41:09 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 45ttyefwte-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 07 Apr 2025 18:41:08 +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 537IY5Db038909; Mon, 7 Apr 2025 18:41:08 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 45ttyefwqr-7; Mon, 07 Apr 2025 18:41:08 +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 v4 6/6] maple_tree: reorder mas->store_type case statements Date: Mon, 7 Apr 2025 18:41:02 +0000 Message-ID: <20250407184102.2155415-7-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250407184102.2155415-1-sidhartha.kumar@oracle.com> References: <20250407184102.2155415-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-07_05,2025-04-07_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-2504070130 X-Proofpoint-ORIG-GUID: BfDzaKACSBh63y6jvwJTyYULhApBmvAO X-Proofpoint-GUID: BfDzaKACSBh63y6jvwJTyYULhApBmvAO X-Rspamd-Queue-Id: D3D5040007 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 3j6xfiga7pan6w97hicwfwa67rpcato4 X-HE-Tag: 1744051277-619081 X-HE-Meta: U2FsdGVkX1+JomvS9s7Mnws5JqPofvW/BXhndOeQlX+EkTO6q6hn0C6D6X/hBTt1Fwanb03sMVCYnPsLgiUEQiD7Z288LqYKBLlXP0gNvD+I0acuI7T3SMZwqRQDmks125qQCWmIKI5EojGLC2JY4oZDJP595kvXwrf6HCsZVkhd+R9YlfuN/2ElDfL5LzcpJ6uUiXkYEB8zCl5PecH4zspwM1J+D1FN8s9TY+PCgHYuaNIML29EQo77SzTj3QOmllnnnXowdv33TA+GG1xzJeMBDvlY5Ik0XdI1Wucxbwn3qBouhevb9WIC5RWYH3A5+E0Zzr3owm0/0N65wpCiImQrewhV9iDXIpjJ9nGjGCCV9LquYim6d4Ndk11/xZPm1Y0qBTYpYLSy007V9rOpuzg9sbcSDgitOvCTXkIWVQkuoef5/rRw78hc8h7JZfZT8WSeD95VXVrVfLsqC5WjWrgW3VNnfT9OjyA8EtIhrFCJmbbZLASYKY7iwawP9EftYHieIr7LWtLJc9yALK2gGDkKtordg7XGRQ5s6yBrVR9gr5H00MJhDkeUaUmCqXhcrNsio3B+bKPZo+H4DzSwayJFB5DuiOPfKAvHuVWQUKgMlDZXbOe8+W15VW6WBnrTCnZJSBP2Ksvm/4ZG6nFwrVrYovhIcVzWTmk44LhdHLluBUB0yRLrBQz7STnHoS5OIy8a01UTWeuuC7g8P7D7VC9dqiw7dCvA17d0YpMEg/HVa83Eq2XDuZ5X4g8ndR+Xlm3baKdkbAj8uYsUweHRAirwlYJiunFHk8WJrm9pfXsflW7PgUu6/6l11skPU85/NNiHtlvxw0iCDoKopEV+aJpwnlrCkZSGNJLOwQTlly3SbcUu+uLpnxIln9F0mQGPR2h2fZb6Q/vMNLAKxmyGw3aDghkCls8+ZkxH8uZwb9+9bZ8x35Ue04Yf8kgZkLjQ552EwsuYrIwl1dC+eO7 skeGbp8y wUQAaup6Rbe2YOOJNAoTptZw8TNrm+DNfZkmIsTCnKILQGtRDsKBpdTDtlv7cfcQhAPz8RpotH5Nc2WT5Xt7mPpoK8IA5/8bvIxeRnPb8t5QjSQ4alD1737+n/UmcsxioBtYK+hd2f1PXU8nyBaSxzlrl+lw9gPriUS469xDihJihcadHFuTpZot2M+UwvnTtlLmn0TOLJjUcI0AaRNtnTQLOwdooCLMVjamn+BAv7ONC2+bIEUBHdtSp+JnG0ccmSnMGoxG8h6VlCVxaKEw8Z8NRW3b/Cc0XEKnvPHa69K++cCYAoaUuHyL9RQ28Cws7WO3azWgAjJAoaqU= 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 98b06709d864..8425728e3c5a 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4085,15 +4085,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) @@ -4115,6 +4106,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; @@ -4179,19 +4178,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) @@ -4211,10 +4201,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;