Skip to content

Commit

Permalink
rcu: Remove the now-obsolete PROVE_RCU_REPEATEDLY Kconfig option
Browse files Browse the repository at this point in the history
The PROVE_RCU_REPEATEDLY Kconfig option was initially added due to
the volume of messages from PROVE_RCU: Doing just one per boot would
have required excessive numbers of boots to locate them all.  However,
PROVE_RCU messages are now relatively rare, so there is no longer any
reason to need more than one such message per boot.  This commit therefore
removes the PROVE_RCU_REPEATEDLY Kconfig option.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Paul E. McKenney committed Jun 9, 2017
1 parent 4e4bea7 commit c4a09ff
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 23 deletions.
4 changes: 0 additions & 4 deletions kernel/locking/lockdep.c
Original file line number Diff line number Diff line change
Expand Up @@ -4490,10 +4490,6 @@ void lockdep_rcu_suspicious(const char *file, const int line, const char *s)
{
struct task_struct *curr = current;

#ifndef CONFIG_PROVE_RCU_REPEATEDLY
if (!debug_locks_off())
return;
#endif /* #ifdef CONFIG_PROVE_RCU_REPEATEDLY */
/* Note: the following can be executed concurrently, so be careful. */
pr_warn("\n");
pr_warn("=============================\n");
Expand Down
4 changes: 1 addition & 3 deletions kernel/rcu/tree_plugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,7 @@ static void __init rcu_bootup_announce_oddness(void)
pr_info("\tHierarchical RCU autobalancing is disabled.\n");
if (IS_ENABLED(CONFIG_RCU_FAST_NO_HZ))
pr_info("\tRCU dyntick-idle grace-period acceleration is enabled.\n");
if (IS_ENABLED(CONFIG_PROVE_RCU_REPEATEDLY))
pr_info("\tRCU lockdep checking is permanently enabled.\n");
else if (IS_ENABLED(CONFIG_PROVE_RCU))
if (IS_ENABLED(CONFIG_PROVE_RCU))
pr_info("\tRCU lockdep checking is enabled.\n");
if (RCU_NUM_LVLS >= 4)
pr_info("\tFour(or more)-level hierarchy is enabled.\n");
Expand Down
14 changes: 0 additions & 14 deletions lib/Kconfig.debug
Original file line number Diff line number Diff line change
Expand Up @@ -1306,20 +1306,6 @@ menu "RCU Debugging"
config PROVE_RCU
def_bool PROVE_LOCKING

config PROVE_RCU_REPEATEDLY
bool "RCU debugging: don't disable PROVE_RCU on first splat"
depends on PROVE_RCU
default n
help
By itself, PROVE_RCU will disable checking upon issuing the
first warning (or "splat"). This feature prevents such
disabling, allowing multiple RCU-lockdep warnings to be printed
on a single reboot.

Say Y to allow multiple RCU-lockdep warnings per boot.

Say N if you are unsure.

config SPARSE_RCU_POINTER
bool "RCU debugging: sparse-based checks for pointer usage"
default n
Expand Down
1 change: 0 additions & 1 deletion tools/testing/selftests/rcutorture/configs/rcu/TINY02
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ CONFIG_NO_HZ_IDLE=n
CONFIG_NO_HZ_FULL=n
CONFIG_RCU_TRACE=y
CONFIG_PROVE_LOCKING=y
CONFIG_PROVE_RCU_REPEATEDLY=y
#CHECK#CONFIG_PROVE_RCU=y
CONFIG_DEBUG_LOCK_ALLOC=y
CONFIG_DEBUG_OBJECTS=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ CONFIG_NO_HZ_FULL -- Do two, one with partial CPU enablement.
CONFIG_PREEMPT -- Do half. (First three and #8.)
CONFIG_PROVE_LOCKING -- Do several, covering CONFIG_DEBUG_LOCK_ALLOC=y and not.
CONFIG_PROVE_RCU -- Hardwired to CONFIG_PROVE_LOCKING.
CONFIG_PROVE_RCU_REPEATEDLY -- Do one.
CONFIG_RCU_BOOST -- one of PREEMPT_RCU.
CONFIG_RCU_FANOUT -- Cover hierarchy, but overlap with others.
CONFIG_RCU_FANOUT_LEAF -- Do one non-default.
Expand Down

0 comments on commit c4a09ff

Please sign in to comment.