From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <jiayu.hu@intel.com>
Received: from mga18.intel.com (mga18.intel.com [134.134.136.126])
by dpdk.org (Postfix) with ESMTP id 63F7023B
for <dev@dpdk.org>; Mon, 7 May 2018 08:43:01 +0200 (CEST)
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from fmsmga005.fm.intel.com ([10.253.24.32])
by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
06 May 2018 23:42:58 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.49,373,1520924400"; d="scan'208";a="226334524"
Received: from dpdk15.sh.intel.com ([10.67.111.77])
by fmsmga005.fm.intel.com with ESMTP; 06 May 2018 23:42:57 -0700
From: Jiayu Hu <jiayu.hu@intel.com>
To: dev@dpdk.org
Cc: zhiyong.yang@intel.com, maxime.coquelin@redhat.com,
Jiayu Hu <jiayu.hu@intel.com>
Date: Mon, 7 May 2018 14:50:06 +0800
Message-Id: <1525675806-22387-1-git-send-email-jiayu.hu@intel.com>
X-Mailer: git-send-email 2.7.4
Subject: [dpdk-dev] [PATCH] net/virtio-user: fix feature setting with
vhost-net backend
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Mon, 07 May 2018 06:43:01 -0000
Currently, when the backend is vhost-net, which implies
virtio-user works in client mode, virtio-user is assigned
to the default feature VIRTIO_USER_SUPPORTED_FEATURES.
However, virtio-user should request features from the
backend in this case.
Fixes: bd8f50a45d0f ("net/virtio-user: support server mode")
Signed-off-by: Jiayu Hu <jiayu.hu@intel.com>
---
drivers/net/virtio/virtio_user/virtio_user_dev.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index 38b8bc9..f745163 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -353,20 +353,22 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
return -1;
}
- if (dev->vhostfd >= 0) {
+ if (!dev->is_server) {
if (dev->ops->send_request(dev, VHOST_USER_SET_OWNER,
- NULL) < 0) {
+ NULL) < 0) {
PMD_INIT_LOG(ERR, "set_owner fails: %s",
- strerror(errno));
+ strerror(errno));
return -1;
}
if (dev->ops->send_request(dev, VHOST_USER_GET_FEATURES,
- &dev->device_features) < 0) {
+ &dev->device_features) < 0) {
PMD_INIT_LOG(ERR, "get_features failed: %s",
- strerror(errno));
+ strerror(errno));
return -1;
}
+ if (dev->mac_specified)
+ dev->device_features |= (1ull << VIRTIO_NET_F_MAC);
} else {
/* We just pretend vhost-user can support all these features.
* Note that this could be problematic that if some feature is
@@ -376,9 +378,6 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
dev->device_features = VIRTIO_USER_SUPPORTED_FEATURES;
}
- if (dev->mac_specified)
- dev->device_features |= (1ull << VIRTIO_NET_F_MAC);
-
if (cq) {
/* device does not really need to know anything about CQ,
* so if necessary, we just claim to support CQ
--
2.7.4