Received-SPF: pass (google.com: domain of linux-kernel+bounces-206625-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Sidhartha Kumar <sidhartha.kumar@oracle.com>
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 <sidhartha.kumar@oracle.com>
Subject: [PATCH v2 11/16] maple_tree: simplify mas_commit_b_node()
Date: Fri,  7 Jun 2024 11:52:52 -0700
Message-ID: <20240607185257.963768-12-sidhartha.kumar@oracle.com>
In-Reply-To: <20240607185257.963768-1-sidhartha.kumar@oracle.com>
References: <20240607185257.963768-1-sidhartha.kumar@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?S71ULrciHvLsCkSum58H7/xvV005NdCrJglsqEC5/TmgS9gAlptmKEt047T1?=
 =?us-ascii?Q?TIrOvyRLZW2Su3TEfvreJTif8QteLrYMFIVpXY258lwQzQ7ILCcQuc3rNp5Q?=
 =?us-ascii?Q?PrYiZpF0HV+8Dgz439NTf0l9Aot+b7SijvCxDeuuYs3GISWXLW2FyPq4CCF2?=
 =?us-ascii?Q?ORP5WIz/TAHBcyBVueFoIHYL1Lt/yubvdG9vZUbks+5eVBeAyuqBK8GHWDZf?=
 =?us-ascii?Q?QZ2xscEZPVYz/VcQ3Azn/9PdhxHga0KeTkiAaZR1lf5ni1STm3IRDfI9BC/E?=
 =?us-ascii?Q?1Cp+PpCrUPLcuIQTjp/TGmcEOz9O8zybCZJqjkwwYMcIdSK0LZ0eVaik2v4R?=
 =?us-ascii?Q?drc7Nz/QDmEX8mN0R2vuH87/cAjUzwnKC7xe60LoPcQgld6Ye6sh5bfGKA/t?=
 =?us-ascii?Q?oCDOcXir5lKioPWMsHhJ0Fj9GZWes+0EbC+j28Uhv5DoZOQyadesiKJngyI+?=
 =?us-ascii?Q?oHlu3L6LOvIlgn/3fSAFkhSrqrdrljhGPsfuTuazqk6dhaa8CuUikPwCIo59?=
 =?us-ascii?Q?IWMva8Xm+pxsgblzL01+jg5SZMhlwpXoQXr5XLJAauMNZH838T8AnPVpybUm?=
 =?us-ascii?Q?+VlVmJAk4/wefW6XF9sZsEpzDe/KbAI2jiETDOCtiDGqEaCXANtEXptmwkUs?=
 =?us-ascii?Q?3DBRrvFvNCTwmvsCRFKl7ELySLDOOy1p/EezAIgmAfqeWnLzC3kTRT0eoMs2?=
 =?us-ascii?Q?k29KNJmzphDgdRzrr5yC23n1nF2IpVHK0ZBT52z+uUnVdaIfXnxWun6TCJgu?=
 =?us-ascii?Q?IGMdGM05h1+h2Nq46zfCOYCtxV9s4KEWAztZqEGHGd0c8m7KGL7ePafhxjhH?=
 =?us-ascii?Q?EmaVIboFnYMKfU7BjZFgdvs1+q5bg7hVM3um8k10lCuJQQ7eZI3qMAH8VJPb?=
 =?us-ascii?Q?Omf60kyOUBxnwfpciZkKyV8RztJrauEJ96ip/6u3xkNbYq3F9Fw74YbfleF/?=
 =?us-ascii?Q?RSzHeXRrZ3VoIoM0EPfHJYn21dESPyApcV3jeaLFiDPxCzEiU02YVO+T84uB?=
 =?us-ascii?Q?2ln65ea8Pf8MuRR0+CC1Ksi0TiQgAOJJ/4OV3LyQgC5HM4afMbvjfBSwtMCc?=
 =?us-ascii?Q?t0UZ0ZsxMLNInEoCEp/uWY0RBh8jNL0QromJKXt9cCJtBYCCz0nhDupl0iYD?=
 =?us-ascii?Q?W4c3oCkHDs92W+qcKeEJIU01aot2kLAgsOhLQUNi0I9M1ywKtqxNRrOdk+WJ?=
 =?us-ascii?Q?rFhm/HrpTGQz0/IpltyGSqZdrn00y+HJj3fVotpHZ3DBROkCw7Ze4h6pbWGu?=
 =?us-ascii?Q?RSsyvXT/BXkMDgkMt+cnRv/kUNNOyiqXq7ozxrmagEU04scbwRM3o5Pj0api?=
 =?us-ascii?Q?xtUx+LpOWudxy17K2FSH0P+mphySPu3rW0XWiDqcFuT4tRxlxyTGO4TgnuZc?=
 =?us-ascii?Q?y21mcN8oAj0/fK42O5OjkgzIUvuGjcq3xHfoNvLnBwZz4yBpA4fbbujRJae6?=
 =?us-ascii?Q?vZh2FJXF2M4pxIPT6HrcAZLAuYS3JA5kd2nNCGR+Lzuuh+X22I/QI/CBEtgC?=
 =?us-ascii?Q?93iWiLNRLJ2dQtIGNh+u1xLRE3nZXoAmZttjxdChk0ZgO3gHUaL6CxE9RDNQ?=
 =?us-ascii?Q?SPStESKJ3umYiwVGsasEKYjzW4NxTYciBchQnxAwrf9Res558yp1fIPlXDHt?=
 =?us-ascii?Q?99+3D70u2Pvvk8F7Y1mW5G0=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	NDUgEMwwY+LyLHz4sgnqPUbNNIEN7IXv+8qpijK3JkvdPgi/D5OtOihLGEC3kWPa1HSP+K6JAnJsW6IBlaOXAkyKAvhC/W8cP+Q+AVbSM31AYXk8yQUDfp/7wxR3SQKRWS7HyaLg+QOzz9i2hXaaL0EVxBT06BE75APD1GN4kFo4y4K8q4WjNZfhlnBsweCZE9PE2IWUOdMYlL/tcTegxkZM94c199/d3FgSfGezXxaULnlhH1E1mSPA56mxnsupB/LnFtC7WoRcKJYZplieYiT25OSFIAzDvWEk3nCL3IsiMc2FHw0twSiA1iq+qxVbuBg5n75DnFLg/adOlKQ7s2G4UD5S2047x6ZJmn6Wpe9Z2QNNEKyIGCbbckvKK3/Xea1uFmCDRShJkamXRAFlPQ+D4mqPOLym0Dx+3c/ncecjj5xg9T+Rx7Q5xFnWbcxJ9glsUf6kb25bQj1fbJYq7f6COZpK44jH2nnA+KOcr2oT0giAlrIDuXY9FNCkmAoo25qm3YZgGaUmI0kjFFnRS1yJdgn3SubFXkLAed5aSyilyAVwI8Sl3f7XAN9HrpRvErhLuRISQK3LjOkOCohFPha6YGzNLfmAH8b3Hk0wErE=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c911a8e9-5670-4d87-a511-08dc87231f6f
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jun 2024 18:53:30.9125
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: fLgg3NvhhuhHew1lU1WogLLUejR9o8pMcghB5tYaZhknT1yZIVUyP63KZJO5yYrVXUs1RvsGKTEnkt15ykUYEfAJynldO9cpyKH4ZMDQRB0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB5629
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16
 definitions=2024-06-07_11,2024-06-06_02,2024-05-17_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 malwarescore=0 adultscore=0
 phishscore=0 suspectscore=0 bulkscore=0 spamscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000
 definitions=main-2406070138
X-Proofpoint-GUID: S9nHsH1Q15BLfpU4Jn4wWudH6qlOeCGm
X-Proofpoint-ORIG-GUID: S9nHsH1Q15BLfpU4Jn4wWudH6qlOeCGm

Use mas->store_type to simplify the logic of identifying the type of
write. We can also use mas_new_ma_node() instead of mt_mk_node() to
remove b_type and clean up the local variables.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
 lib/maple_tree.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index c37bfac4f622..743de734ba0c 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -3431,18 +3431,14 @@ static inline bool mas_reuse_node(struct ma_wr_state *wr_mas,
 static noinline_for_kasan int mas_commit_b_node(struct ma_wr_state *wr_mas,
 			    struct maple_big_node *b_node, unsigned char end)
 {
-	struct maple_node *node;
-	struct maple_enode *old_enode;
-	unsigned char b_end = b_node->b_end;
-	enum maple_type b_type = b_node->type;
+	unsigned char b_end = 0;
+	struct maple_enode *new_enode;
+	struct maple_enode *old_enode = wr_mas->mas->node;
 
-	old_enode = wr_mas->mas->node;
-	if ((b_end < mt_min_slots[b_type]) &&
-	    (!mte_is_root(old_enode)) &&
-	    (mas_mt_height(wr_mas->mas) > 1))
+	if (wr_mas->mas->store_type == wr_rebalance)
 		return mas_rebalance(wr_mas->mas, b_node);
 
-	if (b_end >= mt_slots[b_type])
+	if (wr_mas->mas->store_type == wr_split_store)
 		return mas_split(wr_mas->mas, b_node);
 
 	if (mas_reuse_node(wr_mas, b_node, end))
@@ -3452,9 +3448,10 @@ static noinline_for_kasan int mas_commit_b_node(struct ma_wr_state *wr_mas,
 	if (mas_is_err(wr_mas->mas))
 		return 0;
 
-	node = mas_pop_node(wr_mas->mas);
-	node->parent = mas_mn(wr_mas->mas)->parent;
-	wr_mas->mas->node = mt_mk_node(node, b_type);
+	b_end = b_node->b_end;
+	new_enode = mas_new_ma_node(wr_mas->mas, b_node);
+	mte_to_node(new_enode)->parent = mte_to_node(old_enode)->parent;
+	wr_mas->mas->node = new_enode;
 	mab_mas_cp(b_node, 0, b_end, wr_mas->mas, false);
 	mas_replace_node(wr_mas->mas, old_enode);
 reuse_node:
-- 
2.45.2