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>
Subject: [PATCH 16/34] maple_tree: Make test code work without debug enabled
Date:   Tue, 25 Apr 2023 10:09:37 -0400
Message-Id: <20230425140955.3834476-17-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?SoO0ivU+/nGgqA2FYqeZ13fSoX3eGGKHbrvKC+qg1Aweh/4NcqIDi0f9gXFp?=
 =?us-ascii?Q?yq9zQ9mVg7oKdpQ6Nc0rck92H0WmfITH1Kr8OzuA2+pNMR/3h59+FFWSUnUm?=
 =?us-ascii?Q?mMnC3clq8t6ouyVuvm3Al3MXf4cv+fKnBnJCpky+C58DN1RsPmvZM4Ff+DMj?=
 =?us-ascii?Q?sjXbgP/SLTLcUypIdVBsqqM/gytWwywcyTf9lFyL5pW/+4v3oPaZZjYnKPGk?=
 =?us-ascii?Q?Rx7xyZ38jpH2UYx4johTU3KdWJWikaqH+YybqcmZx7CmVpG7H0T6sKb71REE?=
 =?us-ascii?Q?GdPGjaqni0iT/rYSvAnG5QHGTHUjVXFY02sUCNlYJ0ios+p3x3Zyu892xoHq?=
 =?us-ascii?Q?J2uCyy3FuPrBXLRrw8P+qHdOvhKEZbtPEd/5l6D16lXpwFXKboFa6ivpW5mh?=
 =?us-ascii?Q?BGODIf4dy1RAr2F1zYeZIE8wtKa795Qcac31i1bnePNVaOaVQcqUtbwzUCuZ?=
 =?us-ascii?Q?s32sY2Lokw55og0dMVACu7CZfk5Gt5p/eYn/2qPJBk5Fxg2ZI/4yEF14BDbM?=
 =?us-ascii?Q?rycRNVAj1AUMT/Pn6WxST3lIEkgIy3/yESe+qJfDC7I6bqD7IT8E9alRwKNw?=
 =?us-ascii?Q?T+tTeku9oTCitrH6Lqiq5/dru1v6GBTMTpRGAPjaDwjXtQ/1+lcSQRQqBOhV?=
 =?us-ascii?Q?BK8zEIFj2o3GKyl96d2vCzuJeuGnS0IOEnOOQD953hKfl6RbaNjQkEUGTOoD?=
 =?us-ascii?Q?UIcbvFu+YjPGqzAxcpCfkia93PGHpXH9uenP3KbsT7ICl1gRNN3TEm1OngOV?=
 =?us-ascii?Q?mkDG13r53g7GH6uDh+2nh8PP7i1rWs4bfZtLZ4wcCnQeNR+vwlklCEU248Cv?=
 =?us-ascii?Q?vGkuh94hNXP5tEyMa6l/DRDGSGWBoxkRP7+JPgFMaVnpUcuXBw2kDxN21RhG?=
 =?us-ascii?Q?dbbWrAJrtIm5fjny9SOxoHHy+WK1AxoHzMATXkWNsiSSG54r2MsRXzP/u5d5?=
 =?us-ascii?Q?r+UK5FY9bjzJEOLz2ctTo2l9/GOQEYdQxDoI/T/67S7iZXelyp6PuxcB/Zg6?=
 =?us-ascii?Q?BAuFrTOd4RgyahQEThfY9UP6lIUy2GrP23/l922eWoH9ED682LKGVITURNM4?=
 =?us-ascii?Q?LQ4OR+wQQZ2jLxXaevm6AnQy2P0eMKmJXKKgycbCOJGECHQJ66UyO75wsUar?=
 =?us-ascii?Q?6VIVrOxCHMLcKSvPUgjX+5iGiwaTrnmFcLmHxwmfF1Ilu6YhtVJ5Ln81td48?=
 =?us-ascii?Q?aMi4Sbz/8FNfEUKCVL9tAfEmLE1pdXTwM7RE+t86+3PERscyRs6Cz38gXWLq?=
 =?us-ascii?Q?TstqofJ0Tkl1bG+FLFaSRZ3IKXPL4UvNPXNvbEYUGS7yO2xHdywqW3nGYWOw?=
 =?us-ascii?Q?QY6cx5u2QZCEnQQwqXycVy9+aWd3AHoFC1mXu82ghEuTCGSD5EuShYwPTtxP?=
 =?us-ascii?Q?CPs03Xk9SJmMHCKDEYZsmbGb0+b/EPioq6xSko4JvT8MdWTiHjYtAUZTl8dH?=
 =?us-ascii?Q?wBDuSGH/FJSQrCDNAtGEr21WkYJtTq/PnvXD2+0Oh5OZxdcC5C3JY5tiqHw5?=
 =?us-ascii?Q?liRRmvpEWfHh9YJh4FQVFmGnmaZ9e1SmKG81xq5NeENZ+oHJXVGWx9Nvj4gr?=
 =?us-ascii?Q?i+OcAkdrs5+YubjNHC8JWm2cUN1/uzs0R5t5dlV+LvrZTBZGkRbDDxEO2ggt?=
 =?us-ascii?Q?FA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: vn5tK7tYS8ZIGClwBCZkqUoZMPceYVbUVGMZCOQY74YVNLpNt1XmC2JubI6BoV8WjNp8Sy0DH+yOmD6Qdk3LskTXFbcCP0C9/cL82hW/LI/L6M+ApnMlNG7sMKW6Qe27yzS7/lv/pQoUAd3q+c8m9u3tn4f0ENqCEJQ06ZVhuHvBxZptnqtagzP2yITAmyPQGIhURNG1ImzMLg9ICdrZVlwxDDg9Z9PHAk1kZQ8JA8PC1XBpDdddvOsQULv79AG0nfc1pCwqxjtdKlQV1mG2FC6XH72ehpwZ8xwLuF0cGyrpWJ/R2nhSXReCFxILhorQOiV/BwzSRjLC5yphFR14GMVHY7ryKMvDdiRxlLYyNYohXXYL/pVkuiMv/b8GzNS553S0/zxd7ZfH2P3dqez8uX5y3bnWfEOcIOpEiu7yHw9waE5aNL88xU/fvAuytOnxQjopX+MNV6LJ76lKv+4ezHTqhn5o0nvMzRjFWG5XxRDKuSIWKQKJ1KCe9IKyzcS1M67sANskDVhOilRdTCP6x20x0749akSkF3ztLJstq4kx4DZssQQ3NUKI0bXl9lf2Ttybu0/c7c8aDV0JctMbWaqiNVxP+SlM06kUa9FPBb92f6Oyqo1Bvsf+9SZn6wOf8enPmUcKS8rGnRAXKO3ZPesf4L9/duHqfmD1EY2sRd1NDnq/0Ujdq8UqTibop7/QBPTALMcbs/FtYb8je7X3msYek1lg0v36m3Npsh3FycxNxK1FjJ9fon4PZMZvgR5U86Go0HpIX22ruKHhkiLKfqO8Nh8ffgYWLvQaLZNGqYDElF+IECbIOOhMMyNtaKuNtO4+Ro7Ut5aWSZ8BI6w7WI6HqXLFWMg7FCyYBb76omm78rpI/1FsnKnx+JZIzgvgjxMTJs1BS7WVMhczBDF0wA==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: af704e12-0371-41bc-5f89-08db4596e3f9
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:57.6140
 (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: yUeAJVh1cI2x4Q2lc+k10dzXcCuBpuUMtvAffRdNwW4Qyp5sJZ6jfCWhYKDlQZJKqtk2UK8MSVcTGkYGf3/C2w==
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 spamscore=0 mlxscore=0 phishscore=0
 mlxlogscore=999 adultscore=0 suspectscore=0 malwarescore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000
 definitions=main-2304250128
X-Proofpoint-GUID: RnHf_S6vxgSSqgrNiMM4amDHUD7O0ppE
X-Proofpoint-ORIG-GUID: RnHf_S6vxgSSqgrNiMM4amDHUD7O0ppE
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

The test code is less useful without debug, but can still do general
validations.  Define mt_dump(), mas_dump() and mas_wr_dump() as a noop
if debug is not enabled and document it in the test module information
that more information can be obtained with another kernel config option.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 lib/Kconfig.debug                | 10 +++++++---
 lib/test_maple_tree.c            |  9 ++++++---
 tools/testing/radix-tree/maple.c |  1 -
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 5cd8183bb4c13..11736e17a62d8 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -2281,9 +2281,13 @@ config TEST_XARRAY
 	tristate "Test the XArray code at runtime"
 
 config TEST_MAPLE_TREE
-	depends on DEBUG_KERNEL
-	select DEBUG_MAPLE_TREE
-	tristate "Test the Maple Tree code at runtime"
+	tristate "Test the Maple Tree code at runtime or module load"
+	help
+	  Enable this option to test the maple tree code functions at boot, or
+	  when the module is loaded. Enable "Debug Maple Trees" will enable
+	  more verbose output on failures.
+
+	  If unsure, say N.
 
 config TEST_RHASHTABLE
 	tristate "Perform selftest on resizable hash table"
diff --git a/lib/test_maple_tree.c b/lib/test_maple_tree.c
index d6929270dd36a..89383eedb70af 100644
--- a/lib/test_maple_tree.c
+++ b/lib/test_maple_tree.c
@@ -11,12 +11,15 @@
 #include <linux/module.h>
 
 #define MTREE_ALLOC_MAX 0x2000000000000Ul
-#ifndef CONFIG_DEBUG_MAPLE_TREE
-#define CONFIG_DEBUG_MAPLE_TREE
-#endif
 #define CONFIG_MAPLE_SEARCH
 #define MAPLE_32BIT (MAPLE_NODE_SLOTS > 31)
 
+#ifndef CONFIG_DEBUG_MAPLE_TREE
+#define mt_dump(mt, fmt)		do {} while (0)
+#define mas_dump(mas)			do {} while (0)
+#define mas_wr_dump(mas)		do {} while (0)
+#endif
+
 /* #define BENCH_SLOT_STORE */
 /* #define BENCH_NODE_STORE */
 /* #define BENCH_AWALK */
diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c
index ebcb3faf85ea9..cf37ed9ab6c4d 100644
--- a/tools/testing/radix-tree/maple.c
+++ b/tools/testing/radix-tree/maple.c
@@ -22,7 +22,6 @@
 #define dump_stack()	assert(0)
 
 #include "../../../lib/maple_tree.c"
-#undef CONFIG_DEBUG_MAPLE_TREE
 #include "../../../lib/test_maple_tree.c"
 
 #define RCU_RANGE_COUNT 1000
-- 
2.39.2