sched/core: Convert synchronize_rcu_mult to synchronize_rcu

From: "Joel Fernandes (Google)" <[email protected]>

synchronize_rcu_mult is now obsolete since all the different RCU flavors have been consolidated and the API is now common on the updater side. sched/core.c is the only user of it. All call_rcu_<flavor> calls boil down to the same call_rcu. So there's no point in calling synchronize_rcu_mult infact it could potentially be slower due to waiting for the call_rcu callback twice. Just call synchronize_rcu here which should do the job.

Signed-off-by Joel Fernandes (Google) <[email protected]>

---
 kernel/sched/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

kernel/sched/core.c +1 -1

index 625bc9897f62..d8311f3cf58c 100644
@@ -5791,7 +5791,7 @@ int sched_cpu_deactivate(unsigned int cpu)
 	 *
 	 * Do sync before park smpboot threads to take care the rcu boost case.
 	 */
-	synchronize_rcu_mult(call_rcu, call_rcu_sched);
+	synchronize_rcu();
 
 	if (!sched_smp_initialized)
 		return 0;

Signature · 1 line

2.19.0.605.g01d371f741-goog

Quoted 10 lines · Joel Fernandes

From: "Joel Fernandes (Google)" <[email protected]>

synchronize_rcu_mult is now obsolete since all the different RCU flavors have been consolidated and the API is now common on the updater side. sched/core.c is the only user of it. All call_rcu_<flavor> calls boil down to the same call_rcu. So there's no point in calling synchronize_rcu_mult infact it could potentially be slower due to waiting for the call_rcu callback twice. Just call synchronize_rcu here which should do the job.

Quoted 1 line

Signed-off-by Joel Fernandes (Google) <[email protected]>

Well, the theory was that I was going to keep this series hidden until the consolidation hit mainline just to avoid confusion, but please see 5fc9d4e000b1 ("rcu: Eliminate synchronize_rcu_mult()"), which I just now pushed to -rcu. To your credit, you did get most of it. ;-)

Here is the full list:

pick 1f3e6eaed8fa Apply coccinelle script to consolidate calls to RCU-bh and RCU-sched pick 5fc9d4e000b1 rcu: Eliminate synchronize_rcu_mult()
pick a8475496801e rcu: Consolidate the RCU update functions invoked by sync.c pick d8ffb03461ad sched/membarrier: Replace synchronize_sched() with synchronize_rcu()

Of course, I will need to rerun the coccinelle script and split the result across subsystems, but I am waiting until the current pull request hits mainline. Let's face it, none of us need to do debugging on someone consolidating their RCU updates before at least this commit and its predecessors hit mainline:

709fdce7545c ("rcu: Express Tiny RCU updates in terms of RCU rather than RCU-sched")

I sent the pull request to Ingo a few days ago, so with some luck this will all get to mainline during the next merge window, and then it is open season on outside-of-RCU cleanups. ;-)

Quoted 13 lines · Paul E. McKenney

Quoted 11 lines · Joel Fernandes

From: "Joel Fernandes (Google)" <[email protected]>

synchronize_rcu_mult is now obsolete since all the different RCU flavors have been consolidated and the API is now common on the updater side. sched/core.c is the only user of it. All call_rcu_<flavor> calls boil down to the same call_rcu. So there's no point in calling synchronize_rcu_mult infact it could potentially be slower due to waiting for the call_rcu callback twice. Just call synchronize_rcu here which should do the job.

Signed-off-by Joel Fernandes (Google) <[email protected]>

Quoted 4 lines

Well, the theory was that I was going to keep this series hidden until the consolidation hit mainline just to avoid confusion, but please see 5fc9d4e000b1 ("rcu: Eliminate synchronize_rcu_mult()"), which I just now pushed to -rcu. To your credit, you did get most of it. ;-)

Glad you already took care of that ;-) I should have taken a peek at rcu/test branch :D

Quoted 13 lines

Here is the full list:

pick 1f3e6eaed8fa Apply coccinelle script to consolidate calls to RCU-bh and RCU-sched pick 5fc9d4e000b1 rcu: Eliminate synchronize_rcu_mult()
pick a8475496801e rcu: Consolidate the RCU update functions invoked by sync.c pick d8ffb03461ad sched/membarrier: Replace synchronize_sched() with synchronize_rcu()

Of course, I will need to rerun the coccinelle script and split the result across subsystems, but I am waiting until the current pull request hits mainline. Let's face it, none of us need to do debugging on someone consolidating their RCU updates before at least this commit and its predecessors hit mainline:

Quoted 5 lines

709fdce7545c ("rcu: Express Tiny RCU updates in terms of RCU rather than RCU-sched")

I sent the pull request to Ingo a few days ago, so with some luck this will all get to mainline during the next merge window, and then it is open season on outside-of-RCU cleanups. ;-)

Cool, thanks,