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 12/36] maple_tree: Use MAS_BUG_ON() from mas_topiary_range()
Date:   Fri,  5 May 2023 13:41:40 -0400
Message-Id: <20230505174204.2665599-13-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?q6MCUG2NXuc8fNEMncc5ZHZ8vEbXVPE4+XqpTS526zY6J9a65w3DFukpm9wu?=
 =?us-ascii?Q?4qzzQr3cwmJyf/bNMJuFukJSOLOMznS6WIYA9T34wSHzvLzExX5HXNhamVA9?=
 =?us-ascii?Q?ljkK3ZlgwXampXTjlxjdprNz3nl6Nz78vWQxss0mJFV47lnezpeX8jFj7l/g?=
 =?us-ascii?Q?OjVo+m8JXhQr24hc7Qah7+KLMVU+e6bafFOadLg84G6uJe4lnUNCXoYgmG+l?=
 =?us-ascii?Q?jK7ljraRhHcJvgYFnTKI4oQlZ1r8GZ7TRuah11Md/5E4OfXx5AxEth5jOpRQ?=
 =?us-ascii?Q?PTH0xe10kxdkBUCeClrG8bpAEXaKkN9uG1D7a0X7r1PnThohIN1ZW7SBlBC+?=
 =?us-ascii?Q?0XaI5wX0Pc4jg3az0Wj3+ucoFdOVMLBYJZ1I4dOB5PqE/VWOVCJ29/FjG9C6?=
 =?us-ascii?Q?zKbxPoLOHdX1WYBxANYXqbUlnVehEjudUE7HazUIylAIdAvVcxgrlNxUZz20?=
 =?us-ascii?Q?uCpOrpG0DyBxcJ0jq7YDvcq3HmMxrsUk2dA54s0+ELa07bkyRNuerLF2MYaK?=
 =?us-ascii?Q?LwhdV7K2otj/nw94hgiQ5+5D1MXsPKS7sNQrRJcxH23BXQg1xfcBG2BtlzzF?=
 =?us-ascii?Q?hVnlnSWirFfbeQvx0AKtByNas1iGB6G65PqzFUAi55e9p6eRvWSeEcHDPiuT?=
 =?us-ascii?Q?7eAG8LfnGcjKSCyMBlGFvRDpK/LmR572VO3yzfzDmVuo/rbEZAaGIAXPt1Fq?=
 =?us-ascii?Q?HemUDY12Ad8DOGJ8qynOAm2REzV+mvtjJI7kCdY5KMjKXeZ6Ks7PYgMLpGur?=
 =?us-ascii?Q?JRKNoaBPZcjfPSc7DPk9Qen5vC+yNGEcxmpct/xZljqZuJbeqFHctGHRTC2b?=
 =?us-ascii?Q?fd0RdPXL+FILGmBt6ScbKSa6gGV3akdtp64p+CrkQNbNy2QhdjX/plOtmJcw?=
 =?us-ascii?Q?cY9hktZdKM5Q218bj9OmEa1v4vVFp+w/yaFyoIob1viAS0N/Fux4PC3M/gCD?=
 =?us-ascii?Q?yB2OD3kOZ6zyPdjckyDIZWktg1hq379IGXoUoVXlrCnElLCQFv7UI7g8eW6G?=
 =?us-ascii?Q?I4VrvnQ7hZHFQvyYPpv6qK0wQa3/6sClK+Jtpyqdm1MUFFpydhm4u8IHkjmQ?=
 =?us-ascii?Q?bfVOliuSiiRB8ZUoIKadKkJd5ve/OUNG2A/FuoDrKyv8F8ym5OAaCM8H8c2I?=
 =?us-ascii?Q?quvV04TgOE38J6/w5UiG4huEKplEt+GBTda59DuLXmzwACa2kIhf/76Ml8nZ?=
 =?us-ascii?Q?Ec1gO9pU79OOQT3qdTwyXcjyN0CO1yMOHrnnw94UxlWfe8h9byYletkuKKRc?=
 =?us-ascii?Q?faMeCwJXuy9HZnbvjcsWONvR6gWBnKcBfASnVHUagL169WblQh6r3vXSByMu?=
 =?us-ascii?Q?tjEf/QLNy3fe6MB4ddNCMNPegEI+IrayCX8SpkDfeIaSQR4zCLs/hgWFKz+6?=
 =?us-ascii?Q?fLEHUZAplENtJH2MYWsKKJGJSiHKmSWZQc7QX0q0P6DQFfHcZicnoni/Ae6J?=
 =?us-ascii?Q?Kvi1d1pSRLRUMwt7CWSvGI5nOFSkZEPijFo0qOxX1S/K08xVWAU28JFuk/qU?=
 =?us-ascii?Q?wQ/XdOL//vxGBu7gWYx6EZoD2k3WIwmNCVG/k8nkZUUP99zhQ8ZbVihoOhwd?=
 =?us-ascii?Q?ITWG2byD3o2pSoNyWedDRB+edjXXGK8AsFOQ2VWpmz+afOofvQHKEdIX8gCL?=
 =?us-ascii?Q?lA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: hqo/LqFDf6dBMwSfoSe1Vs0JnSfrG+M/Kj7I05F3vAnADhXdKQCCAtlIdXdIOSpeHIHwMRkIDW195OwfJpkWUZHNqiQERun2oy748pKDeSQnIT0LcCUYFUg+5qwnxF4G45uSQPaWhJghaN9TWnf7p7Ob4nKzIt5SZB1NNaj7cdhizEaAuJax/WYgtQu4SMYTJZ3btFQO7IjpTTY0sY6j6r6C8lvpoe9B3ob79CVMKMWbfxFPizRWTw+2XJsOkQcXHTV9t8YBAsvkpOf5LdxkOIzr/mbNTFCMlWIFwQ680JZXdUa0shjUjYJ4+ueKMaljWEF1n4J/PSZHI912wERgFEB0s7d/83IdosVcyxhy1gzKBpqSYbUfXVuNCYIvq4wjFfQa8diBNwJZrqToPX153Pbpfcxmx01je0VhmtNK5jJFwPYGltexhVCpqWoiU/gfHiLplpwTxXaK7pZDZttXo7A937XkMAgLv2J7sz5ifvn7QxZdhj/rdrt+8aYk0JGF5ZD8YrqWDPwWnIm5hAqCJ6/U1EiVlX8QzJCrSjBYPabKOuJbUjGnZ+baeV3F9mKF+XsGDJOlH1yvScx+VM6eO+8IE95RYhWvp4IVEEn1ixUp4hG4Uj2xrvmcsoepx3llhHIytUAjvTzaqJ1uzHLDkPKB8gUsK5lmZl7QjFUl2exxLDeRIMyj42slN189vztByJ5ORDtQtljSMEOPWjkASCJuvFFaPN4vSY7gqwecklGkrBXPKt635lN8wGhwV4NyyE/Nk2L3QyRlp6dJeON4EerbJwW6FRvISA/pnRPhE9PVNkkaQZwTdjIC+eOVOoJtImMDv6GQZuoWaymewCk6f1RnxERpD7TOHv7/+kWVWXgyq/eHIidxce9Dc2i0kmHAXWAM13BhtHg3iJPdG5Yetw==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6f7a18dc-bc9b-4fb8-2ca5-08db4d9054f6
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:10.0225
 (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: 0CsVVBf9UrFAK/Uh+hVhkmfka5BypDZQysjjBdgERmHjQAvmE4JTZWtsyRRcbgD5LQtSgaiPWu7HkRjqgLmIzA==
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 bulkscore=0 mlxscore=0 spamscore=0
 mlxlogscore=999 phishscore=0 malwarescore=0 adultscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000
 definitions=main-2305050146
X-Proofpoint-GUID: k8_3q9NBZ-H3VTUXg9N74yRvCI0c2oW5
X-Proofpoint-ORIG-GUID: k8_3q9NBZ-H3VTUXg9N74yRvCI0c2oW5
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