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 14/35] maple_tree: Use MAS_BUG_ON() prior to calling mas_meta_gap()
Date:   Fri, 12 May 2023 14:20:15 -0400
Message-Id: <20230512182036.359030-15-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?YRAKUdjPsAi0Swb8uQ7FEZLeobqbdv4PLVHkRcv9HF2npSEaMOohP5ccBIYH?=
 =?us-ascii?Q?KQA3yRaqyonyI12ebt65n6GglDGRG257gS1bNpYpS97xQH2WU/m+utQkB99l?=
 =?us-ascii?Q?Ri+xsx3AqMz+IU055jFZzwz/UB9An9Xc9LDpN2Kpz1t2sMG/tGg5ajK0MiWG?=
 =?us-ascii?Q?Ha6ib4Th5dwFdr/CYDwRuvwPeFgJoYBch/nFIgyXUNfi3K4otAYC46VnkTaC?=
 =?us-ascii?Q?3NZ1LPSfKyBoTAfnGnbdyxKd17gxP7YjBAWbjwjRxIYXZOLbMdrssRkKjQ+E?=
 =?us-ascii?Q?rNUATLx1hxbpU7fHi1vxv+G6QWQtcYdK56kc350wLEUycaBRSc+miT8qWyYm?=
 =?us-ascii?Q?t+N50rlEsDoWITpj54QFvYVhpMI526FJAZaQW4xWXGkXWoLRqp/PBMLHsQ5Y?=
 =?us-ascii?Q?OpOsVZEDzbQc70Ypm3qUjQEN7c2FChhwYWv3YoRvH8V1y8zRCjpPntKNkPg+?=
 =?us-ascii?Q?TVP9aHA0bTNd+BNTmKCpQzkOxHTOc7CZnVFF10IFQRrAFflKwOKIAYcVAMko?=
 =?us-ascii?Q?ZTYbYG/rj00QVAwYsWW2TeF9VN2ujziFjS3Kb4jlQN0iNUwc7Q0l4boCv8vx?=
 =?us-ascii?Q?xSyKAyuR9I9y1hc4Fe7jbXaoFP/rMcDj5yQrrwGhX3uA1OIGJBWHhDuOrV1C?=
 =?us-ascii?Q?Jf+vQZxIquzIH22Hy4KrrZaOC+0iJH9iIYHlunRwYX0p0a2tfOkgKroNCV0Q?=
 =?us-ascii?Q?UANsj9saSnMcz4tuxmW0foSu+8uK1hGWCd3ykosHI3ceQlkIF7UYjwPXHCMn?=
 =?us-ascii?Q?/LTggwqhp2sJcSyHGvDNVNJFy6QOKHwkpHR9o2oPDmMHrFdkx6ZjEgoXVSTf?=
 =?us-ascii?Q?6/tXeWCIfy+Sfds4f0yek+NP9YkOJ2atYdDqNCovRhZyFJfUWIHwtQakAp/A?=
 =?us-ascii?Q?+575+Ff5d1MXW2xqLNeD8ZvxAOOZXyIitQP90gAVx2gzXEm+UaAM3ezA7NK+?=
 =?us-ascii?Q?LxELk4YzsK4yn0D988Nete9ko+a+B18RJ/mK+OLN06IdNA5hcwcwi8wAzZMY?=
 =?us-ascii?Q?ii4jt6lMZBSQ4jFtP+JUp8WzLn1c4Y5iWKE/6VDSgmLqokyhShF/i1H1C75F?=
 =?us-ascii?Q?EzkI7shKs86u1mukwskLsK+ph38Eh+oT1B/OjxopAaklAKVBbbD0X5FI9e6K?=
 =?us-ascii?Q?eleQcmbHaRIuw4WZ0R/JICCBVP66wcyYHKCWdPsZ3vZiEOghnBzZRXnP45Ar?=
 =?us-ascii?Q?N9LQGiC5YVlBuPdebcRX+8QRKzG+xuB5gD5+OTYIiAHpUgP2XdUEyxYWl6Ei?=
 =?us-ascii?Q?7NQUcNj9BRlEWy1hueSkYM/UYDrN0+u00tODIRCR4/pYUkjAbvOlgjA1iQ5i?=
 =?us-ascii?Q?b4u4B7aOEJIgBvaHv+er1gTkDYQKGb5fxj1ATMKdDdOgusPgkZ/4F5VLI/yA?=
 =?us-ascii?Q?cKjORPfq0yk8cyjuSuZ8jAt6MRFe4cHU6g5HSmpttYUFdnKiFmWw/fh7M9pq?=
 =?us-ascii?Q?cEF7XqmmOMNXawRZEVk4PzER1Y+PPtGXZ9Ki0XER7V+8q+2x6D6UlY5L5ef2?=
 =?us-ascii?Q?okBpgCHv0XiQ0/4CyyoROmMhnNZbrxhofEqj11yjfIX7L52sq2vEmaYqQ/Er?=
 =?us-ascii?Q?j/jwPa43TfDO9/qfBqYw8cmgnyT94evG3uudkaRai/lNmiTO8MSl9T+sNHWi?=
 =?us-ascii?Q?EQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: o8NTy1vScuBRiOO5Tz9Hl5z80l+hQ7I8uMr/tF+yzDappbzCkhQQGrFzohGzIKlA9kTsvjOARK2z4vaLfXugvTuZJdyC+nkOFETQbpIJ1uTw6ffPjo9TsfUhI/rHKuL0NeXPJ56+Qzht/y6FVGii+vRKqOkbxhm9z/1ZCjZVrQl0t/N0WPzxCq4Xp+dEjl7tgtCsoLUP9QZjgezZ87i8b0vcPuehGXechVah9GLYKg7F6nSjLY8jceuubygHI4NeftMWWa9IsZUDSfDz7Y9ow9fXV9cT5Bod11YhJLDnEx1Pl1Z3jE30ljz4bwMSQgwCVqyytHjZT1J9OuHoJzrRPr2KOePUDEHm8o8tQfWmaV0PNnsYVl3mXH7mJmb65zlZ4FI97jsojNXWnDC9utmeo8BSAD1hCbbHEbXkOLjFdrna6+HfO2+D1GUyqrcBuE8dseTYcK3Wjbz2p9Ward98knO0WZSPY98ZZH3Lopjn0YX2pPixljlybjK+22ajv8lTVlDL/RmJBH6kllAWZ10iadCKc5OvuqBufJHMuNXC+1iTwWiZB6e5AOvCvbXUdzfz4tCym/m0ubHHCK2MbXsODgA04iC7V2Tgphjg9nIvXjPH2Px2VIjJzLhG62ZfGmhIKlJylN6wFnmbR5kk+EdGQMSUowO0ARi+IlVKFkq0rcS+UCGIkq1JI0KyuLeCnuClxijHqHiYPLPpWozS391dwDm4cTI4ECUpp/QNEPW6MCh2i9CqtUdODDhw4QWN/0MEVKrQcMAF//JvzgATrNuKBNUO9RGyxDCsRfzBRk/iJNEOlwkUI5nUWAsTgDuFz5rYXRke67hAS83x3vqmof1TA+QUDzE8T5kqDnF7flL1omXQmekfEZiGu+svejbRaWB7/KdPSVTdH3CXtICWmTcmBQ==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 41f3a7e7-d6b8-4fb9-d1b1-08db5315b33b
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:27.0594
 (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: JZBNaHjd45ZOFGepVvbetBfuuVNEayvIg3M4WT9vItOs+fYwjkA+StM0DFlwTggy9wupWk4dpaRBecMigwnmaA==
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: xYSOlNajnFQJ0zrI3hZjAm4dPWVKGCYP
X-Proofpoint-ORIG-GUID: xYSOlNajnFQJ0zrI3hZjAm4dPWVKGCYP
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