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 v3 12/35] maple_tree: Use MAS_BUG_ON() from mas_topiary_range()
Date:   Fri, 12 May 2023 14:20:13 -0400
Message-Id: <20230512182036.359030-13-Liam.Howlett@oracle.com>
In-Reply-To: <20230512182036.359030-1-Liam.Howlett@oracle.com>
References: <20230512182036.359030-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?faozvrWHJQ++Qjd9yXLfDJEORatTeEOH+mb0aHN/xndA0/Uvpb0IsYeYM24c?=
 =?us-ascii?Q?tKZbUepl18LQ/yRTBSej+4E78F7qcUXqSr8u13F3+a9zFH7qWvEvN1tbpehL?=
 =?us-ascii?Q?bRVwy+be/wPVxC0R0YdKIRALbrCp4YtMlh0F6zttozZLF8yMkSLNIGN6b1n+?=
 =?us-ascii?Q?wVa90o/JciIeoOQWUDChP7R5Ycbr7Xos+9qC7rZNExWV3dc3IjMmPSoTl3cE?=
 =?us-ascii?Q?I75o8oboKhmV2xj8LuNFw83ULOulwA9VX4zQ30Pl/3wF3YnMvrVMBvUbhbct?=
 =?us-ascii?Q?IAaNTj2Ip/pxLFqXqGJQLVeytP1J2dS8KK2rV/IikJ1zngN/ZJvCO9LM/7nz?=
 =?us-ascii?Q?vS6xj40GTdzXR+5e2K0eJIm+jsEN7pdgOaoi1IhGTQXsu4h29mzZCrwhWJ2h?=
 =?us-ascii?Q?coXvWrXLKZc3GBNr26KHzn7xVUHOKBlXpelUeiQ84aopPpSXjf6UkGfWHI+P?=
 =?us-ascii?Q?BqziaaZTEvagBY6LGWkAAJDozFPoygapP+OlxayRZme0VTZni+FKWisk3xCV?=
 =?us-ascii?Q?HmIiLgMHn0rjbvzotItLJvskl/yoR6VHuIUx02I8rMz3eglaPkHLVn0imNVP?=
 =?us-ascii?Q?0ucTyodKmXM9ETmVrLH3ME4tN7GnwT7O2tfjKAe1yfJIHFMkma4NnF62o6QU?=
 =?us-ascii?Q?6sL9EmY+aBqpag3iy2DW9mErdNN90UQP97W4LRrhR+H+j9HYcH1DnY3Ru1rH?=
 =?us-ascii?Q?Gq7hO8VR0UYsq+oZ8h09y0NDYiBE0uZOBVtvBOpodzbySB2VN2+YUVBsHRT+?=
 =?us-ascii?Q?0J8PUNzqPq72BfeNikTIZvRV/MJ86e0+hjcspu/K6Q83TGH0Kk1n+VpHjPlH?=
 =?us-ascii?Q?nld1ltnlQsjSj7fhlotQ77/sctceS2LjjHSNfJPVk+Gb4Zu+6n9R76HLRfmE?=
 =?us-ascii?Q?4dFiCyRz+aCF1LgX0ZL+dz4xW2ojgClK1Bmx7ivlZAyfne2jaoxwQy0P/cGS?=
 =?us-ascii?Q?Tf6wrB27WJzJiCcPkSBwOIQ7pSfb0sQak3rZ3N5lUawV83ewz/OLO37n1vOK?=
 =?us-ascii?Q?x+n7l1WAjfHVJ5iL4BSxVXiZqQGMl7csGKcrzcblibrC5DXkX3Y2oGwgWH93?=
 =?us-ascii?Q?Xx0IcYKvlgH6v/L9Cc9490Zs0ZW1qqJYNLeq3wR3lwSiLOmEwQWC0rUpND/V?=
 =?us-ascii?Q?HNovKtXIUbC8sKTCibUVU8rkal9MrGbFuJS13BZJueQXjF1DNHgK5WdQQ9Q1?=
 =?us-ascii?Q?GCeGghggu3QGthaqCSBDT2bPG3gIqaNu5aCH+Vv3JntW7flxFIf9zYtS5PrU?=
 =?us-ascii?Q?mvGfEK6mnKnW+O3zEvCYjHJ2Fovk3NJKLEvWo9fH2E9EMOLXqf9LHYNmrEpQ?=
 =?us-ascii?Q?zs9RL6jGTOX6AsLO0WWb/kRRJQtIZcc2SfY6Pl9lYCD+1263xlYdWf+DPMy2?=
 =?us-ascii?Q?n3xEna20RVMjGtS6OKGuMukMsWpeV9ghmclqv/PXfdVwCyQqBzL+yIv+DhIX?=
 =?us-ascii?Q?ffrTkVFuwmm4dM+w40Kq1ZsuDLOzW/MAEv47sqZ+UZruzENHtKOLYq8vscRP?=
 =?us-ascii?Q?U0pHrjexHSVhlgVH9g0tWioD78Sgr90oUl5ZnHf/LfLYGkh85NEGH6ooW2SH?=
 =?us-ascii?Q?6bCV6lGG52HQ/Guj2qe+qVaES0Tg9S/bsZp4efjCaDx3VH7kftOjHxAb1wMl?=
 =?us-ascii?Q?Cg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: DzQMrUPl6JJ1/vKQ1egR7HivfGci45jW2M5YDYxzVOy8szc5+D+wtXVTTgGCRbsLG9ThG6LIpFsAhvONXWC2hDjquN8DYB0HC8jKywQXMEAKC2pb/UjL9zUlv/o+Q7KxK30aCdU6ZUz4J5pF41KluZ0CEcAZjZRHnZpxnro6p5HEtau/CKE2JD2p0Jy9C6KWkhGz1Is0ptZNwDNb2PznbFy3E9xFLoyMO6ilrjnxE4wpNlxI2/+9B/pPMfRK1QLySeVacn+zXG5EWAaQb9CvgNM7XJjaGIMeWB+xg8VHPs2sCb/3mwsWDh1ikiBQGy6/RRvMUVTAbGfie0Kn0UYFaRh0Gp+yWP+kwhDlXtZ2y82luHe1mou2Jz+3HW7am0uQDdZkhImt1H/hOpbtVKAieRSuOyETHgEwrSkxfd2RHqlGAkU+YFeqARzZCW0L3K6SR4SmjrpQ9jRaDfeCzVex2F2t3lfe8FnJ7oMbq7SNG1YZq+DT56y8VhG9oVIgj7+kwfFpCiMaKV8KxmakVfuIIKDdF0UiwqQTE0IvWeMo90Mj4JqOgX4MxavrDQA3iShUQ3moMKCQ06vvkNUwtiP553CSskCOT3fr5465HXCHye6Hgwq9Szu3wjgqEM/IpTZcyRIgDxfSF1gl2a2ciDDOlfrXqoPK4BQ3vbCJQ0scpJ6shajMCLIuW5fq0s/8DBnvJx2H88cyfuhXnIqP0pPVTU9usjk9/Tvt9d9fWdQjTgyC/1MpHd1s4ShxZCE47JNk+EAYRGo0YV+/VrstUp/t0pkAfDQUnOQU6i+5wX8hWRP3GbiMQ27NtneC+aGbbbBVvIeGMYpptyciTd14cNL4xRqH5D/8cp89fuU3vF8mtLj3h3a5yrAaeUL5qlANNm19iB5DZMW/z5xyEm25VgIatA==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ae13e170-d695-4942-ec6a-08db5315b05f
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2023 18:21:22.2600
 (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: +Achpth6I9Di+7F+DV79hkaPqCpwwTzTcmF4EknQHUCVvsFd8XY/YB9PCijuMS8E7gyt/pdhJWdlS7ZysLDgcQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR10MB6143
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-12_11,2023-05-05_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0
 mlxlogscore=999 phishscore=0 adultscore=0 bulkscore=0 spamscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2304280000 definitions=main-2305120153
X-Proofpoint-GUID: kABGRXxpxGBOZnBVb8ldocqmyptEoEJF
X-Proofpoint-ORIG-GUID: kABGRXxpxGBOZnBVb8ldocqmyptEoEJF
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

In the even of trying to remove data from a leaf node by use of
mas_topiary_range(), log the maple state.

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index da441042ec8ac..824967872d426 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -2345,7 +2345,8 @@ static inline void mas_topiary_range(struct ma_state *mas,
 	void __rcu **slots;
 	unsigned char offset;
 
-	MT_BUG_ON(mas->tree, mte_is_leaf(mas->node));
+	MAS_BUG_ON(mas, mte_is_leaf(mas->node));
+
 	slots = ma_slots(mas_mn(mas), mte_node_type(mas->node));
 	for (offset = start; offset <= end; offset++) {
 		struct maple_enode *enode = mas_slot_locked(mas, slots, offset);
-- 
2.39.2