From: Rusty Russell <rusty@rustcorp•com.au>
To: Mark McLoughlin <markmc@redhat•com>
Cc: Jeff Garzik <jeff@garzik•org>,
netdev@vger•kernel.org,
virtualization@lists•linux-foundation.org
Subject: Re: [PATCH 1/3] virtio: fix virtio_net xmit of freed skb bug
Date: Thu, 29 May 2008 16:34:18 +1000 [thread overview]
Message-ID: <200805291634.18224.rusty@rustcorp.com.au> (raw)
In-Reply-To: <1211886386.3637.48.camel@muff>
On Tuesday 27 May 2008 21:06:26 Mark McLoughlin wrote:
> On Mon, 2008-05-26 at 17:42 +1000, Rusty Russell wrote:
> > If we fail to transmit a packet, we assume the queue is full and put
> > the skb into last_xmit_skb. However, if more space frees up before we
> > xmit it, we loop, and the result can be transmitting the same skb twice.
> >
> > Fix is simple: set skb to NULL if we've used it in some way, and check
> > before sending.
Great! It's a corner case, but it's no more complicated to do it your way.
Minor mod, I find it clearer to have the vi->last_xmit_skb = NULL; under
the branch:
Subject: [PATCH] virtio_net: Delay dropping tx skbs
Date: Tue, 27 May 2008 12:06:26 +0100
From: Mark McLoughlin <markmc@redhat•com>
Currently we drop the skb in start_xmit() if we have a
queued buffer and fail to transmit it.
However, if we delay dropping it until we've stopped the
queue and enabled the tx notification callback, then there
is a chance space might become available for it.
Signed-off-by: Mark McLoughlin <markmc@redhat•com>
Signed-off-by: Rusty Russell <rusty@rustcorp•com.au> (move last_xmit_skb = NULL)
---
drivers/net/virtio_net.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 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
@@ -308,13 +308,8 @@ again:
/* If we has a buffer left over from last time, send it now. */
if (unlikely(vi->last_xmit_skb)) {
- if (xmit_skb(vi, vi->last_xmit_skb) != 0) {
- /* Drop this skb: we only queue one. */
- vi->dev->stats.tx_dropped++;
- kfree_skb(skb);
- skb = NULL;
+ if (xmit_skb(vi, vi->last_xmit_skb) != 0)
goto stop_queue;
- }
vi->last_xmit_skb = NULL;
}
@@ -341,6 +336,11 @@ stop_queue:
vi->svq->vq_ops->disable_cb(vi->svq);
netif_start_queue(dev);
goto again;
+ }
+ if (skb) {
+ /* Drop this skb: we only queue one. */
+ vi->dev->stats.tx_dropped++;
+ kfree_skb(skb);
}
goto done;
}
next prev parent reply other threads:[~2008-05-29 6:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-26 7:42 [PATCH 1/3] virtio: fix virtio_net xmit of freed skb bug Rusty Russell
2008-05-26 7:48 ` [PATCH 2/3] virtio: fix delayed xmit of packet and freeing of old packets Rusty Russell
2008-05-26 7:53 ` [PATCH 3/3] virtio: Use __skb_queue_purge() Rusty Russell
2008-05-26 8:11 ` Wang Chen
2008-05-27 11:01 ` [PATCH 2/3] virtio: fix delayed xmit of packet and freeing of old packets Mark McLoughlin
2008-05-28 4:59 ` Rusty Russell
2008-05-27 11:06 ` [PATCH 1/3] virtio: fix virtio_net xmit of freed skb bug Mark McLoughlin
2008-05-29 6:34 ` Rusty Russell [this message]
2008-06-13 14:14 ` Mark McLoughlin
2008-06-13 19:57 ` Jeff Garzik
2008-06-14 7:39 ` Rusty Russell
2008-05-31 2:12 ` Jeff Garzik
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=200805291634.18224.rusty@rustcorp.com.au \
--to=rusty@rustcorp$(echo .)com.au \
--cc=jeff@garzik$(echo .)org \
--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