Files
linux/drivers/net
Mark McLoughlin 9953ca6cb7 virtio: fix virtio_net xmit of freed skb bug
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.
...
> diff -r 564237b31993 drivers/net/virtio_net.c
> --- a/drivers/net/virtio_net.c	Mon May 19 12:22:00 2008 +1000
> +++ b/drivers/net/virtio_net.c	Mon May 19 12:24:58 2008 +1000
> @@ -287,21 +287,25 @@ again:
>  	free_old_xmit_skbs(vi);
>
>  	/* If we has a buffer left over from last time, send it now. */
> -	if (vi->last_xmit_skb) {
> +	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;
>  			goto stop_queue;
>  		}
>  		vi->last_xmit_skb = NULL;

With this, may drop an skb and then later in the function discover that
we could have sent it after all. Poor wee skb :)

How about the incremental patch below?

Cheers,
Mark.

Subject: [PATCH] virtio_net: Delay dropping tx skbs

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>
2008-07-25 12:06:00 +10:00
..
2008-07-22 19:39:14 -04:00
2008-05-22 14:12:39 -04:00
2008-07-22 16:09:13 -04:00
2008-03-26 00:18:44 -04:00
2008-07-21 21:55:03 -07:00
2008-03-17 08:11:03 -04:00
2006-09-13 13:24:59 -04:00
2008-01-28 15:04:05 -08:00
2006-09-13 13:24:59 -04:00
2006-09-13 13:24:59 -04:00
2008-06-10 18:20:17 -04:00
2006-09-13 13:24:59 -04:00
2008-03-26 00:18:43 -04:00
2007-10-10 16:51:43 -07:00
2008-04-29 01:56:14 -04:00
2006-09-13 13:24:59 -04:00
2008-07-18 17:54:17 -07:00
2008-05-16 22:20:27 -07:00
2008-07-18 17:58:57 -07:00
2008-07-18 17:55:11 -07:00
2008-06-23 20:33:36 -07:00
2008-06-23 20:27:26 -07:00
2008-06-23 20:36:51 -07:00
2008-06-23 20:33:01 -07:00
2008-06-23 20:34:36 -07:00
2008-01-04 00:47:04 -08:00
2006-09-13 13:24:59 -04:00
2008-03-26 00:18:43 -04:00
2007-02-09 16:23:17 +00:00
2006-09-13 13:24:59 -04:00
2008-02-01 20:54:03 +11:00
2008-07-22 17:54:07 -04:00
2007-10-10 16:51:13 -07:00
2007-10-10 16:51:13 -07:00
2008-01-28 15:07:59 -08:00
2008-04-29 01:56:01 -04:00
2008-06-17 23:07:29 -04:00
2007-10-19 11:53:42 -07:00
2006-09-13 13:24:59 -04:00
2008-07-22 17:12:37 +10:00
2008-07-22 17:12:37 +10:00
2008-05-22 14:12:40 -04:00
2008-01-28 15:07:12 -08:00
2006-09-13 13:24:59 -04:00
2008-07-22 17:50:44 -04:00
2008-07-22 17:50:44 -04:00
2008-02-03 04:26:12 -08:00
2007-10-10 16:50:46 -07:00
2008-07-17 19:21:30 -07:00
2008-03-17 08:11:41 -04:00
2008-04-25 02:08:51 -04:00
2008-06-11 22:06:31 -04:00
2008-01-28 15:04:05 -08:00
2008-01-28 15:07:12 -08:00
2008-07-22 19:34:21 -04:00
2007-10-19 11:53:42 -07:00
2007-04-28 11:01:05 -04:00
2008-02-03 04:28:10 -08:00
2008-07-22 19:56:37 -04:00
2008-07-22 17:50:44 -04:00
2008-03-17 07:56:33 -04:00
2008-07-22 17:50:44 -04:00
2008-03-26 00:18:04 -04:00
2008-03-26 00:18:00 -04:00
2006-09-13 13:24:59 -04:00
2007-10-23 21:28:40 -04:00
2008-07-17 19:21:17 -07:00
2008-05-30 22:19:22 -04:00
2008-03-05 16:34:41 -06:00
2008-07-20 17:12:34 -07:00
2008-01-28 15:11:27 -08:00
2008-07-20 17:12:34 -07:00
2008-06-20 21:58:02 -07:00
2008-01-28 15:08:00 -08:00
2008-07-22 20:00:01 -04:00
2008-01-28 15:03:59 -08:00
2008-07-17 19:21:07 -07:00
2008-07-11 01:11:40 -04:00
2008-04-16 20:41:44 -04:00
2008-05-30 22:07:17 -04:00
2008-06-28 10:23:33 -04:00
2006-09-13 13:24:59 -04:00
2007-10-16 21:10:29 -04:00
2008-07-22 21:53:40 -07:00
2008-06-17 23:59:39 -04:00
2008-01-28 15:11:27 -08:00
2008-07-20 17:12:34 -07:00
2006-09-13 13:24:59 -04:00
2008-01-28 15:03:59 -08:00
2007-05-04 17:59:08 -07:00
2007-07-16 15:02:47 +02:00
2008-04-16 20:06:50 -04:00
2007-10-10 16:51:13 -07:00
2008-02-03 04:26:15 -08:00
2008-01-28 15:03:46 -08:00
2008-03-23 03:35:12 -07:00
2008-01-28 15:07:10 -08:00
2008-01-28 15:07:09 -08:00
2008-02-03 04:26:14 -08:00
2007-10-10 16:51:34 -07:00
2008-05-29 01:38:46 -07:00
2008-05-30 22:18:02 -04:00
2008-05-30 22:18:02 -04:00
2008-07-22 17:54:17 -04:00