Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c173eb8 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcu: Consistent rcu_is_watching() naming 



The old rcu_is_cpu_idle() function is just __rcu_is_watching() with
preemption disabled.  This commit therefore renames rcu_is_cpu_idle()
to rcu_is_watching.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent f9ffc31e

include/linux/rcupdate.h

+9 −9
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static inline void rcu_user_hooks_switch(struct task_struct *prev, 
	} while (0)



#if defined(CONFIG_DEBUG_LOCK_ALLOC) || defined(CONFIG_RCU_TRACE) || defined(CONFIG_SMP)

extern int rcu_is_cpu_idle(void);

extern bool __rcu_is_watching(void);

#endif /* #if defined(CONFIG_DEBUG_LOCK_ALLOC) || defined(CONFIG_RCU_TRACE) || defined(CONFIG_SMP) */



/*
@@ -351,7 +351,7 @@ static inline int rcu_read_lock_held(void) 
{

	if (!debug_lockdep_rcu_enabled())

		return 1;

	if (rcu_is_cpu_idle())

	if (!rcu_is_watching())

		return 0;

	if (!rcu_lockdep_current_cpu_online())

		return 0;
@@ -402,7 +402,7 @@ static inline int rcu_read_lock_sched_held(void) 


	if (!debug_lockdep_rcu_enabled())

		return 1;

	if (rcu_is_cpu_idle())

	if (!rcu_is_watching())

		return 0;

	if (!rcu_lockdep_current_cpu_online())

		return 0;
@@ -771,7 +771,7 @@ static inline void rcu_read_lock(void) 
	__rcu_read_lock();

	__acquire(RCU);

	rcu_lock_acquire(&rcu_lock_map);

	rcu_lockdep_assert(!rcu_is_cpu_idle(),

	rcu_lockdep_assert(rcu_is_watching(),

			   "rcu_read_lock() used illegally while idle");

}
@@ -792,7 +792,7 @@ static inline void rcu_read_lock(void) 
 */

static inline void rcu_read_unlock(void)

{

	rcu_lockdep_assert(!rcu_is_cpu_idle(),

	rcu_lockdep_assert(rcu_is_watching(),

			   "rcu_read_unlock() used illegally while idle");

	rcu_lock_release(&rcu_lock_map);

	__release(RCU);
@@ -821,7 +821,7 @@ static inline void rcu_read_lock_bh(void) 
	local_bh_disable();

	__acquire(RCU_BH);

	rcu_lock_acquire(&rcu_bh_lock_map);

	rcu_lockdep_assert(!rcu_is_cpu_idle(),

	rcu_lockdep_assert(rcu_is_watching(),

			   "rcu_read_lock_bh() used illegally while idle");

}
@@ -832,7 +832,7 @@ static inline void rcu_read_lock_bh(void) 
 */

static inline void rcu_read_unlock_bh(void)

{

	rcu_lockdep_assert(!rcu_is_cpu_idle(),

	rcu_lockdep_assert(rcu_is_watching(),

			   "rcu_read_unlock_bh() used illegally while idle");

	rcu_lock_release(&rcu_bh_lock_map);

	__release(RCU_BH);
@@ -857,7 +857,7 @@ static inline void rcu_read_lock_sched(void) 
	preempt_disable();

	__acquire(RCU_SCHED);

	rcu_lock_acquire(&rcu_sched_lock_map);

	rcu_lockdep_assert(!rcu_is_cpu_idle(),

	rcu_lockdep_assert(rcu_is_watching(),

			   "rcu_read_lock_sched() used illegally while idle");

}
@@ -875,7 +875,7 @@ static inline notrace void rcu_read_lock_sched_notrace(void) 
 */

static inline void rcu_read_unlock_sched(void)

{

	rcu_lockdep_assert(!rcu_is_cpu_idle(),

	rcu_lockdep_assert(rcu_is_watching(),

			   "rcu_read_unlock_sched() used illegally while idle");

	rcu_lock_release(&rcu_sched_lock_map);

	__release(RCU_SCHED);

include/linux/rcutiny.h

+12 −4
Original line number Diff line number Diff line
@@ -132,13 +132,21 @@ static inline void rcu_scheduler_starting(void) 
}

#endif /* #else #ifdef CONFIG_DEBUG_LOCK_ALLOC */



#ifdef CONFIG_RCU_TRACE

#if defined(CONFIG_DEBUG_LOCK_ALLOC) || defined(CONFIG_RCU_TRACE)



static inline bool __rcu_is_watching(void)

static inline bool rcu_is_watching(void)

{

	return !rcu_is_cpu_idle();

	return __rcu_is_watching();

}



#endif /* #ifdef CONFIG_RCU_TRACE */

#else /* defined(CONFIG_DEBUG_LOCK_ALLOC) || defined(CONFIG_RCU_TRACE) */



static inline bool rcu_is_watching(void)

{

	return true;

}





#endif /* #else defined(CONFIG_DEBUG_LOCK_ALLOC) || defined(CONFIG_RCU_TRACE) */



#endif /* __LINUX_RCUTINY_H */

include/linux/rcutree.h

+1 −1
Original line number Diff line number Diff line
@@ -90,6 +90,6 @@ extern void exit_rcu(void); 
extern void rcu_scheduler_starting(void);

extern int rcu_scheduler_active __read_mostly;



extern bool __rcu_is_watching(void);

extern bool rcu_is_watching(void);



#endif /* __LINUX_RCUTREE_H */

kernel/lockdep.c

+2 −2
Original line number Diff line number Diff line
@@ -4224,7 +4224,7 @@ void lockdep_rcu_suspicious(const char *file, const int line, const char *s) 
	printk("\n%srcu_scheduler_active = %d, debug_locks = %d\n",

	       !rcu_lockdep_current_cpu_online()

			? "RCU used illegally from offline CPU!\n"

			: rcu_is_cpu_idle()

			: !rcu_is_watching()

				? "RCU used illegally from idle CPU!\n"

				: "",

	       rcu_scheduler_active, debug_locks);
@@ -4247,7 +4247,7 @@ void lockdep_rcu_suspicious(const char *file, const int line, const char *s) 
	 * So complain bitterly if someone does call rcu_read_lock(),

	 * rcu_read_lock_bh() and so on from extended quiescent states.

	 */

	if (rcu_is_cpu_idle())

	if (!rcu_is_watching())

		printk("RCU used illegally from extended quiescent state!\n");



	lockdep_print_held_locks(curr);

kernel/rcupdate.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ int rcu_read_lock_bh_held(void) 
{

	if (!debug_lockdep_rcu_enabled())

		return 1;

	if (rcu_is_cpu_idle())

	if (!rcu_is_watching())

		return 0;

	if (!rcu_lockdep_current_cpu_online())

		return 0;