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

Commit 9dd238e2 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcu: Fold rcu_eqs_exit_common() into rcu_eqs_exit() 



There is now only one call to rcu_eqs_exit_common() and there is no other
reason to keep it separate.  This commit therefore inlines it into its
sole call site, saving a few lines of code in the process.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent 215bba9f

kernel/rcu/tree.c

+18 −32
Original line number Diff line number Diff line
@@ -916,34 +916,6 @@ void rcu_irq_exit_irqson(void) 
	local_irq_restore(flags);

}



/*

 * rcu_eqs_exit_common - current CPU moving away from extended quiescent state

 *

 * If the new value of the ->dynticks_nesting counter was previously zero,

 * we really have exited idle, and must do the appropriate accounting.

 * The caller must have disabled interrupts.

 */

static void rcu_eqs_exit_common(long newval, int user)

{

	RCU_TRACE(struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks);)



	rcu_dynticks_task_exit();

	rcu_dynticks_eqs_exit();

	rcu_cleanup_after_idle();

	trace_rcu_dyntick(TPS("End"), rdtp->dynticks_nesting, newval, rdtp->dynticks);

	if (IS_ENABLED(CONFIG_RCU_EQS_DEBUG) &&

	    !user && !is_idle_task(current)) {

		struct task_struct *idle __maybe_unused =

			idle_task(smp_processor_id());



		trace_rcu_dyntick(TPS("Error on exit: not idle task"), rdtp->dynticks_nesting, newval, rdtp->dynticks);

		rcu_ftrace_dump(DUMP_ORIG);

		WARN_ONCE(1, "Current pid: %d comm: %s / Idle pid: %d comm: %s",

			  current->pid, current->comm,

			  idle->pid, idle->comm); /* must be idle task! */

	}

}



/*

 * Exit an RCU extended quiescent state, which can be either the

 * idle loop or adaptive-tickless usermode execution.
@@ -963,12 +935,26 @@ static void rcu_eqs_exit(bool user) 
	WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) && oldval < 0);

	if (oldval) {

		rdtp->dynticks_nesting++;

	} else {

		rcu_eqs_exit_common(1, user);

		return;

	}

	rcu_dynticks_task_exit();

	rcu_dynticks_eqs_exit();

	rcu_cleanup_after_idle();

	trace_rcu_dyntick(TPS("End"), rdtp->dynticks_nesting, 1, rdtp->dynticks);

	if (IS_ENABLED(CONFIG_RCU_EQS_DEBUG) &&

	    !user && !is_idle_task(current)) {

		struct task_struct *idle __maybe_unused =

			idle_task(smp_processor_id());



		trace_rcu_dyntick(TPS("Error on exit: not idle task"), rdtp->dynticks_nesting, 1, rdtp->dynticks);

		rcu_ftrace_dump(DUMP_ORIG);

		WARN_ONCE(1, "Current pid: %d comm: %s / Idle pid: %d comm: %s",

			  current->pid, current->comm,

			  idle->pid, idle->comm); /* must be idle task! */

	}

	WRITE_ONCE(rdtp->dynticks_nesting, 1);

	WRITE_ONCE(rdtp->dynticks_nmi_nesting, DYNTICK_IRQ_NONIDLE);

}

}



/**

 * rcu_idle_exit - inform RCU that current CPU is leaving idle