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 14/36] maple_tree: Use MAS_BUG_ON() prior to calling mas_meta_gap()
Date:   Fri,  5 May 2023 13:41:42 -0400
Message-Id: <20230505174204.2665599-15-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?XDcEqYMvMOkS1fXe2NKaCvTjITJpU27ftwNnEjJOmKrian0AECLfo3iduKdj?=
 =?us-ascii?Q?5afx7ss/4Uy/IdTcx1knvQ0kxG6QmebWhdZXNFpUwPEvudyanPlnEWxkz2tZ?=
 =?us-ascii?Q?FPfhCbEXjgDpXM+B+WilQvxVUFh9WlU8J1KBtl95BaNhzNnBCysTrPQqpfnR?=
 =?us-ascii?Q?Bah7jB59gYrEyolHvybNFQUKWFx5fHRFPVzfD0/nWc9r8dZToTQ+csZQO/Ml?=
 =?us-ascii?Q?UoE6b4SONH7Hj1ucruO+sFF8NMxl9M3Oqx8r49NPvEyjMV6NDXhRnuvqaq1S?=
 =?us-ascii?Q?pHnkVCtpb/faTvi4z/cV31T/CalGMzSiNWIEx8CEQ8rHrAEalePcWfy8biix?=
 =?us-ascii?Q?PG4FILWU8UCu4Z5v69fo3VlQc27MRwHeos1A3QcQHYMr46isxpJJHvDE3wbE?=
 =?us-ascii?Q?M2Ox6C6vPhfZI1iYj3YTfDojT2kQWtr2z+el9oVqrHMt6Mg1dRgr9neViqx2?=
 =?us-ascii?Q?FiPK5jnXUkgWFbck51AX/wVzn+v0wWsbFdtpyN61/veRgJ3522tRsCpm8web?=
 =?us-ascii?Q?+zYNbbLTSPNQ67Ts4zCqZUMSuKsPOuU6RI9J/znFi4e2FFwQhGvO6ljjxLQS?=
 =?us-ascii?Q?8+cLsZwf7zWR1dnsNbfUXT9i9asf2dBpu/VA0PCPh7ssWvWuXN/dan/a1wfM?=
 =?us-ascii?Q?KNiVxK54OFnbngHt+Jf3LpyL/FarCMyixWb/+vcngtbqiJMPTo2DmDlXFeZJ?=
 =?us-ascii?Q?OIW/FrXt5MbRJL4adUt8oZWX38/LWv3Nf9m4S1REBb50kuHvqL0abVeGZvHk?=
 =?us-ascii?Q?ai/2OEthZXz3E/FLJCw0SBTPkP3BipkEXKopOYRV+4tBGGuDOQmWYUG6ZAzB?=
 =?us-ascii?Q?F4KTbrdvgfiXbTzEHAbtvTUxV80zsypSVm7R+6NDaBEU5GyhVUMJ/VWICAlh?=
 =?us-ascii?Q?UzNBcVEdCv0zwYrA79vD+lfkHsIYg6BDDi/qbX5E8EGxEIVYDIPiYvB+O8Ym?=
 =?us-ascii?Q?qijJUZh8XT+81OiNNmCSdLLvcTa6Tu9V+KwOGoSE59eQThyVO59gY57WnyQV?=
 =?us-ascii?Q?1pb0iADsjbKTRq5Ks+sLfDkfLzosooT6aY9Wy281B+HRaihxdmHm72SKn1HE?=
 =?us-ascii?Q?tbbZcpjzM3nfenQCk2DyFGoqi3q6gGjRdRJ34pN2R5k2B7oeAou4EGvJAHuZ?=
 =?us-ascii?Q?Uae4coXgVXgbsPV4Lvuk7WZpAToiweLK1THbP1QQG2+KG5NchHoT+crgelZ+?=
 =?us-ascii?Q?Kx98Prj7I0h7cQDeaQPQVBV4fe8J2PPPAONTmTwnfcc3kc4Uq/MRDiswyV8d?=
 =?us-ascii?Q?XbF73ulzilOzmTImjDFq8y+mtoZTbi3m8HkGCxDBVYHig0aeby7qIV/KX/zQ?=
 =?us-ascii?Q?8kGFMwhw2Pl+BVjZSgbboPkr2+IzQGRU76JpxOuqcBsevCvvKhnxfMworCAd?=
 =?us-ascii?Q?MGcEKMthtyIwn/Bw8bkY0FEy8mYGdD6DRsaaosfoTtlPLYSIkKQ8CQ2OZ/M8?=
 =?us-ascii?Q?jXuGxVyExY0CZfk5QDXBu7KnfNut+1KCgPJ6ewpHRw/QlPJIkDG3EUxYBKZD?=
 =?us-ascii?Q?9V9GzWVHKB9lU5tNHw5BZsAizNBPrioUcXt97hah50CpIrjZsMqp7bdfSgaC?=
 =?us-ascii?Q?ywA2rEUTmfOxrCLRxv7OdII/6knxQW4g33yzf3cbmJgy/hyBz5TXtvRjT8my?=
 =?us-ascii?Q?rA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: J6NKesXpDw8DnxAU/OaT7CzC1X9ML368uejM6ClXasOjzVGLg4lpZt+S3wYICp7oyHA0yXOWvntSAKw7e4lxh59ucMh9mVklBS3FW+FBlVkMm084VNZrcTMmZAO+ii4baTp42oY8lR1XanFcNN/Kt089ZA990c9nprgxj52qs1rWKuqNMDA7SU3En6DHPBanq2P2eob8TVOei6jQetClyyzsrHKgFaKnbS87HXjuCIKQSpOxR/jFcGyBhhCVABuNMcbpjpRc2lBJmwqhjP2dgbWSAB1IEzmb0Tt5sgdDPdFiV5x7jYGr7phz3+qWvQ5vDwNpxwXKAwiGP9Z8z8bnG4g9Clr3dJl0AfTrT9Nz2QTbtfmEqJwac7vmt4QI2RFEnoTE71W2QMrWknMYBApp5srMZOFTxZKC0oIwLl3cwvPj+xUIflbZYdxHvQK0IXCJd7ewEZWtTSH+aUx/UemJFRsG63t1UKs0ipebs9/5A1w5bbKlgLVuusMBmK07r5g4bRb+QswNP7u+02rxAHKnlTqUhqdFj8Q/CXfIpFjFoWAHm79kTbX40pR0wVedSQkWAaPwV63F4Y+8lH1d/gBb/gtxgly+Tbm/F6V+l0ewAAkMl37BWC3N+2XRzyenhFtV2vyDnoyqEzr9zwCXvgWndvOJIEyhiqmlFCJnrpADzAEIkIDUb595mREZq3UCPiIsFWDmyZ+sEyzJBW+AxoqDo7JNSU09n6V6wCP98pnZsMw0Vd/9Q6QRMvV3OJfRmRWlJFosIXVIwerbQTDgXvmLY8bkpwTMAJGpxiixnzqHpaQ9wodes2s7zKLyxrx6RTBBwiwgHWCgxUz+65Jq9v9ONthobM5FMx09l9kYSkBgttrRBZo20Vafz4ew49M29iVvs4QR9aXyB1zoFymn2aDlig==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 05e3a9bc-75a5-48fd-8120-08db4d905844
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:15.5963
 (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: bjNd+dQ7lh0usRIMzjjQNgbfIW0hUBiyIeXz+W7HIBrWjsJepvD/APeqmkcecVQdqvokyHq48pOhTfxgGrrzRQ==
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 adultscore=0 phishscore=0 spamscore=0
 mlxlogscore=999 bulkscore=0 suspectscore=0 mlxscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000
 definitions=main-2305050146
X-Proofpoint-GUID: cP8GtmiRcDCrQNxIQs5lLM3gySqSZnmt
X-Proofpoint-ORIG-GUID: cP8GtmiRcDCrQNxIQs5lLM3gySqSZnmt
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

Replace the call to BUG_ON() in mas_meta_gap() with calls before the
function call MAS_BUG_ON() to get more information on error condition.

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index d5ccf7bcf3b5d..d7809a7000c58 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -963,8 +963,6 @@ static inline unsigned char ma_meta_end(struct maple_node *mn,
 static inline unsigned char ma_meta_gap(struct maple_node *mn,
 					enum maple_type mt)
 {
-	BUG_ON(mt != maple_arange_64);
-
 	return mn->ma64.meta.gap;
 }
 
@@ -1628,6 +1626,7 @@ static inline unsigned long mas_max_gap(struct ma_state *mas)
 		return mas_leaf_max_gap(mas);
 
 	node = mas_mn(mas);
+	MAS_BUG_ON(mas, mt != maple_arange_64);
 	offset = ma_meta_gap(node, mt);
 	if (offset == MAPLE_ARANGE64_META_MAX)
 		return 0;
@@ -1661,6 +1660,7 @@ static inline void mas_parent_gap(struct ma_state *mas, unsigned char offset,
 	pgaps = ma_gaps(pnode, pmt);
 
 ascend:
+	MAS_BUG_ON(mas, pmt != maple_arange_64);
 	meta_offset = ma_meta_gap(pnode, pmt);
 	if (meta_offset == MAPLE_ARANGE64_META_MAX)
 		meta_gap = 0;
-- 
2.39.2