whitelist host virtio networking features
This patch is a followup to 8eca6b1bc7
,
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>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
9f56640c85
commit
184bd04845
@ -187,10 +187,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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user