From: Rusty Russell <rusty@rustcorp•com.au>
To: Mark McLoughlin <markmc@redhat•com>
Cc: netdev@vger•kernel.org,
virtualization@lists•linux-foundation.org,
Herbert Xu <herbert@gondor•apana.org.au>
Subject: Re: [PATCH 2/4] virtio_net: return NETDEV_TX_BUSY instead of queueing an extra skb.
Date: Tue, 2 Jun 2009 23:34:28 +0930 [thread overview]
Message-ID: <200906022334.29428.rusty@rustcorp.com.au> (raw)
In-Reply-To: <1243930050.9146.53.camel@blaa>
On Tue, 2 Jun 2009 05:37:30 pm Mark McLoughlin wrote:
> On Fri, 2009-05-29 at 23:46 +0930, Rusty Russell wrote:
> > This effectively reverts 99ffc696d10b28580fe93441d627cf290ac4484c
> > "virtio: wean net driver off NETDEV_TX_BUSY".
> >
> > The complexity of queuing an skb (setting a tasklet to re-xmit) is
> > questionable,
>
> It certainly adds some subtle complexities to start_xmit()
>
> > especially once we get rid of the other reason for the
> > tasklet in the next patch.
> >
> > If the skb won't fit in the tx queue, just return NETDEV_TX_BUSY. It
> > might be frowned upon, but it's common and not going away any time
> > soon.
> >
> > Signed-off-by: Rusty Russell <rusty@rustcorp•com.au>
> > Cc: Herbert Xu <herbert@gondor•apana.org.au>
> > ---
> > drivers/net/virtio_net.c | 49
> > ++++++++++------------------------------------- 1 file changed, 11
> > insertions(+), 38 deletions(-)
> >
> > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> > --- a/drivers/net/virtio_net.c
> > +++ b/drivers/net/virtio_net.c
> >
> > @@ -526,27 +517,14 @@ again:
> > /* Free up any pending old buffers before queueing new ones. */
> > free_old_xmit_skbs(vi);
> >
> > - /* If we has a buffer left over from last time, send it now. */
> > - if (unlikely(vi->last_xmit_skb) &&
> > - xmit_skb(vi, vi->last_xmit_skb) != 0)
> > - goto stop_queue;
> > + /* Put new one in send queue and do transmit */
> > + __skb_queue_head(&vi->send, skb);
> > + if (likely(xmit_skb(vi, skb) == 0)) {
> > + vi->svq->vq_ops->kick(vi->svq);
> > + return NETDEV_TX_OK;
> > + }
>
> Hmm, is it okay to leave the skb on the send queue if we return
> NETDEV_TX_BUSY?
Certainly not. That's a bug. Incremental fix is:
diff -u b/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
--- b/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -524,8 +524,9 @@
return NETDEV_TX_OK;
}
- /* Ring too full for this packet. */
+ /* Ring too full for this packet, remove it from queue again. */
pr_debug("%s: virtio not prepared to send\n", dev->name);
+ __skb_unlink(skb, &vi->send);
netif_stop_queue(dev);
/* Activate callback for using skbs: if this returns false it
Thanks!
Rusty.
next prev parent reply other threads:[~2009-06-02 14:06 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-29 14:16 [PATCH 2/4] virtio_net: return NETDEV_TX_BUSY instead of queueing an extra skb Rusty Russell
2009-06-02 8:07 ` Mark McLoughlin
2009-06-02 14:04 ` Rusty Russell [this message]
2009-06-02 9:05 ` Herbert Xu
2009-06-02 13:55 ` Rusty Russell
2009-06-02 23:45 ` Herbert Xu
2009-06-03 3:17 ` Rusty Russell
2009-06-08 5:22 ` Herbert Xu
2009-06-13 12:30 ` Rusty Russell
2009-06-14 6:45 ` Herbert Xu
2009-06-18 7:17 ` Rusty Russell
2009-06-18 7:34 ` Herbert Xu
2009-06-19 3:37 ` Rusty Russell
2009-06-19 4:36 ` Herbert Xu
2009-06-19 13:50 ` Rusty Russell
2009-06-19 14:10 ` Herbert Xu
2009-06-22 2:39 ` Rusty Russell
2009-06-22 5:46 ` Krishna Kumar2
2009-06-22 7:34 ` Herbert Xu
2009-06-22 13:41 ` Krishna Kumar2
2009-06-22 18:25 ` Matt Carlson
2009-06-23 2:54 ` Herbert Xu
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=200906022334.29428.rusty@rustcorp.com.au \
--to=rusty@rustcorp$(echo .)com.au \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=markmc@redhat$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=virtualization@lists$(echo .)linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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