Received-SPF: pass (google.com: domain of linux-kernel+bounces-201191-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
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 12/18] maple_tree: convert mas_insert() to preallocate nodes
Date: Tue,  4 Jun 2024 10:41:39 -0700
Message-ID: <20240604174145.563900-13-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?ZinUU1qFYwWIC9W1nKI1//VZPfNSM1dL4ZyXfc/Hr0++9jxCblnT7Z4N4/lS?=
 =?us-ascii?Q?WPNBgJ5CpVACT9YchnMvVDemWbitCKnq2xSeFq5wSe8xS4l+egxSfcHr5SOg?=
 =?us-ascii?Q?vAThyU21Eq2wLNEQEC84xLwGbrvdIyOc+Xl1hk65zvzJHkeQLi+4qS7ZrGtP?=
 =?us-ascii?Q?fkflwQA4m1TMPQLLnEDeVS8OohpA/+Q6tf1epWF3zfnCSxTTkutYVB0/yBV4?=
 =?us-ascii?Q?1+RkcrJDY/dX7DdmIvqrzBPnzJbK/2yYEgmsGmViiuD4ESDf6u+1L7MHCWAN?=
 =?us-ascii?Q?AhBPTz98Fsxxlo6p9Spl6Wgbas+ntK41uzZ7Zp3GNhUuDK7fM8f4Nwu4CJCn?=
 =?us-ascii?Q?fN+c39oFhSvyPTvgA7+FnzQ0/2R/0Th3qU0cRNyd8s4DGEYIwazNtSMK5J76?=
 =?us-ascii?Q?KqltDFScYvi1/dCOZyvdmJvvi9PYvkASozv+8E2nUnfXA8AASLfrZVhapow5?=
 =?us-ascii?Q?36bJ3Mfu7/O//x9lAImkjJba0R7GDrqzvClHIZqYmtzMYo+ZEAZm3jgVERCn?=
 =?us-ascii?Q?c8h9HQm83Ckuj0ARI8hT1SBCkkcWj5iBsmmwjj8KUGT4WuDDu74aAv4UZ+me?=
 =?us-ascii?Q?9eDGABl7CYbVwp4U0XbyoSqIwSbZmv1+mXisAhZWVQkzaEcw851hSjoDX2U3?=
 =?us-ascii?Q?BfXfD1us7azZ8/XROIDepmoW3G6Z0oCoJ6yfrEn+3i3sDwl+TCuTHkZspaWe?=
 =?us-ascii?Q?8AItsQNydPL1t9WgbV6s/ipyiJ8t0vj2V/Yno229LnikThjSBzdYXagj/mfb?=
 =?us-ascii?Q?hnis7u9+ssCw+llaLht1g+LWkcMJd6yvKLRblUnRV/wzKxawIIAb85ZiIWIJ?=
 =?us-ascii?Q?D8lXLNF/trR3Y9cuSwy5zfZNLGzx7WkUbLhWFDsJAvFkUgGB9MIcetMhju4l?=
 =?us-ascii?Q?veT9esSMp35qwcoMtsEmzxR6j3SpssMBnu7IqcEBMhSLYwih6C3FqVeqe9f1?=
 =?us-ascii?Q?TO+hzswiUraM+IlisGnlArqUCujf8yz65k3aH41chTqAk3d/h19U6ykJ1FdS?=
 =?us-ascii?Q?ystX5u4UK6Ep4mazwZ17g0v7Nu+VC+Fn/r7isrpH03KBaez+lLG2T/tMaGB9?=
 =?us-ascii?Q?8+OnyS8Sh0uOzg2xMnpMv9eKfJ8oNH/gNuJEqwurlYU4avShFbS2j74nQKsO?=
 =?us-ascii?Q?eXGxUoJqmakIF1IygZJAoi3xDch6gsoe7XCkHZdy4Ec4oIIGMx4TU2XMwBog?=
 =?us-ascii?Q?TJgrJ7SjXGMUqiA3qKWeB2Lm/Pf8o6M4uphLmefGqiYjIECNiPJ+h1v7YxiR?=
 =?us-ascii?Q?G2MzaxXmKhYgSrEXfDl0J6wnFDLSmz29vFi8y14QkB3RvRha2KvuirJWrsPb?=
 =?us-ascii?Q?7B1K79hlyBsakHZWswhjBpHiw39lgIXdnqiXAMm6J4pIM+3kN1nRAUnXWziL?=
 =?us-ascii?Q?KtXPumxA1uPeYfqXZwD/Sk6/tvzHE0XOC8ZCuUMv7Rzba4qGbKIGYpDw845B?=
 =?us-ascii?Q?CC/QPzGW990rMgfv8R0FcAXg+YFOsxQ6+sS+VICbqOFjj0FLc/nv8stoQqq5?=
 =?us-ascii?Q?KTyFWlRpR4hXHxfFnNNfRryNDpcFbZeWVzxWv6Yv8mZJGWLcFxRFT2qhHHm+?=
 =?us-ascii?Q?AwjeFtOOmeAcZHu2KwPKJ9iSGk8okAd9GA5/4iJiUr+JgCQXLpIKd9DRiFJi?=
 =?us-ascii?Q?d/Q8dJgtNvm8Mq+Pqd+HoWE=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	SvA4u3yM5wfYFDGDk9XPpIwjfm/1jTYbdV0vXNGfwog2N5j1ACKkWThQO45vzEeboYue6e42ExgwLDuvOEJbrzydGdCqr6zFOKKK/C11yot+Qb4j/68u0JPiA6RXINCgTFZhFMm5KeDfTdHA7/svCkuBrf3Cp1/uEjZVIVaf9mx6p0ovdDoMjqpPKQO/Jht7yh36v4MPqVjMBZUr58mbDF44CBrFUnEZ2SuBKswbIlLNZWI6wffwsz6r0w9FxTfNchy2SEMs8avTObzRK0eSxBJ7Sco2AReVgx9w5AAyRZngCnaurBF34KGfKK7//QK7dl1KrkDMb9VUdntspqbmsqRays/gu/iBf+9qRQN37OXfgHhQ8CHNyZlwWD0RKCC/YkBCmRqBBV+2DqT0CoXfL47gAOH5EZYb5N3TOMd3LW9Lbck3tXn2ghvjRHij5YHa/tRAtixIeWCV8nOuHz+GGmthlblV0LxiTYZy4Wj/fUdB2uRGH1WuYJ3iOXwERIuv/9k0eUbz/BAn9QGg4Fn8Gqg558KEWde6uU472khyuKegCGAHhjpx1HcktbzjsSPolCOF9EB+JGTleJ+tobgoyi8D/SPI8vcUZduUoOKIdIw=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 04ec3810-4fbb-4c8d-5448-08dc84bdad56
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:17.3339
 (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: hJb2WTfQgHcTzFpbNcate9PY7xndkOcCA+OlEgNmKK26YiBT2FJmgcxUo6din0quAH/jg9ZQi7tk07ZMuzNmtqZ6/AVk9BrzmMLChgsYYGU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5893
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 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-2406040142
X-Proofpoint-ORIG-GUID: ZMVqSr4Kl0NzC6Lyq8I0ug1sQjfAqvXt
X-Proofpoint-GUID: ZMVqSr4Kl0NzC6Lyq8I0ug1sQjfAqvXt

By setting the store type in mas_insert(), we no longer need to use
mas_wr_modify() to determine the correct store function to use. Instead,
set the store type and call mas_wr_store_entry(). Also, pass in the
requested gfp flags to mas_insert() so they can be passed to the call to
mas_wr_preallocate().

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 20e9d13c2980..314691fd1c67 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -4445,7 +4445,7 @@ static inline void mas_wr_preallocate(struct ma_wr_state *wr_mas, void *entry, g
  * Return: %NULL or the contents that already exists at the requested index
  * otherwise.  The maple state needs to be checked for error conditions.
  */
-static inline void *mas_insert(struct ma_state *mas, void *entry)
+static inline void *mas_insert(struct ma_state *mas, void *entry, gfp_t gfp)
 {
 	MA_WR_STATE(wr_mas, mas, entry);
 
@@ -4467,26 +4467,24 @@ static inline void *mas_insert(struct ma_state *mas, void *entry)
 	if (wr_mas.content)
 		goto exists;
 
-	if (mas_is_none(mas) || mas_is_ptr(mas)) {
-		mas_store_root(mas, entry);
+	mas_wr_preallocate(&wr_mas, entry, gfp);
+	if (mas_is_err(mas))
 		return NULL;
-	}
 
 	/* spanning writes always overwrite something */
-	if (!mas_wr_walk(&wr_mas))
+	if (mas->store_type == wr_spanning_store)
 		goto exists;
 
 	/* At this point, we are at the leaf node that needs to be altered. */
-	wr_mas.offset_end = mas->offset;
-	wr_mas.end_piv = wr_mas.r_max;
-
-	if (wr_mas.content || (mas->last > wr_mas.r_max))
-		goto exists;
+	if (mas->store_type != wr_new_root && mas->store_type != wr_store_root) {
+		wr_mas.offset_end = mas->offset;
+		wr_mas.end_piv = wr_mas.r_max;
 
-	if (!entry)
-		return NULL;
+		if (wr_mas.content || (mas->last > wr_mas.r_max))
+			goto exists;
+	}
 
-	mas_wr_modify(&wr_mas);
+	mas_wr_store_entry(&wr_mas);
 	return wr_mas.content;
 
 exists:
@@ -4531,7 +4529,7 @@ int mas_alloc_cyclic(struct ma_state *mas, unsigned long *startp,
 		return ret;
 
 	do {
-		mas_insert(mas, entry);
+		mas_insert(mas, entry, gfp);
 	} while (mas_nomem(mas, gfp));
 	if (mas_is_err(mas))
 		return xa_err(mas->node);
@@ -6532,7 +6530,7 @@ int mtree_insert_range(struct maple_tree *mt, unsigned long first,
 
 	mtree_lock(mt);
 retry:
-	mas_insert(&ms, entry);
+	mas_insert(&ms, entry, gfp);
 	if (mas_nomem(&ms, gfp))
 		goto retry;
 
@@ -6581,7 +6579,7 @@ int mtree_alloc_range(struct maple_tree *mt, unsigned long *startp,
 	if (ret)
 		goto unlock;
 
-	mas_insert(&mas, entry);
+	mas_insert(&mas, entry, gfp);
 	/*
 	 * mas_nomem() may release the lock, causing the allocated area
 	 * to be unavailable, so try to allocate a free area again.
@@ -6663,7 +6661,7 @@ int mtree_alloc_rrange(struct maple_tree *mt, unsigned long *startp,
 	if (ret)
 		goto unlock;
 
-	mas_insert(&mas, entry);
+	mas_insert(&mas, entry, gfp);
 	/*
 	 * mas_nomem() may release the lock, causing the allocated area
 	 * to be unavailable, so try to allocate a free area again.
-- 
2.45.1