From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: "Xia, Chenbo" <chenbo.xia@intel.com>,
"dev@dpdk.org" <dev@dpdk.org>,
"david.marchand@redhat.com" <david.marchand@redhat.com>,
"mkp@redhat.com" <mkp@redhat.com>,
"fbl@redhat.com" <fbl@redhat.com>,
"jasowang@redhat.com" <jasowang@redhat.com>,
"Liang, Cunming" <cunming.liang@intel.com>,
"Xie, Yongji" <xieyongji@bytedance.com>,
"echaudro@redhat.com" <echaudro@redhat.com>,
"eperezma@redhat.com" <eperezma@redhat.com>,
"amorenoz@redhat.com" <amorenoz@redhat.com>,
"lulu@redhat.com" <lulu@redhat.com>
Subject: Re: [PATCH v4 26/26] vhost: add VDUSE device stop
Date: Tue, 6 Jun 2023 10:14:59 +0200 [thread overview]
Message-ID: <2980991d-1128-b94e-9e78-66b2df567fb6@redhat.com> (raw)
In-Reply-To: <SN6PR11MB3504B3F3FB0506568434F88B9C4DA@SN6PR11MB3504.namprd11.prod.outlook.com>
On 6/5/23 09:56, Xia, Chenbo wrote:
>> -----Original Message-----
>> From: Maxime Coquelin <maxime.coquelin@redhat.com>
>> Sent: Friday, June 2, 2023 4:08 AM
>> To: dev@dpdk.org; Xia, Chenbo <chenbo.xia@intel.com>;
>> david.marchand@redhat.com; mkp@redhat.com; fbl@redhat.com;
>> jasowang@redhat.com; Liang, Cunming <cunming.liang@intel.com>; Xie, Yongji
>> <xieyongji@bytedance.com>; echaudro@redhat.com; eperezma@redhat.com;
>> amorenoz@redhat.com; lulu@redhat.com
>> Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
>> Subject: [PATCH v4 26/26] vhost: add VDUSE device stop
>>
>> This patch adds VDUSE device stop and cleanup of its
>> virtqueues.
>>
>> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
>> ---
>> doc/guides/rel_notes/release_23_07.rst | 6 +++
>> lib/vhost/vduse.c | 72 +++++++++++++++++++++++---
>> 2 files changed, 70 insertions(+), 8 deletions(-)
>>
>> diff --git a/doc/guides/rel_notes/release_23_07.rst
>> b/doc/guides/rel_notes/release_23_07.rst
>> index 7034fb664c..6f43e8e633 100644
>> --- a/doc/guides/rel_notes/release_23_07.rst
>> +++ b/doc/guides/rel_notes/release_23_07.rst
>> @@ -67,6 +67,12 @@ New Features
>> Introduced ``rte_vhost_driver_set_max_queue_num()`` to be able to limit
>> the
>> maximum number of supported queue pairs, required for VDUSE support.
>>
>> +* **Added VDUSE support into Vhost library.**
>> +
>> + VDUSE aims at implementing vDPA devices in userspace. It can be used as
>> an
>> + alternative to Vhost-user when using Vhost-vDPA, but also enable
>> providing a
>> + virtio-net netdev to the host when using Virtio-vDPA driver.
>> +
>>
>> Removed Items
>> -------------
>> diff --git a/lib/vhost/vduse.c b/lib/vhost/vduse.c
>> index 699cfed9e3..f421b1cf4c 100644
>> --- a/lib/vhost/vduse.c
>> +++ b/lib/vhost/vduse.c
>> @@ -252,6 +252,44 @@ vduse_vring_setup(struct virtio_net *dev, unsigned
>> int index)
>> }
>> }
>>
>> +static void
>> +vduse_vring_cleanup(struct virtio_net *dev, unsigned int index)
>> +{
>> + struct vhost_virtqueue *vq = dev->virtqueue[index];
>> + struct vduse_vq_eventfd vq_efd;
>> + int ret;
>> +
>> + if (vq == dev->cvq && vq->kickfd >= 0) {
>> + fdset_del(&vduse.fdset, vq->kickfd);
>> + fdset_pipe_notify(&vduse.fdset);
>> + }
>> +
>> + vq_efd.index = index;
>> + vq_efd.fd = VDUSE_EVENTFD_DEASSIGN;
>> +
>> + ret = ioctl(dev->vduse_dev_fd, VDUSE_VQ_SETUP_KICKFD, &vq_efd);
>> + if (ret)
>> + VHOST_LOG_CONFIG(dev->ifname, ERR, "Failed to cleanup kickfd
>> for VQ %u: %s\n",
>> + index, strerror(errno));
>> +
>> + close(vq->kickfd);
>> + vq->kickfd = VIRTIO_UNINITIALIZED_EVENTFD;
>> +
>> + vring_invalidate(dev, vq);
>> +
>> + rte_free(vq->batch_copy_elems);
>> + vq->batch_copy_elems = NULL;
>> +
>> + rte_free(vq->shadow_used_split);
>> + vq->shadow_used_split = NULL;
>> +
>> + vq->enabled = false;
>> + vq->ready = false;
>> + vq->size = 0;
>> + vq->last_used_idx = 0;
>> + vq->last_avail_idx = 0;
>> +}
>> +
>> static void
>> vduse_device_start(struct virtio_net *dev)
>> {
>> @@ -304,6 +342,23 @@ vduse_device_start(struct virtio_net *dev)
>> }
>> }
>>
>> +static void
>> +vduse_device_stop(struct virtio_net *dev)
>> +{
>> + unsigned int i;
>> +
>> + VHOST_LOG_CONFIG(dev->ifname, INFO, "Stopping device...\n");
>> +
>> + vhost_destroy_device_notify(dev);
>> +
>> + dev->flags &= ~VIRTIO_DEV_READY;
>> +
>> + for (i = 0; i < dev->nr_vring; i++)
>> + vduse_vring_cleanup(dev, i);
>> +
>> + vhost_user_iotlb_flush_all(dev);
>> +}
>> +
>> static void
>> vduse_events_handler(int fd, void *arg, int *remove __rte_unused)
>> {
>> @@ -311,6 +366,7 @@ vduse_events_handler(int fd, void *arg, int *remove
>> __rte_unused)
>> struct vduse_dev_request req;
>> struct vduse_dev_response resp;
>> struct vhost_virtqueue *vq;
>> + uint8_t old_status;
>> int ret;
>>
>> memset(&resp, 0, sizeof(resp));
>> @@ -339,10 +395,15 @@ vduse_events_handler(int fd, void *arg, int *remove
>> __rte_unused)
>> case VDUSE_SET_STATUS:
>> VHOST_LOG_CONFIG(dev->ifname, INFO, "\tnew status: 0x%08x\n",
>> req.s.status);
>> + old_status = dev->status;
>> dev->status = req.s.status;
>>
>> - if (dev->status & VIRTIO_DEVICE_STATUS_DRIVER_OK)
>> - vduse_device_start(dev);
>> + if ((old_status ^ dev->status) &
>> VIRTIO_DEVICE_STATUS_DRIVER_OK) {
>> + if (dev->status & VIRTIO_DEVICE_STATUS_DRIVER_OK)
>> + vduse_device_start(dev);
>> + else
>> + vduse_device_stop(dev);
>> + }
>>
>> resp.result = VDUSE_REQ_RESULT_OK;
>> break;
>> @@ -560,12 +621,7 @@ vduse_device_destroy(const char *path)
>> if (vid == RTE_MAX_VHOST_DEVICE)
>> return -1;
>>
>> - if (dev->cvq && dev->cvq->kickfd >= 0) {
>> - fdset_del(&vduse.fdset, dev->cvq->kickfd);
>> - fdset_pipe_notify(&vduse.fdset);
>> - close(dev->cvq->kickfd);
>> - dev->cvq->kickfd = VIRTIO_UNINITIALIZED_EVENTFD;
>> - }
>> + vduse_device_stop(dev);
>>
>> fdset_del(&vduse.fdset, dev->vduse_dev_fd);
>> fdset_pipe_notify(&vduse.fdset);
>> --
>> 2.40.1
>
> Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
>
Thanks Chenbo, I just fixed an issue when testing with OVS that impact
both this patch and the one adding VDUSE device startup.
So your R-by on these patches will be removed for both these patches in
v5.
Maxime
prev parent reply other threads:[~2023-06-06 8:15 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-01 20:07 [PATCH v4 00/26] Add VDUSE support to Vhost library Maxime Coquelin
2023-06-01 20:07 ` [PATCH v4 01/26] vhost: fix IOTLB entries overlap check with previous entry Maxime Coquelin
2023-06-01 20:07 ` [PATCH v4 02/26] vhost: add helper of IOTLB entries coredump Maxime Coquelin
2023-06-01 20:07 ` [PATCH v4 03/26] vhost: add helper for IOTLB entries shared page check Maxime Coquelin
2023-06-01 20:07 ` [PATCH v4 04/26] vhost: don't dump unneeded pages with IOTLB Maxime Coquelin
2023-06-01 20:07 ` [PATCH v4 05/26] vhost: change to single IOTLB cache per device Maxime Coquelin
2023-06-01 20:07 ` [PATCH v4 06/26] vhost: add offset field to IOTLB entries Maxime Coquelin
2023-06-01 20:07 ` [PATCH v4 07/26] vhost: add page size info to IOTLB entry Maxime Coquelin
2023-06-01 20:07 ` [PATCH v4 08/26] vhost: retry translating IOVA after IOTLB miss Maxime Coquelin
2023-06-01 20:07 ` [PATCH v4 09/26] vhost: introduce backend ops Maxime Coquelin
2023-06-01 20:07 ` [PATCH v4 10/26] vhost: add IOTLB cache entry removal callback Maxime Coquelin
2023-06-01 20:07 ` [PATCH v4 11/26] vhost: add helper for IOTLB misses Maxime Coquelin
2023-06-01 20:07 ` [PATCH v4 12/26] vhost: add helper for interrupt injection Maxime Coquelin
2023-06-01 20:07 ` [PATCH v4 13/26] vhost: add API to set max queue pairs Maxime Coquelin
2023-06-05 7:56 ` Xia, Chenbo
2023-06-01 20:08 ` [PATCH v4 14/26] net/vhost: use " Maxime Coquelin
2023-06-01 20:08 ` [PATCH v4 15/26] vhost: add control virtqueue support Maxime Coquelin
2023-06-01 20:08 ` [PATCH v4 16/26] vhost: add VDUSE device creation and destruction Maxime Coquelin
2023-06-01 20:08 ` [PATCH v4 17/26] vhost: add VDUSE callback for IOTLB miss Maxime Coquelin
2023-06-01 20:08 ` [PATCH v4 18/26] vhost: add VDUSE callback for IOTLB entry removal Maxime Coquelin
2023-06-01 20:08 ` [PATCH v4 19/26] vhost: add VDUSE callback for IRQ injection Maxime Coquelin
2023-06-01 20:08 ` [PATCH v4 20/26] vhost: add VDUSE events handler Maxime Coquelin
2023-06-01 20:08 ` [PATCH v4 21/26] vhost: add support for virtqueue state get event Maxime Coquelin
2023-06-01 20:08 ` [PATCH v4 22/26] vhost: add support for VDUSE status set event Maxime Coquelin
2023-06-01 20:08 ` [PATCH v4 23/26] vhost: add support for VDUSE IOTLB update event Maxime Coquelin
2023-06-01 20:08 ` [PATCH v4 24/26] vhost: add VDUSE device startup Maxime Coquelin
2023-06-01 20:08 ` [PATCH v4 25/26] vhost: add multiqueue support to VDUSE Maxime Coquelin
2023-06-01 20:08 ` [PATCH v4 26/26] vhost: add VDUSE device stop Maxime Coquelin
2023-06-05 7:56 ` Xia, Chenbo
2023-06-06 8:14 ` Maxime Coquelin [this message]
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=2980991d-1128-b94e-9e78-66b2df567fb6@redhat.com \
--to=maxime.coquelin@redhat.com \
--cc=amorenoz@redhat.com \
--cc=chenbo.xia@intel.com \
--cc=cunming.liang@intel.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=echaudro@redhat.com \
--cc=eperezma@redhat.com \
--cc=fbl@redhat.com \
--cc=jasowang@redhat.com \
--cc=lulu@redhat.com \
--cc=mkp@redhat.com \
--cc=xieyongji@bytedance.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).