Received-SPF: pass (google.com: domain of linux-kernel+bounces-201198-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,
        zhangpeng.00@bytedance.com, willy@infradead.org,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH 18/18] maple_tree: remove unneeded mas_wr_walk() in mas_store_prealloc()
Date: Tue,  4 Jun 2024 10:41:45 -0700
Message-ID: <20240604174145.563900-19-sidhartha.kumar@oracle.com>
In-Reply-To: <20240604174145.563900-1-sidhartha.kumar@oracle.com>
References: <20240604174145.563900-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?ycagm2bgr6iZ/tQh0OMuZdS8BNzS3JiTBIjdFISc+jq7SI/6YPOOyCHjSKoq?=
 =?us-ascii?Q?vetVaEAJM9aNGJeyFUcSkvMcoqsytWgbKzxddhE0eBnpigl54S5aYvAiT6pS?=
 =?us-ascii?Q?rEl2qPQgl7kE98jxgy7hpAP6rR+9KCG8fcJ6qUOCNw5QUNVO8O0EJ+KcqDI3?=
 =?us-ascii?Q?KDwbCpgsRB+eAMM1tpJWVOZdxpeQOUktQOv7XofnlrVj2M/a4Lz53FUD0cl9?=
 =?us-ascii?Q?ApYYfqRTz6TgX+K/BHSovmDHOx8lMRviT1MZURlK4zIYonDsvRh1qb0/Me63?=
 =?us-ascii?Q?M84UmC0hQDBcVhEWLulGQQNKNFAyO9KR617LyNLZmAjwtB23BjGEg7mhUx0x?=
 =?us-ascii?Q?Wge+No1fWRiOw0sQYG/hY4AKPUDrSxu8aOyFlTITxsnHwLBN6QbbArpbW5ku?=
 =?us-ascii?Q?2aQ5PbetoGrldwxThKJpgzDTOud4iFB2a4yeaIC1z3qkx5qUOmCfX9HKU3d/?=
 =?us-ascii?Q?Zpumue97O1/vfBVt8RTEIXKOI5ZB/SpOmLJEWensJ4AFaqCnvpRCMD/ITYQm?=
 =?us-ascii?Q?K3+dQ579/+X5TaYjKKNmDg0PY8E/89RMKFKLFs61/K1KGgdzFgg0FNdMp091?=
 =?us-ascii?Q?H8sTgeea8OkFN/ghDsRCyfTh7tY6gzg5mgfbEwzE+3vsq1NX3pdZ3WfE3oGn?=
 =?us-ascii?Q?0c7qPVzYi9bcrF/skCc8jON4sMY2b84c1xL8EvBihfGNqYgi2MZb17/xPf6C?=
 =?us-ascii?Q?6Q85pLw2eL44mrKWDxaAGDoA89D5WSKw6/r8ny65ob61KkuOGEwlVjNOV+UM?=
 =?us-ascii?Q?WeGAmLPc0mEJr3BMUUUqiWZtPELnTQ4WJy0tchWojebOOImbVBI1Q6LqbkCx?=
 =?us-ascii?Q?stlTzxXZs1dgqt5onTZvbSiymKe5OQbgSnf34drgRdIwudxxUQsFiuO17H9u?=
 =?us-ascii?Q?+3cQ6F9xBo0DAZrHVBMIJ4DzRcKXdp/OW/tLpZHVnMfenVMbwEMSEwy7Sckm?=
 =?us-ascii?Q?62Ah0XV+8RXyfAwPC2u1FXvOVZrpnM6pGWG7kxcms868AJTp8HIAA7GuuxJ5?=
 =?us-ascii?Q?VnnjZJxQ3tlsZjGjQ9msLBZ/VZFbPNoX9F1CiG6rTMVprQcK8hSV6nYMGAdc?=
 =?us-ascii?Q?41yUosZzyM62/BdpR9K3D1GMiyYx8lWEy7troPUMLJBw6l0/YzDLRQgcp9Rr?=
 =?us-ascii?Q?bOGiTXNjzaF+oObQCXFtcH6o2+2UCUhDQVkCKSu17ivf8a6GR+82hWQf18rC?=
 =?us-ascii?Q?gBTgb4uDwlg6af9VP9gAIn1MAHUoOT4L7M8CXpZoBU3CZzRYpx/LfKq+nS6k?=
 =?us-ascii?Q?q2evjQMPUA7+4IZ78Q2wvVSHfowLl/49x4UQyrOqPyXYDWoUkInGJXCktUFW?=
 =?us-ascii?Q?k0ZtsOCEkwypWEVlrXnQ4URsvrJ+xD3K8Ps2mtp7UJW2qH8t0ehsH6h+DDc1?=
 =?us-ascii?Q?+sLpdOSnbP88R7WTwKhusUxrI/rmCBtRrePSIb4Feygy1iNj0N4PHBqVuHYk?=
 =?us-ascii?Q?TMB4faHwmOsNdB5SJChk/vH1DfevAMJREk+FUsktSj4YLCdN8pbP3jP6V67R?=
 =?us-ascii?Q?QKYKchKv16Hzkf7jOkPdAfCi0NQyEW1R7uicDeXEZtqLbaP2TXQViBw29vne?=
 =?us-ascii?Q?Zju4RonfJ7Gpu75BkX+UxxyqFG0lc4/q1flzoxDCAfykwnnpemdhHzK321K1?=
 =?us-ascii?Q?WmeHO4cIGm+iBHkuI9CmF+E=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	YKbrFAaLGIG/HTeukfjRLIc49EaiepX5IBcYjVGxFMDa9ICbAJSwmHlRQ9s+MllqkSyU637F49Ct9lLCa5Z37afNS/gQyoucHnZRSac1dc9u1bP7zVQpneWvmYUrNF9pRKejaL5RF4KbH/gYBxRT0XWmsQyupl49vEk69M+2MgsUAyHWrMFj3yq/qk3kuopXgRLY5BaNl0CNIyoYtP963/waq/MVRr/7nutPOhj+Mpu4zs4UzgaBSYYYhoHfbdglRVoUQTWfiyYpbCxwRhIvsRuHgAKtL3NkWtC4fKD6baD1pdnnqgdexP81wez7iDneoxAB3YkfcZZ0byhpG23z86hAUspVEBIXb/6f4pS3TKpohmty2cIQOkztayP++26e7zUyIQhrF1RikTyeWHWHriuxHln9xO0f25meTMVnvZ3e7ncP/6rQfVkr2N+A1uC5MEk3UYrwhmYZI7miwpz4vP8Nym3daLIkVu01Ad2Pc15E60B86fb343LOZcq0BY7T4u9jiPnvL7p6PgzBdwv7F1FkceCc7Xv0xQa3Rli9SFUCHNysiO/gASHRRWQoJX+DfwwPf2CUK/luQG1A2CRxMVdY147ngj7UFuLdubV/TKc=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6c1b2a79-7cbc-4d59-d95c-08dc84bdb511
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 17:42:30.3087
 (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: 28sTVdoYgGp2d/vQuPtCKDld9SvwYHE8tdslpLKVSP97AUI0DHhm0ynaD4WbXWfd+21Pm4tPlVSy4yJZYguJRz6/rxQoDnXnWqh2Qg/yg8o=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB7593
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-04_09,2024-06-04_01,2024-05-17_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 bulkscore=0 spamscore=0
 malwarescore=0 suspectscore=0 phishscore=0 mlxlogscore=999 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000
 definitions=main-2406040142
X-Proofpoint-GUID: auNnVvWluD28L6jy7NFku5XcrXrWOj0I
X-Proofpoint-ORIG-GUID: auNnVvWluD28L6jy7NFku5XcrXrWOj0I

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 a90512d15549..eeb8def13f63 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -4028,9 +4028,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)
@@ -5595,12 +5592,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.1