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 v4 3/5] vhost: add apis for datapath configuration
Date: Sat, 31 Mar 2018 09:04:24 +0200 [thread overview]
Message-ID: <328e0972-d3cf-a925-21be-4fb06f2e225e@redhat.com> (raw)
In-Reply-To: <20180310100148.12030-4-zhihong.wang@intel.com>
On 03/10/2018 11:01 AM, Zhihong Wang wrote:
> This patch adds APIs for datapath configuration.
>
> The did of the vhost-user socket can be set to identify the backend device,
> in this case each vhost-user socket can have only 1 connection. The did is
> set to -1 by default when the software datapath is used.
>
> Signed-off-by: Zhihong Wang <zhihong.wang@intel.com>
> ---
> Changes in v4:
>
> 1. Remove the "engine" concept in the lib.
>
> lib/librte_vhost/rte_vhost.h | 35 +++++++++++++++++++++++++++++++++
> lib/librte_vhost/rte_vhost_version.map | 3 +++
> lib/librte_vhost/socket.c | 36 ++++++++++++++++++++++++++++++++++
> lib/librte_vhost/vhost.c | 25 +++++++++++++++++++++++
> lib/librte_vhost/vhost.h | 9 +++++++++
> 5 files changed, 108 insertions(+)
>
> diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h
> index 671ea5053..d50f4c67d 100644
> --- a/lib/librte_vhost/rte_vhost.h
> +++ b/lib/librte_vhost/rte_vhost.h
> @@ -200,6 +200,30 @@ int rte_vhost_driver_register(const char *path, uint64_t flags);
> int rte_vhost_driver_unregister(const char *path);
>
> /**
> + * Set the device id, enforce single connection per socket
> + *
> + * @param path
> + * The vhost-user socket file path
> + * @param did
> + * Device id
> + * @return
> + * 0 on success, -1 on failure
> + */
> +int __rte_experimental
> +rte_vhost_driver_set_vdpa_did(const char *path, int did);
IIUC, we call this to attach a VDPA device to a Vhost-user port?
What about having this named explicitly? Something like:
rte_vhost_driver_attach_vdpa_did(const char *path, int did)
rte_vhost_driver_detach_vdpa_did(const char *path)
The later would set to did -1
This is not mandatory though
> +
> +/**
> + * Get the device id
> + *
> + * @param path
> + * The vhost-user socket file path
> + * @return
> + * Device id, -1 on failure
> + */
> +int __rte_experimental
> +rte_vhost_driver_get_vdpa_did(const char *path);
> +
> +/**
> * Set the feature bits the vhost-user driver supports.
> *
> * @param path
> @@ -464,6 +488,17 @@ int rte_vhost_vring_call(int vid, uint16_t vring_idx);
> */
> uint32_t rte_vhost_rx_queue_count(int vid, uint16_t qid);
>
> +/**
> + * Get vdpa device id for vhost device.
> + *
> + * @param vid
> + * vhost device ID
> + * @return
> + * device id
> + */
> +int __rte_experimental
> +rte_vhost_get_vdpa_did(int vid);
> +
> #ifdef __cplusplus
> }
> #endif
> diff --git a/lib/librte_vhost/rte_vhost_version.map b/lib/librte_vhost/rte_vhost_version.map
> index 7bcffb490..6e2d5364a 100644
> --- a/lib/librte_vhost/rte_vhost_version.map
> +++ b/lib/librte_vhost/rte_vhost_version.map
> @@ -64,4 +64,7 @@ EXPERIMENTAL {
> rte_vdpa_register_device;
> rte_vdpa_unregister_device;
> rte_vdpa_find_device_id;
> + rte_vhost_driver_set_vdpa_did;
> + rte_vhost_driver_get_vdpa_did;
> + rte_vhost_get_vdpa_did;
> } DPDK_18.02;
> diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
> index cfc31e179..3d58da94e 100644
> --- a/lib/librte_vhost/socket.c
> +++ b/lib/librte_vhost/socket.c
> @@ -52,6 +52,13 @@ struct vhost_user_socket {
> uint64_t supported_features;
> uint64_t features;
>
> + /*
> + * Device id to identify a specific backend device.
> + * It's set to -1 for the default software implementation.
> + * If valid, one socket can have 1 connection only.
> + */
> + int did;
I would rename it to something like vdpa_did or even better,
vdpa_dev_id. At least prefix it with vdpa not to confuse the user.
> +
> struct vhost_device_ops const *notify_ops;
> };
>
> @@ -545,6 +552,35 @@ find_vhost_user_socket(const char *path)
> }
>
> int
> +rte_vhost_driver_set_vdpa_did(const char *path, int did)
> +{
> + struct vhost_user_socket *vsocket;
> +
> + pthread_mutex_lock(&vhost_user.mutex);
> + vsocket = find_vhost_user_socket(path);
> + if (vsocket)
> + vsocket->did = did;
I guess it is possible to know whether the did exists
at that time. Maybe we could check this?
> + pthread_mutex_unlock(&vhost_user.mutex);
> +
> + return vsocket ? 0 : -1;
> +}
> +
> +int
> +rte_vhost_driver_get_vdpa_did(const char *path)
> +{
> + struct vhost_user_socket *vsocket;
> + int did = -1;
> +
> + pthread_mutex_lock(&vhost_user.mutex);
> + vsocket = find_vhost_user_socket(path);
> + if (vsocket)
> + did = vsocket->did;
> + pthread_mutex_unlock(&vhost_user.mutex);
> +
> + return did;
> +}
> +
> +int
> rte_vhost_driver_disable_features(const char *path, uint64_t features)
> {
> struct vhost_user_socket *vsocket;
> diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
> index f6f12a03b..1740cc1ab 100644
> --- a/lib/librte_vhost/vhost.c
> +++ b/lib/librte_vhost/vhost.c
> @@ -283,6 +283,7 @@ vhost_new_device(void)
> dev->vid = i;
> dev->flags = VIRTIO_DEV_BUILTIN_VIRTIO_NET;
> dev->slave_req_fd = -1;
> + dev->did = -1;
>
> return i;
> }
> @@ -311,6 +312,20 @@ vhost_destroy_device(int vid)
> }
>
> void
> +vhost_set_vdpa_did(int vid, int did)
> +{
> + struct virtio_net *dev = get_device(vid);
> +
> + if (did < 0)
> + return;
> +
> + if (dev == NULL)
> + return;
> +
> + dev->did = did;
> +}
> +
> +void
> vhost_set_ifname(int vid, const char *if_name, unsigned int if_len)
> {
> struct virtio_net *dev;
> @@ -614,3 +629,13 @@ rte_vhost_rx_queue_count(int vid, uint16_t qid)
>
> return *((volatile uint16_t *)&vq->avail->idx) - vq->last_avail_idx;
> }
> +
> +int rte_vhost_get_vdpa_did(int vid)
> +{
> + struct virtio_net *dev = get_device(vid);
> +
> + if (dev == NULL)
> + return -1;
> +
> + return dev->did;
> +}
> diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
> index 2e28e4026..2970c1eab 100644
> --- a/lib/librte_vhost/vhost.h
> +++ b/lib/librte_vhost/vhost.h
> @@ -19,6 +19,7 @@
> #include <rte_rwlock.h>
>
> #include "rte_vhost.h"
> +#include "rte_vdpa.h"
>
> /* Used to indicate that the device is running on a data core */
> #define VIRTIO_DEV_RUNNING 1
> @@ -239,6 +240,12 @@ struct virtio_net {
> struct guest_page *guest_pages;
>
> int slave_req_fd;
> +
> + /*
> + * Device id to identify a specific backend device.
> + * It's set to -1 for the default software implementation.
> + */
> + int did;
Same as for struct vhost_user_socket, it would be less confusing to
prefix it with vdpa.
> } __rte_cache_aligned;
>
>
> @@ -365,6 +372,8 @@ void free_vq(struct vhost_virtqueue *vq);
>
> int alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx);
>
> +void vhost_set_vdpa_did(int vid, int did);
> +
> void vhost_set_ifname(int, const char *if_name, unsigned int if_len);
> void vhost_enable_dequeue_zero_copy(int vid);
> void vhost_set_builtin_virtio_net(int vid, bool enable);
>
next prev parent reply other threads:[~2018-03-31 7:04 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
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 [this message]
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=328e0972-d3cf-a925-21be-4fb06f2e225e@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).