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:     linux-kernel@vger.kernel.org, linux-mm@kvack.org,
        maple-tree@lists.infradead.org,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH 15/34] maple_tree: Return error on mte_pivots() out of range
Date:   Tue, 25 Apr 2023 10:09:36 -0400
Message-Id: <20230425140955.3834476-16-Liam.Howlett@oracle.com>
In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com>
References: <20230425140955.3834476-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?/Wbi9j78pmU7kChc3u+U1S3Qmk+F1oASjQ57warXe2PhaZ/ccu3tLtaPMGRm?=
 =?us-ascii?Q?4fzc70/+DxgANuwo74UTYxBru8nawm0fQjL6rvJoWUzN8N82I8Gux6kZqpri?=
 =?us-ascii?Q?JqRZdwyT9KDrJJEr3DDlyo0vgS/BEfIFKYYtr4Udl2dKwiOTZ6O9SwUNSWOn?=
 =?us-ascii?Q?2gOguliiyhJHFZGOiEprdD6LomIGNDGclewcxA4W/K06bvnBT+En1Lnc5/+j?=
 =?us-ascii?Q?IlDnRKhQ/6Vxe5rlOwqsx4lBSeVDvExE0vcfPHfqSMjOKOsuC2z6FF3w9fpf?=
 =?us-ascii?Q?vfWJMJ/OeYq/yNKj/E6yb/SpTkgt+qJRLlXweKkKfw63QLTZIlEPu7roFQcB?=
 =?us-ascii?Q?5FxCo7Yx6Bh8vbgEUIOhLm8fyjn/O7SuW/2xpwjhrCXRxstxprIPJH05XWxO?=
 =?us-ascii?Q?lFRgMAVtxLFw1r27JjcLLQv7VvpnY+k6gpHcCJcFPX90HJ7NWJhfzEQk5Q0s?=
 =?us-ascii?Q?lh2iqyj1RcOc/ZlwwPoTkaw8EZrwt7OT5Vj2/nSP0tHO1jxcfruE/lCzEzAV?=
 =?us-ascii?Q?YKEZ3oBx3Hv7VWEVlF8O2FIgkEYscwxf5LFJw22n3f/FzWdlIbHoGyffwIuD?=
 =?us-ascii?Q?NSMe2XfmWTH7hm3rD3KlSXuA8CeRcw6eGf0arNPTo1l+x/DALKCyD38Nj+HH?=
 =?us-ascii?Q?atMIQfDq0+k3lMI/0ZsT9nv9v+wkHNGFJKTAvcG2PK3OJf8TYIX/2ZDT+/PS?=
 =?us-ascii?Q?JHPCzQ5U8hkDYwb4314m/9tB4UNCFx5JdYK2rHuTg2ySkGDMJnjzLKBgltQN?=
 =?us-ascii?Q?EZ05a5qC2InXiKpm1xsD2F71nnDVQJ/lpJHZ0Ii1VCWFjZulxiP2mZhCDrjT?=
 =?us-ascii?Q?SaFML6Q4R6bV4L7rpOe9Sb296+lquX2l3eBdlgpX1ozoaW4KFDh4LIdaV2F0?=
 =?us-ascii?Q?6lNB8ZYZNrGB7BQ5pLebe2bKhzwrAgtMgDgV2djnTuQJr5Gf09kdnta80mpj?=
 =?us-ascii?Q?UnIHGmWFQrVz4/JJCFd2pvv0nydwqjp1BRGrccfB2Yts4Zte6tvXePEwzE1F?=
 =?us-ascii?Q?8Li/sdkz+qutRHav2Kq20I//PdKklSVAMc63AZdcCoLZw+/bwRBIziqAgdsQ?=
 =?us-ascii?Q?Mi4bqLjfHR1SwWWjDB7ks3KvlWZYOdBYV3hUkh/PmTOkgyVRqF+plL6xssx9?=
 =?us-ascii?Q?AdJf/q+tSrKerz0G3f7sw5KH5R0ght9xaArPdoFuWl33qMYuDCFYfWN+9Lf5?=
 =?us-ascii?Q?YDaYQNG3TSR4r/qZ78Hw+92o9Nzkuj1K5q4SlamfAzNK6DhUi4/nwISdGx8s?=
 =?us-ascii?Q?hL2Uw2+vqU/lo/C4MKjbIm1Tsa5LeSadvVWh80rkB+9Ga9A8Oms+2TLyMz+X?=
 =?us-ascii?Q?Du9QmL7zV5PSitIeigJyrLX8J9FceUx41MncOD4yFzjDMGijm8pgWk6N5eok?=
 =?us-ascii?Q?klI20guenw8k/NZpiz/ZLGNORitniX45mzU3nL0XNEF3aXBgVW+8ZUUoGiQR?=
 =?us-ascii?Q?GnupxKygBh5SLJL3lsVQeB/25k6CqE/nt0dLGnrV4QACM/VgEmMn6JfXm/mM?=
 =?us-ascii?Q?vtbfSjwpiNjOI0zjWRRwDUUTi4rm05v9ZJvdpNX3bwzB328nOUMaDZ6DSybZ?=
 =?us-ascii?Q?78bvPpMhZm8qo4194JHCg+JETv5KSQp1OgIkB86K5iFAgd5mSDY+O92Kw7hl?=
 =?us-ascii?Q?rw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: yIeYUt3zRoHLCKWcUCKcJoEUbsrlB6MaaJv0eq0FEBFymzc/7QgDMJKDhtXJ+JTqUiI6uONqpEtUVx4kw+E6Cigvai5qDUIdgFoYCg5NuXiryrFmhs1G6gzADHcZ9Jw2MSmQ46etjJUdlC2OsATUvhuHFFRYODqn2Kh8gUspRiEG54j12v/MV+jPKigV13I0A40f4gjm1VIkG4cW15Nfg7IDz6GfGPVerUUVvZvkUKOMw8W8sW8IAT3PAUvZ1Bm0bYWxWArET3SoouHugYhKsBHQ05r+vjSxc+fv4uePF2MUTCwd5/4vNs+NytNFdl8WhTRbxesak/wR6RnRT3Txc4AnkGHBJkJLYQxz/5isKlDXYLCaITs0vf4EoGXevMeFCiJNuzwaaYG1yEbuMHGlorkfgEg617DXUysWP7aOfCO95vPxqv8Y4PUEdowKpOWEpXRXYE+wiIMg2Ux3YbPaRX7KC3kpASS9giinGOswVp73cFL9HyHbhaoOUkfqfbL+ShVy+4qy3CyJPaKnfNHYrJKn3AU/oiQPGMmZSy6Q3hUTcZmRmfV1TlOFBpTw6wEnc6C2OirDSaqSYxwrZMfq0GPpkzV8zhBswHnynRf6Hkn5Y7AdUv7X5EQT8QS9l6m1I0Co+eCXvNLtu5HMEb/FgyuNNPI0yjEBg//pVeltBfH1yvnsCuQvfzlPzdnXtKvbVVcIMvg/EbtjKbP/QYhl9tYB4xn8cMhmEJjrc7JArP1Q6+H/uyQK867m87pndYgDrvR+bgNNcNQJMx+C9AyFVZ8qK5giIFb2w5Wgt6kogqyODHY/lPrKzxN6xFlLvXRo0ihrqGJ9O3B59Pt1PmmA2FqtzzfTnhwrZuXHhq2WOY8KE1CaminG4gO3fuY+WwV9uGiJFQQpHmPhQZywIW+Mgg==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a4385abd-aec8-41c7-db65-08db4596e268
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:10:54.9805
 (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: 2i6jh//QjStnlS4POgAajYLYiWojIJenShCs/yALIv0rDVSVo1vn7HiQiqDkFQ10j0gOwptjcX0WnhNL3Ti4sg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR10MB7650
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-04-25_06,2023-04-25_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 bulkscore=0
 mlxlogscore=999 malwarescore=0 mlxscore=0 spamscore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000
 definitions=main-2304250128
X-Proofpoint-GUID: FklFDom8mGTOD6g9MWzntqFDJ3R8RRwz
X-Proofpoint-ORIG-GUID: FklFDom8mGTOD6g9MWzntqFDJ3R8RRwz
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>
---
 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 41873d935cfa3..89e30462f8b62 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];
@@ -5400,8 +5400,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. */
@@ -5418,7 +5418,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