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>,
        "Liam R . Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH 09/34] maple_tree: Convert debug code to use MT_WARN_ON() and MAS_WARN_ON()
Date:   Tue, 25 Apr 2023 10:09:30 -0400
Message-Id: <20230425140955.3834476-10-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?RwIIdaExrx/wPTlZG0dy2F5q4YrrjYEuz9AoLvH1kzonWfzi05zeBiJEjHbR?=
 =?us-ascii?Q?kzVHv/hb0VIZxRks8bvhK9Ht1/GEzjrD8IXR68mW5ViwxGCiX9mT83f3nHKZ?=
 =?us-ascii?Q?rnyBrdFhpX6M/wBmZEfQZ9WA4qAXrqUcXi59c23UnxmXh4Xw5gRik2wKNRgA?=
 =?us-ascii?Q?niBsGKS8EMY7cN567NuqFm9SMjir/TiKfrntehgeXEr/Kw+L5VlD6zObhmHT?=
 =?us-ascii?Q?hYSebCqkBo1eQpoZxCKv1+hIS5Mo9MhPZ3pqBLbbnuSnruhiD3AkYn2q3D91?=
 =?us-ascii?Q?lPsiHjRP44OeWFO+iG+WLKjP+iX+RQvF65U2EV+ioUXtsIwSY+OFHpJJ8Toj?=
 =?us-ascii?Q?E/Ai9/CLVkc3ia1jBPXDyiArUVfxaWwaXE/51IH4QLKF+FsV/eJWZuQZCx/L?=
 =?us-ascii?Q?abnLdZV9boTQd86ZYHL56ywkgU5s7r1f0mEuVP5cPGPZKCUDnaSrhjFZYAIE?=
 =?us-ascii?Q?EFGwoMt73T7ElfmSckSfzpZ4ljm/+Cdts9QkoY+a8rtylap69cz6AA9MpmFS?=
 =?us-ascii?Q?z3g7lVu9cNsBUnsyUPzwMc/I3De8SNM73Fk4Z63UUnUpUbD5r7uDOTYZqaqy?=
 =?us-ascii?Q?KqOaDyjLCFIxZCU9x3HdbvCMHVdV8tvCYL7qVXFe6tQt5vt9f1E/KdqIygUO?=
 =?us-ascii?Q?BCgcCa+DakyRSGyn3qfNQGYHWcYSWGTUZn+Uo37ORGrsrLvPasbUjbiB4qrQ?=
 =?us-ascii?Q?g9uS1qKbtmULDupkBlEiAoby1ZXgJ6owiaO/HR3DR8F/5mjsU/3VM8f2sTi4?=
 =?us-ascii?Q?qM9CLf6xP6ix8CT5efQcV8Px1QGjiuNH5hswHtO5eveYT2DXGEJRd7Is3p8I?=
 =?us-ascii?Q?weyI3h2RwcK0XDy5CUCp+y95wX/X3TDUXUZBLDAYJQ9yUofhk7DpsY9GEZ6X?=
 =?us-ascii?Q?B+NMMzZncr/+gNeIyxTfod7D28VPnUq3ptMMYwAxnCtYM6Z9Dajr63QJ290n?=
 =?us-ascii?Q?oRKgHk8ZHQhSoMti9zYDqu3Gg6a10gKLtQthfbYxGylDqkxuxgiFHLVRh38r?=
 =?us-ascii?Q?xkVO4NjlQT2rHQUDCk/LC9af2dV0hilX3uECT10WjDic0/TrgupAMDKnhcaf?=
 =?us-ascii?Q?LRMULtmRERqCqtj7TYUyWUta/25IQVaisXBw/yeK2G9xcycz5dfa+aesw6Bt?=
 =?us-ascii?Q?rKdb2xXWrqoRuM3U4yn2yL7DdeJZNaPKUR1qkHwr78qIdxEOTUVCg/N57qw3?=
 =?us-ascii?Q?dGJfgJAhJ14ZrkUo1TGvm4UlVU9JyY1B0vJPdC9z1UpXry7bzwdcG1qWHF3Z?=
 =?us-ascii?Q?YOOFnMMDQdGN4Yg4lFFRidFyVp6SMofU8LUTmddGkvkiX7/5B7sRn1PjTqRt?=
 =?us-ascii?Q?976tDXfoaaTacGnSdOf7OHOWo5M4Jgxkxsla1rftoofkpkWgIjVcl/ILN6Hj?=
 =?us-ascii?Q?cm/Gvyb5B6c8mWH3czO4sQvpwe41TVExsuDZrq8WFsXIL4jCuKark+2bn7T7?=
 =?us-ascii?Q?PDplyXxJoUD3ZZRYWoQscfkYrTv5L0Z6J5x0B8Jl5Fjpd+73NEw4Jqz0WX8I?=
 =?us-ascii?Q?EBhYlbGQbpvv4WcnaC8g7KBYgeQi7AVMS5pIfScx6+5ZCcL+0CZOdXPMHP6f?=
 =?us-ascii?Q?+K4WVTiI9xuyAAR99cAnIUGVdjpLMI0ftW1Vc4qEIcUL4gHhQUmzMywXFKZy?=
 =?us-ascii?Q?nw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: W8HJUHT1x9IrnTeVlUXIWP5NrF8vOIljpWA7kk7BCtggvonpJk/DD2/y8earwYs0JltKvZHp4BsWwA2iCaU/tj+GBK8v74Ych3tyHJP1SIYRBOrlaKCrRxWbfJrGkemLHHE6lluAzIXH4vSP9rQ9QhhTJzm50RmluPBWofpAHKvS2umodeniEIqdNBovzxt2zRoVYhXco2U5rYPvS2FHtB1HCSnNb6kQVxwN2n5WWOtFSvcOe/QWX45fRIXAefN7srTswS4thwmZWxfqnyoj5yuL2+yzo7MLm4zILn3REziHVZTZb6bSpcfEXIWCgZikNxl8J844qp7Cgx/1IcBUVM/TwfEiU8GS4bB+UHHuW2lOQjHqY5KEAvX7ebFeJyVIzzZgFQyaAxd/8OveuyAiyeSzVFvp4Lk0+xCCi90syb2ZRd9ZnZ8LJoV5d7bEpLPubknSEHK9fgKnGLf2R7QjbigOPPMWdB+sBdmuUe1SsTaUWZ8qS4FWG3leJWwhhRV0fRI3si4sKUJZ0nnm8R+S9ZXmaupz3efY+Yj+zRl2ZjvoL95J/B5gWGAHY2iA076qzb7lUBslq2X2qtUfukeDwTX5QQ3G1Ki6n4rBBUdBL+4JW9bMuk9YEdu8ImeRP+iAWDSzZzbrl8ec1Q8G7ixIGgDudklrR2TUw+Ks1fgET/VBMuETihzkp34/GvxZqbToe9U0Ss1DXo31BazNIsaxP+3gm87kvjPeQRgACZmV6HWx3fiPMm1CmUh4kbzp1M1gIU3Sp1nBxiExWeUFMO0tevHOSy6eG90LY3QYxnKpP950/uYfE1k29GYS/RP9nbpjOqYstsnrA91zekFybmBmeN/U0MXwZQcjHCgwIc+AiQ1DRWCgxb49/nztUC21IVuoZjJkPk45up5mc0JAi2cyDw==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 02409481-c407-4bd9-ddc1-08db4596d9c6
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:40.5061
 (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: ZcOeidtT3KyzcbJtDWuur7kTqo84HOUhF3VFRh63BCzbnECMmJeXgIjCaCTVJB34vnmHoZDI/lHYmbd2Vb0F+Q==
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 mlxlogscore=999 suspectscore=0
 malwarescore=0 mlxscore=0 spamscore=0 adultscore=0 phishscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2303200000 definitions=main-2304250128
X-Proofpoint-GUID: WOrgBsNIbS9dHqb77X7Rz5YXewIieZT5
X-Proofpoint-ORIG-GUID: WOrgBsNIbS9dHqb77X7Rz5YXewIieZT5
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

From: "Liam R. Howlett" <Liam.Howlett@Oracle.com>

Using MT_WARN_ON() allows for the removal of if statements before
logging.  Using MAS_WARN_ON() will provide more information when issues
are encountered.

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 662a9ecccecbf..d22a337e9cb6b 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5699,9 +5699,9 @@ void *mas_store(struct ma_state *mas, void *entry)
 
 	trace_ma_write(__func__, mas, 0, entry);
 #ifdef CONFIG_DEBUG_MAPLE_TREE
-	if (mas->index > mas->last)
+	if (MAS_WARN_ON(mas, mas->index > mas->last))
 		pr_err("Error %lX > %lX %p\n", mas->index, mas->last, entry);
-	MT_BUG_ON(mas->tree, mas->index > mas->last);
+
 	if (mas->index > mas->last) {
 		mas_set_err(mas, -EINVAL);
 		return NULL;
@@ -6530,10 +6530,9 @@ void *mt_find(struct maple_tree *mt, unsigned long *index, unsigned long max)
 	if (likely(entry)) {
 		*index = mas.last + 1;
 #ifdef CONFIG_DEBUG_MAPLE_TREE
-		if ((*index) && (*index) <= copy)
+		if (MT_WARN_ON(mt, (*index) && ((*index) <= copy)))
 			pr_err("index not increased! %lx <= %lx\n",
 			       *index, copy);
-		MT_BUG_ON(mt, (*index) && ((*index) <= copy));
 #endif
 	}
 
@@ -6679,7 +6678,7 @@ static inline void *mas_first_entry(struct ma_state *mas, struct maple_node *mn,
 	max = mas->max;
 	mas->offset = 0;
 	while (likely(!ma_is_leaf(mt))) {
-		MT_BUG_ON(mas->tree, mte_dead_node(mas->node));
+		MAS_WARN_ON(mas, mte_dead_node(mas->node));
 		slots = ma_slots(mn, mt);
 		entry = mas_slot(mas, slots, 0);
 		pivots = ma_pivots(mn, mt);
@@ -6690,7 +6689,7 @@ static inline void *mas_first_entry(struct ma_state *mas, struct maple_node *mn,
 		mn = mas_mn(mas);
 		mt = mte_node_type(mas->node);
 	}
-	MT_BUG_ON(mas->tree, mte_dead_node(mas->node));
+	MAS_WARN_ON(mas, mte_dead_node(mas->node));
 
 	mas->max = max;
 	slots = ma_slots(mn, mt);
@@ -7134,18 +7133,18 @@ static void mas_validate_limits(struct ma_state *mas)
 		if (prev_piv > piv) {
 			pr_err("%p[%u] piv %lu < prev_piv %lu\n",
 				mas_mn(mas), i, piv, prev_piv);
-			MT_BUG_ON(mas->tree, piv < prev_piv);
+			MAS_WARN_ON(mas, piv < prev_piv);
 		}
 
 		if (piv < mas->min) {
 			pr_err("%p[%u] %lu < %lu\n", mas_mn(mas), i,
 				piv, mas->min);
-			MT_BUG_ON(mas->tree, piv < mas->min);
+			MAS_WARN_ON(mas, piv < mas->min);
 		}
 		if (piv > mas->max) {
 			pr_err("%p[%u] %lu > %lu\n", mas_mn(mas), i,
 				piv, mas->max);
-			MT_BUG_ON(mas->tree, piv > mas->max);
+			MAS_WARN_ON(mas, piv > mas->max);
 		}
 		prev_piv = piv;
 		if (piv == mas->max)
@@ -7168,7 +7167,7 @@ static void mas_validate_limits(struct ma_state *mas)
 
 			pr_err("%p[%u] should not have piv %lu\n",
 			       mas_mn(mas), i, piv);
-			MT_BUG_ON(mas->tree, i < mt_pivots[type] - 1);
+			MAS_WARN_ON(mas, i < mt_pivots[type] - 1);
 		}
 	}
 }
@@ -7227,16 +7226,15 @@ void mt_validate(struct maple_tree *mt)
 
 	mas_first_entry(&mas, mas_mn(&mas), ULONG_MAX, mte_node_type(mas.node));
 	while (!mas_is_none(&mas)) {
-		MT_BUG_ON(mas.tree, mte_dead_node(mas.node));
+		MAS_WARN_ON(&mas, mte_dead_node(mas.node));
 		if (!mte_is_root(mas.node)) {
 			end = mas_data_end(&mas);
-			if ((end < mt_min_slot_count(mas.node)) &&
-			    (mas.max != ULONG_MAX)) {
+			if (MAS_WARN_ON(&mas,
+					(end < mt_min_slot_count(mas.node)) &&
+					(mas.max != ULONG_MAX))) {
 				pr_err("Invalid size %u of %p\n", end,
-				mas_mn(&mas));
-				MT_BUG_ON(mas.tree, 1);
+				       mas_mn(&mas));
 			}
-
 		}
 		mas_validate_parent_slot(&mas);
 		mas_validate_child_slot(&mas);
-- 
2.39.2