From: "Xia, Chenbo" <chenbo.xia@intel.com>
To: Matan Azrad <matan@mellanox.com>,
Maxime Coquelin <maxime.coquelin@redhat.com>
Cc: "dev@dpdk.org" <dev@dpdk.org>, "Wang, Xiao W" <xiao.w.wang@intel.com>
Subject: Re: [dpdk-dev] [PATCH v2 2/5] vhost: improve device readiness notifications
Date: Sun, 28 Jun 2020 03:08:15 +0000 [thread overview]
Message-ID: <MN2PR11MB4063E85E3134A632587DF3D29C910@MN2PR11MB4063.namprd11.prod.outlook.com> (raw)
In-Reply-To: <1593092298-52257-3-git-send-email-matan@mellanox.com>
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Matan Azrad
> Sent: Thursday, June 25, 2020 9:38 PM
> To: Maxime Coquelin <maxime.coquelin@redhat.com>
> Cc: dev@dpdk.org; Wang, Xiao W <xiao.w.wang@intel.com>
> Subject: [dpdk-dev] [PATCH v2 2/5] vhost: improve device readiness
> notifications
>
> Some guest drivers may not configure disabled virtio queues.
>
> In this case, the vhost management never notifies the application and the vDPA
> device readiness because it waits to the device to be ready.
>
> The current ready state means that all the virtio queues should be configured
> regardless the enablement status.
>
> In order to support this case, this patch changes the ready state:
> The device is ready when at least 1 queue pair is configured and enabled.
>
> So, now, the application and vDPA driver are notifies when the first queue pair is
> configured and enabled.
>
> Also the queue notifications will be triggered according to the new ready
> definition.
>
> Signed-off-by: Matan Azrad <matan@mellanox.com>
> ---
> lib/librte_vhost/vhost.h | 1 +
> lib/librte_vhost/vhost_user.c | 55 +++++++++++++++++++++++++++++------------
> --
> 2 files changed, 38 insertions(+), 18 deletions(-)
>
> diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h index
> 17f1e9a..8a74f33 100644
> --- a/lib/librte_vhost/vhost.h
> +++ b/lib/librte_vhost/vhost.h
> @@ -151,6 +151,7 @@ struct vhost_virtqueue {
> int backend;
> int enabled;
> int access_ok;
> + int ready;
> rte_spinlock_t access_lock;
>
> /* Used to notify the guest (trigger interrupt) */ diff --git
> a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index
> 8d8050b..b90fc78 100644
> --- a/lib/librte_vhost/vhost_user.c
> +++ b/lib/librte_vhost/vhost_user.c
> @@ -228,6 +228,21 @@
> dev->postcopy_listening = 0;
> }
>
> +static void
> +vhost_user_notify_queue_state(struct virtio_net *dev, uint16_t index,
> + int enable)
> +{
> + int did = dev->vdpa_dev_id;
> + struct rte_vdpa_device *vdpa_dev = rte_vdpa_get_device(did);
> +
> + if (vdpa_dev && vdpa_dev->ops->set_vring_state)
> + vdpa_dev->ops->set_vring_state(dev->vid, index, enable);
> +
> + if (dev->notify_ops->vring_state_changed)
> + dev->notify_ops->vring_state_changed(dev->vid,
> + index, enable);
> +}
> +
> /*
> * This function just returns success at the moment unless
> * the device hasn't been initialised.
> @@ -1306,27 +1321,31 @@
>
> return rings_ok &&
> vq->kickfd != VIRTIO_UNINITIALIZED_EVENTFD &&
> - vq->callfd != VIRTIO_UNINITIALIZED_EVENTFD;
> + vq->callfd != VIRTIO_UNINITIALIZED_EVENTFD &&
> + vq->enabled;
> }
>
> +#define VIRTIO_DEV_NUM_VQS_TO_BE_READY 2u
> +
> static int
> virtio_is_ready(struct virtio_net *dev) {
> struct vhost_virtqueue *vq;
> uint32_t i;
>
> - if (dev->nr_vring == 0)
> + if (dev->nr_vring < VIRTIO_DEV_NUM_VQS_TO_BE_READY)
> return 0;
>
> - for (i = 0; i < dev->nr_vring; i++) {
> + for (i = 0; i < VIRTIO_DEV_NUM_VQS_TO_BE_READY; i++) {
> vq = dev->virtqueue[i];
>
> if (!vq_is_ready(dev, vq))
> return 0;
> }
>
> - VHOST_LOG_CONFIG(INFO,
> - "virtio is now ready for processing.\n");
> + if (!(dev->flags & VIRTIO_DEV_RUNNING))
> + VHOST_LOG_CONFIG(INFO,
> + "virtio is now ready for processing.\n");
> return 1;
> }
>
> @@ -1970,8 +1989,6 @@ static int vhost_user_set_vring_err(struct virtio_net
> **pdev __rte_unused,
> struct virtio_net *dev = *pdev;
> int enable = (int)msg->payload.state.num;
> int index = (int)msg->payload.state.index;
> - struct rte_vdpa_device *vdpa_dev;
> - int did = -1;
>
> if (validate_msg_fds(msg, 0) != 0)
> return RTE_VHOST_MSG_RESULT_ERR;
> @@ -1980,15 +1997,6 @@ static int vhost_user_set_vring_err(struct virtio_net
> **pdev __rte_unused,
> "set queue enable: %d to qp idx: %d\n",
> enable, index);
>
> - did = dev->vdpa_dev_id;
> - vdpa_dev = rte_vdpa_get_device(did);
> - if (vdpa_dev && vdpa_dev->ops->set_vring_state)
> - vdpa_dev->ops->set_vring_state(dev->vid, index, enable);
> -
> - if (dev->notify_ops->vring_state_changed)
> - dev->notify_ops->vring_state_changed(dev->vid,
> - index, enable);
> -
> /* On disable, rings have to be stopped being processed. */
> if (!enable && dev->dequeue_zero_copy)
> drain_zmbuf_list(dev->virtqueue[index]);
> @@ -2618,6 +2626,7 @@ typedef int (*vhost_message_handler_t)(struct
> virtio_net **pdev,
> int unlock_required = 0;
> bool handled;
> int request;
> + uint32_t i;
>
> dev = get_device(vid);
> if (dev == NULL)
> @@ -2793,6 +2802,17 @@ typedef int (*vhost_message_handler_t)(struct
> virtio_net **pdev,
> return -1;
> }
>
> + for (i = 0; i < dev->nr_vring; i++) {
> + struct vhost_virtqueue *vq = dev->virtqueue[i];
> + bool cur_ready = vq_is_ready(dev, vq);
> +
> + if (cur_ready != (vq && vq->ready)) {
> + vhost_user_notify_queue_state(dev, i, cur_ready);
> + vq->ready = cur_ready;
> + }
> + }
> +
> +
> if (!(dev->flags & VIRTIO_DEV_RUNNING) && virtio_is_ready(dev)) {
> dev->flags |= VIRTIO_DEV_READY;
>
> @@ -2810,8 +2830,7 @@ typedef int (*vhost_message_handler_t)(struct
> virtio_net **pdev,
> did = dev->vdpa_dev_id;
> vdpa_dev = rte_vdpa_get_device(did);
> if (vdpa_dev && virtio_is_ready(dev) &&
> - !(dev->flags & VIRTIO_DEV_VDPA_CONFIGURED) &&
> - msg.request.master == VHOST_USER_SET_VRING_CALL)
> {
> + !(dev->flags & VIRTIO_DEV_VDPA_CONFIGURED)) {
> if (vdpa_dev->ops->dev_conf)
> vdpa_dev->ops->dev_conf(dev->vid);
> dev->flags |= VIRTIO_DEV_VDPA_CONFIGURED;
> --
> 1.8.3.1
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
next prev parent reply other threads:[~2020-06-28 3:08 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-18 16:28 [dpdk-dev] [PATCH v1 0/4] vhost: improve ready state Matan Azrad
2020-06-18 16:28 ` [dpdk-dev] [PATCH v1 1/4] vhost: support host notifier queue configuration Matan Azrad
2020-06-19 6:44 ` Maxime Coquelin
2020-06-19 13:28 ` Matan Azrad
2020-06-19 14:01 ` Maxime Coquelin
2020-06-21 6:26 ` Matan Azrad
2020-06-22 8:06 ` Maxime Coquelin
2020-06-18 16:28 ` [dpdk-dev] [PATCH v1 2/4] vhost: skip access lock when vDPA is configured Matan Azrad
2020-06-19 6:49 ` Maxime Coquelin
2020-06-18 16:28 ` [dpdk-dev] [PATCH v1 3/4] vhost: improve device ready definition Matan Azrad
2020-06-19 7:41 ` Maxime Coquelin
2020-06-19 12:04 ` Maxime Coquelin
2020-06-19 13:11 ` Matan Azrad
2020-06-19 13:54 ` Maxime Coquelin
2020-06-21 6:20 ` Matan Azrad
2020-06-22 8:04 ` Maxime Coquelin
2020-06-22 8:41 ` Matan Azrad
2020-06-22 8:56 ` Maxime Coquelin
2020-06-22 10:06 ` Matan Azrad
2020-06-22 12:32 ` Maxime Coquelin
2020-06-22 13:43 ` Matan Azrad
2020-06-22 14:55 ` Maxime Coquelin
2020-06-22 15:51 ` Matan Azrad
2020-06-22 16:47 ` Maxime Coquelin
2020-06-23 9:02 ` Matan Azrad
2020-06-23 9:19 ` Maxime Coquelin
2020-06-23 11:53 ` Matan Azrad
2020-06-23 13:55 ` Maxime Coquelin
2020-06-23 14:33 ` Maxime Coquelin
2020-06-23 14:52 ` Matan Azrad
2020-06-23 15:18 ` Maxime Coquelin
2020-06-24 5:54 ` Matan Azrad
2020-06-24 7:22 ` Maxime Coquelin
2020-06-24 8:38 ` Matan Azrad
2020-06-24 9:12 ` Maxime Coquelin
2020-06-18 16:28 ` [dpdk-dev] [PATCH v1 4/4] vdpa/mlx5: support queue update Matan Azrad
2020-06-25 13:38 ` [dpdk-dev] [PATCH v2 0/5] vhost: improve ready state Matan Azrad
2020-06-25 13:38 ` [dpdk-dev] [PATCH v2 1/5] vhost: skip access lock when vDPA is configured Matan Azrad
2020-06-28 3:06 ` Xia, Chenbo
2020-06-25 13:38 ` [dpdk-dev] [PATCH v2 2/5] vhost: improve device readiness notifications Matan Azrad
2020-06-26 12:10 ` Maxime Coquelin
2020-06-28 3:08 ` Xia, Chenbo [this message]
2020-06-25 13:38 ` [dpdk-dev] [PATCH v2 3/5] vhost: handle memory hotplug with vDPA devices Matan Azrad
2020-06-26 12:15 ` Maxime Coquelin
2020-06-28 3:18 ` Xia, Chenbo
2020-06-25 13:38 ` [dpdk-dev] [PATCH v2 4/5] vhost: notify virtq file descriptor update Matan Azrad
2020-06-26 12:19 ` Maxime Coquelin
2020-06-28 3:19 ` Xia, Chenbo
2020-06-25 13:38 ` [dpdk-dev] [PATCH v2 5/5] vdpa/mlx5: support queue update Matan Azrad
2020-06-26 12:29 ` Maxime Coquelin
2020-06-29 14:08 ` [dpdk-dev] [PATCH v3 0/6] vhost: improve ready state Matan Azrad
2020-06-29 14:08 ` [dpdk-dev] [PATCH v3 1/6] vhost: support host notifier queue configuration Matan Azrad
2020-06-29 14:08 ` [dpdk-dev] [PATCH v3 2/6] vhost: skip access lock when vDPA is configured Matan Azrad
2020-06-29 14:08 ` [dpdk-dev] [PATCH v3 3/6] vhost: improve device readiness notifications Matan Azrad
2020-06-29 14:08 ` [dpdk-dev] [PATCH v3 4/6] vhost: handle memory hotplug with vDPA devices Matan Azrad
2020-06-29 14:08 ` [dpdk-dev] [PATCH v3 5/6] vhost: notify virtq file descriptor update Matan Azrad
2020-06-29 14:08 ` [dpdk-dev] [PATCH v3 6/6] vdpa/mlx5: support queue update Matan Azrad
2020-06-29 17:24 ` [dpdk-dev] [PATCH v3 0/6] vhost: improve ready state Maxime Coquelin
2020-07-17 1:41 ` Wang, Yinan
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=MN2PR11MB4063E85E3134A632587DF3D29C910@MN2PR11MB4063.namprd11.prod.outlook.com \
--to=chenbo.xia@intel.com \
--cc=dev@dpdk.org \
--cc=matan@mellanox.com \
--cc=maxime.coquelin@redhat.com \
--cc=xiao.w.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).