summaryrefslogtreecommitdiff
path: root/include/linux/rcu_sync.h
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2015-09-11 17:59:18 +0200
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2015-10-06 11:25:45 -0700
commit4bace7344d6dbd7a1b0b801abf24ea9878064317 (patch)
treed6d2eeb78cbbb002f105a7a0d4d8928c2e4dca29 /include/linux/rcu_sync.h
parentcc5f730b41506d37a5c2826b2e801d0a59853d11 (diff)
downloadlwn-4bace7344d6dbd7a1b0b801abf24ea9878064317.tar.gz
lwn-4bace7344d6dbd7a1b0b801abf24ea9878064317.zip
rcu_sync: Cleanup the CONFIG_PROVE_RCU checks
1. Rename __rcu_sync_is_idle() to rcu_sync_lockdep_assert() and change it to use rcu_lockdep_assert(). 2. Change rcu_sync_is_idle() to return rsp->gp_state == GP_IDLE unconditonally, this way we can remove the same check from rcu_sync_lockdep_assert() and clearly isolate the debugging code. Note: rcu_sync_enter()->wait_event(gp_state == GP_PASSED) needs another CONFIG_PROVE_RCU check, the same as is done in ->sync(); but this needs some simple preparations in the core RCU code to avoid the code duplication. Signed-off-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'include/linux/rcu_sync.h')
-rw-r--r--include/linux/rcu_sync.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/rcu_sync.h b/include/linux/rcu_sync.h
index 8069d6468bc4..a63a33e6196e 100644
--- a/include/linux/rcu_sync.h
+++ b/include/linux/rcu_sync.h
@@ -40,7 +40,7 @@ struct rcu_sync {
enum rcu_sync_type gp_type;
};
-extern bool __rcu_sync_is_idle(struct rcu_sync *);
+extern void rcu_sync_lockdep_assert(struct rcu_sync *);
/**
* rcu_sync_is_idle() - Are readers permitted to use their fastpaths?
@@ -53,10 +53,9 @@ extern bool __rcu_sync_is_idle(struct rcu_sync *);
static inline bool rcu_sync_is_idle(struct rcu_sync *rsp)
{
#ifdef CONFIG_PROVE_RCU
- return __rcu_sync_is_idle(rsp);
-#else
- return !rsp->gp_state; /* GP_IDLE */
+ rcu_sync_lockdep_assert(rsp);
#endif
+ return !rsp->gp_state; /* GP_IDLE */
}
extern void rcu_sync_init(struct rcu_sync *, enum rcu_sync_type);