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>,
        Peng Zhang <zhangpeng.00@bytedance.com>
Subject: [PATCH v4 15/35] maple_tree: Return error on mte_pivots() out of range
Date:   Thu, 18 May 2023 10:55:24 -0400
Message-Id: <20230518145544.1722059-16-Liam.Howlett@oracle.com>
In-Reply-To: <20230518145544.1722059-1-Liam.Howlett@oracle.com>
References: <20230518145544.1722059-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?Cbzn1kSabOocGsfkNJFP7931oJQxQqIAFrnvFG5PkH31JSQ3fe8RTHNnoMGt?=
 =?us-ascii?Q?J5Qua0aDLxtrcRPLiz1PbLMVVlTrg/kp16gX0gOYYtVtDyS+2FZUEMG6z+uU?=
 =?us-ascii?Q?/sFlCGpvfQSCSAMpSwfpgBSXxm9lS4TRTHEVZ4mVgGL2GczAI5BcIkTPZctD?=
 =?us-ascii?Q?H7jdrc3eFLmYWjDS42CnVOpZTXAyoXSIhVr9d64srul5QDhMZlfuT4lmaioG?=
 =?us-ascii?Q?En64R3wbYbysR5BOShCSOYzM06dg47AYuCGbtBU3fQZzTBTvDGvwr6smgpnh?=
 =?us-ascii?Q?78tzfnH25lRHUnujbjxaEA25HKTSBOcrz5S5IudUk2FrMXJ0ijkELqVQriDT?=
 =?us-ascii?Q?5BlPlTyHla1zNxm7EbnQ5HcvIigCu7m8DDD99wSPlJPG33JczXDnogT//WLg?=
 =?us-ascii?Q?aLmKNEG83LFnRchMcd1P1ORqGl38nBLkMEJ0cj//qwnKp94cQbNThec6b2Ca?=
 =?us-ascii?Q?7kqM2mnoIMCjg6cpbC9wnfezxL0rEA4lU51p2P3KGO7ZgFb2UnhTkA8ySBrc?=
 =?us-ascii?Q?bOuF8615qFcjBf4vW9WQtBQFhZ+qVDt79ggfqHEKENP8bsbF0nRQZ/IGNyO1?=
 =?us-ascii?Q?hy0P9v6FYDimyQ7sxT8UyO9AGhxtdeLfOn6BSbOM0fsgg/KBosMB7ZZkSqRD?=
 =?us-ascii?Q?1dP6zRAZL7obkEO8URS3ShdK+6Gdzh19ogGP9jIQitLbU4pVkVEqUMuk/vTq?=
 =?us-ascii?Q?h2D7oLgWAiAK2IZKBKS/GFG1lUqD9Qv6Scsv0hLyu9aUcw6ucI7WH5488S+k?=
 =?us-ascii?Q?RIRKNbbJv+CdeZ8fU3oSYlNL+LMdfROt5sMBNMCCbQBNQJ0vStH3vPIsHjRN?=
 =?us-ascii?Q?UBfPxe/prg+b+COtsKjYCHfJu1MboNgAJcF+A07gXIlmDBTGFqwTek3rz/zi?=
 =?us-ascii?Q?36Nkf25bJt+S2ILxmvUe9F6x2Vr6MOyb9umqp4L2LPaXblsrXQkPYkt9vgkp?=
 =?us-ascii?Q?m7MTUSUyRGTJN8PfoKKDpUUfHrg3QfnJ4WQ/bR9V+m5ZywqSE1VrWv9AQzPs?=
 =?us-ascii?Q?kvogF0lslz/VE/sqKGBcU1gCkDOKY934kbac1PyoOiurfr+8rro6Dx7oPp2/?=
 =?us-ascii?Q?uNbE8DbXAgcdv7FSrEdawhdpSELg9FC1t+H4vkAaFexQ8xhn4+v4pdTlFnpE?=
 =?us-ascii?Q?Uzrf/88pV6dQb2APPS7lJM2Bw8slw4Ag3J+hVc4h4nKIMllhP8Fu+c+r9A2L?=
 =?us-ascii?Q?XWoTWnTDBBzxpjdmn8QxQ2uKJpjige5i1FyzhuARFhrFumc5OvrgvmpovRkx?=
 =?us-ascii?Q?UsfFVTWOqLDguCOuNdYphw1zgU1s0S7bg+uuMFrQm5zhbEK8Ml/8Ird4xFeh?=
 =?us-ascii?Q?UQG9/Pj/4trkLXpspDv0qvI4sLrMrbK18O0zUkFC9IbFsLgAZUHVpuhcY2jh?=
 =?us-ascii?Q?l/l/yiCj8QwUPquIkPBMpO+W38Sj1UJBXl1nv0mmOy5gPfGP33ieFJeSgZVe?=
 =?us-ascii?Q?LpNxF5uxon0tiKNEZBg9wwmJQGYDFNV7tbfB01Cr2mihIA2dHlBg1+2JcI6S?=
 =?us-ascii?Q?dqoAj/x2mnoKPjTOD7ehvBigpLgK7oHX68cZ5nPlYYYIo4H+v2HD6vVce27e?=
 =?us-ascii?Q?THfqQK2hS7k4jMF3k+FT/a4lAlmz8LUah+hbaT5RpNT8RrW7eqII+Dhlu44p?=
 =?us-ascii?Q?eg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?nPHDj2uhe2ZEgZU719VvmF5bdI62Flf41ivoOlW7FdJFVHUy4j7yXqIxAWtW?=
 =?us-ascii?Q?l56kn81aNoiCEe5tZWVuC1wkbKtS5fEwTz5YchLBXysldHLaQEhBrQu+bj5n?=
 =?us-ascii?Q?DkzVt3UutbsJ9NoEjahshQ8lzNdtAf6jeb0zX6QCDLuriAXUVCI4s9s8IPlx?=
 =?us-ascii?Q?sVlvwy9GAt1vpHfJfgBFcva5sGEJefqPULTQFhCwT9RA5nB3D8RflRvwRuJI?=
 =?us-ascii?Q?Cj7HU/VE4esJ2C7lF8Eu04G3UjBM9LNfobJVZIzVWP6EEp8v5mv9I1U+zuez?=
 =?us-ascii?Q?cH4nvNnz0G5dqUL6aOxWVg+4gKDRZJmHlaVN/9lKqaUgzxQWkfsCRoF1Z0iD?=
 =?us-ascii?Q?3q1VAP3eqGbFsXyf1ekAJwi0SIuVjS8Oea4DHMt982a3i8J5MolhxPxa44+H?=
 =?us-ascii?Q?RRwv3LX2CKBCt2CSMZ/JXn5cs7a50tx991Mt0n7CgcWMGe5E6rHW+5d1RWOe?=
 =?us-ascii?Q?EHA0R9TlB9njo1mNGkPsfkiVCjrGXX49aLSSod/xLG5pJuDbomAIYpbKRhHW?=
 =?us-ascii?Q?8wkg4gxaXvzSIwO/OeHV6jx99gCia/6Qzh/2XuIT2fjQzkFn7cRJGaDMTCKW?=
 =?us-ascii?Q?TL42njSKc62Y/Bck17ri8Gc8i90tEIgJZApl02FH7nyIZuV5uh/w4280I0ZQ?=
 =?us-ascii?Q?S8CZhy2efFpZ48rcYfOoCTSYyNB5ripZR+lgI5Xjh2FdcDcXjFHmBQq8BAAL?=
 =?us-ascii?Q?jAUIzY4J4gGIUTMsT1nk9kFmwCJd9dt0L6vIXbonfCb9oK+keAyrhQuBnK3N?=
 =?us-ascii?Q?Tu9B98xLNA4QvOdmRGyyDm4yLg1yPoGBGR+2R0uQP+I0WPQzLuAnJiUqFUZ9?=
 =?us-ascii?Q?yzABdvDLtOrUmabaP1SpyDRMfMyjAa8u/QM2izYq7dtH6fmsj3Ha9RoCMLNQ?=
 =?us-ascii?Q?pH2a0RVknLOBqjkPLA0rRi6inZPEITIcUD9D/oc9yVo4d6yxpgqlVPL/GWSi?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0e490de1-120a-4e1f-41e7-08db57b00cf5
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 14:56:24.7288
 (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: 8BuU7IjxRUEzZ0Vk9JUDPnyWEFwgps2aXefEkPcMBZr2rgA0vsQ2FVNteWkcmg4G+JcmTDX5jcJgwP9rjCWSdg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4347
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-05-18_11,2023-05-17_02,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 bulkscore=0
 mlxscore=0 phishscore=0 malwarescore=0 spamscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000
 definitions=main-2305180120
X-Proofpoint-GUID: v33UtgKjWn_jLqCX8-aT7Wi3ERorXtG4
X-Proofpoint-ORIG-GUID: v33UtgKjWn_jLqCX8-aT7Wi3ERorXtG4
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,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

Rename mte_pivots() to mas_pivots() and pass through the ma_state to set
the error code to -EIO when the offset is out of range for the node
type.  Change the WARN_ON() to MAS_WARN_ON() to log the maple state.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Reviewed-by: Peng Zhang <zhangpeng.00@bytedance.com>
---
 lib/maple_tree.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index d7809a7000c5..9f3784f4a5b7 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -663,22 +663,22 @@ static inline unsigned long *ma_gaps(struct maple_node *node,
 }
 
 /*
- * mte_pivot() - Get the pivot at @piv of the maple encoded node.
- * @mn: The maple encoded node.
+ * mas_pivot() - Get the pivot at @piv of the maple encoded node.
+ * @mas: The maple state.
  * @piv: The pivot.
  *
  * Return: the pivot at @piv of @mn.
  */
-static inline unsigned long mte_pivot(const struct maple_enode *mn,
-				 unsigned char piv)
+static inline unsigned long mas_pivot(struct ma_state *mas, unsigned char piv)
 {
-	struct maple_node *node = mte_to_node(mn);
-	enum maple_type type = mte_node_type(mn);
+	struct maple_node *node = mas_mn(mas);
+	enum maple_type type = mte_node_type(mas->node);
 
-	if (piv >= mt_pivots[type]) {
-		WARN_ON(1);
+	if (MAS_WARN_ON(mas, piv >= mt_pivots[type])) {
+		mas_set_err(mas, -EIO);
 		return 0;
 	}
+
 	switch (type) {
 	case maple_arange_64:
 		return node->ma64.pivot[piv];
@@ -5399,8 +5399,8 @@ static inline int mas_alloc(struct ma_state *mas, void *entry,
 			return xa_err(mas->node);
 
 		if (!mas->index)
-			return mte_pivot(mas->node, 0);
-		return mte_pivot(mas->node, 1);
+			return mas_pivot(mas, 0);
+		return mas_pivot(mas, 1);
 	}
 
 	/* Must be walking a tree. */
@@ -5417,7 +5417,10 @@ static inline int mas_alloc(struct ma_state *mas, void *entry,
 	 */
 	min = mas->min;
 	if (mas->offset)
-		min = mte_pivot(mas->node, mas->offset - 1) + 1;
+		min = mas_pivot(mas, mas->offset - 1) + 1;
+
+	if (mas_is_err(mas))
+		return xa_err(mas->node);
 
 	if (mas->index < min)
 		mas->index = min;
-- 
2.39.2