Commit 4316415e authored by Peng Zhang's avatar Peng Zhang Committed by Peng Zhang
Browse files

maple_tree: skip other tests when BENCH is enabled 

mainline inclusion
from mainline-v6.8-rc1
commit f670fa1caadb4ea532a89012c5451e4c6789bfcc
category: performance
bugzilla: https://gitee.com/openeuler/kernel/issues/I9AYM3
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f670fa1caadb4ea532a89012c5451e4c6789bfcc

--------------------------------

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

Link: https://lkml.kernel.org/r/20231027033845.90608-8-zhangpeng.00@bytedance.com


Signed-off-by: default avatarPeng Zhang <zhangpeng.00@bytedance.com>
Reviewed-by: default avatarLiam R. Howlett <Liam.Howlett@oracle.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Mateusz Guzik <mjguzik@gmail.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Mike Christie <michael.christie@oracle.com>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent 9a460b23

lib/test_maple_tree.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

tools/testing/radix-tree/maple.c

+2 −0
Original line number Diff line number Diff line
@@ -36299,7 +36299,9 @@ void farmer_tests(void) 








void maple_tree_tests(void)









{









#if !defined(BENCH)









	farmer_tests();









#endif









	maple_tree_seed();









	maple_tree_harvest();









}