Commit 847d3576 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds

radix tree test suite: track preempt_count

Rather than simply NOP out preempt_enable() and preempt_disable(), keep
track of preempt_count and display it regularly in case either the test
suite or the code under test is forgetting to balance the enables &
disables.  Only found a test-case that was forgetting to re-enable
preemption, but it's a possibility worth checking.

Link: http://lkml.kernel.org/r/1480369871-5271-39-git-send-email-mawilcox@linuxonhyperv.comSigned-off-by: default avatarMatthew Wilcox <willy@infradead.org>
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 31023cd6
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <urcu/uatomic.h> #include <urcu/uatomic.h>
int nr_allocated; int nr_allocated;
int preempt_count;
void *mempool_alloc(mempool_t *pool, int gfp_mask) void *mempool_alloc(mempool_t *pool, int gfp_mask)
{ {
......
/* */ extern int preempt_count;
#define preempt_disable() do { } while (0) #define preempt_disable() uatomic_inc(&preempt_count)
#define preempt_enable() do { } while (0) #define preempt_enable() uatomic_dec(&preempt_count)
...@@ -293,27 +293,36 @@ static void single_thread_tests(bool long_run) ...@@ -293,27 +293,36 @@ static void single_thread_tests(bool long_run)
{ {
int i; int i;
printf("starting single_thread_tests: %d allocated\n", nr_allocated); printf("starting single_thread_tests: %d allocated, preempt %d\n",
nr_allocated, preempt_count);
multiorder_checks(); multiorder_checks();
printf("after multiorder_check: %d allocated\n", nr_allocated); printf("after multiorder_check: %d allocated, preempt %d\n",
nr_allocated, preempt_count);
locate_check(); locate_check();
printf("after locate_check: %d allocated\n", nr_allocated); printf("after locate_check: %d allocated, preempt %d\n",
nr_allocated, preempt_count);
tag_check(); tag_check();
printf("after tag_check: %d allocated\n", nr_allocated); printf("after tag_check: %d allocated, preempt %d\n",
nr_allocated, preempt_count);
gang_check(); gang_check();
printf("after gang_check: %d allocated\n", nr_allocated); printf("after gang_check: %d allocated, preempt %d\n",
nr_allocated, preempt_count);
add_and_check(); add_and_check();
printf("after add_and_check: %d allocated\n", nr_allocated); printf("after add_and_check: %d allocated, preempt %d\n",
nr_allocated, preempt_count);
dynamic_height_check(); dynamic_height_check();
printf("after dynamic_height_check: %d allocated\n", nr_allocated); printf("after dynamic_height_check: %d allocated, preempt %d\n",
nr_allocated, preempt_count);
big_gang_check(long_run); big_gang_check(long_run);
printf("after big_gang_check: %d allocated\n", nr_allocated); printf("after big_gang_check: %d allocated, preempt %d\n",
nr_allocated, preempt_count);
for (i = 0; i < (long_run ? 2000 : 3); i++) { for (i = 0; i < (long_run ? 2000 : 3); i++) {
copy_tag_check(); copy_tag_check();
printf("%d ", i); printf("%d ", i);
fflush(stdout); fflush(stdout);
} }
printf("after copy_tag_check: %d allocated\n", nr_allocated); printf("after copy_tag_check: %d allocated, preempt %d\n",
nr_allocated, preempt_count);
} }
int main(int argc, char **argv) int main(int argc, char **argv)
...@@ -336,7 +345,8 @@ int main(int argc, char **argv) ...@@ -336,7 +345,8 @@ int main(int argc, char **argv)
single_thread_tests(long_run); single_thread_tests(long_run);
sleep(1); sleep(1);
printf("after sleep(1): %d allocated\n", nr_allocated); printf("after sleep(1): %d allocated, preempt %d\n",
nr_allocated, preempt_count);
rcu_unregister_thread(); rcu_unregister_thread();
exit(0); exit(0);
......
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