From: "Michael S. Tsirkin" <mst@redhat.com>
To: rusty@rustcorp.com.au, habanero@linux.vnet.ibm.com,
Shirley Ma <mashirle@us.ibm.com>,
Krishna Kumar2 <krkumar2@in.ibm.com>,
kvm@vger.kernel.org, steved@us.ibm.com, Tom Lendacky <tahm@
Cc: Rusty Russell <rusty@rustcorp.com.au>,
"Michael S. Tsirkin" <mst@redhat.com>,
virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH RFC] virtio_net: fix patch: virtio_net: limit xmit polling
Date: Thu, 19 May 2011 01:01:25 +0300 [thread overview]
Message-ID: <20110518220125.GA26835@redhat.com> (raw)
The patch virtio_net: limit xmit polling
got the logic reversed: it polled while we had
capacity not while ring was empty.
Fix it up and clean up a bit by using a for loop.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
OK, turns out that patch was borken. Here's
a fix that survived stress test on my box.
Pushed on my branch, I'll send a rebased series
with Rusty's comments addressed ASAP.
drivers/net/virtio_net.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 9982bd7..c8cd22d 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -514,12 +514,14 @@ static bool free_old_xmit_skbs(struct virtnet_info *vi, int capacity)
struct sk_buff *skb;
unsigned int len;
bool c;
+ int n;
+
/* We try to free up at least 2 skbs per one sent, so that we'll get
* all of the memory back if they are used fast enough. */
- int n = 2;
-
- while ((c = virtqueue_get_capacity(vi->svq) >= capacity) && --n > 0 &&
- (skb = virtqueue_get_buf(vi->svq, &len)) != NULL) {
+ for (n = 0;
+ ((c = virtqueue_get_capacity(vi->svq)) < capacity || n < 2) &&
+ ((skb = virtqueue_get_buf(vi->svq, &len)));
+ ++n) {
pr_debug("Sent skb %p\n", skb);
vi->dev->stats.tx_bytes += skb->len;
vi->dev->stats.tx_packets++;
--
1.7.5.53.gc233e
next reply other threads:[~2011-05-18 22:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-18 22:01 Michael S. Tsirkin [this message]
2011-05-19 7:30 ` [PATCH RFC] virtio_net: fix patch: virtio_net: limit xmit polling Rusty Russell
2011-05-22 17:32 ` Michael S. Tsirkin
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=20110518220125.GA26835@redhat.com \
--to=mst@redhat.com \
--cc=habanero@linux.vnet.ibm.com \
--cc=krkumar2@in.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mashirle@us.ibm.com \
--cc=netdev@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
--cc=steved@us.ibm.com \
--cc=virtualization@lists.linux-foundation.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 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).