Rick Jones
2012-Mar-27 17:28 UTC
[PATCH net-next] virtio_net: do not rate limit counter increments
From: Rick Jones <rick.jones2 at hp.com>
While it is desirable to rate limit certain messages, it is not
desirable to rate limit the incrementing of counters associated
with those messages.
Signed-off-by: Rick Jones <rick.jones2 at hp.com>
---
Compiled, and run briefly in a 1 vCPU guest under a netperf workload.
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 019da01..4de2760 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -625,12 +625,13 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct
net_device *dev)
/* This can happen with OOM and indirect buffers. */
if (unlikely(capacity < 0)) {
- if (net_ratelimit()) {
- if (likely(capacity == -ENOMEM)) {
+ if (likely(capacity == -ENOMEM)) {
+ if (net_ratelimit()) {
dev_warn(&dev->dev,
"TX queue failure: out of memory\n");
} else {
- dev->stats.tx_fifo_errors++;
+ dev->stats.tx_fifo_errors++;
+ if (net_ratelimit())
dev_warn(&dev->dev,
"Unexpected TX queue failure: %d\n",
capacity);
Rusty Russell
2012-Mar-28 06:03 UTC
[PATCH net-next] virtio_net: do not rate limit counter increments
On Tue, 27 Mar 2012 10:28:09 -0700 (PDT), raj at tardy.cup.hp.com (Rick Jones) wrote:> From: Rick Jones <rick.jones2 at hp.com> > > While it is desirable to rate limit certain messages, it is not > desirable to rate limit the incrementing of counters associated > with those messages. > > Signed-off-by: Rick Jones <rick.jones2 at hp.com>Acked-by: Rusty Russell <rusty at rustcorp.com.au> Thanks! Rusty.> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 019da01..4de2760 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -625,12 +625,13 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev) > > /* This can happen with OOM and indirect buffers. */ > if (unlikely(capacity < 0)) { > - if (net_ratelimit()) { > - if (likely(capacity == -ENOMEM)) { > + if (likely(capacity == -ENOMEM)) { > + if (net_ratelimit()) { > dev_warn(&dev->dev, > "TX queue failure: out of memory\n"); > } else { > - dev->stats.tx_fifo_errors++; > + dev->stats.tx_fifo_errors++; > + if (net_ratelimit()) > dev_warn(&dev->dev, > "Unexpected TX queue failure: %d\n", > capacity); >-- How could I marry someone with more hair than me? http://baldalex.org
Michael S. Tsirkin
2012-Mar-28 08:30 UTC
[PATCH net-next] virtio_net: do not rate limit counter increments
On Tue, Mar 27, 2012 at 10:28:09AM -0700, Rick Jones wrote:> From: Rick Jones <rick.jones2 at hp.com> > > While it is desirable to rate limit certain messages, it is not > desirable to rate limit the incrementing of counters associated > with those messages. > > Signed-off-by: Rick Jones <rick.jones2 at hp.com>Acked-by: Michael S. Tsirkin <mst at redhat.com> Dave, can you apply pls? Thanks!> --- > > Compiled, and run briefly in a 1 vCPU guest under a netperf workload. > > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 019da01..4de2760 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -625,12 +625,13 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev) > > /* This can happen with OOM and indirect buffers. */ > if (unlikely(capacity < 0)) { > - if (net_ratelimit()) { > - if (likely(capacity == -ENOMEM)) { > + if (likely(capacity == -ENOMEM)) { > + if (net_ratelimit()) { > dev_warn(&dev->dev, > "TX queue failure: out of memory\n"); > } else { > - dev->stats.tx_fifo_errors++; > + dev->stats.tx_fifo_errors++; > + if (net_ratelimit()) > dev_warn(&dev->dev, > "Unexpected TX queue failure: %d\n", > capacity);
David Miller
2012-Mar-28 08:41 UTC
[PATCH net-next] virtio_net: do not rate limit counter increments
From: "Michael S. Tsirkin" <mst at redhat.com> Date: Wed, 28 Mar 2012 10:30:46 +0200> On Tue, Mar 27, 2012 at 10:28:09AM -0700, Rick Jones wrote: >> From: Rick Jones <rick.jones2 at hp.com> >> >> While it is desirable to rate limit certain messages, it is not >> desirable to rate limit the incrementing of counters associated >> with those messages. >> >> Signed-off-by: Rick Jones <rick.jones2 at hp.com> > > > Acked-by: Michael S. Tsirkin <mst at redhat.com> > > Dave, can you apply pls? Thanks!Done.