Received-SPF: pass (google.com: domain of linux-kernel+bounces-206630-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
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 16/16] maple_tree: remove unneeded mas_wr_walk() in mas_store_prealloc()
Date: Fri,  7 Jun 2024 11:52:57 -0700
Message-ID: <20240607185257.963768-17-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?uMzg8Bs9fAUvmWxZy+/+yTvvLbGvyIcRwb+SNJhRGVpDRfCWc4RH1JpmlMXv?=
 =?us-ascii?Q?jfZ3K0L4ytKJ5Esi6YfvY5CwNly9OzEWo/k0X/zIBP7DklEHEFYC9cFXP9LX?=
 =?us-ascii?Q?gy162QXvREyb/EM/ZMhmnbljLt9aShIYocuhevenYknTjiE2bp7sEaKKGU4X?=
 =?us-ascii?Q?2QP6AFgP/Gs1vN1eivWdztuOSZoG+QMOwgu+pdNJb+zTPj+8v0CRRxWVaBId?=
 =?us-ascii?Q?O3RRoNyzaYiTERBgUQs5FiUyrFeakynwHSVbnbv2q5Y0x0iIhLnmr13MqxFt?=
 =?us-ascii?Q?JrljQwfCvlXDYmKQO2BDAlMiCoFatZaKAgpv6yNG/tIuOYR2VOBbheIffu4z?=
 =?us-ascii?Q?wwU5dhahV5RAZhA6yVwN6Iy3cGMcGj7o36mbbIapEPYXX7SVfiDJ/KKUZiQK?=
 =?us-ascii?Q?IBrxjH6IGa3LtsX4RbLomZ1zrq/p4CHi/GSvoChQsLoDZLNVqvLCHJdbXStS?=
 =?us-ascii?Q?gmNzjGqafGpaxlvWTlu3Q/lioBYMBIiyFGQs50hDCv4EIeh5tuORJ5aL+Zyr?=
 =?us-ascii?Q?kz+8/4PnSl2NR21YFMqdX9GtW17+SvnzJoQfNJJqQ2X96RnsuZ+vSkVXTAMH?=
 =?us-ascii?Q?F26dEGrJ4b/ZTB8X7MpehahU1QXKsOM8kAq/Dh5Xfo2v8n1m9r4NkzO6rBG1?=
 =?us-ascii?Q?awT0tQ/cCDBqdmhPpLblH57R2eIDRT4mn2axQUWog+a+TMzcOR69YXWUGCSl?=
 =?us-ascii?Q?fD8guzMaWrza3Tb0ROkYq+PoRPr7dwjzRWdDDs7lOvssefCoKoBRGSRyhKHg?=
 =?us-ascii?Q?46TCT2cRxBj1y1Ep0l56r02iNjwj0SVjAcoqiVJcCKsuexU5k58GPUZGGPEf?=
 =?us-ascii?Q?xuGR8VctTBlsF4D7+BWxGgKZpzdm9mfpcq5im+LxpCe+a9U9Qys8YkrY0Mvg?=
 =?us-ascii?Q?wjkS2KGjmi4crE78RIxPE9LUxOkdlmkQnYp3uT6FywA5TUBjFkyXAR77FXK+?=
 =?us-ascii?Q?kafuUsVreifISr0a9WvhlGQmj9VOEyzTfmUVDiKgm35gB1NKjYxokXOlCyz+?=
 =?us-ascii?Q?NpM4V9zv24PkLUrTXLdYqsrim07CRRTV0IM61WE6Go/j/fo3Ele6wedCpBLJ?=
 =?us-ascii?Q?pHqYXCK9/19Dw/F7omSYpDM3m3w0znN4WiMgN2NmL1vO3DBhupbUDoHdPH8k?=
 =?us-ascii?Q?9L2eandq/gLENFW9wkw8WGOzoFH7vF2KVynMstvLDvVphCwDJzpokoSW18kr?=
 =?us-ascii?Q?UlS58ozOouwddBtn2zHDsyYrXaDFxXgC0AOpMG/dbZ+Z+Osacfav6oJx0Ija?=
 =?us-ascii?Q?NxomgX7/Uf5zHtIxHNO2FfViFE0UDAzXITsvCRWP9G3leVsMfSZLLpPSVRDB?=
 =?us-ascii?Q?CGFj7G09Q/pkdhH6wJgHWl29TU547HLHSGhsKWNKGgoqP+n7A/JimI1tbW9c?=
 =?us-ascii?Q?BIoUQfQMz/gauoj9E/oVcOM16E1B/z79mvCOU9dxQYcMNPRC6HbhYRBq+svX?=
 =?us-ascii?Q?KdIvEEYaR199jCKZUOc0Y0e5vaLGGX37LkXCVav9cD+b7DQy8GZvGlV89ZRl?=
 =?us-ascii?Q?Y2ReXlPfB67ohq3AQFumu4GK3xOrs1o9R4VoyKPBl9xG6xVggptbUvuimwiV?=
 =?us-ascii?Q?VysRir8IhS0IvDxnvTk67YDgkXQngFkYNy32jcq6vyCwR3NzTJhB14MLTXy/?=
 =?us-ascii?Q?QXp8HYzU15TyF5sJli3hc4Y=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	eE4rMOqgQkci4XJDxvus5lubg/5lL5Iyc/Kspzdk7g5mmgNOyPqebYfgFgEb1XWz/N7+Xxg47UjVDDAY3rJY9daL+IXzj8OM4JObtuIv62ZSz339rwXNVusAwcQKkVxYUcxIefM7sWxnxMhT8O1fA1Pqzc9yANxqkYwhDlpSI/snZ6wGVMgOuPRPKHs+Kds1Ul1QtHIr0gogPegQ8u7QTp66Flsv/P8pM4vMhLedZEHxeQuOGkRRBt/+D6djhHTyCayh5Zm+CazbFJGktH5c0cf5CZ9zQyEEGOGY2DjTWQh6Wj45NVHDlq6WXOTNVh3djq1EtTRyrk9odxG6w7oh9VDM7OCfv18LpSAzE1UFvqNFlKcS/dNlUQvKO1ndzsMr6UVUxflM05n+ihhXhVtEqVKl4Lc92tq/QdFNIF16xVlfSqf1CSj7Yj5vRaz0pJupm5fjWI3wWh5sGNP5jcEvvy6YJEUz3lbVuIy++JEl5ClBWv6UzvCrqxMy7O7Xibll+9mhfkx+I1cY2hgzDFSYvK61kbVRBnl7uwqrwPh67KQEzB+uFzpWWecZPXb10PgFSDZJY9oKxneoo6q6VxEjc3uffKm6PzTU41LU8g0ANRo=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ae91e1bb-95f5-4401-8aa3-08dc87232cf4
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:53.6289
 (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: scQQd5c31gn9YE7Yu7RzM4yoHhmzDE/SYRbpvvPrdgydzWa+o3qEICotaKu0bkpskVO6ZF3Ltlqg3AcvvOedpiQ56cXPYZFEK2snG9aF3aU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB6640
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 mlxlogscore=999 phishscore=0
 adultscore=0 bulkscore=0 spamscore=0 malwarescore=0 mlxscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2405010000 definitions=main-2406070138
X-Proofpoint-GUID: lsOVYUOxyU8eo4HtaI5MiKA8cv9g5mab
X-Proofpoint-ORIG-GUID: lsOVYUOxyU8eo4HtaI5MiKA8cv9g5mab

Users of mas_store_prealloc() enter this function with nodes already
preallocated. This means the store type must be already set. We can then
remove the call to mas_wr_store_type() and initialize the write state to
continue the partial walk that was done when determining the store type.

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 3d334e7c19a5..5854f25a4ae5 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -4027,9 +4027,6 @@ static inline void mas_wr_end_piv(struct ma_wr_state *wr_mas)
 		wr_mas->end_piv = wr_mas->pivots[wr_mas->offset_end];
 	else
 		wr_mas->end_piv = wr_mas->mas->max;
-
-	if (!wr_mas->entry)
-		mas_wr_extend_null(wr_mas);
 }
 
 static inline unsigned char mas_wr_new_end(struct ma_wr_state *wr_mas)
@@ -5598,12 +5595,23 @@ void mas_store_prealloc(struct ma_state *mas, void *entry)
 {
 	MA_WR_STATE(wr_mas, mas, entry);
 
-	mas_wr_prealloc_setup(&wr_mas);
-	mas_wr_store_type(&wr_mas);
+	if (mas->store_type == wr_store_root) {
+		mas_wr_prealloc_setup(&wr_mas);
+		goto store;
+	}
+
+	mas_wr_walk_descend(&wr_mas);
+	if (mas->store_type != wr_spanning_store) {
+		/* set wr_mas->content to current slot */
+		wr_mas.content = mas_slot_locked(mas, wr_mas.slots, mas->offset);
+		mas_wr_end_piv(&wr_mas);
+	}
+store:
 	trace_ma_write(__func__, mas, 0, entry);
 	mas_wr_store_entry(&wr_mas);
 	MAS_WR_BUG_ON(&wr_mas, mas_is_err(mas));
 	mas_destroy(mas);
+
 }
 EXPORT_SYMBOL_GPL(mas_store_prealloc);
 
-- 
2.45.2