tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

lockdep/selftest: Remove wait-type RCU_CALLBACK tests

The problem is that rcu_callback_map doesn't have wait_types defined,
and doing so would make it indistinguishable from SOFTIRQ in any case.
Remove it.

Fixes: 9271a40d2a14 ("lockdep/selftest: Add wait context selftests")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Joerg Roedel <jroedel@suse.de>
Link: https://lore.kernel.org/r/20210617190313.384290291@infradead.org

Peter Zijlstra 1a812296 c0c2c0da

-17
-17
lib/locking-selftest.c
··· 2494 2494 int rcu_sched_guard_##name __guard(rcu_sched_exit); \ 2495 2495 rcu_read_lock_sched(); 2496 2496 2497 - static void rcu_callback_exit(int *_) 2498 - { 2499 - rcu_lock_release(&rcu_callback_map); 2500 - } 2501 - 2502 - #define RCU_CALLBACK_CONTEXT(name, ...) \ 2503 - int rcu_callback_guard_##name __guard(rcu_callback_exit); \ 2504 - rcu_lock_acquire(&rcu_callback_map); 2505 - 2506 - 2507 2497 static void raw_spinlock_exit(raw_spinlock_t **lock) 2508 2498 { 2509 2499 raw_spin_unlock(*lock); ··· 2550 2560 * ---------------+-------+----------+------+------- 2551 2561 * RCU_BH | o | o | o | x 2552 2562 * ---------------+-------+----------+------+------- 2553 - * RCU_CALLBACK | o | o | o | x 2554 - * ---------------+-------+----------+------+------- 2555 2563 * RCU_SCHED | o | o | x | x 2556 2564 * ---------------+-------+----------+------+------- 2557 2565 * RAW_SPIN | o | o | x | x ··· 2566 2578 GENERATE_2_CONTEXT_TESTCASE(SOFTIRQ, , inner, inner_lock) \ 2567 2579 GENERATE_2_CONTEXT_TESTCASE(RCU, , inner, inner_lock) \ 2568 2580 GENERATE_2_CONTEXT_TESTCASE(RCU_BH, , inner, inner_lock) \ 2569 - GENERATE_2_CONTEXT_TESTCASE(RCU_CALLBACK, , inner, inner_lock) \ 2570 2581 GENERATE_2_CONTEXT_TESTCASE(RCU_SCHED, , inner, inner_lock) \ 2571 2582 GENERATE_2_CONTEXT_TESTCASE(RAW_SPINLOCK, raw_lock_A, inner, inner_lock) \ 2572 2583 GENERATE_2_CONTEXT_TESTCASE(SPINLOCK, lock_A, inner, inner_lock) \ ··· 2625 2638 2626 2639 print_testname("in RCU-bh context"); 2627 2640 DO_CONTEXT_TESTCASE_OUTER_LIMITED_PREEMPTIBLE(RCU_BH); 2628 - pr_cont("\n"); 2629 - 2630 - print_testname("in RCU callback context"); 2631 - DO_CONTEXT_TESTCASE_OUTER_LIMITED_PREEMPTIBLE(RCU_CALLBACK); 2632 2641 pr_cont("\n"); 2633 2642 2634 2643 print_testname("in RCU-sched context");