Commit e1de4383 authored by Valentin Schneider's avatar Valentin Schneider Committed by Neeraj Upadhyay
Browse files

context_tracking, rcu: Rename DYNTICK_IRQ_NONIDLE into CT_NESTING_IRQ_NONIDLE 



The context_tracking.state RCU_DYNTICKS subvariable has been renamed to
RCU_WATCHING, and the 'dynticks' prefix can be dropped without losing any
meaning.

Signed-off-by: default avatarValentin Schneider <vschneid@redhat.com>
Reviewed-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Signed-off-by: default avatarNeeraj Upadhyay <neeraj.upadhyay@kernel.org>
parent 2ef2890b

include/linux/context_tracking_state.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include <linux/context_tracking_irq.h>



/* Offset to allow distinguishing irq vs. task-based idle entry/exit. */

#define DYNTICK_IRQ_NONIDLE	((LONG_MAX / 2) + 1)

#define CT_NESTING_IRQ_NONIDLE	((LONG_MAX / 2) + 1)



enum ctx_state {

	CT_STATE_DISABLED	= -1,	/* returned by ct_state() if unknown */

kernel/context_tracking.c

+4 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
DEFINE_PER_CPU(struct context_tracking, context_tracking) = {

#ifdef CONFIG_CONTEXT_TRACKING_IDLE

	.nesting = 1,

	.nmi_nesting = DYNTICK_IRQ_NONIDLE,

	.nmi_nesting = CT_NESTING_IRQ_NONIDLE,

#endif

	.state = ATOMIC_INIT(CT_RCU_WATCHING),

};
@@ -125,7 +125,7 @@ static void noinstr ct_kernel_exit(bool user, int offset) 
{

	struct context_tracking *ct = this_cpu_ptr(&context_tracking);



	WARN_ON_ONCE(ct_nmi_nesting() != DYNTICK_IRQ_NONIDLE);

	WARN_ON_ONCE(ct_nmi_nesting() != CT_NESTING_IRQ_NONIDLE);

	WRITE_ONCE(ct->nmi_nesting, 0);

	WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) &&

		     ct_nesting() == 0);
@@ -156,7 +156,7 @@ static void noinstr ct_kernel_exit(bool user, int offset) 
 * Exit an RCU extended quiescent state, which can be either the

 * idle loop or adaptive-tickless usermode execution.

 *

 * We crowbar the ->nmi_nesting field to DYNTICK_IRQ_NONIDLE to

 * We crowbar the ->nmi_nesting field to CT_NESTING_IRQ_NONIDLE to

 * allow for the possibility of usermode upcalls messing up our count of

 * interrupt nesting level during the busy period that is just now starting.

 */
@@ -186,7 +186,7 @@ static void noinstr ct_kernel_enter(bool user, int offset) 
	WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) && !user && !is_idle_task(current));

	WRITE_ONCE(ct->nesting, 1);

	WARN_ON_ONCE(ct_nmi_nesting());

	WRITE_ONCE(ct->nmi_nesting, DYNTICK_IRQ_NONIDLE);

	WRITE_ONCE(ct->nmi_nesting, CT_NESTING_IRQ_NONIDLE);

	instrumentation_end();

}

kernel/rcu/tree.c

+1 −1
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ void rcu_irq_exit_check_preempt(void) 
	RCU_LOCKDEP_WARN(ct_nesting() <= 0,

			 "RCU nesting counter underflow/zero!");

	RCU_LOCKDEP_WARN(ct_nmi_nesting() !=

			 DYNTICK_IRQ_NONIDLE,

			 CT_NESTING_IRQ_NONIDLE,

			 "Bad RCU  nmi_nesting counter\n");

	RCU_LOCKDEP_WARN(rcu_dynticks_curr_cpu_in_eqs(),

			 "RCU in extended quiescent state!");