From patchwork Fri Apr 7 07:57:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianfeng Tan X-Patchwork-Id: 23312 X-Patchwork-Delegate: yuanhan.liu@linux.intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 36752376F; Fri, 7 Apr 2017 09:56:57 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 7F6922FDD for ; Fri, 7 Apr 2017 09:56:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491551815; x=1523087815; h=from:to:cc:subject:date:message-id; bh=/A9yAM5wrt3g1hJQVeQAnl54cVT3gSs3ihhjJt/Hksw=; b=Zy3BB2xP+GeLqw80jQuAsFpem+/iCZBru+O44Nuq4EdrIfGwEOHcCpak lH5HNPUBqFT/+6lqm5CxRBwUWhVsrA==; Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Apr 2017 00:56:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,164,1488873600"; d="scan'208";a="85824826" Received: from dpdk06.sh.intel.com ([10.239.129.195]) by fmsmga005.fm.intel.com with ESMTP; 07 Apr 2017 00:56:53 -0700 From: Jianfeng Tan To: dev@dpdk.org Cc: Jianfeng Tan , Maxime Coquelin , Yuanhan Liu Date: Fri, 7 Apr 2017 07:57:40 +0000 Message-Id: <1491551860-15005-1-git-send-email-jianfeng.tan@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [dpdk-dev] [PATCH] net/virtio-user: fix cannot get initialized X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" After the introduction of vhost MTU, VIRTIO_NET_F_MTU is enabled by default. However, virtio-user vtpci does not support to get MTU from device yet, i.e., vtpci_read_dev_config(MTU) fails. Plus, struct virtio_net_config is defined as a uninitialized variable, and could be different values in virtio_negotiate_features() and virtio_init_device(). In some cases, it passes the check in virtio_negotiate_features() but fails the check in virtio_init_device(). As a result, virtio-user canno be initialized. To fix it, (1) accessing uninitialized variable is not a good practice, so initialize it as zero; (2) explicitly disable MTU feature in virtio-user. Fixes: 49d26d9e3f47 ("net/virtio: support MTU feature") Cc: Maxime Coquelin Cc: Yuanhan Liu Signed-off-by: Jianfeng Tan --- drivers/net/virtio/virtio_ethdev.c | 4 ++-- drivers/net/virtio/virtio_user/virtio_user_dev.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index 78cb3e8..4c43784 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1163,7 +1163,7 @@ virtio_negotiate_features(struct virtio_hw *hw, uint64_t req_features) /* If supported, ensure MTU value is valid before acknowledging it. */ if (host_features & req_features & (1ULL << VIRTIO_NET_F_MTU)) { - struct virtio_net_config config; + struct virtio_net_config config = {0}; vtpci_read_dev_config(hw, offsetof(struct virtio_net_config, mtu), @@ -1332,7 +1332,7 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) { struct virtio_hw *hw = eth_dev->data->dev_private; struct virtio_net_config *config; - struct virtio_net_config local_config; + struct virtio_net_config local_config = {0}; struct rte_pci_device *pci_dev = NULL; int ret; diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c index 6871cd4..529b3d7 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c @@ -362,6 +362,12 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues, /* The backend will not report this feature, we add it explicitly */ dev->device_features |= (1ull << VIRTIO_NET_F_STATUS); + /* TODO: VIRTIO_NET_F_MTU is for QEMU to advertise MTU to both frontend + * and backend driver. For virtio-user, disable it for now, until we + * have a parameter to specify the MTU. + */ + dev->device_features &= ~(1ull << VIRTIO_NET_F_MTU); + return 0; }