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>,
        "Liam R . Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH v3 09/35] maple_tree: Convert debug code to use MT_WARN_ON() and MAS_WARN_ON()
Date:   Fri, 12 May 2023 14:20:10 -0400
Message-Id: <20230512182036.359030-10-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?NIJZfOQl3U3NRMWb0mvcVKVYLjLSu/6+xDMZeyiC3blzBV4cdrR4Wm5epoq0?=
 =?us-ascii?Q?hy8N1mLw9pnll0IUOCWQ+b2ThRTJBE0CjTbUc3dXZC9/ShdNJoGlgnCvn+iy?=
 =?us-ascii?Q?CMD6AfwgcZImrn/5ak2nuvPQn22//5moE8xyueFx56Jl8lGzE6IHLGSVijM3?=
 =?us-ascii?Q?V5qxXfJqzhQ31h+5mkUJ+41Lkp44ZVpuEx/PPpNikP/bkPKRdKzZhajpvv8n?=
 =?us-ascii?Q?GD/qrLdGlhLasANrPEmpe5prBH3cjaah6vEKvOFq2fAKB4z0A566mQVrZAJw?=
 =?us-ascii?Q?HfLnT3g4/VDEJoFKPbzFZdJUH511oJr+B/JzPfUz1vs9HSvdG2L1iKx4oMjR?=
 =?us-ascii?Q?mo0UVeC1l4E9fJ+KExmzT4NlwnAtjf5jfMjQvbzblvP08zzQCcbjXgon1nXV?=
 =?us-ascii?Q?WOX2uIZpAkBP1/Tgc/j7AnL3Yf+Br2Wz+8yhVU3iVYf/SSgb2WlUcdHWCI9e?=
 =?us-ascii?Q?x/Dqx87GeGNgHCOKkGUS6DHCmZYIIWkPdAOzaaNY7Nlx+cV4MeCmCEiieFSs?=
 =?us-ascii?Q?TbOrrZjyVVLrQ/x2+f3dSMhSMHwcKaZEyyX3UjWjLJpBWDKTsgvDPMxOGNcw?=
 =?us-ascii?Q?BIzfKEnhtSeutxky3M7pp1J1JUJiAoUuhl6LRyDLzw7WEqhSj9PA1NYI/ZJt?=
 =?us-ascii?Q?yBRHS195mZT6cccM0HeKK3Q49dWCHi8WIu30vCO7QaZ7vakDJ0A/3J9ByMAM?=
 =?us-ascii?Q?eGvO3CnVkeHnOEav7UefliUZmTgNESkox6cNbLBWAmnrP+724hkb+2iv1JVP?=
 =?us-ascii?Q?WhyA6jCXNm6D9Uud5syQnLZsMz1D/rOzGrgDCexv8KjcotL4t+XTkWNSJxRg?=
 =?us-ascii?Q?llz1aRpjJnfPT8RapZ3FdrsAp/H0kIEsznTLcUO2B+ZhfrQaPlGYrh/Oxg/X?=
 =?us-ascii?Q?h8YGCT+yLz/KLQR8jnppDysAar7lu/223ictDAzo2ugF0qiWo2vsCE3h+uV1?=
 =?us-ascii?Q?fD14FjNpH8qU6HJGjk0ZQiHD/45pQNDEDYoeL3HTHcln3Wn/hHce6m0RSVOj?=
 =?us-ascii?Q?iogX+rXQSi5wCUFh7FsJkZSAWExmInMP21Y8+2CK2PsIbRZZEjA33SWdbYgP?=
 =?us-ascii?Q?mprbkTrGWeLIftGEsuRgKgOAHVz/8yPkkaYdlQHy55cf/rs8Baco5CZRIRr9?=
 =?us-ascii?Q?CmYPGMHsZmdC7hfJwNyEAxARay48a2QOEavJEGtrbAXhv4glOrsPtbW/Sx0H?=
 =?us-ascii?Q?v2D1BFtp6SG/ftLV4PGm9gRlTOOPyBs1/kH6i/WXPjUaF1EQGlwjdE0/9vGG?=
 =?us-ascii?Q?P9TblcwBqZV5EWQF0KG5Xw6IZuSZxEL8iIvx6slNm53af5eaM3ZnlL7ghmRm?=
 =?us-ascii?Q?epfPNvlsAPqQJla4iYNu/2jcrTlzi1P55ZF2zwzeIVkeDEliE/FolaJLDzN0?=
 =?us-ascii?Q?UTsXBSQX8uAbkrhPVUsaT18+8TVtyBND+secnn2IAAIa0oe1e1uWUCLxTgJ6?=
 =?us-ascii?Q?MFuWTCAXdkjh0LL3GGVS2PIgK/G7DyCxyDZey/4zF8R3MBFrpF3/fvW4Lvd0?=
 =?us-ascii?Q?VWovdM+7TxcPfC14Vg0KqBJ1HdSrYk3lVZ6TKjLg3/E0yG5VMcEBUocw/6Yy?=
 =?us-ascii?Q?fykVmBkT7sZxqam/JFzwFdQ0KoI+XBF7dwFFbh2nd8LuH99pfxnLzo0wCbO3?=
 =?us-ascii?Q?HA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 9Gu+QEPkRgjYpRywp7QhOjXCGEkdBB/dPQAHihRou2qUF7zODnGGP/+WhLomOajj4id3L9XkS0DHGu4/BHRgoykqiSSrB0LU79Xq9/gRTbTVXqtzqDUI0l+wIxjRO/jyaty9h1QCdVwbKDfnJ8kv9dkwx2wtK74e1/OThdL5Xqc2k5j2lHiGMGw8KxXUMZ7D1LkqH9VQmznhOpkLgOx6oNleht4bqht78q1JLiPeJipFNZzLh72HmZgTVRYLVSkXPtjN9BL8us3O8YcCs8eMVbyw6igobkGylW4OZewQt4HYcEJIYcbKoo4x+HwFl6iHEZhRXGzc+1m4wL1UI/oyKmOm/zsM21rCK7stcKuLrpMy5Ykd1iW+g7XxCI3osGkXPk408R1wsHupJvikdBD0WYPTgUb4evH/LMgPNehwkzTUh1NsbBY0SjkzY2imX+stFoHR5TJiBv+lvyNvx8SiuzXskf+koQAs0h34deoIb7XgZSP4/Abd33Gnp/+NLKdJl4jtucdeb8OdWehEUmRkCrE9yeT42KLqK8/qS4EeFEL7Smw0BamHkJ2XzHSLdv7Q7ZjBYau0W1LDPfzeZGWTTWKgC6nf1CGeNfOZNWuza+4nLhAkD+9YVHDZTKwTCHW72pVvoSVaWYgTag97kMZkqzQX//ru7fZI3OwmgjbHLz8EdqKudRq8f/CIRlvgTPigMAI2ioDtTPrHWj2wZ4uNZdmdqJuPaGHWgroCaFDscaXcXJflB/5pTQ9H2ydM7kx0PnQkohnkO6lw8itAkk0zLtzP/bZ3ui09nhxwHLALXeY4zqD20MVrn1q69ONY6Y8jL5yjz1ZaAlD9i/t+b+VdYTWqA+dPF4kn5DsNCTMRQrMlnFjk1svC4O2SAqO8O2d8jwTR2HQ7PcuP153VsPGKUg==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cc8385dc-dca3-4afc-160e-08db5315ab62
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:13.8790
 (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: kQ9o4o3INAtCaW8ujKhBVsFxzOW3V4uRpH4JEgCGcEDEd2J0aziC9T0rkVvlOCnmzGbb+HX4jSpMAEJrS9NKYg==
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 mlxlogscore=999 malwarescore=0
 adultscore=0 spamscore=0 mlxscore=0 phishscore=0 bulkscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2304280000 definitions=main-2305120153
X-Proofpoint-GUID: 4A_otSfq3BCvFwcrPSxyoZdN5gDbAVIc
X-Proofpoint-ORIG-GUID: 4A_otSfq3BCvFwcrPSxyoZdN5gDbAVIc
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 c3ce2bc594123..8fd83f21caf00 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5698,9 +5698,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;
@@ -6529,10 +6529,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
 	}
 
@@ -6678,7 +6677,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);
@@ -6689,7 +6688,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);
@@ -7133,18 +7132,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)
@@ -7167,7 +7166,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);
 		}
 	}
 }
@@ -7226,16 +7225,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