From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758813Ab2FOXhy (ORCPT ); Fri, 15 Jun 2012 19:37:54 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:42137 "EHLO relay3-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758549Ab2FOXhx (ORCPT ); Fri, 15 Jun 2012 19:37:53 -0400 X-Originating-IP: 217.70.178.133 X-Originating-IP: 50.43.46.74 Date: Fri, 15 Jun 2012 16:37:35 -0700 From: Josh Triplett To: "Paul E. McKenney" Cc: linux-kernel@vger.kernel.org, mingo@elte.hu, laijs@cn.fujitsu.com, dipankar@in.ibm.com, akpm@linux-foundation.org, mathieu.desnoyers@polymtl.ca, niv@us.ibm.com, tglx@linutronix.de, peterz@infradead.org, rostedt@goodmis.org, Valdis.Kletnieks@vt.edu, dhowells@redhat.com, eric.dumazet@gmail.com, darren@dvhart.com, fweisbec@gmail.com, patches@linaro.org Subject: Re: [PATCH tip/core/rcu 12/15] rcu: Remove unneeded __rcu_process_callbacks() argument Message-ID: <20120615233735.GC7613@leaf> References: <20120615210550.GA27506@linux.vnet.ibm.com> <1339794370-28119-1-git-send-email-paulmck@linux.vnet.ibm.com> <1339794370-28119-12-git-send-email-paulmck@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1339794370-28119-12-git-send-email-paulmck@linux.vnet.ibm.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jun 15, 2012 at 02:06:07PM -0700, Paul E. McKenney wrote: > From: "Paul E. McKenney" > > With the advent of __this_cpu_ptr(), it is no longer necessary to pass > both the rcu_state and rcu_data structures into __rcu_process_callbacks(). > This commit therefore computes the rcu_data pointer from the rcu_state > pointer within __rcu_process_callbacks() so that callers can pass in > only the pointer to the rcu_state structure. This paves the way for > linking the rcu_state structures together and iterating over them. > > Signed-off-by: Paul E. McKenney Reviewed-by: Josh Triplett > kernel/rcutree.c | 8 ++++---- > kernel/rcutree_plugin.h | 3 +-- > 2 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/kernel/rcutree.c b/kernel/rcutree.c > index ebd5223..bd4e41c 100644 > --- a/kernel/rcutree.c > +++ b/kernel/rcutree.c > @@ -1785,9 +1785,10 @@ unlock_fqs_ret: > * whom the rdp belongs. > */ > static void > -__rcu_process_callbacks(struct rcu_state *rsp, struct rcu_data *rdp) > +__rcu_process_callbacks(struct rcu_state *rsp) > { > unsigned long flags; > + struct rcu_data *rdp = __this_cpu_ptr(rsp->rda); > > WARN_ON_ONCE(rdp->beenonline == 0); > > @@ -1824,9 +1825,8 @@ __rcu_process_callbacks(struct rcu_state *rsp, struct rcu_data *rdp) > static void rcu_process_callbacks(struct softirq_action *unused) > { > trace_rcu_utilization("Start RCU core"); > - __rcu_process_callbacks(&rcu_sched_state, > - &__get_cpu_var(rcu_sched_data)); > - __rcu_process_callbacks(&rcu_bh_state, &__get_cpu_var(rcu_bh_data)); > + __rcu_process_callbacks(&rcu_sched_state); > + __rcu_process_callbacks(&rcu_bh_state); > rcu_preempt_process_callbacks(); > trace_rcu_utilization("End RCU core"); > } > diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h > index 6888706..686cb55 100644 > --- a/kernel/rcutree_plugin.h > +++ b/kernel/rcutree_plugin.h > @@ -687,8 +687,7 @@ static void rcu_preempt_check_callbacks(int cpu) > */ > static void rcu_preempt_process_callbacks(void) > { > - __rcu_process_callbacks(&rcu_preempt_state, > - &__get_cpu_var(rcu_preempt_data)); > + __rcu_process_callbacks(&rcu_preempt_state); > } > > #ifdef CONFIG_RCU_BOOST > -- > 1.7.8 >