From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: Zhihong Wang <zhihong.wang@intel.com>, dev@dpdk.org
Cc: jianfeng.tan@intel.com, tiwei.bie@intel.com,
yliu@fridaylinux.org, cunming.liang@intel.com,
xiao.w.wang@intel.com, dan.daly@intel.com
Subject: Re: [dpdk-dev] [PATCH 1/7] vhost: make capabilities configurable
Date: Tue, 6 Feb 2018 11:19:03 +0100 [thread overview]
Message-ID: <8954f0ba-dfbe-4af5-c7d7-9acfebdd931d@redhat.com> (raw)
In-Reply-To: <1517614137-62926-2-git-send-email-zhihong.wang@intel.com>
Hi Zhihong,
On 02/03/2018 12:28 AM, Zhihong Wang wrote:
> This patch makes vhost device capabilities configurable to adopt new
> devices, since different devices may have different capabilities, like
> different combinations of supported features, or different number of
> queues. APIs are introduced to let app configure these capabilities.
>
> Signed-off-by: Zhihong Wang <zhihong.wang@intel.com>
> ---
> lib/librte_vhost/rte_vhost.h | 50 ++++++++++++++++++++++++++++
> lib/librte_vhost/socket.c | 77 +++++++++++++++++++++++++++++++++++++++++++
> lib/librte_vhost/vhost_user.c | 48 ++++++++++++++++++++-------
> 3 files changed, 164 insertions(+), 11 deletions(-)
>
...
> diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
> index 6e3857e..e1d0036 100644
> --- a/lib/librte_vhost/socket.c
> +++ b/lib/librte_vhost/socket.c
> @@ -49,7 +49,10 @@ struct vhost_user_socket {
> * features negotiation.
> */
> uint64_t supported_features;
> + uint64_t supported_protocol_features;
> uint64_t features;
> + uint64_t protocol_features;
> + uint16_t queue_num;
>
> struct vhost_device_ops const *notify_ops;
> };
> @@ -593,6 +596,75 @@ rte_vhost_driver_get_features(const char *path, uint64_t *features)
> }
> }
>
> +int rte_vhost_driver_set_protocol_features(const char *path,
> + uint64_t protocol_features)
> +{
> + struct vhost_user_socket *vsocket;
> +
> + pthread_mutex_lock(&vhost_user.mutex);
> + vsocket = find_vhost_user_socket(path);
> + if (vsocket) {
> + vsocket->supported_protocol_features = protocol_features;
> + vsocket->protocol_features = protocol_features;
> + }
> + pthread_mutex_unlock(&vhost_user.mutex);
> +
> + return vsocket ? 0 : -1;
> +}
> +
> +int
> +rte_vhost_driver_get_protocol_features(const char *path,
> + uint64_t *protocol_features)
> +{
> + struct vhost_user_socket *vsocket;
> +
> + pthread_mutex_lock(&vhost_user.mutex);
> + vsocket = find_vhost_user_socket(path);
> + if (vsocket)
> + *protocol_features = vsocket->protocol_features;
> + pthread_mutex_unlock(&vhost_user.mutex);
> +
> + if (!vsocket) {
> + RTE_LOG(ERR, VHOST_CONFIG,
> + "socket file %s is not registered yet.\n", path);
> + return -1;
> + } else {
> + return 0;
> + }
> +}
> +
> +int rte_vhost_driver_set_queue_num(const char *path, uint16_t queue_num)
> +{
> + struct vhost_user_socket *vsocket;
> +
> + pthread_mutex_lock(&vhost_user.mutex);
> + vsocket = find_vhost_user_socket(path);
> + if (vsocket)
> + vsocket->queue_num = queue_num;
Shouldn't be MIN(queue_num, VHOST_MAX_QUEUE_PAIRS) to be sure you can
switch from HW offload to SW processing?
> + pthread_mutex_unlock(&vhost_user.mutex);
> +
> + return vsocket ? 0 : -1;
> +}
> +
> +int rte_vhost_driver_get_queue_num(const char *path, uint16_t *queue_num)
> +{
> + struct vhost_user_socket *vsocket;
> +
> + pthread_mutex_lock(&vhost_user.mutex);
> + vsocket = find_vhost_user_socket(path);
> + if (vsocket)
> + *queue_num = vsocket->queue_num;
> + pthread_mutex_unlock(&vhost_user.mutex);
> +
> + if (!vsocket) {
> + RTE_LOG(ERR, VHOST_CONFIG,
> + "socket file %s is not registered yet.\n", path);
> + return -1;
> + } else {
> + return 0;
> + }
> +}
> +
> /*
> * Register a new vhost-user socket; here we could act as server
> * (the default case), or client (when RTE_VHOST_USER_CLIENT) flag
> @@ -655,6 +727,11 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
> vsocket->features &= ~(1ULL << VIRTIO_F_IOMMU_PLATFORM);
> }
>
> + vsocket->supported_protocol_features = VHOST_USER_PROTOCOL_FEATURES;
> + vsocket->protocol_features = VHOST_USER_PROTOCOL_FEATURES;
> +
> + vsocket->queue_num = VHOST_MAX_QUEUE_PAIRS;
> +
> if ((flags & RTE_VHOST_USER_CLIENT) != 0) {
> vsocket->reconnect = !(flags & RTE_VHOST_USER_NO_RECONNECT);
> if (vsocket->reconnect && reconn_tid == 0) {
> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
> index 1dd1a61..87ba267 100644
> --- a/lib/librte_vhost/vhost_user.c
> +++ b/lib/librte_vhost/vhost_user.c
> @@ -127,6 +127,18 @@ vhost_user_reset_owner(struct virtio_net *dev)
> }
>
> /*
> + * The supported queue num.
> + */
> +static uint16_t
> +vhost_user_get_queue_num(struct virtio_net *dev)
> +{
> + uint16_t queue_num = 0;
> +
> + rte_vhost_driver_get_queue_num(dev->ifname, &queue_num);
> + return queue_num;
> +}
> +
> +/*
> * The features that we support are requested.
> */
> static uint64_t
> @@ -930,13 +942,17 @@ vhost_user_set_vring_enable(struct virtio_net *dev,
> return 0;
> }
>
> -static void
> -vhost_user_get_protocol_features(struct virtio_net *dev,
> - struct VhostUserMsg *msg)
> +/*
> + * The protocol features that we support are requested.
> + */
> +
> +static uint64_t
> +vhost_user_get_protocol_features(struct virtio_net *dev)
> {
> - uint64_t features, protocol_features = VHOST_USER_PROTOCOL_FEATURES;
> + uint64_t features, protocol_features;
>
> rte_vhost_driver_get_features(dev->ifname, &features);
> + rte_vhost_driver_get_protocol_features(dev->ifname, &protocol_features);
>
> /*
> * REPLY_ACK protocol feature is only mandatory for now
> @@ -947,18 +963,27 @@ vhost_user_get_protocol_features(struct virtio_net *dev,
> if (!(features & (1ULL << VIRTIO_F_IOMMU_PLATFORM)))
> protocol_features &= ~(1ULL << VHOST_USER_PROTOCOL_F_REPLY_ACK);
>
> - msg->payload.u64 = protocol_features;
> - msg->size = sizeof(msg->payload.u64);
> + return protocol_features;
> }
>
> -static void
> +static int
> vhost_user_set_protocol_features(struct virtio_net *dev,
> uint64_t protocol_features)
> {
> - if (protocol_features & ~VHOST_USER_PROTOCOL_FEATURES)
I think the above check is still necessary, or it should be checked
in rte_vhost_driver_set_protocol_features().
Indeed, the application shouldn't set a protocol feature bit that isn't
supported by the libvhost-user library.
> - return;
> + uint64_t vhost_protocol_features = 0;
> +
> + rte_vhost_driver_get_protocol_features(dev->ifname,
> + &vhost_protocol_features);
> + if (protocol_features & ~vhost_protocol_features) {
> + RTE_LOG(ERR, VHOST_CONFIG,
> + "(%d) received invalid negotiated protocol_features.\n",
> + dev->vid);
> + return -1;
> + }
>
> dev->protocol_features = protocol_features;
> +
> + return 0;
> }
>
> static int
> @@ -1391,7 +1416,8 @@ vhost_user_msg_handler(int vid, int fd)
> break;
>
> case VHOST_USER_GET_PROTOCOL_FEATURES:
> - vhost_user_get_protocol_features(dev, &msg);
> + msg.payload.u64 = vhost_user_get_protocol_features(dev);
> + msg.size = sizeof(msg.payload.u64);
> send_vhost_reply(fd, &msg);
> break;
> case VHOST_USER_SET_PROTOCOL_FEATURES:
> @@ -1451,7 +1477,7 @@ vhost_user_msg_handler(int vid, int fd)
> break;
>
> case VHOST_USER_GET_QUEUE_NUM:
> - msg.payload.u64 = VHOST_MAX_QUEUE_PAIRS;
> + msg.payload.u64 = vhost_user_get_queue_num(dev);
> msg.size = sizeof(msg.payload.u64);
> send_vhost_reply(fd, &msg);
> break;
>
Maxime
next prev parent reply other threads:[~2018-02-06 10:19 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-02 23:28 [dpdk-dev] [PATCH 0/7] vhost: support selective datapath Zhihong Wang
2018-02-02 23:28 ` [dpdk-dev] [PATCH 1/7] vhost: make capabilities configurable Zhihong Wang
2018-02-06 10:19 ` Maxime Coquelin [this message]
2018-02-08 3:03 ` Wang, Zhihong
2018-02-02 23:28 ` [dpdk-dev] [PATCH 2/7] vhost: export vhost feature definitions Zhihong Wang
2018-02-02 23:28 ` [dpdk-dev] [PATCH 3/7] vhost: support selective datapath Zhihong Wang
2018-02-02 23:28 ` [dpdk-dev] [PATCH 4/7] vhost: add apis for datapath configuration Zhihong Wang
2018-02-02 23:28 ` [dpdk-dev] [PATCH 5/7] vhost: adapt vhost lib for selective datapath Zhihong Wang
2018-02-02 23:28 ` [dpdk-dev] [PATCH 6/7] vhost: get callfd before device setup Zhihong Wang
2018-02-02 23:28 ` [dpdk-dev] [PATCH 7/7] vhost: export new apis Zhihong Wang
2018-03-05 9:20 ` [dpdk-dev] [PATCH v2 0/6] vhost: support selective datapath Zhihong Wang
2018-03-05 9:20 ` [dpdk-dev] [PATCH v2 1/6] vhost: export vhost feature definitions Zhihong Wang
2018-03-06 9:37 ` Tan, Jianfeng
2018-03-06 14:03 ` Maxime Coquelin
2018-03-15 10:58 ` Wang, Zhihong
2018-03-05 9:20 ` [dpdk-dev] [PATCH v2 2/6] vhost: support selective datapath Zhihong Wang
2018-03-05 9:20 ` [dpdk-dev] [PATCH v2 3/6] vhost: add apis for datapath configuration Zhihong Wang
2018-03-05 9:20 ` [dpdk-dev] [PATCH v2 5/6] vhost: add apis for live migration Zhihong Wang
2018-03-05 9:20 ` [dpdk-dev] [PATCH v2 4/6] vhost: adapt vhost lib for selective datapath Zhihong Wang
2018-03-05 9:20 ` [dpdk-dev] [PATCH v2 6/6] vhost: export new apis Zhihong Wang
2018-03-06 9:51 ` Tan, Jianfeng
2018-03-15 10:55 ` Wang, Zhihong
2018-03-19 10:12 ` [dpdk-dev] [PATCH v3 0/5] vhost: support selective datapath Zhihong Wang
2018-03-19 10:12 ` [dpdk-dev] [PATCH v3 1/5] vhost: export vhost feature definitions Zhihong Wang
2018-03-19 10:12 ` [dpdk-dev] [PATCH v3 2/5] vhost: support selective datapath Zhihong Wang
2018-03-21 21:05 ` Maxime Coquelin
2018-03-22 7:55 ` Wang, Zhihong
2018-03-22 8:31 ` Maxime Coquelin
2018-03-19 10:12 ` [dpdk-dev] [PATCH v3 3/5] vhost: add apis for datapath configuration Zhihong Wang
2018-03-21 21:08 ` Maxime Coquelin
2018-03-22 8:22 ` Wang, Zhihong
2018-03-22 14:18 ` Maxime Coquelin
2018-03-23 10:35 ` Wang, Zhihong
2018-03-19 10:12 ` [dpdk-dev] [PATCH v3 4/5] vhost: adapt vhost lib for selective datapath Zhihong Wang
2018-03-19 10:13 ` [dpdk-dev] [PATCH v3 5/5] vhost: add apis for live migration Zhihong Wang
2018-03-29 12:15 ` [dpdk-dev] [PATCH v3 0/5] vhost: support selective datapath Wodkowski, PawelX
2018-03-30 9:35 ` Wang, Zhihong
2018-03-30 10:00 ` [dpdk-dev] [PATCH v4 " Zhihong Wang
2018-03-30 10:00 ` [dpdk-dev] [PATCH v4 1/5] vhost: export vhost feature definitions Zhihong Wang
2018-03-31 5:56 ` Maxime Coquelin
2018-03-30 10:01 ` [dpdk-dev] [PATCH v4 2/5] vhost: support selective datapath Zhihong Wang
2018-03-31 6:10 ` Maxime Coquelin
2018-04-02 1:58 ` Wang, Zhihong
2018-03-31 7:38 ` Maxime Coquelin
2018-04-02 2:03 ` Wang, Zhihong
2018-03-30 10:01 ` [dpdk-dev] [PATCH v4 3/5] vhost: add apis for datapath configuration Zhihong Wang
2018-03-31 7:04 ` Maxime Coquelin
2018-04-02 2:01 ` Wang, Zhihong
2018-03-30 10:01 ` [dpdk-dev] [PATCH v4 4/5] vhost: adapt vhost lib for selective datapath Zhihong Wang
2018-03-31 7:35 ` Maxime Coquelin
2018-04-02 11:52 ` Wang, Zhihong
2018-03-30 10:01 ` [dpdk-dev] [PATCH v4 5/5] vhost: add apis for live migration Zhihong Wang
2018-03-31 7:39 ` Maxime Coquelin
2018-04-02 11:46 ` [dpdk-dev] [PATCH v5 0/5] vhost: support selective datapath Zhihong Wang
2018-04-02 11:46 ` [dpdk-dev] [PATCH v5 1/5] vhost: export vhost feature definitions Zhihong Wang
2018-04-02 11:46 ` [dpdk-dev] [PATCH v5 2/5] vhost: support selective datapath Zhihong Wang
2018-04-03 8:02 ` Maxime Coquelin
2018-04-15 17:39 ` Thomas Monjalon
2018-04-16 7:26 ` Maxime Coquelin
2018-04-03 8:19 ` Maxime Coquelin
2018-04-03 14:35 ` Wang, Zhihong
2018-04-02 11:46 ` [dpdk-dev] [PATCH v5 3/5] vhost: add apis for datapath configuration Zhihong Wang
2018-04-03 8:07 ` Maxime Coquelin
2018-04-02 11:46 ` [dpdk-dev] [PATCH v5 4/5] vhost: adapt vhost lib for selective datapath Zhihong Wang
2018-04-03 8:05 ` Maxime Coquelin
2018-04-02 11:46 ` [dpdk-dev] [PATCH v5 5/5] vhost: add apis for live migration Zhihong Wang
2018-04-03 8:27 ` [dpdk-dev] [PATCH v5 0/5] vhost: support selective datapath 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=8954f0ba-dfbe-4af5-c7d7-9acfebdd931d@redhat.com \
--to=maxime.coquelin@redhat.com \
--cc=cunming.liang@intel.com \
--cc=dan.daly@intel.com \
--cc=dev@dpdk.org \
--cc=jianfeng.tan@intel.com \
--cc=tiwei.bie@intel.com \
--cc=xiao.w.wang@intel.com \
--cc=yliu@fridaylinux.org \
--cc=zhihong.wang@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).