[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20120327172809.C52572900384@tardy>
Date:	Tue, 27 Mar 2012 10:28:09 -0700 (PDT)
From:	raj@...dy.cup.hp.com (Rick Jones)
To:	<netdev@...r.kernel.org>
Cc:	<rusty@...tcorp.com.au>, <mst@...hat.com>,
	<virtualization@...ts.linux-foundation.org>
Subject: [PATCH net-next] virtio_net: do not rate limit counter increments
From: Rick Jones <rick.jones2@...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@...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);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists
 
