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 v2 15/36] maple_tree: Return error on mte_pivots() out of range
Date:   Fri,  5 May 2023 13:41:43 -0400
Message-Id: <20230505174204.2665599-16-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?3GgGhjxTWnxArczJ3BnSuuiAN4y9go7LZbY0upkf+gVirYXiF4nId+UVPWSO?=
 =?us-ascii?Q?94PHlHX+zbWbnHWGxxEvDvILzC/nK2TOhuego9Uk5uH8XSLXjx/AhKKfq4bK?=
 =?us-ascii?Q?b41vpXZqwphdn2jFaLyb4iomvxz3pIsAjoy0djTsSytQIeOPOlTjUhUQYovt?=
 =?us-ascii?Q?lTbdjPyQE5brzUIMVfw4nVenX4lRXFPHxs6Ne+AKpLtlW/rJlSScFvfeC+w1?=
 =?us-ascii?Q?p54K0WJVTZaHSpB06/CUtnQoS0jW40ww3r/ARg21Lh+pirEQa201shfFCpGy?=
 =?us-ascii?Q?OfzFeRrzljXuSAxfuhmH+L/EoghwoSLnGGB5OTYeNRRjzqCIKE9IL3VpJpAX?=
 =?us-ascii?Q?Ag0bXWggPgE/BColAwhDe40SdTJ2Z+3OX0cGFO3+K3YDZ1U1wct8XmTrvv6i?=
 =?us-ascii?Q?noqLy03rnWk9iwVj30Xotf9kmpGP99WYi+BmiWduk4vj6KyM1sXf3/tcIgwk?=
 =?us-ascii?Q?sxg5Guk/EQEvCpaFiaPZl8ST1hero4MU9AwF+xwLOEBFF1kTAQ5iVc5HrtU7?=
 =?us-ascii?Q?9sI9SBQSXMROQSDzSjSdIMN0SDD8a8f1TvC2ZlsFyGsAeIf5lJ/iC7rewZA1?=
 =?us-ascii?Q?rVUlN8j/mxmjTVzvWYZAxfSeVudRg3RZJPO3YBlc/IEscajIZk6ihpwO2Mnw?=
 =?us-ascii?Q?IK9ZxxarQKOgxB7ZRkQ1s4xwVs2jyeN2AQbQcSN47di/53/yr5gi7+sXJchU?=
 =?us-ascii?Q?OxXfPflO1iJWaOHULBo22jkMBLndVHbEhZvNtiJfLsnLRRjQq+mJ6N4hG4P/?=
 =?us-ascii?Q?Y4CtNOA6XHuzrzlVOHaV85arp+E0UORN7Yu+LKDgetEDIClkdUzCrznOlJwy?=
 =?us-ascii?Q?Rw3Nuu3oHLF9xJvUFaf/3YMcV7m+Jr59mQAQQYNfur+pq3GNKPqgvTkuslOF?=
 =?us-ascii?Q?BQ9JITXLNZ9ab+ApolTRlO91wZl6OElW8bgXR8qgX3U0fv/hT7wh9E/w9AG3?=
 =?us-ascii?Q?TeUkY8HnjV7sie04Aag8LGNiUI8ho0HssTC2QhbD5a2jdtFMZuge/7mRsOkG?=
 =?us-ascii?Q?HT4TR0ml9NvGL7RvCtYkmIMXzmEewc3PMqUVI18q/WfGvX2bS95JNCZ3Ma7g?=
 =?us-ascii?Q?uSTxFBqkzRcs+6enIiS4GfU5iRhY+8MYNAJKbJU1pvnmIbCwvtpgi6cA18eS?=
 =?us-ascii?Q?J7xna9+43ZrOXq3bFug6kKWTmKMOHGEoNudjTdras4dGliCv5bzzVYo/Wmbp?=
 =?us-ascii?Q?AcAIQU1RVQPVCSD6LYV/3vpx9K2924IJbcDjUbz1iosFJsiinjWtuCPnvwzO?=
 =?us-ascii?Q?ubcwwZCEwPbQuTz0+NT7IY+lvHOv4F9sUhpq6YZvcZX5/x0vNttQUelOp6aq?=
 =?us-ascii?Q?4kFW3xKgJWG/FGxjgVCPEvWicsKOSN3cQsu9xN7aNdwmD/PDt118ubKOqJX3?=
 =?us-ascii?Q?njQq0IxeXE1NBq0n+xOwXKNdsW+bIcIT70B3bjgxl/CHn3sqjjHVT2KAzFh0?=
 =?us-ascii?Q?vEfYc2ceBRSpdDr8a7SS0i7HIcsS0QC6N6RaX0SHAJR6J8XbSsjGW0IPGLQS?=
 =?us-ascii?Q?nbYPkeV1ca0qNJRQPCcUPPmWFfzNadaTkoF1MaWBXmo2iIq1YDztpoFZ/eFm?=
 =?us-ascii?Q?vq342SnVSi3gHYoecE1p9eKsvay4bfCEQLsPBLz6PQK1m7hrowzQXQ0mT5WP?=
 =?us-ascii?Q?bw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?HgsV0Hurf5gVcIBGcPnOsgcLhEYCxrvekhlpyLJikzUa39lGkemjp4+adaxc?=
 =?us-ascii?Q?PA/4AbnfjLP4CsHWFvT9X6YSL7nnCj0gqKL9F0EDQmPt6P1QRqNOQv135gMy?=
 =?us-ascii?Q?G9+w0LOzBl1ZAdJMcjRdn5387VFa1EjPrl3IFmtNpQChV40kMnpRPVtha3U1?=
 =?us-ascii?Q?lWDLnERUYiRBPQXhO6nzST6+iLnfJ969P2yYLQkE09+KlFCegPzDj30f5xHe?=
 =?us-ascii?Q?mWYOznsx4kXFeOHMx/81bbGDbYD7Cq8OVIwzzD5HdWyKf4y8irwEwrHZGM88?=
 =?us-ascii?Q?F59W67ZNCpysYxDJBXm+xZhPHqfYjNxpccOPJL4VEGUQYsYvF+CS2waXQhei?=
 =?us-ascii?Q?QvRzJo2oaBtwfXOtAENPCdmzARcxUcZ64DQCRAvsbpURZouhVOLYt67NdqAF?=
 =?us-ascii?Q?Rb0JicEZESNkdGM0NEy94O+4wrmK2va3P55GtQtENHmPf8DNePAHtVzbPlif?=
 =?us-ascii?Q?0f+vR6cIjt8qNKmAUc8Z5EmJxy7nxsdntjxeAiAiwNUl71yL7LfSZOngz0Rt?=
 =?us-ascii?Q?H4h5+ihFqrSJAiMfRThKK898IVKNPhM5o6f0e+UpPl7T63EzwjahOzRsAEoW?=
 =?us-ascii?Q?VT2e3olrsoO1BEi07UbGJEcVdqDbv1upzjp+4SK2ZOC9T9PnBfK43ecwCdP+?=
 =?us-ascii?Q?crfGlQDdMMoOZBmBLgBgWCo4IvM3EmtVVqJtFWdXapdV2450JTZzspIYM4+W?=
 =?us-ascii?Q?Z03Uge/ERwXx3VjVn7f+Df9WJQbyDibumuRTdBEpoYzFawSPGOatmsF/SFCa?=
 =?us-ascii?Q?aYKx2913rZ98d4dK9jr4rpiNO1c4Sv1ASTXr5gKlVW1ZEN7/HFNJwP+ktLxP?=
 =?us-ascii?Q?DVOK6SZ5PyNxmt7KCWSd2T0nYHP2RMA8P92O1TJufk58MplJacd6fdJCRK6L?=
 =?us-ascii?Q?zsv4ww1jVC9bYdMGg8vhHtAtTBp4oV9Tts1+3GTFIyhi9E0tD21elt776uED?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 839cb527-22d8-4cc8-b394-08db4d905a04
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:18.5093
 (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: LKizUnttVTJFJjckjIQIzSqfyc/G3oFIUzzMB0zNeqCnJDUaCRCRQOd3bzrCfs+bJRbbCGkg5BQgRUmfHNKrWw==
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 suspectscore=0 malwarescore=0
 mlxlogscore=999 spamscore=0 phishscore=0 adultscore=0 mlxscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2303200000 definitions=main-2305050146
X-Proofpoint-GUID: Sf1wnS3f9QUWX7JseDho1HaWH8LxLdhk
X-Proofpoint-ORIG-GUID: Sf1wnS3f9QUWX7JseDho1HaWH8LxLdhk
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

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 d7809a7000c58..9f3784f4a5b7c 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