Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751480Ab2KPIin (ORCPT ); Fri, 16 Nov 2012 03:38:43 -0500 Received: from mail-pb0-f46.google.com ([209.85.160.46]:45343 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750799Ab2KPIil (ORCPT ); Fri, 16 Nov 2012 03:38:41 -0500 Message-ID: <50A5FB89.4000400@gmail.com> Date: Fri, 16 Nov 2012 16:38:33 +0800 From: Shan Wei User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: David Miller CC: Shan Wei , venkat.x.venkatsubra@oracle.com, rds-devel@oss.oracle.com, NetDev , Kernel-Maillist , cl@linux-foundation.org, Tejun Heo Subject: Re: [PATCH v4 2/9] net: rds: use this_cpu_* per-cpu helper References: <50A1A7C1.50308@gmail.com> In-Reply-To: <50A1A7C1.50308@gmail.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2714 Lines: 91 Shan Wei said, at 2012/11/13 9:52: > From: Shan Wei > > > Signed-off-by: Shan Wei > Reviewed-by: Christoph Lameter David Miller, would you like to pick it up to your net-next tree? > --- > v4: > 1. add missing __percpu annotations. > 2. [read|write]ing fields of struct rds_ib_cache_head > using __this_cpu_* operation, drop per_cpu_ptr. > --- > net/rds/ib.h | 2 +- > net/rds/ib_recv.c | 24 +++++++++++++----------- > 2 files changed, 14 insertions(+), 12 deletions(-) > > diff --git a/net/rds/ib.h b/net/rds/ib.h > index 8d2b3d5..7280ab8 100644 > --- a/net/rds/ib.h > +++ b/net/rds/ib.h > @@ -50,7 +50,7 @@ struct rds_ib_cache_head { > }; > > struct rds_ib_refill_cache { > - struct rds_ib_cache_head *percpu; > + struct rds_ib_cache_head __percpu *percpu; > struct list_head *xfer; > struct list_head *ready; > }; > diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c > index 8d19491..8c5bc85 100644 > --- a/net/rds/ib_recv.c > +++ b/net/rds/ib_recv.c > @@ -418,20 +418,21 @@ static void rds_ib_recv_cache_put(struct list_head *new_item, > struct rds_ib_refill_cache *cache) > { > unsigned long flags; > - struct rds_ib_cache_head *chp; > struct list_head *old; > + struct list_head __percpu *chpfirst; > > local_irq_save(flags); > > - chp = per_cpu_ptr(cache->percpu, smp_processor_id()); > - if (!chp->first) > + chpfirst = __this_cpu_read(cache->percpu->first); > + if (!chpfirst) > INIT_LIST_HEAD(new_item); > else /* put on front */ > - list_add_tail(new_item, chp->first); > - chp->first = new_item; > - chp->count++; > + list_add_tail(new_item, chpfirst); > > - if (chp->count < RDS_IB_RECYCLE_BATCH_COUNT) > + __this_cpu_write(chpfirst, new_item); > + __this_cpu_inc(cache->percpu->count); > + > + if (__this_cpu_read(cache->percpu->count) < RDS_IB_RECYCLE_BATCH_COUNT) > goto end; > > /* > @@ -443,12 +444,13 @@ static void rds_ib_recv_cache_put(struct list_head *new_item, > do { > old = xchg(&cache->xfer, NULL); > if (old) > - list_splice_entire_tail(old, chp->first); > - old = cmpxchg(&cache->xfer, NULL, chp->first); > + list_splice_entire_tail(old, chpfirst); > + old = cmpxchg(&cache->xfer, NULL, chpfirst); > } while (old); > > - chp->first = NULL; > - chp->count = 0; > + > + __this_cpu_write(chpfirst, NULL); > + __this_cpu_write(cache->percpu->count, 0); > end: > local_irq_restore(flags); > } > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/