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 v4 14/35] maple_tree: Use MAS_BUG_ON() prior to calling mas_meta_gap()
Date:   Thu, 18 May 2023 10:55:23 -0400
Message-Id: <20230518145544.1722059-15-Liam.Howlett@oracle.com>
In-Reply-To: <20230518145544.1722059-1-Liam.Howlett@oracle.com>
References: <20230518145544.1722059-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?VVWpvfEsmBpmTEuKp2WMeWipyU5IXrFdJcz5uvY6RCrwoFbeSPoXHmMHQdRR?=
 =?us-ascii?Q?NV+V9YlEDW7dA5uuHieuK8PvbOepGePo5LGhdd/z2fDeTHu84v/TXq3mpGhE?=
 =?us-ascii?Q?QMGMeA3tlq8bCK6iMXJKHlZtNjx2b6xCgnIS1pfmDvcGxVqp+OzEoHHgDlCV?=
 =?us-ascii?Q?yd0uPurUml0IypNR6Rt9dfd68lThgtsXFb9ZecruYW5gCWZCqUm9/ZitmvU6?=
 =?us-ascii?Q?gmSwtvxGySxIS8K9lD6PDAe64aqzDizETFL5bU7cK8VWSi2GgtJhttmYXnrx?=
 =?us-ascii?Q?NZtODL5vxqbuULy0IwHOS7xntEuslAXRoCUTqWENVpf96sSpruNLg2eujSb4?=
 =?us-ascii?Q?IqYPbzkHgnwwIufeG6tVjdQ+fi2CvRT0phL335x0xWSXxHEsYM9fg7IUuSlU?=
 =?us-ascii?Q?FxQgGtQZ6EaRe+mPD9ngg2TuYeMUYXxjTkDDZKRVWYIdH1qyKVutTFhAZbgA?=
 =?us-ascii?Q?0zxLxsKYE1jnBP+nkk6WKv1UnqQ7uyN50fH9ksqKJ5WEqkjdmd5/1XAAmtXV?=
 =?us-ascii?Q?Kd4S4cx8XTBv8z4qWd4dasd98Yeg0Q7uZGNvRSfBHXWTEHqEv0fHdfPXOEwl?=
 =?us-ascii?Q?Jkqlr/sMmOJTrbS3IvJoWj8lMF6tRmDFvSb53yDQKY5vf9FMOADuihoBXNzQ?=
 =?us-ascii?Q?xiEbZLLqCLrdNk4EhKGYObqXZLEmLW2vwOQyq+k9IRVNH1Eg5iHSqa8zEzgU?=
 =?us-ascii?Q?sXGzviZunTJjWU/Iost8aDGp1mVwO3F1DNPiIO5sRq93BAOUVuf1MybB4qP3?=
 =?us-ascii?Q?MTvm7VJVwEI7VX5R0ZjNlphj3j/vGsp3Ro25y/Vv6YUB92DSq/wUfODZF+Dl?=
 =?us-ascii?Q?3ZpuQTFxtv5PW0jo4gTp9I97C270dppysneo8KgaXvlitQ7FTYBds/KUjW7J?=
 =?us-ascii?Q?8jkC+UEQ21o++pwiAZGB2p/T60ckDQw5Ug1xbHCNUWO/ynXBjygmNGiNGNtM?=
 =?us-ascii?Q?uuWSUwNG0QaD/+w7iyV23exbOTz5KeoJCDuDCwPjVd3CBc/d1h48iJUDCFf6?=
 =?us-ascii?Q?uWlcSmT+Ox9UFfpoyjQhOROkkO4YBolZFpcQlbmAlnn5295truEDOxMFvBlt?=
 =?us-ascii?Q?xvxLQgyFo81TZZ+eOTockJdbZIQbD5JJ2qPBpDGu8E/qBIEMsr0GRAdSPm1E?=
 =?us-ascii?Q?b9T/adrd1SrX9VAtD45HOkO43Do/xj98wezsXjVwtzWuK1GBiKtfQIuiy+8i?=
 =?us-ascii?Q?PbsFaGOqZoFGcCZCwS6ze2WMMvqBU8RbWAm/llUrX3Kebg7TshDFS+igDGMA?=
 =?us-ascii?Q?jXWh86l/DW+qbKFoFn7x5RvyfbPA8ckR7Owc2bIP3+AmdfmpMqIqwioG583I?=
 =?us-ascii?Q?EkDG5iS0p36lQfUxNmjiEtscaQfnLISji+dzaP8bysufZcM8KVrz4WvYeMSh?=
 =?us-ascii?Q?KnCtdiLitKkexvC0R3VF3bmLzRNqLgOsZKMzvofTG0SpAM6ACfxUrc9UpJM1?=
 =?us-ascii?Q?mu/wMgR2gKLV2fv0wx1JRUBd0zKbkvvDBTYZVBIQNC7aYOgYhfM1WLYqbvpk?=
 =?us-ascii?Q?CKJV8XBqJQJeVZHFXp131TVaskisWCxq0P5RtSOW8VuLy/i9h/1TQjc+5OM+?=
 =?us-ascii?Q?wgC8cBi2ddmPWAqWARoZc+6EqyCiuXKNGZU9lYDu6XvbGA33BviQEKt7qbol?=
 =?us-ascii?Q?EA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 9sEC34dFuew2JZ4yQ8hNGfexZxdgbV/AxIkjDuV2x3S/oInh0MjzAL9fUnwiSuVDiOx57aIA/yWAu+yXlO6oahSWO+pGoNAa7ENh72tJao1t2ClrxVIllk/qCqO7g+u6zWs7BVJHEqJb2F3BUi0y/2gt45zpDPw3Lw3IWuLfgkapy/fSGaYG5Wsa4r1dHLcnsP+yNp9EPyYjzM7CTX9K2Ln0QOb0fk3SLzdonj7aTxSb1ea1p/rXr+c5TDSStSX35PySZQzDZi0sNoJl+kJrx4hjVMcqDlPRvug/S0uQB1hUJAys32rl3d+knFEkOayJZhwuBcX1Nymg1XvI1s+gtLAYvnv6DCn2X5jOZJnjTQTw+wlwDYRnY07OfHT7CkSgBL04Zr2S0n5+Q8yyM3IdcoFlt54xe+zYj2qB3eq/N1/AYlWu42XWawhcGjJ2DHUxygAlhznUkIyNigv4WHkaLW+vh51h3+A0VQSWhjYTiNiiyD+AYYpZhZYMGgcs3XbP09SDhUO+sSou4vVYNVlJzqPEdTnPHeLHlbezV42PbEp9AdrShNEjNGZnfVuK3LIsimnmeiZhBBHrfWO5slvB9H2YWg6Y+xFuwOlIOXmMolvcgp5r5RQGjBs8S+lGJapiSA5Y4+kuqSn6gI9aZ3TZUBY9QDOruehSKVzANsQ8p3NcUf8293LHC2fA20LG1SCbscPiULaXaMRvh0PshsgdfCqpijblQuNZmOleR6yZm5RrLwcWr52wfe5Cx9/6BDuikLw1o1xA6SnQse8+AF6oS0bbyrnlz1SkLNTiML+MiySQH5Bl8DDeE5omBUvCmW6im72/vm0L7afUwN00clkPG3oJAx0dbjLlriqi2lgA5iBj3MEQ3OIjG+V4KC0y50yTqqChuB34J7a5003UnI56nQ==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a2aeb6e9-7406-4004-05c4-08db57b00bd0
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 14:56:22.8113
 (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: HWBpC/bGZY9Mcd7Aira1dXfUKpOi+HtEkgsNZ8H3IKa551kLKZeBrwvF3US0Fgln/p7e6wc5DTRRntMSrfUsmg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4347
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-05-18_11,2023-05-17_02,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 phishscore=0
 mlxlogscore=999 spamscore=0 adultscore=0 malwarescore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000
 definitions=main-2305180120
X-Proofpoint-ORIG-GUID: hCMlzqsSuwi1bxTbegoNwJmik0KNaLfn
X-Proofpoint-GUID: hCMlzqsSuwi1bxTbegoNwJmik0KNaLfn
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,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 d5ccf7bcf3b5..d7809a7000c5 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