All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dustin Kirkland <kirkland@canonical.com>
To: Mark McLoughlin <markmc@redhat.com>
Cc: Anthony Liguori <anthony@codemonkey.ws>,
	Scott Tsai <scottt.tw@gmail.com>,
	qemu-devel <qemu-devel@nongnu.org>, kvm <kvm@vger.kernel.org>,
	Rusty Russell <rusty@rustcorp.com.au>
Subject: [PATCH] whitelist host virtio networking features [was Re: qemu-kvm-0.11 regression, crashes on older ...]
Date: Thu, 29 Oct 2009 10:34:15 -0500	[thread overview]
Message-ID: <1256830455.25064.155.camel@x200> (raw)
In-Reply-To: <1256827719.10825.75.camel@blaa>

[-- Attachment #1: Type: text/plain, Size: 1713 bytes --]

whitelist host virtio networking features

This patch is a followup to 8eca6b1bc770982595db2f7207c65051572436cb,
fixing crashes when guests with 2.6.25 virtio drivers have saturated
virtio network connections.

https://bugs.edge.launchpad.net/ubuntu/+source/qemu-kvm/+bug/458521

That patch should have been whitelisting *_HOST_* rather than the the
*_GUEST_* features.

I tested this by running an Ubuntu 8.04 Hardy guest (2.6.24 kernel +
2.6.25-virtio driver).  I saturated both the incoming, and outgoing
network connection with nc, seeing sustained 6MB/s up and 6MB/s down
bitrates for ~20 minutes.  Previously, this crashed immediately.  Now,
the guest does not crash and maintains network connectivity throughout
the test.

Signed-off-by: Dustin Kirkland <kirkland@canonical.com>
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Tested-by: Dustin Kirkland <kirkland@canonical.com>

diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index ce8e6cb..27834fa 100644
--- a/hw/virtio-net.c
+++ b/hw/virtio-net.c
@@ -164,10 +164,10 @@ static uint32_t virtio_net_bad_features(VirtIODevice *vdev)
     /* Linux kernel 2.6.25.  It understood MAC (as everyone must),
      * but also these: */
     features |= (1 << VIRTIO_NET_F_MAC);
-    features |= (1 << VIRTIO_NET_F_GUEST_CSUM);
-    features |= (1 << VIRTIO_NET_F_GUEST_TSO4);
-    features |= (1 << VIRTIO_NET_F_GUEST_TSO6);
-    features |= (1 << VIRTIO_NET_F_GUEST_ECN);
+    features |= (1 << VIRTIO_NET_F_CSUM);
+    features |= (1 << VIRTIO_NET_F_HOST_TSO4);
+    features |= (1 << VIRTIO_NET_F_HOST_TSO6);
+    features |= (1 << VIRTIO_NET_F_HOST_ECN);
 
     return features & virtio_net_get_features(vdev);
 }


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

WARNING: multiple messages have this Message-ID
From: Dustin Kirkland <kirkland@canonical.com>
To: Mark McLoughlin <markmc@redhat.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>,
	Scott Tsai <scottt.tw@gmail.com>,
	qemu-devel <qemu-devel@nongnu.org>, kvm <kvm@vger.kernel.org>
Subject: [Qemu-devel] [PATCH] whitelist host virtio networking features [was Re: qemu-kvm-0.11 regression, crashes on older ...]
Date: Thu, 29 Oct 2009 10:34:15 -0500	[thread overview]
Message-ID: <1256830455.25064.155.camel@x200> (raw)
In-Reply-To: <1256827719.10825.75.camel@blaa>

[-- Attachment #1: Type: text/plain, Size: 1713 bytes --]

whitelist host virtio networking features

This patch is a followup to 8eca6b1bc770982595db2f7207c65051572436cb,
fixing crashes when guests with 2.6.25 virtio drivers have saturated
virtio network connections.

https://bugs.edge.launchpad.net/ubuntu/+source/qemu-kvm/+bug/458521

That patch should have been whitelisting *_HOST_* rather than the the
*_GUEST_* features.

I tested this by running an Ubuntu 8.04 Hardy guest (2.6.24 kernel +
2.6.25-virtio driver).  I saturated both the incoming, and outgoing
network connection with nc, seeing sustained 6MB/s up and 6MB/s down
bitrates for ~20 minutes.  Previously, this crashed immediately.  Now,
the guest does not crash and maintains network connectivity throughout
the test.

Signed-off-by: Dustin Kirkland <kirkland@canonical.com>
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Tested-by: Dustin Kirkland <kirkland@canonical.com>

diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index ce8e6cb..27834fa 100644
--- a/hw/virtio-net.c
+++ b/hw/virtio-net.c
@@ -164,10 +164,10 @@ static uint32_t virtio_net_bad_features(VirtIODevice *vdev)
     /* Linux kernel 2.6.25.  It understood MAC (as everyone must),
      * but also these: */
     features |= (1 << VIRTIO_NET_F_MAC);
-    features |= (1 << VIRTIO_NET_F_GUEST_CSUM);
-    features |= (1 << VIRTIO_NET_F_GUEST_TSO4);
-    features |= (1 << VIRTIO_NET_F_GUEST_TSO6);
-    features |= (1 << VIRTIO_NET_F_GUEST_ECN);
+    features |= (1 << VIRTIO_NET_F_CSUM);
+    features |= (1 << VIRTIO_NET_F_HOST_TSO4);
+    features |= (1 << VIRTIO_NET_F_HOST_TSO6);
+    features |= (1 << VIRTIO_NET_F_HOST_ECN);
 
     return features & virtio_net_get_features(vdev);
 }


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

  parent reply	other threads:[~2009-10-29 15:34 UTC|newest]

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-28 19:22 qemu-kvm-0.11 regression, crashes on older guests with virtio network Dustin Kirkland
2009-10-28 19:22 ` [Qemu-devel] " Dustin Kirkland
2009-10-28 19:29 ` Dustin Kirkland
2009-10-28 19:29   ` [Qemu-devel] " Dustin Kirkland
2009-10-29  3:12 ` [Qemu-devel] " Scott Tsai
2009-10-29  3:12   ` Scott Tsai
2009-10-29  9:16 ` Mark McLoughlin
2009-10-29  9:16   ` Mark McLoughlin
2009-10-29 12:00   ` Scott Tsai
2009-10-29 12:00     ` Scott Tsai
2009-10-29 12:16     ` Mark McLoughlin
2009-10-29 12:16       ` Mark McLoughlin
2009-10-29 12:21       ` Scott Tsai
2009-10-29 12:21         ` Scott Tsai
2009-10-29 14:11       ` Anthony Liguori
2009-10-29 14:11         ` Anthony Liguori
2009-10-29 14:25         ` Mark McLoughlin
2009-10-29 14:25           ` Mark McLoughlin
2009-10-29 14:34           ` Dustin Kirkland
2009-10-29 14:34             ` Dustin Kirkland
2009-10-29 14:46             ` Dustin Kirkland
2009-10-29 14:46               ` Dustin Kirkland
2009-10-29 14:50               ` Mark McLoughlin
2009-10-29 14:50                 ` Mark McLoughlin
2009-10-29 14:39           ` Anthony Liguori
2009-10-29 14:39             ` Anthony Liguori
2009-10-29 14:48             ` Mark McLoughlin
2009-10-29 14:48               ` Mark McLoughlin
2009-10-29 15:01               ` Dustin Kirkland
2009-10-29 15:01                 ` Dustin Kirkland
2009-10-29 15:01                 ` Mark McLoughlin
2009-10-29 15:01                   ` Mark McLoughlin
2009-10-29 15:13                   ` Dustin Kirkland
2009-10-29 15:13                     ` Dustin Kirkland
2009-10-29 15:15                     ` Mark McLoughlin
2009-10-29 15:15                       ` Mark McLoughlin
2009-10-29 15:34               ` Dustin Kirkland [this message]
2009-10-29 15:34                 ` [Qemu-devel] [PATCH] whitelist host virtio networking features [was Re: qemu-kvm-0.11 regression, crashes on older ...] Dustin Kirkland
2009-10-30 21:15                 ` Dustin Kirkland
2009-10-30 21:15                   ` [Qemu-devel] " Dustin Kirkland
2009-11-02 14:38                   ` Mark McLoughlin
2009-11-02 14:38                     ` [Qemu-devel] " Mark McLoughlin
2009-11-02 15:42                     ` Anthony Liguori
2009-11-02 15:42                       ` [Qemu-devel] " Anthony Liguori
2009-11-02 15:52                       ` Jamie Lokier
2009-11-02 18:20                         ` Michael Tokarev
2009-11-02 18:20                           ` Michael Tokarev
2009-11-02 19:39                           ` Jamie Lokier
2009-11-02 19:39                             ` Jamie Lokier
2009-11-02 18:55                         ` Anthony Liguori
2009-11-02 19:25                           ` Dustin Kirkland
2009-11-02 19:25                             ` Dustin Kirkland
2009-11-02 20:50                             ` Anthony Liguori
2009-11-02 20:50                               ` Anthony Liguori
2009-11-05  5:06                               ` Jamie Lokier
2009-11-05  5:06                                 ` Jamie Lokier
2009-11-02 16:58                     ` Dustin Kirkland
2009-11-02 16:58                       ` [Qemu-devel] " Dustin Kirkland
2009-10-29 14:39     ` [Qemu-devel] qemu-kvm-0.11 regression, crashes on older guests with virtio network Dustin Kirkland
2009-10-29 14:39       ` Dustin Kirkland
2009-10-29 23:22       ` Scott Tsai
2009-10-29 23:22         ` Scott Tsai
2009-10-29 12:23   ` Michael S. Tsirkin
2009-10-29 12:23     ` [Qemu-devel] " Michael S. Tsirkin
2009-10-29 14:38     ` Avi Kivity
2009-10-29 14:38       ` [Qemu-devel] " Avi Kivity
2009-10-29 15:03       ` Michael S. Tsirkin
2009-10-29 15:03         ` [Qemu-devel] " Michael S. Tsirkin
2009-10-29 14:43   ` [Qemu-devel] " Dustin Kirkland
2009-10-29 14:43     ` Dustin Kirkland

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=1256830455.25064.155.camel@x200 \
    --to=kirkland@canonical.com \
    --cc=anthony@codemonkey.ws \
    --cc=kvm@vger.kernel.org \
    --cc=markmc@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rusty@rustcorp.com.au \
    --cc=scottt.tw@gmail.com \
    --subject='[PATCH] whitelist host virtio networking features [was Re: qemu-kvm-0.11 regression, crashes on older ...]' \
    /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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.