From: "Xia, Chenbo" <chenbo.xia@intel.com>
To: Maxime Coquelin <maxime.coquelin@redhat.com>,
"dev@dpdk.org" <dev@dpdk.org>,
"olivier.matz@6wind.com" <olivier.matz@6wind.com>,
"amorenoz@redhat.com" <amorenoz@redhat.com>,
"david.marchand@redhat.com" <david.marchand@redhat.com>
Subject: Re: [dpdk-dev] [PATCH v2 26/44] net/virtio: add Virtio-user ops to set owner
Date: Fri, 22 Jan 2021 03:27:50 +0000 [thread overview]
Message-ID: <MN2PR11MB4063637BEDA9923144E6CF039CA00@MN2PR11MB4063.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20210119212507.1043636-27-maxime.coquelin@redhat.com>
> -----Original Message-----
> From: Maxime Coquelin <maxime.coquelin@redhat.com>
> Sent: Wednesday, January 20, 2021 5:25 AM
> To: dev@dpdk.org; Xia, Chenbo <chenbo.xia@intel.com>; olivier.matz@6wind.com;
> amorenoz@redhat.com; david.marchand@redhat.com
> Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
> Subject: [PATCH v2 26/44] net/virtio: add Virtio-user ops to set owner
>
> This patch implements a dedicated callback for
> sending owner request. All the requests will be
> converted that way so that backends other than
> Vhost-user don't have to work around being it.
>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
> drivers/net/virtio/virtio_user/vhost.h | 1 +
> drivers/net/virtio/virtio_user/vhost_kernel.c | 28 +++++++++++++++--
> drivers/net/virtio/virtio_user/vhost_user.c | 21 +++++++++++--
> drivers/net/virtio/virtio_user/vhost_vdpa.c | 30 ++++++++++++++++---
> .../net/virtio/virtio_user/virtio_user_dev.c | 3 +-
> 5 files changed, 72 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/net/virtio/virtio_user/vhost.h
> b/drivers/net/virtio/virtio_user/vhost.h
> index 8ec3a6a62c..5413ec6778 100644
> --- a/drivers/net/virtio/virtio_user/vhost.h
> +++ b/drivers/net/virtio/virtio_user/vhost.h
> @@ -109,6 +109,7 @@ struct virtio_user_dev;
>
> struct virtio_user_backend_ops {
> int (*setup)(struct virtio_user_dev *dev);
> + int (*set_owner)(struct virtio_user_dev *dev);
> int (*send_request)(struct virtio_user_dev *dev,
> enum vhost_user_request req,
> void *arg);
> diff --git a/drivers/net/virtio/virtio_user/vhost_kernel.c
> b/drivers/net/virtio/virtio_user/vhost_kernel.c
> index 2c805077af..b79dcad179 100644
> --- a/drivers/net/virtio/virtio_user/vhost_kernel.c
> +++ b/drivers/net/virtio/virtio_user/vhost_kernel.c
> @@ -6,6 +6,7 @@
> #include <sys/stat.h>
> #include <fcntl.h>
> #include <unistd.h>
> +#include <errno.h>
>
> #include <rte_memory.h>
>
> @@ -55,8 +56,28 @@ get_vhost_kernel_max_regions(void)
> close(fd);
> }
>
> +static int
> +vhost_kernel_ioctl(int fd, uint64_t request, void *arg)
> +{
> + int ret;
> +
> + ret = ioctl(fd, request, arg);
> + if (ret) {
> + PMD_DRV_LOG(ERR, "Vhost-kernel ioctl %"PRIu64" failed (%s)",
> + request, strerror(errno));
> + return -1;
> + }
> +
> + return 0;
> +}
> +
> +static int
> +vhost_kernel_set_owner(struct virtio_user_dev *dev)
> +{
> + return vhost_kernel_ioctl(dev->vhostfds[0], VHOST_SET_OWNER, NULL);
> +}
> +
> static uint64_t vhost_req_user_to_kernel[] = {
> - [VHOST_USER_SET_OWNER] = VHOST_SET_OWNER,
> [VHOST_USER_RESET_OWNER] = VHOST_RESET_OWNER,
> [VHOST_USER_SET_FEATURES] = VHOST_SET_FEATURES,
> [VHOST_USER_GET_FEATURES] = VHOST_GET_FEATURES,
> @@ -175,7 +196,7 @@ tap_support_features(void)
> }
>
> static int
> -vhost_kernel_ioctl(struct virtio_user_dev *dev,
> +vhost_kernel_send_request(struct virtio_user_dev *dev,
> enum vhost_user_request req,
> void *arg)
> {
> @@ -385,6 +406,7 @@ vhost_kernel_enable_queue_pair(struct virtio_user_dev *dev,
>
> struct virtio_user_backend_ops virtio_ops_kernel = {
> .setup = vhost_kernel_setup,
> - .send_request = vhost_kernel_ioctl,
> + .set_owner = vhost_kernel_set_owner,
> + .send_request = vhost_kernel_send_request,
> .enable_qp = vhost_kernel_enable_queue_pair
> };
> diff --git a/drivers/net/virtio/virtio_user/vhost_user.c
> b/drivers/net/virtio/virtio_user/vhost_user.c
> index 55c813333a..ea3bd4ca10 100644
> --- a/drivers/net/virtio/virtio_user/vhost_user.c
> +++ b/drivers/net/virtio/virtio_user/vhost_user.c
> @@ -125,6 +125,24 @@ vhost_user_read(int fd, struct vhost_user_msg *msg)
> return -1;
> }
>
> +static int
> +vhost_user_set_owner(struct virtio_user_dev *dev)
> +{
> + int ret;
> + struct vhost_user_msg msg = {
> + .request = VHOST_USER_SET_OWNER,
> + .flags = VHOST_USER_VERSION,
> + };
> +
> + ret = vhost_user_write(dev->vhostfd, &msg, NULL, 0);
> + if (ret < 0) {
> + PMD_DRV_LOG(ERR, "Failed to set owner");
> + return -1;
> + }
> +
> + return 0;
> +}
> +
> struct walk_arg {
> struct vhost_memory *vm;
> int *fds;
> @@ -230,7 +248,6 @@ prepare_vhost_memory_user(struct vhost_user_msg *msg, int
> fds[])
> static struct vhost_user_msg m;
>
> const char * const vhost_msg_strings[] = {
> - [VHOST_USER_SET_OWNER] = "VHOST_SET_OWNER",
> [VHOST_USER_RESET_OWNER] = "VHOST_RESET_OWNER",
> [VHOST_USER_SET_FEATURES] = "VHOST_SET_FEATURES",
> [VHOST_USER_GET_FEATURES] = "VHOST_GET_FEATURES",
> @@ -308,7 +325,6 @@ vhost_user_sock(struct virtio_user_dev *dev,
> msg.size = sizeof(m.payload.u64);
> break;
>
> - case VHOST_USER_SET_OWNER:
> case VHOST_USER_RESET_OWNER:
> break;
>
> @@ -519,6 +535,7 @@ vhost_user_enable_queue_pair(struct virtio_user_dev *dev,
>
> struct virtio_user_backend_ops virtio_ops_user = {
> .setup = vhost_user_setup,
> + .set_owner = vhost_user_set_owner,
> .send_request = vhost_user_sock,
> .enable_qp = vhost_user_enable_queue_pair
> };
> diff --git a/drivers/net/virtio/virtio_user/vhost_vdpa.c
> b/drivers/net/virtio/virtio_user/vhost_vdpa.c
> index 004802b9eb..d9bc213e0d 100644
> --- a/drivers/net/virtio/virtio_user/vhost_vdpa.c
> +++ b/drivers/net/virtio/virtio_user/vhost_vdpa.c
> @@ -39,7 +39,6 @@
> #define VHOST_GET_BACKEND_FEATURES _IOR(VHOST_VIRTIO, 0x26, __u64)
>
> static uint64_t vhost_req_user_to_vdpa[] = {
> - [VHOST_USER_SET_OWNER] = VHOST_SET_OWNER,
> [VHOST_USER_RESET_OWNER] = VHOST_RESET_OWNER,
> [VHOST_USER_SET_FEATURES] = VHOST_SET_FEATURES,
> [VHOST_USER_GET_FEATURES] = VHOST_GET_FEATURES,
> @@ -86,6 +85,28 @@ struct vhost_msg {
> };
> };
>
> +
> +static int
> +vhost_vdpa_ioctl(int fd, uint64_t request, void *arg)
> +{
> + int ret;
> +
> + ret = ioctl(fd, request, arg);
> + if (ret) {
> + PMD_DRV_LOG(ERR, "Vhost-vDPA ioctl %"PRIu64" failed (%s)",
> + request, strerror(errno));
> + return -1;
> + }
> +
> + return 0;
> +}
> +
> +static int
> +vhost_vdpa_set_owner(struct virtio_user_dev *dev)
> +{
> + return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_OWNER, NULL);
> +}
> +
> static int
> vhost_vdpa_iotlb_batch_begin(struct virtio_user_dev *dev)
> {
> @@ -308,7 +329,7 @@ vhost_vdpa_dma_map_all(struct virtio_user_dev *dev)
> (1ULL << VIRTIO_NET_F_CSUM))
>
> static int
> -vhost_vdpa_ioctl(struct virtio_user_dev *dev,
> +vhost_vdpa_send_request(struct virtio_user_dev *dev,
> enum vhost_user_request req,
> void *arg)
> {
> @@ -396,7 +417,7 @@ vhost_vdpa_enable_queue_pair(struct virtio_user_dev *dev,
> .num = enable,
> };
>
> - if (vhost_vdpa_ioctl(dev, VHOST_USER_SET_VRING_ENABLE, &state))
> + if (vhost_vdpa_send_request(dev, VHOST_USER_SET_VRING_ENABLE,
> &state))
> return -1;
> }
>
> @@ -407,7 +428,8 @@ vhost_vdpa_enable_queue_pair(struct virtio_user_dev *dev,
>
> struct virtio_user_backend_ops virtio_ops_vdpa = {
> .setup = vhost_vdpa_setup,
> - .send_request = vhost_vdpa_ioctl,
> + .set_owner = vhost_vdpa_set_owner,
> + .send_request = vhost_vdpa_send_request,
> .enable_qp = vhost_vdpa_enable_queue_pair,
> .dma_map = vhost_vdpa_dma_map_batch,
> .dma_unmap = vhost_vdpa_dma_unmap_batch,
> diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c
> b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> index 202431ca22..f4b97d8489 100644
> --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
> +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> @@ -490,8 +490,7 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char
> *path, int queues,
> (1ULL << VHOST_USER_F_PROTOCOL_FEATURES);
>
> if (!dev->is_server) {
> - if (dev->ops->send_request(dev, VHOST_USER_SET_OWNER,
> - NULL) < 0) {
> + if (dev->ops->set_owner(dev) < 0) {
> PMD_INIT_LOG(ERR, "set_owner fails: %s",
> strerror(errno));
> return -1;
> --
> 2.29.2
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
next prev parent reply other threads:[~2021-01-22 3:27 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-19 21:24 [dpdk-dev] [PATCH v2 00/44] net/virtio: Virtio PMD rework Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 01/44] bus/vdev: add helper to get vdev from eth dev Maxime Coquelin
2021-01-20 0:56 ` Thomas Monjalon
2021-01-25 10:53 ` Maxime Coquelin
2021-01-25 11:04 ` Thomas Monjalon
2021-01-21 8:58 ` Xia, Chenbo
2021-01-25 14:51 ` Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 02/44] bus/vdev: add driver IOVA VA mode requirement Maxime Coquelin
2021-01-20 15:32 ` David Marchand
2021-01-20 17:47 ` Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 03/44] net/virtio: fix getting old status on reconnect Maxime Coquelin
2021-01-21 7:12 ` Xia, Chenbo
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 04/44] net/virtio: introduce Virtio bus type Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 05/44] net/virtio: refactor virtio-user device Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 06/44] net/virtio: introduce PCI device metadata Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 07/44] net/virtio: move PCI device init in dedicated file Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 08/44] net/virtio: move PCI specific dev init to PCI ethdev init Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 09/44] net/virtio: move MSIX detection to PCI ethdev Maxime Coquelin
2021-01-21 7:12 ` Xia, Chenbo
2021-01-25 12:41 ` Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 10/44] net/virtio: force IOVA as VA mode for Virtio-user Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 11/44] net/virtio: store PCI type in Virtio device metadata Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 12/44] net/virtio: add callback for device closing Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 13/44] net/virtio: validate features at bus level Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 14/44] net/virtio: remove bus type enum Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 15/44] net/virtio: move PCI-specific fields to PCI device Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 16/44] net/virtio: pack virtio HW struct Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 17/44] net/virtio: move legacy IO to Virtio PCI Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 18/44] net/virtio: introduce generic virtio header Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 19/44] net/virtio: move features definition to generic header Maxime Coquelin
2021-01-21 6:47 ` Xia, Chenbo
2021-01-25 12:35 ` Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 20/44] net/virtio: move virtqueue defines in " Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 21/44] net/virtio: move config definitions to " Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 22/44] net/virtio: make interrupt handling more generic Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 23/44] net/virtio: move vring alignment to generic header Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 24/44] net/virtio: remove last PCI refs in non-PCI code Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 25/44] net/virtio: make Vhost-user req sender consistent Maxime Coquelin
2021-01-21 8:50 ` Xia, Chenbo
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 26/44] net/virtio: add Virtio-user ops to set owner Maxime Coquelin
2021-01-22 3:27 ` Xia, Chenbo [this message]
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 27/44] net/virtio: add Virtio-user features ops Maxime Coquelin
2021-01-22 7:25 ` Xia, Chenbo
2021-01-25 14:53 ` Maxime Coquelin
2021-01-22 8:46 ` Xia, Chenbo
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 28/44] net/virtio: add Virtio-user protocol " Maxime Coquelin
2021-01-22 7:27 ` Xia, Chenbo
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 29/44] net/virtio: add Virtio-user memory tables ops Maxime Coquelin
2021-01-22 7:34 ` Xia, Chenbo
2021-01-25 14:56 ` Maxime Coquelin
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 30/44] net/virtio: add Virtio-user vring setting ops Maxime Coquelin
2021-01-22 7:49 ` Xia, Chenbo
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 31/44] net/virtio: add Virtio-user vring file ops Maxime Coquelin
2021-01-22 8:01 ` Xia, Chenbo
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 32/44] net/virtio: add Virtio-user vring address ops Maxime Coquelin
2021-01-22 8:02 ` Xia, Chenbo
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 33/44] net/virtio: add Virtio-user status ops Maxime Coquelin
2021-01-22 8:02 ` Xia, Chenbo
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 34/44] net/virtio: remove useless request ops Maxime Coquelin
2021-01-22 8:10 ` Xia, Chenbo
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 35/44] net/virtio: improve Virtio-user errors handling Maxime Coquelin
2021-01-22 8:10 ` Xia, Chenbo
2021-01-19 21:24 ` [dpdk-dev] [PATCH v2 36/44] net/virtio: move Vhost-user reqs to Vhost-user backend Maxime Coquelin
2021-01-21 8:56 ` Xia, Chenbo
2021-01-25 14:50 ` Maxime Coquelin
2021-01-19 21:25 ` [dpdk-dev] [PATCH v2 37/44] net/virtio: make server mode blocking Maxime Coquelin
2021-01-22 8:19 ` Xia, Chenbo
2021-01-19 21:25 ` [dpdk-dev] [PATCH v2 38/44] net/virtio: move protocol features to Vhost-user Maxime Coquelin
2021-01-22 8:20 ` Xia, Chenbo
2021-01-19 21:25 ` [dpdk-dev] [PATCH v2 39/44] net/virtio: introduce backend data Maxime Coquelin
2021-01-22 8:26 ` Xia, Chenbo
2021-01-19 21:25 ` [dpdk-dev] [PATCH v2 40/44] net/virtio: move Vhost-user specifics to its backend Maxime Coquelin
2021-01-22 8:49 ` Xia, Chenbo
2021-01-19 21:25 ` [dpdk-dev] [PATCH v2 41/44] net/virtio: move Vhost-kernel data " Maxime Coquelin
2021-01-22 8:55 ` Xia, Chenbo
2021-01-25 14:59 ` Maxime Coquelin
2021-01-19 21:25 ` [dpdk-dev] [PATCH v2 42/44] net/virtio: move Vhost-vDPA " Maxime Coquelin
2021-01-22 9:06 ` Xia, Chenbo
2021-01-25 15:02 ` Maxime Coquelin
2021-01-19 21:25 ` [dpdk-dev] [PATCH v2 43/44] net/virtio: improve Vhost-user error logging Maxime Coquelin
2021-01-22 9:11 ` Xia, Chenbo
2021-01-25 15:04 ` Maxime Coquelin
2021-01-26 6:10 ` Xia, Chenbo
2021-01-19 21:25 ` [dpdk-dev] [PATCH v2 44/44] net/virtio: handle Virtio-user setup failure properly Maxime Coquelin
2021-01-22 9:24 ` Xia, Chenbo
2021-01-25 16:16 ` 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=MN2PR11MB4063637BEDA9923144E6CF039CA00@MN2PR11MB4063.namprd11.prod.outlook.com \
--to=chenbo.xia@intel.com \
--cc=amorenoz@redhat.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=maxime.coquelin@redhat.com \
--cc=olivier.matz@6wind.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).