[6.6,04/28] maple_tree: skip other tests when BENCH is enabled

Commit Message

Yu Kuai Oct. 24, 2024, 1:19 p.m. UTC

From: Peng Zhang <[e-mail]>

commit f670fa1caadb4ea532a89012c5451e4c6789bfcc upstream.

Skip other tests when BENCH is enabled so that performance can be measured
in user space.

Link: https://lkml.kernel.org/r/[e-mail]
Signed-off-by: Peng Zhang <[e-mail]>
Reviewed-by: Liam R. Howlett <[e-mail]>
Cc: Christian Brauner <[e-mail]>
Cc: Jonathan Corbet <[e-mail]>
Cc: Mateusz Guzik <[e-mail]>
Cc: Mathieu Desnoyers <[e-mail]>
Cc: Matthew Wilcox <[e-mail]>
Cc: Michael S. Tsirkin <[e-mail]>
Cc: Mike Christie <[e-mail]>
Cc: Nicholas Piggin <[e-mail]>
Cc: Peter Zijlstra <[e-mail]>
Cc: Suren Baghdasaryan <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
Signed-off-by: Yu Kuai <[e-mail]>
---
 lib/test_maple_tree.c            | 8 ++++----
 tools/testing/radix-tree/maple.c | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

Patch

diff --git a/lib/test_maple_tree.c b/lib/test_maple_tree.c
index 464eeb90d5ad..de470950714f 100644
--- a/lib/test_maple_tree.c
+++ b/lib/test_maple_tree.c
@@ -3585,10 +3585,6 @@  static int __init maple_tree_seed(void)
 
 	pr_info("\nTEST STARTING\n\n");
 
-	mt_init_flags(&tree, MT_FLAGS_ALLOC_RANGE);
-	check_root_expand(&tree);
-	mtree_destroy(&tree);
-
 #if defined(BENCH_SLOT_STORE)
 #define BENCH
 	mt_init_flags(&tree, MT_FLAGS_ALLOC_RANGE);
@@ -3646,6 +3642,10 @@  static int __init maple_tree_seed(void)
 	goto skip;
 #endif
 
+	mt_init_flags(&tree, MT_FLAGS_ALLOC_RANGE);
+	check_root_expand(&tree);
+	mtree_destroy(&tree);
+
 	mt_init_flags(&tree, MT_FLAGS_ALLOC_RANGE);
 	check_iteration(&tree);
 	mtree_destroy(&tree);
diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c
index 76a8990bb14e..576b825d6bb1 100644
--- a/tools/testing/radix-tree/maple.c
+++ b/tools/testing/radix-tree/maple.c
@@ -35938,7 +35938,9 @@  void farmer_tests(void)
 
 void maple_tree_tests(void)
 {
+#if !defined(BENCH)
 	farmer_tests();
+#endif
 	maple_tree_seed();
 	maple_tree_harvest();
 }