Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751691AbaKMFxT (ORCPT ); Thu, 13 Nov 2014 00:53:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58611 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751108AbaKMFxI (ORCPT ); Thu, 13 Nov 2014 00:53:08 -0500 From: Jason Wang 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 Subject: [PATCH 2/2] virtio-net: fix buggy features advertised by host Date: Thu, 13 Nov 2014 13:52:54 +0800 Message-Id: <1415857974-23326-2-git-send-email-jasowang@redhat.com> In-Reply-To: <1415857974-23326-1-git-send-email-jasowang@redhat.com> References: <1415857974-23326-1-git-send-email-jasowang@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Michael S. Tsirkin Signed-off-by: Jason Wang --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/