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 12/34] maple_tree: Use MAS_BUG_ON() from mas_topiary_range()
Date:   Tue, 25 Apr 2023 10:09:33 -0400
Message-Id: <20230425140955.3834476-13-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?xbXAWEvXKBa022r1UZuprTP+Acwr8qBtCNQRvxgzT4C1EPNX+AEeZnEKOY1L?=
 =?us-ascii?Q?6G9aKWAQS77dvo835yR34Ic+sXn1ZiMEAat0WX3U7WPTxDSBHmlRmjxh01yr?=
 =?us-ascii?Q?UchvVpGUVkvJplJ6QrsKB6I3Si3uC4ZtdzHxy6TMQM5T9NtE87I65J7Nj7VC?=
 =?us-ascii?Q?HAOLX5JRooF85hatom9MUJnRZ4VHJnwzKJKtVEUwU6OF6q7lgzeEAVz9cMEa?=
 =?us-ascii?Q?n1julFNRZycVr91WHUBH6+URAT32OH8PpYcFoYjwwIcxDdAZdImtxkiobdiW?=
 =?us-ascii?Q?6xw/c9QKY2o3Lu1wnKEVOeg9CKPG6hpm7dG0NfX5W/0YirA7kL5loNKe+uyR?=
 =?us-ascii?Q?rE8zx/HGJp0BSmdsZpVluT+ccQ9/qmutD45kdewoUleWNH+eLW6rojhnA/vx?=
 =?us-ascii?Q?p4spZlFVoQTwJNtErNd2qa7krss9X81E68/wZZFTzODaHo+MtWSaWLuZUZA5?=
 =?us-ascii?Q?2m9d7123yPryvcie0dZbA5SUBSQRdy3bIs/uKRD19PgdsDC9x2biuoSbZAsi?=
 =?us-ascii?Q?5/pona2rLSGzcSCwHIxh9/tDOO7xBlY46baMg9x3oI8/28+BL/bj2oJvb+Ih?=
 =?us-ascii?Q?/sSCRvWxi0Cs3eldp1f0gMC0lWwmIBSBidguHolaZ1/3vUxt6bAXnqQoaOD+?=
 =?us-ascii?Q?6kF8lngxs4jllZyjbSwzKKNeHCJP7lZDHEwEmTLFw5PHc2i/41F1LtDiEN8N?=
 =?us-ascii?Q?AC4dGzcujzBC9bCqg8LJsMTSQEep/PnfSwbujWP+QIo5RbdWn9lfNxmxOvDp?=
 =?us-ascii?Q?hzBHFv9w5MB4CMEjNruXdt/+HcIccMwrHm7rC8bdVeevv5JiwiJcb+ia1rpY?=
 =?us-ascii?Q?cjHceciegRQ7O9LLTVYfwX0TfbNVDjwpF5PMBxLvvfIqGm2qKc9nnahs46Nt?=
 =?us-ascii?Q?4h13frQc3u39x0gehpXLH4SE+lKOOH8vcA0EdPMwWGQ+ERo56KuYzgmlSF28?=
 =?us-ascii?Q?r6A/H50GQR3lHvZ3ay6ARfixUvW7asE8BPUQLKPLkWZ8qXIhLztlVegXtbrW?=
 =?us-ascii?Q?0hHOJlZnZldZuEH4cIBYzv6zsIJZTb4hMfoFXiDJnJ4lOVdD5W6QT3E0hqIx?=
 =?us-ascii?Q?L06SBE4LWSF+ak7n2ZPftJbRtRnHR2vEmVspTT5FGJtHBvD7eWavP2ZuuDGe?=
 =?us-ascii?Q?Q/1OD4mVWBHDkeZ64bEsxO12dxI1KVB2ADS6xvvY4PSOAAY+fvj790nlaFor?=
 =?us-ascii?Q?bQ69ldzN5112JofvoaO17Kr296JYZ1A9lMpKP3VGZxyBSx8rzYNAmH+EfHx4?=
 =?us-ascii?Q?rQ3EFMr9OVCBo5bSjoM/OYAJqWSLp74/WJKlNwtbOQu/8Zd6BFVU5V8e3n6n?=
 =?us-ascii?Q?cmNXlWA7at785U+14QBYtr4Uq8nzBe7hRClTES93sVFuC8vDmnT7CWRs46Lp?=
 =?us-ascii?Q?jJSPXk5Vb4arE//IFdQx0nW7nQEBUhb67FsU6kSVoEsvnf/QViKoemUuthhp?=
 =?us-ascii?Q?sV8r7HZ0oiLGAy0yZVIxeF+HBjAlvBhVAP/bjCEjDOgEme+STNVaq2zzdaBP?=
 =?us-ascii?Q?1GKTWu1bS3TdyczhHlAN1NIBRpvKWQTFfhJbh+1hE06bLMCfozl3aIss7Nld?=
 =?us-ascii?Q?bPmOm3jCq0o/iu2JwyomM10S+mF/hy0ovJnnrWondOob4l3FsPGunk+7NWEm?=
 =?us-ascii?Q?4Q=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: +IaQsyDUazjxhAPupK/sTBxWv2/oCiLPfQhpb+YKatAjuyUdaWSuPYlTOXmb14GBX86hOtfSi1YpC10NKp//1cMq2EJKxDP2HOHi9fNxkOQ2SfptEfknDhj71kAPGmV5rRbwT8cR5SdW64OpOWpHKuyspC1M9qD7UWQdACA9q+f2Sm1uuG+MB8BV5NR9Ypd4rYkA1DCmCgvyDA0/i2JJwHsKV+YRJD9YCyQsGEd6ruIBPRVT16CxirPKG931l6NHZ079NpxexrHv5PgCxLpBuxBJuhtk28ek2SsztiUaf6mxm7mbAcPt/gPygR+wXwegBQmYwIOQYYa1L4tffn2c5Yi33qaXsQlBD93Rx1rNOgC5w9Ad+7lveFCbiRydT/8/DqL1BWRPWUT3EX4UKr4crZyf0ndbxMCrZj7qmy/wkNUc/bod3nVGeGUM/0WgjbyR1fwxZP8E302DQpE0wCsueF/HMAwKFVoxnsRcLvwQfZB6b02Zk3dCpKFSvRuw4AFI0S/zjx4jczF4CNRMel8xB3ki+ltqgCN0V08McqmdNfQ4lqJKIkSN3Kl9dFLoCn1N5KUXDOMHaL9/bDgPTdaMagR488jBfUUbGZSS14IfpMqAesjVB8QqQ1aWY4EZh9ekU2VDV6mpDI2GuVrJBGURiNMFZKlW3M77uY0maSkJFvT39tzSW0/5FUWuqNs+1p00zhyix99733S3bP7CPb2H8d8geu4LkGpSRJ1rhKbzOuiEtuZwdPs67hqmXag4j0ZAEGQhJrsxnL2+po14oCIZZjTHlDMlU+pGs8cTD8fPLBWYQPignwQTOS5o21ac72qwiCmG7PPAszCGiSojMzK2s3hk88x3mBw1nNp/lSYCxFoDp4S6OV5w+KAsreZguLtn6SUTzfaaYdgEm3acz118eQ==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ce01c4b1-cc41-4e06-4efe-08db4596ddb7
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:47.1100
 (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: oyETaNh/Cszjiul96GjpYntb4vVfjtYnX1I2t6bXRYj9xoqEcfe30iHUWufMIxsQGfGmEfEjAOkkoHn380MkVw==
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: Pa0eAAczEWgPjK72jytBzlBsdpgjZomV
X-Proofpoint-ORIG-GUID: Pa0eAAczEWgPjK72jytBzlBsdpgjZomV
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 f1ce3852712db..b8b8e5d9ed7e5 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -2346,7 +2346,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