Received-SPF: pass (google.com: domain of linux-kernel+bounces-201192-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
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 11/18] maple_tree: use store type in mas_wr_store_entry()
Date: Tue,  4 Jun 2024 10:41:38 -0700
Message-ID: <20240604174145.563900-12-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?fciB/gNATGR8qHrIL62bOlHfsPtkZjjJVmDyuGju7M9fi1BaroZ1Ozi6Oeoy?=
 =?us-ascii?Q?raCkXsW4VPFsa2zupm4S916+1/Kv05wHslXeRmZvJmutAOnsTNvUKT0rd8kH?=
 =?us-ascii?Q?7g0OigRiGKLfUveCywdX7lNr3ha0gXQHCfP+m5Thnyo2orALHpdSbYES34FM?=
 =?us-ascii?Q?V4jeTVptTVXEXmOj7gjdlCtVbcJJP11TCYkWkYCdivHqjDJe+m0m6NGVM801?=
 =?us-ascii?Q?15l6nDlXDc8Us7RIhTqTdqA8Gmt21mOy5P7nWKkYvYbs4KVUE9UHlNHizh6H?=
 =?us-ascii?Q?kAwnDLbEDMwMvkocQWaFhU2Ga2FeijFfUXfP2NAh6hqY2Gvdgrkrwk/t1wMa?=
 =?us-ascii?Q?3AARvoD6HhC9Okcud7z68wtBriSzMhJzMf64GD1qlX0yGitWCo+7/iPvdywT?=
 =?us-ascii?Q?zkDV+a/NUjB1C01M0g98DcB12zxjF/p05T7wCa07oYF7kXUcDrhKoYjXbhUU?=
 =?us-ascii?Q?MQ0aMPeqMhNMe4p3zrf7HfcPBYbGAjmTwfSKWMGsQmQmrnE4wQDwRZZENtxj?=
 =?us-ascii?Q?m5itSYBro1rax1Mzr6yIuXmOJv56V0BbL7E+zfMTHmAFyTMokR2Sjji920yZ?=
 =?us-ascii?Q?KYnDsDKggwZzYLvJoYzKmcIgVcTttXnZHZbEHSLZJbwec0EbiYe189m9xbBI?=
 =?us-ascii?Q?TRdoACvc8fGQJagr1Dmq1cEJiV1ahngpfeQ8seSGud0p0prpESTn7z/pJYF8?=
 =?us-ascii?Q?RNIIYCtsxKFRaRWS1wc5pjfSr95tbEB2xZD/qcKggrrH3SDClf1t7QwqevWW?=
 =?us-ascii?Q?ke1FuHpGWsy+Mzd0dOrHyqK1cBVINyQ+pCv7YGzA21Az5vML2gK6ioJqamAM?=
 =?us-ascii?Q?L3NqCsNysu+KTT5D3ZRzjZnYxX1D/jjLfVlcS5fi8kxVekbSjjBfIE+42ubQ?=
 =?us-ascii?Q?tphqLemE7VeyxX9BVYPAI6MEqsD5xn2aO16qFmUuFZgUw3M4XVcyjsFUobmz?=
 =?us-ascii?Q?oPXId/QFwArME0PfrwqfjGyYLpJdaSOxkoFRyH+jrq8zRxcE9RWKo0gDmgim?=
 =?us-ascii?Q?uDjOV6r5bbOrsNDu1N1zFEEUku+/XOAhUW8NlZBHOLzBi6nppbPnwS7K6LGq?=
 =?us-ascii?Q?ErZ4u3VR0VP/q32qJV4xhDp327TcFZGXPBl+3MC0XgfwdMdhEIleLj5VZcEg?=
 =?us-ascii?Q?F01wmcKL0zLuHVpG6U93Cma68IoUCseR2nzzPohEgEug2bQnQvwipwmdt54T?=
 =?us-ascii?Q?j92GW6zxNyY4Rwr2Pl7kbYvsMc7p1sY96hTF6yW32hWd0bi7xuvkJRpQkYqb?=
 =?us-ascii?Q?vsfs9Ng8dEdAbZ+aHQQTUEJoRPj8JEmClE9OTKj+C+GEh3C661iONAkzKOuK?=
 =?us-ascii?Q?pCalvmhaz2pm1pTMmiLSWn/wVnjQMX73P0G9ZlC146OupC7+9r6vqv8mqws+?=
 =?us-ascii?Q?yASdFad91xDlvXH9B0h5yL2z0rKmzgqBkuPb1faSXRpFmRLqEeq0QU+yDSPM?=
 =?us-ascii?Q?t8OSE8NLKZVmgvChoHADFmE0+0Fr6xx8mtpCYUbcLcp+zJTW1bb+6Iwm7fGo?=
 =?us-ascii?Q?9T8uiiCtAHpOgk3Hdvu0QdKA7o0Tn7Um65jazNV5QkrClCfByZUP7sSnlpzQ?=
 =?us-ascii?Q?IpaCT5IRkKuFVtV4cO8lUDXZJMLz7zXeVMpZAHk71mb0Y8tg0LcdS1jVZc2A?=
 =?us-ascii?Q?kRYZqfP0nov343Qic1CSnWI=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	GhywvZYYAFFMkY5colRjYWv9aMGDUWNoQqTqzXiVUKxcuzb0XY7keexKdTbVkPdHq3J9nYEx6E9E8koGTT4GDxAK3cw0TnjgmLAo6D3dNcrtfEL33GRHfAzd9f5F0n4ShZjiKJwJ9YD1eMk4TM49A85XnM+S2qPITUWoeMJCP0aG5LiY0oNlwHpDKuE7eKTXUpTDFe2O8aNDJ3iSbbtc//LvzaciJSr1KqUr72McoEM9Yk+v++L24c0qLi/9a4Dg05LQk7M5dcpcmkpy+hG1V2Wl51ftYRbjc2aGdLVsz4iPaLc37FmXfU32A8tn47GIkAeV7rpB9wj3uJQpn+0Dw2NSYa/dvBm8hmRapHule6eS6PJLpSJtWrefAUESaBbdX8fefHoRwz8GvoDx/W/VnBzPjEWgl/d96LhFx9jOMrhVURFh7zuOErNx0wsHZtI3kJtjCaoQhqQV4OV5AHv8fMCh4mYVng1zzoTVnbo9Vt30p8oG++EdBKTBUjcSggirttXymeAQf9UZZK1fSQgi76B0fZb35dkpDylfmZpYa8E+7eOBylknj0l0yJeZKqTHN8M+noT5WsVAvSbNr6facFLMApa6paOkJkvFYk0UCts=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0e16849e-7ca6-4ec5-7775-08dc84bdac38
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:15.3905
 (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: 3j1JllUW84s9B0dS+xfwsLSw6oxuW0HJvR8mCpd+Ib0vwRIMKKdqNnRdqpVI2bSfr7lKKu8A5vUqsdf5O5+T/1Y8dcI513uU7P0IK4xD4eA=
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 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-2406040142
X-Proofpoint-GUID: sPgAtGPgjca7tCyYUEaocuu-5rsppJpx
X-Proofpoint-ORIG-GUID: sPgAtGPgjca7tCyYUEaocuu-5rsppJpx

When storing an entry, we can read the store type that was set from a
previous partial walk of the tree. Now that the type of store is known,
select the correct write helper function to use to complete the store.

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index abd2f396bb1e..20e9d13c2980 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -4206,27 +4206,42 @@ static inline void mas_wr_modify(struct ma_wr_state *wr_mas)
 static inline void *mas_wr_store_entry(struct ma_wr_state *wr_mas)
 {
 	struct ma_state *mas = wr_mas->mas;
+	unsigned char new_end = mas_wr_new_end(wr_mas);
 
-	wr_mas->content = mas_start(mas);
-	if (mas_is_none(mas) || mas_is_ptr(mas)) {
+	switch (mas->store_type) {
+	case wr_invalid:
+		MT_BUG_ON(mas->tree, 1);
+		return NULL;
+	case wr_new_root:
+		mas_new_root(mas, wr_mas->entry);
+		break;
+	case wr_store_root:
 		mas_store_root(mas, wr_mas->entry);
-		return wr_mas->content;
-	}
-
-	if (unlikely(!mas_wr_walk(wr_mas))) {
+		break;
+	case wr_exact_fit:
+		rcu_assign_pointer(wr_mas->slots[mas->offset], wr_mas->entry);
+		if (!!wr_mas->entry ^ !!wr_mas->content)
+			mas_update_gap(mas);
+		break;
+	case wr_append:
+		mas_wr_append(wr_mas, new_end);
+		break;
+	case wr_slot_store:
+		mas_wr_slot_store(wr_mas);
+		break;
+	case wr_node_store:
+		mas_wr_node_store(wr_mas, new_end);
+		break;
+	case wr_spanning_store:
 		mas_wr_spanning_store(wr_mas);
-		return wr_mas->content;
-	}
-
-	/* At this point, we are at the leaf node that needs to be altered. */
-	mas_wr_end_piv(wr_mas);
-	/* New root for a single pointer */
-	if (unlikely(!mas->index && mas->last == ULONG_MAX)) {
-		mas_new_root(mas, wr_mas->entry);
-		return wr_mas->content;
+		break;
+	case wr_split_store:
+	case wr_rebalance:
+	case wr_bnode:
+		mas_wr_bnode(wr_mas);
+		break;
 	}
 
-	mas_wr_modify(wr_mas);
 	return wr_mas->content;
 }
 
-- 
2.45.1