From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: Christoph Lameter <cl@linux.com>
Cc: linux-kernel@vger.kernel.org
Subject: Re: rcu: Replace __this_cpu_ptr uses with raw_cpu_ptr
Date: Tue, 15 Apr 2014 12:21:27 -0700 [thread overview]
Message-ID: <20140415192127.GR4496@linux.vnet.ibm.com> (raw)
In-Reply-To: <alpine.DEB.2.10.1404151234030.27440@gentwo.org>
On Tue, Apr 15, 2014 at 12:35:13PM -0500, Christoph Lameter wrote:
> 3.15-rc1 has raw_cpu operations. So this patch that you acked before will
> now apply.
>
>
> Subject: rcu: Replace __this_cpu_ptr uses with raw_cpu_ptr
>
> __this_cpu_ptr is being phased out.
>
> One special case is increment_cpu_stall_ticks().
> A per cpu variable is incremented so use raw_cpu_inc().
>
> Cc: Dipankar Sarma <dipankar@in.ibm.com>
> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
> Signed-off-by: Christoph Lameter <cl@linux.com>
Queued for 3.16, thank you Christoph.
Thanx, Paul
> Index: linux/kernel/rcu/tree.c
> ===================================================================
> --- linux.orig/kernel/rcu/tree.c 2014-04-14 13:24:55.189353922 -0500
> +++ linux/kernel/rcu/tree.c 2014-04-14 13:24:55.185354000 -0500
> @@ -1951,7 +1951,7 @@
> static void rcu_adopt_orphan_cbs(struct rcu_state *rsp, unsigned long flags)
> {
> int i;
> - struct rcu_data *rdp = __this_cpu_ptr(rsp->rda);
> + struct rcu_data *rdp = raw_cpu_ptr(rsp->rda);
>
> /* No-CBs CPUs are handled specially. */
> if (rcu_nocb_adopt_orphan_cbs(rsp, rdp, flags))
> @@ -2334,7 +2334,7 @@
> __rcu_process_callbacks(struct rcu_state *rsp)
> {
> unsigned long flags;
> - struct rcu_data *rdp = __this_cpu_ptr(rsp->rda);
> + struct rcu_data *rdp = raw_cpu_ptr(rsp->rda);
>
> WARN_ON_ONCE(rdp->beenonline == 0);
>
> @@ -2988,7 +2988,7 @@
> static void rcu_barrier_func(void *type)
> {
> struct rcu_state *rsp = type;
> - struct rcu_data *rdp = __this_cpu_ptr(rsp->rda);
> + struct rcu_data *rdp = raw_cpu_ptr(rsp->rda);
>
> _rcu_barrier_trace(rsp, "IRQ", -1, rsp->n_barrier_done);
> atomic_inc(&rsp->barrier_cpu_count);
> Index: linux/kernel/rcu/tree_plugin.h
> ===================================================================
> --- linux.orig/kernel/rcu/tree_plugin.h 2014-04-14 13:24:55.189353922 -0500
> +++ linux/kernel/rcu/tree_plugin.h 2014-04-14 13:24:55.185354000 -0500
> @@ -1855,7 +1855,7 @@
> struct rcu_data *rdp;
>
> for_each_rcu_flavor(rsp) {
> - rdp = __this_cpu_ptr(rsp->rda);
> + rdp = raw_cpu_ptr(rsp->rda);
> if (rdp->qlen_lazy != 0) {
> atomic_inc(&oom_callback_count);
> rsp->call(&rdp->oom_head, rcu_oom_callback);
> @@ -1997,7 +1997,7 @@
> struct rcu_state *rsp;
>
> for_each_rcu_flavor(rsp)
> - __this_cpu_ptr(rsp->rda)->ticks_this_gp++;
> + raw_cpu_inc(rsp->rda->ticks_this_gp);
> }
>
> #else /* #ifdef CONFIG_RCU_CPU_STALL_INFO */
>
prev parent reply other threads:[~2014-04-15 19:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-15 17:35 rcu: Replace __this_cpu_ptr uses with raw_cpu_ptr Christoph Lameter
2014-04-15 19:21 ` Paul E. McKenney [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140415192127.GR4496@linux.vnet.ibm.com \
--to=paulmck@linux.vnet.ibm.com \
--cc=cl@linux.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.