* [RFC net-next] netpoll: use static branch
@ 2012-09-18 21:10 Stephen Hemminger
2012-09-19 4:50 ` Cong Wang
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Hemminger @ 2012-09-18 21:10 UTC (permalink / raw)
To: David Miller, Cong Wang, Eric Dumazet; +Cc: netdev
This is an attempt to optimize netpoll when not used.
Since distro's enable everything and netpoll is only occasionally
used, improve performance by getting netpoll condition check
out of the Rx fastpath.
Compile tested only, I have no real use for netpoll.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
---
include/linux/netpoll.h | 28 ++++++++++++++++++++--------
net/core/netpoll.c | 8 +++++++-
2 files changed, 27 insertions(+), 9 deletions(-)
--- a/include/linux/netpoll.h 2012-09-18 13:25:15.575750004 -0700
+++ b/include/linux/netpoll.h 2012-09-18 13:29:16.245323347 -0700
@@ -66,10 +66,16 @@ static inline void netpoll_send_skb(stru
#ifdef CONFIG_NETPOLL
+extern struct static_key netpoll_needed;
+
static inline bool netpoll_rx_on(struct sk_buff *skb)
{
- struct netpoll_info *npinfo = rcu_dereference_bh(skb->dev->npinfo);
+ struct netpoll_info *npinfo;
+
+ if (static_key_true(&netpoll_needed))
+ return false;
+ npinfo = rcu_dereference_bh(skb->dev->npinfo);
return npinfo && (!list_empty(&npinfo->rx_np) || npinfo->rx_flags);
}
@@ -79,12 +85,14 @@ static inline bool netpoll_rx(struct sk_
unsigned long flags;
bool ret = false;
- local_irq_save(flags);
+ if (static_key_true(&netpoll_needed))
+ return false;
- if (!netpoll_rx_on(skb))
+ local_irq_save(flags);
+ npinfo = rcu_dereference_bh(skb->dev->npinfo);
+ if (!npinfo || (list_empty(&npinfo->rx_np) && !npinfo->rx_flags))
goto out;
- npinfo = rcu_dereference_bh(skb->dev->npinfo);
spin_lock(&npinfo->rx_lock);
/* check rx_flags again with the lock held */
if (npinfo->rx_flags && __netpoll_rx(skb, npinfo))
@@ -96,11 +104,15 @@ out:
return ret;
}
-static inline int netpoll_receive_skb(struct sk_buff *skb)
+static inline bool netpoll_receive_skb(struct sk_buff *skb)
{
+ if (static_key_true(&netpoll_needed))
+ return false;
+
if (!list_empty(&skb->dev->napi_list))
return netpoll_rx(skb);
- return 0;
+
+ return false;
}
static inline void *netpoll_poll_lock(struct napi_struct *napi)
@@ -139,9 +151,9 @@ static inline bool netpoll_rx_on(struct
{
return false;
}
-static inline int netpoll_receive_skb(struct sk_buff *skb)
+static inline bool netpoll_receive_skb(struct sk_buff *skb)
{
- return 0;
+ return false;
}
static inline void *netpoll_poll_lock(struct napi_struct *napi)
{
--- a/net/core/netpoll.c 2012-09-18 13:25:15.575750004 -0700
+++ b/net/core/netpoll.c 2012-09-18 13:26:44.330855089 -0700
@@ -67,6 +67,8 @@ module_param(carrier_timeout, uint, 0644
#define np_notice(np, fmt, ...) \
pr_notice("%s: " fmt, np->name, ##__VA_ARGS__)
+struct static_key netpoll_needed __read_mostly;
+
static void queue_process(struct work_struct *work)
{
struct netpoll_info *npinfo =
@@ -786,6 +788,8 @@ int __netpoll_setup(struct netpoll *np,
npinfo->rx_flags |= NETPOLL_RX_ENABLED;
list_add_tail(&np->rx, &npinfo->rx_np);
spin_unlock_irqrestore(&npinfo->rx_lock, flags);
+
+ static_key_slow_inc(&netpoll_needed);
}
/* last thing to do is link it to the net device structure */
@@ -926,8 +930,10 @@ void __netpoll_cleanup(struct netpoll *n
if (!list_empty(&npinfo->rx_np)) {
spin_lock_irqsave(&npinfo->rx_lock, flags);
list_del(&np->rx);
- if (list_empty(&npinfo->rx_np))
+ if (list_empty(&npinfo->rx_np)) {
npinfo->rx_flags &= ~NETPOLL_RX_ENABLED;
+ static_key_slow_dec(&netpoll_needed);
+ }
spin_unlock_irqrestore(&npinfo->rx_lock, flags);
}
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [RFC net-next] netpoll: use static branch
2012-09-18 21:10 [RFC net-next] netpoll: use static branch Stephen Hemminger
@ 2012-09-19 4:50 ` Cong Wang
2012-09-19 20:00 ` Stephen Hemminger
0 siblings, 1 reply; 4+ messages in thread
From: Cong Wang @ 2012-09-19 4:50 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: David Miller, Eric Dumazet, netdev
On Tue, 2012-09-18 at 14:10 -0700, Stephen Hemminger wrote:
> This is an attempt to optimize netpoll when not used.
>
> Since distro's enable everything and netpoll is only occasionally
> used, improve performance by getting netpoll condition check
> out of the Rx fastpath.
>
> Compile tested only, I have no real use for netpoll.
>
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
>
>
> ---
> include/linux/netpoll.h | 28 ++++++++++++++++++++--------
> net/core/netpoll.c | 8 +++++++-
> 2 files changed, 27 insertions(+), 9 deletions(-)
>
> --- a/include/linux/netpoll.h 2012-09-18 13:25:15.575750004 -0700
> +++ b/include/linux/netpoll.h 2012-09-18 13:29:16.245323347 -0700
> @@ -66,10 +66,16 @@ static inline void netpoll_send_skb(stru
>
>
> #ifdef CONFIG_NETPOLL
> +extern struct static_key netpoll_needed;
> +
> static inline bool netpoll_rx_on(struct sk_buff *skb)
> {
> - struct netpoll_info *npinfo = rcu_dereference_bh(skb->dev->npinfo);
> + struct netpoll_info *npinfo;
> +
> + if (static_key_true(&netpoll_needed))
> + return false;
>
I think we should use static_key_false() here, as netpoll is an
"unlikely" code path.
Using static branch is a good idea though.
Thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [RFC net-next] netpoll: use static branch
2012-09-19 4:50 ` Cong Wang
@ 2012-09-19 20:00 ` Stephen Hemminger
2012-09-20 7:30 ` Cong Wang
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Hemminger @ 2012-09-19 20:00 UTC (permalink / raw)
To: Cong Wang; +Cc: David Miller, Eric Dumazet, netdev
On Wed, 19 Sep 2012 12:50:10 +0800
Cong Wang <amwang@redhat.com> wrote:
> On Tue, 2012-09-18 at 14:10 -0700, Stephen Hemminger wrote:
> > This is an attempt to optimize netpoll when not used.
> >
> > Since distro's enable everything and netpoll is only occasionally
> > used, improve performance by getting netpoll condition check
> > out of the Rx fastpath.
> >
> > Compile tested only, I have no real use for netpoll.
> >
> > Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
> >
> >
> > ---
> > include/linux/netpoll.h | 28 ++++++++++++++++++++--------
> > net/core/netpoll.c | 8 +++++++-
> > 2 files changed, 27 insertions(+), 9 deletions(-)
> >
> > --- a/include/linux/netpoll.h 2012-09-18 13:25:15.575750004 -0700
> > +++ b/include/linux/netpoll.h 2012-09-18 13:29:16.245323347 -0700
> > @@ -66,10 +66,16 @@ static inline void netpoll_send_skb(stru
> >
> >
> > #ifdef CONFIG_NETPOLL
> > +extern struct static_key netpoll_needed;
> > +
> > static inline bool netpoll_rx_on(struct sk_buff *skb)
> > {
> > - struct netpoll_info *npinfo = rcu_dereference_bh(skb->dev->npinfo);
> > + struct netpoll_info *npinfo;
> > +
> > + if (static_key_true(&netpoll_needed))
> > + return false;
> >
>
> I think we should use static_key_false() here, as netpoll is an
> "unlikely" code path.
>
> Using static branch is a good idea though.
>
> Thanks.
But static_key_true is just a wrapper around !static_key_false()
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [RFC net-next] netpoll: use static branch
2012-09-19 20:00 ` Stephen Hemminger
@ 2012-09-20 7:30 ` Cong Wang
0 siblings, 0 replies; 4+ messages in thread
From: Cong Wang @ 2012-09-20 7:30 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: David Miller, Eric Dumazet, netdev
On Wed, 2012-09-19 at 13:00 -0700, Stephen Hemminger wrote:
> On Wed, 19 Sep 2012 12:50:10 +0800
> Cong Wang <amwang@redhat.com> wrote:
>
> > On Tue, 2012-09-18 at 14:10 -0700, Stephen Hemminger wrote:
> > > This is an attempt to optimize netpoll when not used.
> > >
> > > Since distro's enable everything and netpoll is only occasionally
> > > used, improve performance by getting netpoll condition check
> > > out of the Rx fastpath.
> > >
> > > Compile tested only, I have no real use for netpoll.
> > >
> > > Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
> > >
> > >
> > > ---
> > > include/linux/netpoll.h | 28 ++++++++++++++++++++--------
> > > net/core/netpoll.c | 8 +++++++-
> > > 2 files changed, 27 insertions(+), 9 deletions(-)
> > >
> > > --- a/include/linux/netpoll.h 2012-09-18 13:25:15.575750004 -0700
> > > +++ b/include/linux/netpoll.h 2012-09-18 13:29:16.245323347 -0700
> > > @@ -66,10 +66,16 @@ static inline void netpoll_send_skb(stru
> > >
> > >
> > > #ifdef CONFIG_NETPOLL
> > > +extern struct static_key netpoll_needed;
> > > +
> > > static inline bool netpoll_rx_on(struct sk_buff *skb)
> > > {
> > > - struct netpoll_info *npinfo = rcu_dereference_bh(skb->dev->npinfo);
> > > + struct netpoll_info *npinfo;
> > > +
> > > + if (static_key_true(&netpoll_needed))
> > > + return false;
> > >
> >
> > I think we should use static_key_false() here, as netpoll is an
> > "unlikely" code path.
> >
> > Using static branch is a good idea though.
> >
> > Thanks.
>
> But static_key_true is just a wrapper around !static_key_false()
For !HAVE_JUMP_LABEL arch, the definition is below:
static __always_inline bool static_key_false(struct static_key *key)
{
if (unlikely(atomic_read(&key->enabled)) > 0)
return true;
return false;
}
static __always_inline bool static_key_true(struct static_key *key)
{
if (likely(atomic_read(&key->enabled)) > 0)
return true;
return false;
}
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-09-20 7:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-18 21:10 [RFC net-next] netpoll: use static branch Stephen Hemminger
2012-09-19 4:50 ` Cong Wang
2012-09-19 20:00 ` Stephen Hemminger
2012-09-20 7:30 ` Cong Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).