Commit af1c5cca authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds

radix tree test suite: use rcu_barrier

Calling rcu_barrier() allows all of the rcu-freed memory to be actually
returned to the pool, and allows nr_allocated to return to 0.  As well
as allowing diffs between runs to be more useful, it also lets us
pinpoint leaks more effectively.

Link: http://lkml.kernel.org/r/1480369871-5271-44-git-send-email-mawilcox@linuxonhyperv.comSigned-off-by: default avatarMatthew Wilcox <mawilcox@microsoft.com>
Tested-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Konstantin Khlebnikov <koct9i@gmail.com>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Matthew Wilcox <mawilcox@microsoft.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cfa40bcf
...@@ -295,24 +295,31 @@ static void single_thread_tests(bool long_run) ...@@ -295,24 +295,31 @@ static void single_thread_tests(bool long_run)
printf("starting single_thread_tests: %d allocated, preempt %d\n", printf("starting single_thread_tests: %d allocated, preempt %d\n",
nr_allocated, preempt_count); nr_allocated, preempt_count);
multiorder_checks(); multiorder_checks();
rcu_barrier();
printf("after multiorder_check: %d allocated, preempt %d\n", printf("after multiorder_check: %d allocated, preempt %d\n",
nr_allocated, preempt_count); nr_allocated, preempt_count);
locate_check(); locate_check();
rcu_barrier();
printf("after locate_check: %d allocated, preempt %d\n", printf("after locate_check: %d allocated, preempt %d\n",
nr_allocated, preempt_count); nr_allocated, preempt_count);
tag_check(); tag_check();
rcu_barrier();
printf("after tag_check: %d allocated, preempt %d\n", printf("after tag_check: %d allocated, preempt %d\n",
nr_allocated, preempt_count); nr_allocated, preempt_count);
gang_check(); gang_check();
rcu_barrier();
printf("after gang_check: %d allocated, preempt %d\n", printf("after gang_check: %d allocated, preempt %d\n",
nr_allocated, preempt_count); nr_allocated, preempt_count);
add_and_check(); add_and_check();
rcu_barrier();
printf("after add_and_check: %d allocated, preempt %d\n", printf("after add_and_check: %d allocated, preempt %d\n",
nr_allocated, preempt_count); nr_allocated, preempt_count);
dynamic_height_check(); dynamic_height_check();
rcu_barrier();
printf("after dynamic_height_check: %d allocated, preempt %d\n", printf("after dynamic_height_check: %d allocated, preempt %d\n",
nr_allocated, preempt_count); nr_allocated, preempt_count);
big_gang_check(long_run); big_gang_check(long_run);
rcu_barrier();
printf("after big_gang_check: %d allocated, preempt %d\n", printf("after big_gang_check: %d allocated, preempt %d\n",
nr_allocated, preempt_count); nr_allocated, preempt_count);
for (i = 0; i < (long_run ? 2000 : 3); i++) { for (i = 0; i < (long_run ? 2000 : 3); i++) {
...@@ -320,6 +327,7 @@ static void single_thread_tests(bool long_run) ...@@ -320,6 +327,7 @@ static void single_thread_tests(bool long_run)
printf("%d ", i); printf("%d ", i);
fflush(stdout); fflush(stdout);
} }
rcu_barrier();
printf("after copy_tag_check: %d allocated, preempt %d\n", printf("after copy_tag_check: %d allocated, preempt %d\n",
nr_allocated, preempt_count); nr_allocated, preempt_count);
} }
...@@ -354,8 +362,8 @@ int main(int argc, char **argv) ...@@ -354,8 +362,8 @@ int main(int argc, char **argv)
benchmark(); benchmark();
sleep(1); rcu_barrier();
printf("after sleep(1): %d allocated, preempt %d\n", printf("after rcu_barrier: %d allocated, preempt %d\n",
nr_allocated, preempt_count); nr_allocated, preempt_count);
rcu_unregister_thread(); rcu_unregister_thread();
......
...@@ -51,6 +51,7 @@ void simple_checks(void) ...@@ -51,6 +51,7 @@ void simple_checks(void)
verify_tag_consistency(&tree, 1); verify_tag_consistency(&tree, 1);
printf("before item_kill_tree: %d allocated\n", nr_allocated); printf("before item_kill_tree: %d allocated\n", nr_allocated);
item_kill_tree(&tree); item_kill_tree(&tree);
rcu_barrier();
printf("after item_kill_tree: %d allocated\n", nr_allocated); printf("after item_kill_tree: %d allocated\n", nr_allocated);
} }
...@@ -331,12 +332,16 @@ void tag_check(void) ...@@ -331,12 +332,16 @@ void tag_check(void)
single_check(); single_check();
extend_checks(); extend_checks();
contract_checks(); contract_checks();
rcu_barrier();
printf("after extend_checks: %d allocated\n", nr_allocated); printf("after extend_checks: %d allocated\n", nr_allocated);
__leak_check(); __leak_check();
leak_check(); leak_check();
rcu_barrier();
printf("after leak_check: %d allocated\n", nr_allocated); printf("after leak_check: %d allocated\n", nr_allocated);
simple_checks(); simple_checks();
rcu_barrier();
printf("after simple_checks: %d allocated\n", nr_allocated); printf("after simple_checks: %d allocated\n", nr_allocated);
thrash_tags(); thrash_tags();
rcu_barrier();
printf("after thrash_tags: %d allocated\n", nr_allocated); printf("after thrash_tags: %d allocated\n", nr_allocated);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment