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>
Subject: [dpdk-dev] [PATCH] net/virtio-user: fix feature setting with vhost-net backend
Date: Mon, 7 May 2018 14:50:06 +0800 [thread overview]
Message-ID: <1525675806-22387-1-git-send-email-jiayu.hu@intel.com> (raw)
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
next reply other threads:[~2018-05-07 6:43 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-07 6:50 Jiayu Hu [this message]
2018-05-08 2:49 ` Tiwei Bie
2018-05-08 7:44 ` Jiayu Hu
2018-05-10 5:04 ` Tiwei Bie
2018-05-10 8:33 ` Hu, Jiayu
2018-05-08 8:14 ` [dpdk-dev] [PATCH v2] " Jiayu Hu
2018-05-09 2:58 ` Yao, Lei A
2018-05-11 7:26 ` [dpdk-dev] [PATCH v3] " Jiayu Hu
2018-05-11 7:33 ` Tiwei Bie
2018-05-11 7:45 ` Yang, Zhiyong
2018-05-16 6:05 ` Maxime Coquelin
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=1525675806-22387-1-git-send-email-jiayu.hu@intel.com \
--to=jiayu.hu@intel.com \
--cc=dev@dpdk.org \
--cc=maxime.coquelin@redhat.com \
--cc=zhiyong.yang@intel.com \
/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).