Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "Liam R. Howlett" <Liam.Howlett@oracle.com>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     maple-tree@lists.infradead.org, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH v2 10/36] maple_tree: Use MAS_BUG_ON() when setting a leaf node as a parent
Date:   Fri,  5 May 2023 13:41:38 -0400
Message-Id: <20230505174204.2665599-11-Liam.Howlett@oracle.com>
In-Reply-To: <20230505174204.2665599-1-Liam.Howlett@oracle.com>
References: <20230505174204.2665599-1-Liam.Howlett@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?By2OzFSEbXewBukove7VeQG2ACqCGtvk6ajnT2N+tEfsTinSf/QvwA4K7Mkf?=
 =?us-ascii?Q?1qsKY9fm2mk9077xxrmrRdS0dHJV9NmGIecdQxjlBwMowMW43KAxk6dwXO1q?=
 =?us-ascii?Q?Vobf/AuNeRFmAEqFDTZtyxqFOfnCiflZxgay9g6vbLDKLNBGwWjOu8pOwCOt?=
 =?us-ascii?Q?TzzCs81oRReynPlPqAsNFiU/jv7A48Haxg2AzECZLt/PzZ86VMEoS+L7RZJG?=
 =?us-ascii?Q?6Yv77fBRVCEuuhTQ1WaDPmGXJSN/+I+9U4Y9Tr3PFgc3GbVxXKiWF6VWzxo6?=
 =?us-ascii?Q?P5CCVczLUwryfvxb/VImrXst8psxDq3Fxxe9OFbLdIGBOd+mGjeXU9wFVpvV?=
 =?us-ascii?Q?tPXWvdIFcfE2EGusYdQYPeuRYx7b2BG7DzhjhCyIqs3HBTXQIJ7VqffPH1Gh?=
 =?us-ascii?Q?unctVE9IrrVSYDp0wKK6eCWJTa5qaUTiCJ+xJg2OZTNduODAz0vISoMhhKYk?=
 =?us-ascii?Q?rCPif2qSMjtHtvKAj0MqHYyjKHzV33F6y4+pylLimYQ73RVW+LR4/iLUcfmD?=
 =?us-ascii?Q?eNoRjI/JY46p2283QjYWZPkU15aiZ1ZdwUiFbD6tQNznlHdNQ7ChPm2DpUyd?=
 =?us-ascii?Q?utCA42DjR8NsEl7jQJ+YFZeybWN8izJnzBWijFMtc5GYJtDqWJSa3rzHYXi6?=
 =?us-ascii?Q?sXBJCsTZgslxsWHnKXCukjNUDtE9Pj3BV84ZSo2V8EB5ds1D2C9dfAwtcwD9?=
 =?us-ascii?Q?WoEeQcZeGHva/gWxsOpMCyGihCPs0SEtSUOsH434FNTUim2RZIs+f6IGYoqj?=
 =?us-ascii?Q?Zt5YD8DIZIBIbF8U/nFVddC3abzvdXie3EMXZthvsuZhtBn88rQvsUUtxbrc?=
 =?us-ascii?Q?PEpXxZXrZseEvGA8bk3J9gpxGWXba/VzpsdW2BliX/FSnQdAatiU+uCiLKzl?=
 =?us-ascii?Q?cmpsV5ITYVXxZF9qJvv8ftXLDpbBdU07Gjzmo8lGEn56MWyE+lQPkOaqsAUp?=
 =?us-ascii?Q?+dYGvxDEDuhvXuRvC4AbiKvW3TsbckQ7qm/Ps/pJzi7v5eEq99FpVb7kdob6?=
 =?us-ascii?Q?dAoBNgfqxDEmxoCh4t16KBD0UG9jqYUUWwvIOoF/9sc99QEw8MpbnPheY0pk?=
 =?us-ascii?Q?oORHV4Si8Ue2WSenJ68Qmj+IOlzJTVlWwZvRx8ine25FKBl9yOR5Jvv7XQgs?=
 =?us-ascii?Q?IqpEmPFxxqq5kfsY+YyxdvsyXjzdxF24eeqdlNgeS7cu4g1YyUa1yTfjx/XC?=
 =?us-ascii?Q?qhR3iy83xPuqL70PW2hTM6H/UYckhxKyqbzDHGaHTXs+DY/GGcmsv08W2Pbc?=
 =?us-ascii?Q?o2eqIIK5nLbtBAmsc2LRdS6Fw3h+JT5OuVaJnOCqIE4QPNkdD5cWx8EUfRM5?=
 =?us-ascii?Q?8sHZ1pZ7QUI0mNdqn3ullJGjTZesHYSIClxR4Tw5gn0Od+JieRfSOXcJL/5z?=
 =?us-ascii?Q?nvmp0K37Kq/QFQoYrgHXpvTPLkHWnL4gPN685uH/2pp9qi6hN/JONlGOgvel?=
 =?us-ascii?Q?Dt9doaSvP5gCTgoR6F3W7P0Jme4tbIEri9tAydiHDah6BaBDSP8BCHrXvItM?=
 =?us-ascii?Q?7qYmh8FOyz6KG/ySkVrycbH/gUaugu4CFswu1E1QYkNGENq+JOtc7HlTAKXr?=
 =?us-ascii?Q?ukJRCgO2t5h+oPm0v7K5y+EICE9r8fN/0OxiEyz3qbni2fm7WIIqybDonIAq?=
 =?us-ascii?Q?aA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: XmCub5lnT7WXu04XcsDNzQGJJqNxZA7+t0Uo0X4CrXlD23X+QMQXVm0/XpebGNVjhvUKIu4aeH3GWnlGe/YzvRI4wfyz7eXfKWP8OFMGP/euhfeLrtGpLeADXxBwnttTV6qRPGCVuLMEbfMjHByEfVOiT4nH9Mp7NiNSkvxXV6Yitd186phyI7IeKkT2tfbE70GlXFCqGa1EulbqWrxYBksiuz1sHqM5N5dWe6u1ZII3XI4BxS1t21NfUDA0pxDWbTYrDn9Q9ePnqCijWlmRbYZd5/iOffSYi+PJdYT42VPvnWaSwERXQBQ+KattU5plMM7hfzoxvePixijD/bCsAvU3S7GE9ASXDPQHjo9A7ykhbaUv+aIa7kbYVs6yokwDCnjAhMxpLSblHanF9ebiQ2luBDhBlM/5k4aKKPMA5jRthFPJd0i22WruUZGVEfGnPluimBdUwvSAxkljVBVBUN+YP33r2lu2/X0jsACRNyE6I1t6jjWhlHA9PVM/mKiZdE+w6GYVH7M5sRFKtl/8gDnpKqJn4gjB+hoUyg83C9sb3wdBlrWphaIZ3uzbY8IPOx2NrGh4UZHcf7xJIU1UfRA/N4WBZ9ojUDza8RrjuejTOlUFxxJ43eEAgdr7jG8CAgKhFyzSp++Qqtm1xMQPsf+Ocdg1iAWV8rua1RndHE0+5hf9T7YUTTFNh4dFzaGRYGbKGAgkZFQHdLSvq0xEyOMi09ihUqMZ3P+D3WQOkWCVg9JOmLX/gvYo5/WKwaD7QkswoWnF2s9CEC+QgR3dowdDKmEf7JiXsGTn2joIhiSHsoYM52nFYPhit4FRoBJpC+/b4FPaab8l7YGIfeiQn++K+d1lCAob/xCeOvlxsm6Oj/omy77raPJ9GJjQ3UUzZUoxU4r5ETrFOgmHV35z2w==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8b9321ec-c6ca-4807-75e5-08db4d9051a5
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2023 17:44:04.4688
 (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: vb3iBgdDKw1izveosrSgKJvbQXEJZ0ikD+pBJYcdlHc/EdN6GOYgMdk+pdPYAUZFBXGPfi8DBq4I/fHnKeTnSw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR10MB6089
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-05-05_24,2023-05-05_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 spamscore=0
 mlxlogscore=999 mlxscore=0 adultscore=0 phishscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000
 definitions=main-2305050146
X-Proofpoint-GUID: e9RYm0PeKU_u5aA2vraGPTpuqLugWopS
X-Proofpoint-ORIG-GUID: e9RYm0PeKU_u5aA2vraGPTpuqLugWopS
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Use MAS_BUG_ON() to dump the maple state and tree in the unlikely event
of an issue.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 lib/maple_tree.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 8fd83f21caf00..a594f1d88d062 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -453,7 +453,7 @@ enum maple_type mas_parent_type(struct ma_state *mas, struct maple_enode *enode)
 }
 
 /*
- * mte_set_parent() - Set the parent node and encode the slot
+ * mas_set_parent() - Set the parent node and encode the slot
  * @enode: The encoded maple node.
  * @parent: The encoded maple node that is the parent of @enode.
  * @slot: The slot that @enode resides in @parent.
@@ -462,16 +462,16 @@ enum maple_type mas_parent_type(struct ma_state *mas, struct maple_enode *enode)
  * parent type.
  */
 static inline
-void mte_set_parent(struct maple_enode *enode, const struct maple_enode *parent,
-		    unsigned char slot)
+void mas_set_parent(struct ma_state *mas, struct maple_enode *enode,
+		    const struct maple_enode *parent, unsigned char slot)
 {
 	unsigned long val = (unsigned long)parent;
 	unsigned long shift;
 	unsigned long type;
 	enum maple_type p_type = mte_node_type(parent);
 
-	BUG_ON(p_type == maple_dense);
-	BUG_ON(p_type == maple_leaf_64);
+	MAS_BUG_ON(mas, p_type == maple_dense);
+	MAS_BUG_ON(mas, p_type == maple_leaf_64);
 
 	switch (p_type) {
 	case maple_range_64:
@@ -1740,7 +1740,7 @@ static inline void mas_adopt_children(struct ma_state *mas,
 	offset = ma_data_end(node, type, pivots, mas->max);
 	do {
 		child = mas_slot_locked(mas, slots, offset);
-		mte_set_parent(child, parent, offset);
+		mas_set_parent(mas, child, parent, offset);
 	} while (offset--);
 }
 
@@ -2705,9 +2705,9 @@ static inline void mas_set_split_parent(struct ma_state *mas,
 		return;
 
 	if ((*slot) <= split)
-		mte_set_parent(mas->node, left, *slot);
+		mas_set_parent(mas, mas->node, left, *slot);
 	else if (right)
-		mte_set_parent(mas->node, right, (*slot) - split - 1);
+		mas_set_parent(mas, mas->node, right, (*slot) - split - 1);
 
 	(*slot)++;
 }
@@ -3104,12 +3104,12 @@ static int mas_spanning_rebalance(struct ma_state *mas,
 				mte_node_type(mast->orig_l->node));
 	mast->orig_l->depth++;
 	mab_mas_cp(mast->bn, 0, mt_slots[mast->bn->type] - 1, &l_mas, true);
-	mte_set_parent(left, l_mas.node, slot);
+	mas_set_parent(mas, left, l_mas.node, slot);
 	if (middle)
-		mte_set_parent(middle, l_mas.node, ++slot);
+		mas_set_parent(mas, middle, l_mas.node, ++slot);
 
 	if (right)
-		mte_set_parent(right, l_mas.node, ++slot);
+		mas_set_parent(mas, right, l_mas.node, ++slot);
 
 	if (mas_is_root_limits(mast->l)) {
 new_root:
@@ -3336,8 +3336,8 @@ static inline bool mas_split_final_node(struct maple_subtree_state *mast,
 	 * The Big_node data should just fit in a single node.
 	 */
 	ancestor = mas_new_ma_node(mas, mast->bn);
-	mte_set_parent(mast->l->node, ancestor, mast->l->offset);
-	mte_set_parent(mast->r->node, ancestor, mast->r->offset);
+	mas_set_parent(mas, mast->l->node, ancestor, mast->l->offset);
+	mas_set_parent(mas, mast->r->node, ancestor, mast->r->offset);
 	mte_to_node(ancestor)->parent = mas_mn(mas)->parent;
 
 	mast->l->node = ancestor;
-- 
2.39.2