From: Jason Wang <jasowang@redhat.com>
To: rusty@rustcorp.com.au, mst@redhat.com,
virtualization@lists.linux-foundation.org,
linux-kernel@vger.kernel.org
Cc: netdev@vger.kernel.org, Jason Wang <jasowang@redhat.com>
Subject: [PATCH 2/2] virtio-net: fix buggy features advertised by host
Date: Thu, 13 Nov 2014 13:52:54 +0800 [thread overview]
Message-ID: <1415857974-23326-2-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1415857974-23326-1-git-send-email-jasowang@redhat.com>
This patch tries to detect the possible buggy features advertised by host
and fix them. One example is booting virtio-net with only ctrl_vq disabled,
qemu may still advertise many features which depends on it. This will
trigger several BUG()s in virtnet_send_command().
This patch utilizes the fix_features() method, and disables all features that
depends on ctrl_vq if it was not advertised.
This fixes the crash when booting with ctrl_vq=off.
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
Changes from V1:
- fix the cut-and-paste error
---
drivers/net/virtio_net.c | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index ec2a8b4..6ce125e 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1948,6 +1948,40 @@ static int virtnet_restore(struct virtio_device *vdev)
}
#endif
+static void virtnet_fix_features(struct virtio_device *dev)
+{
+ if (!virtio_has_feature(dev, VIRTIO_NET_F_CTRL_VQ)) {
+ if (virtio_has_feature(dev, VIRTIO_NET_F_CTRL_RX)) {
+ pr_warning("Disable VIRTIO_NET_F_CTRL_RX since host "
+ "does not advertise VIRTIO_NET_F_CTRL_VQ");
+ virtio_disable_feature(dev, VIRTIO_NET_F_CTRL_RX);
+ }
+ if (virtio_has_feature(dev, VIRTIO_NET_F_CTRL_VLAN)) {
+ pr_warning("Disable VIRTIO_NET_F_CTRL_VLAN since host "
+ "does not advertise VIRTIO_NET_F_CTRL_VQ");
+ virtio_disable_feature(dev, VIRTIO_NET_F_CTRL_VLAN);
+ }
+ if (virtio_has_feature(dev, VIRTIO_NET_F_GUEST_ANNOUNCE)) {
+ pr_warning("Disable VIRTIO_NET_F_GUEST_ANNOUNCE since "
+ "host does not advertise "
+ "VIRTIO_NET_F_CTRL_VQ");
+ virtio_disable_feature(dev,
+ VIRTIO_NET_F_GUEST_ANNOUNCE);
+ }
+ if (virtio_has_feature(dev, VIRTIO_NET_F_MQ)) {
+ pr_warning("Disable VIRTIO_NET_F_MQ since host "
+ "does not advertise VIRTIO_NET_F_CTRL_VQ");
+ virtio_disable_feature(dev, VIRTIO_NET_F_MQ);
+ }
+ if (virtio_has_feature(dev, VIRTIO_NET_F_CTRL_MAC_ADDR)) {
+ pr_warning("Disable VIRTIO_NET_F_CTRL_MAC_ADDR since "
+ "host does not advertise "
+ "VIRTIO_NET_F_CTRL_VQ");
+ virtio_disable_feature(dev, VIRTIO_NET_F_CTRL_MAC_ADDR);
+ }
+ }
+}
+
static struct virtio_device_id id_table[] = {
{ VIRTIO_ID_NET, VIRTIO_DEV_ANY_ID },
{ 0 },
@@ -1975,6 +2009,7 @@ static struct virtio_driver virtio_net_driver = {
.probe = virtnet_probe,
.remove = virtnet_remove,
.config_changed = virtnet_config_changed,
+ .fix_features = virtnet_fix_features,
#ifdef CONFIG_PM_SLEEP
.freeze = virtnet_freeze,
.restore = virtnet_restore,
--
1.9.1
next prev parent reply other threads:[~2014-11-13 5:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-13 5:52 [PATCH 1/2] virito: introduce methods of fixing device features Jason Wang
2014-11-13 5:52 ` Jason Wang [this message]
2014-11-13 6:06 ` [PATCH 2/2] virtio-net: fix buggy features advertised by host Wanlong Gao
2014-11-13 6:45 ` Jason Wang
2014-11-13 8:53 ` Cornelia Huck
2014-11-13 9:12 ` Jason Wang
2014-11-13 8:46 ` [PATCH 1/2] virito: introduce methods of fixing device features Cornelia Huck
2014-11-13 9:11 ` Jason Wang
2014-11-13 9:14 ` Cornelia Huck
2014-11-13 9:49 ` Jason Wang
2014-11-24 1:08 ` Rusty Russell
2014-11-26 7:09 ` Jason Wang
-- strict thread matches above, loose matches on Subject: below --
2014-11-13 5:24 Jason Wang
2014-11-13 5:24 ` [PATCH 2/2] virtio-net: fix buggy features advertised by host Jason Wang
2014-11-13 5:42 ` Jason Wang
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=1415857974-23326-2-git-send-email-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
--cc=virtualization@lists.linux-foundation.org \
/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
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;
as well as URLs for NNTP newsgroup(s).