rcu: Simplify and inline cpu_needs_another_gp()

Now that RCU no longer relies on failsafe checks, cpu_needs_another_gp()
can be greatly simplified.  This simplification eliminates the last
call to rcu_future_needs_gp() and to rcu_segcblist_future_gp_needed(),
both of which which can then be eliminated.  And then, because
cpu_needs_another_gp() is called only from __rcu_pending(), it can be
inlined and eliminated.

This commit carries out the simplification, inlining, and elimination
called out above.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Tested-by: Nicholas Piggin <npiggin@gmail.com>

1 files changed, 3 insertions, 37 deletions

diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 7776d709e060..020a0fe2dbee 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -709,42 +709,6 @@ static struct rcu_node *rcu_get_root(struct rcu_state *rsp)
 }
 
 /*
- * Is there any need for future grace periods?
- * Interrupts must be disabled.  If the caller does not hold the root
- * rnp_node structure's ->lock, the results are advisory only.
- */
-static int rcu_future_needs_gp(struct rcu_state *rsp)
-{
-        struct rcu_node *rnp = rcu_get_root(rsp);
-
-        lockdep_assert_irqs_disabled();
-        return need_any_future_gp(rnp);
-}
-
-/*
- * Does the current CPU require a not-yet-started grace period?
- * The caller must have disabled interrupts to prevent races with
- * normal callback registry.
- */
-static bool
-cpu_needs_another_gp(struct rcu_state *rsp, struct rcu_data *rdp)
-{
-        lockdep_assert_irqs_disabled();
-        if (rcu_gp_in_progress(rsp))
-                return false;  /* No, a grace period is already in progress. */
-        if (rcu_future_needs_gp(rsp))
-                return true;  /* Yes, a no-CBs CPU needs one. */
-        if (!rcu_segcblist_is_enabled(&rdp->cblist))
-                return false;  /* No, this is a no-CBs (or offline) CPU. */
-        if (!rcu_segcblist_restempty(&rdp->cblist, RCU_NEXT_READY_TAIL))
-                return true;  /* Yes, CPU has newly registered callbacks. */
-        if (rcu_segcblist_future_gp_needed(&rdp->cblist,
-                                           READ_ONCE(rsp->completed)))
-                return true;  /* Yes, CBs for future grace period. */
-        return false; /* No grace period needed. */
-}
-
-/*
  * Enter an RCU extended quiescent state, which can be either the
  * idle loop or adaptive-tickless usermode execution.
  *
@@ -3298,7 +3262,9 @@ static int __rcu_pending(struct rcu_state *rsp, struct rcu_data *rdp)
                 return 1;
 
         /* Has RCU gone idle with this CPU needing another grace period? */
-        if (cpu_needs_another_gp(rsp, rdp))
+        if (!rcu_gp_in_progress(rsp) &&
+            rcu_segcblist_is_enabled(&rdp->cblist) &&
+            !rcu_segcblist_restempty(&rdp->cblist, RCU_NEXT_READY_TAIL))
                 return 1;
 
         /* Has another RCU grace period completed?  */