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 v2 16/36] maple_tree: Make test code work without debug enabled
Date:   Fri,  5 May 2023 13:41:44 -0400
Message-Id: <20230505174204.2665599-17-Liam.Howlett@oracle.com>
In-Reply-To: <20230505174204.2665599-1-Liam.Howlett@oracle.com>
References: <20230505174204.2665599-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?c2MOHj8wuPtnb6hy4CQ0Xf82O6ZqmJ9XJghZitue/6GYV3EfTt7aeVcERLU2?=
 =?us-ascii?Q?FYDa1SE0ek8GiekrcV5SVKfBbYSsdwzzOVtKzlyFqpzys5sYvvCG3GGDeCsB?=
 =?us-ascii?Q?PFuscM9Bq+v8s+TUNGTsOGnDgwIFGUsW2yz4hPSd6ZOb109K3oP0MGMHSa9w?=
 =?us-ascii?Q?QXN0me9csIssxaT5WdZD0DmdgpFvuuhPe7fW+jxAUprFZU+1uP1aJQR699QL?=
 =?us-ascii?Q?+J8Hfh7II2eBfC84vXuOz7TR9TM709cxrmMy1LfjFPoCavbcfUPwF43QhqP6?=
 =?us-ascii?Q?gBCBpSEdxwPWQx99dfb97dLiQOuuMsyCrYYkvKhvKDBHLt4g7TZOocFi3DZv?=
 =?us-ascii?Q?lpb4BuPqvRJkv7RuL3xQUtp7U2poQW+5hYpaGSoiJdJRCLHINqiX6N6vQvzU?=
 =?us-ascii?Q?ttl+fPvlyqUYTyqfPmB/aABexoRP6tIWAovTdr0B7UEUXTwMgC1fAUkrGx+N?=
 =?us-ascii?Q?lO4eZ01wanTDbV8xQIfCVALpAVfx+hCDyoZWx0kEOg8e+a95F56WLIG5+3xx?=
 =?us-ascii?Q?utqd3PU3Eadya4/BnUQsI8P2JNSux3K7BYMKp7Y0yTPuEGctgroiruieCGm8?=
 =?us-ascii?Q?GS0amdPOfZHMgvc6uHhtpKmeakzSVqyOCok0LmOVfOKUrFYyNPjLB4b5PnvY?=
 =?us-ascii?Q?b3CSCZcBh7Xa0xCCgX1W8f6UW5R+4c+wpt3jlJFTFupaqFZ+fG30qLsrDmtD?=
 =?us-ascii?Q?HMWVnGk0wTFd0h+mkfiNoiNGotcdEKBRc6Fa0zSfW7RjiDrjMSvDIt1JovUp?=
 =?us-ascii?Q?g01Fw0GeaKoixlvSWg/Hi5HiHalW3/6OTekFRZSpmLCVu5SphHR6oZFe4Av1?=
 =?us-ascii?Q?nfp/VGi/ijGf7i8VXfFULy6XGk5uKasumrodGOyzqPx79aMey1rfIWveVMqj?=
 =?us-ascii?Q?xQr3IeE5TMHk2X3NftGnweu6VEyjFMiwC0VYHnSOp5cXhAcLgMlaeZEWZkh0?=
 =?us-ascii?Q?vuCa6Ral/O9RLDqkpV0OM/8e2Y++CF1pFxjY4Qk5LI/SlVa5eOziDZQq1B1Z?=
 =?us-ascii?Q?bHD+Q0n80MFnA0nA+LnDtCe7aZPb81cyWMNF30AmmRCGB94kYSskb1cSgCsm?=
 =?us-ascii?Q?3p9HkX8X/n9xreWtTb8A/4ABnjvhFQ1ot0hW7k1MbIu0y9W6zTQtCu4NjKx0?=
 =?us-ascii?Q?rlnvHdjGi0amwPVgbhEBF4tc795Xd+hDD8ufBuORWSs5ePXA8En/LUu2aHR/?=
 =?us-ascii?Q?sEXTSSPTuj8uPbG5HooPy3XNZvba+rhv8HVa76zOUl+IFmqruj7dw6DIFlLM?=
 =?us-ascii?Q?EMqMS34zWWnTx3Y3+B/m874y457+m+ci/MXKtOiI5FlNzO0HI4U7JqQjKF6v?=
 =?us-ascii?Q?O3XHT9/Z9O+7aMNs7T9XILSVy4a2/1WseCiNZtWYyJ44cvR8sCQk1Umlw1Ff?=
 =?us-ascii?Q?7EqP3cz+1frgt1wReeGQ6gNSYAR24z1OoCPxixZWpU/XBWl0BzWfD/DWVbRH?=
 =?us-ascii?Q?orAaiiDJe/653QsX72GTAMWYo6ICouPCl6xVxgsqvFdJ80IOV+Nl16YHpCjv?=
 =?us-ascii?Q?7+LJ1BLCkgxP49aUe2MVu4owQJOye7VkqIC4kg0+N6NaU5IEvnrPgp6gMjmA?=
 =?us-ascii?Q?cxH6y7Ac10WudeJubvDMh0dl0h1AKStPvKfS97AMJkqFimpHfigLHxgRwCs5?=
 =?us-ascii?Q?rQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: zBRyU4HVJjiXzmA5Rj5NNDApjMgvjWETgWJwtn1J0WXHGP7h6TNbIpvxpMI1VR5kpLBnjbvItfdQbaCkvURiHQgmC2JSK8xc9A8hpWOD8kyqCZ+/wKaUVT15TLwNFyVD5VwFjn4h50LP5tgKCIq8kxdVsNEK88n3i4Uig2tHOKqt5caGcwnqxaHMCwkgltq3RZY8NERryf2a0havd5YvNgdPkImYyF0ZbrXxfbiO9njQyDqk3iQV0pF2J4Xs0NcLaQPJPa5LlnzM9VHOujV9LQxO1qVoHZjkj/F5Kx8+6u7j1sDJImcXn3U8qZUEzx3kH5dHyZfFDGDh4qEh1XD30LiOnBwURPuZ8430CVz+tzdJcOHuvHXWId3PKb4i4RJ4Hia5Wn+ptVN7GFW40EdBjVnMl3+0P2hw9LLa93OrfS7quaxjLVL+dGW7++z9kCo27K6y2UdM/lHJvELzTCuLmGOSOSF26Ht/iEl8hPgluPLTCaanniS8B6ZO5W8yXpZ1px8I/Sucj3bkqgEBAAOZzMA0e3BwvulvBngviFCoOEU8amqoR4UkawwEyFrvcrAXHWGGfxerR5z6AzWZVAFPivl8NY0V7DorEyz8mE0Og58JQGsXLoVEwtEetsNXB/Z/6cUJyIeWjiIJTwwumToTKUEiS9cq4HlTgRrgPB4PMmFFp6cJlvrd6EA/RIp8Qc4j90cNfYejASzPsjmeeJdCY5fIUIJb+heDc9aFktRhZ0uB0OQlzNAXaf3RJlmOx3gfv5DxL+Qauuk6V0hiG4qyStmCglB87PU3r/jpR2oMwaMrilLEEKCRCywhJvHyXSpF8s003M+rGzbgXG5fegGV4bfg6/7doGj/su4Wft8LV+KaoaOQdpMYIEjAhuUMoakLf1+c87fZlKvIo19L1flPzg==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2670660a-b603-48b2-7531-08db4d905b71
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2023 17:44:20.8945
 (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: TXa4InUvnLumFw1a6PPqjmIGovt7FZ0qPhaFUGJrraOJEjyqRT3pXJCLvPgEnpa+eDPS08/66DMWzAGHnMQrwA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR10MB6089
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-05_24,2023-05-05_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 phishscore=0 spamscore=0
 mlxlogscore=999 bulkscore=0 suspectscore=0 mlxscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000
 definitions=main-2305050146
X-Proofpoint-GUID: bjqzePQZIItG1aC03WhxDSled2RIkHjh
X-Proofpoint-ORIG-GUID: bjqzePQZIItG1aC03WhxDSled2RIkHjh
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.

MT_BUG_ON() will report a failures without tree dumps, and the output
will be less useful.

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

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index be272aa2fc0a4..17ba96a3c7bfe 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -2293,9 +2293,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..93b40a78c4f55 100644
--- a/lib/test_maple_tree.c
+++ b/lib/test_maple_tree.c
@@ -11,12 +11,33 @@
 #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 mt_validate(mt)			do {} while (0)
+#define mt_cache_shrink()		do {} while (0)
+#define mas_dump(mas)			do {} while (0)
+#define mas_wr_dump(mas)		do {} while (0)
+atomic_t maple_tree_tests_run;
+atomic_t maple_tree_tests_passed;
+#undef MT_BUG_ON
+
+#define MT_BUG_ON(__tree, __x) do {					\
+	atomic_inc(&maple_tree_tests_run);				\
+	if (__x) {							\
+		pr_info("BUG at %s:%d (%u)\n",				\
+		__func__, __LINE__, __x);				\
+		pr_info("Pass: %u Run:%u\n",				\
+			atomic_read(&maple_tree_tests_passed),		\
+			atomic_read(&maple_tree_tests_run));		\
+	} else {							\
+		atomic_inc(&maple_tree_tests_passed);			\
+	}								\
+} 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