From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 873FB42C3E; Tue, 6 Jun 2023 10:15:09 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2431440A84; Tue, 6 Jun 2023 10:15:09 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 56F5640697 for ; Tue, 6 Jun 2023 10:15:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686039307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3h24WP3/Jl9o9uVZslEBtHRXfNie/MSmWLw0ZbZcGRY=; b=MX3fQjc6miCzfAednQPkss287tpKjE+/2bpM9+LLoQZ0SBvrfjIwHwhRQDQ42drPOErPSw XA/Qk4EuDslvoD7B/xu8YwufNnO2keNwJ99APBWVZozzEjTf8i6fqq778tPIQqWDuz89oU Mi/6qaESCo1BspATXxXCsHRyNsxZn6Y= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-408-wiDg3jxeN1WCihFjoD0iGg-1; Tue, 06 Jun 2023 04:15:04 -0400 X-MC-Unique: wiDg3jxeN1WCihFjoD0iGg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1A1CD8002BF; Tue, 6 Jun 2023 08:15:04 +0000 (UTC) Received: from [10.39.208.25] (unknown [10.39.208.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8058B2166B25; Tue, 6 Jun 2023 08:15:01 +0000 (UTC) Message-ID: <2980991d-1128-b94e-9e78-66b2df567fb6@redhat.com> Date: Tue, 6 Jun 2023 10:14:59 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: [PATCH v4 26/26] vhost: add VDUSE device stop To: "Xia, Chenbo" , "dev@dpdk.org" , "david.marchand@redhat.com" , "mkp@redhat.com" , "fbl@redhat.com" , "jasowang@redhat.com" , "Liang, Cunming" , "Xie, Yongji" , "echaudro@redhat.com" , "eperezma@redhat.com" , "amorenoz@redhat.com" , "lulu@redhat.com" References: <20230601200812.672233-1-maxime.coquelin@redhat.com> <20230601200812.672233-27-maxime.coquelin@redhat.com> From: Maxime Coquelin In-Reply-To: X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org On 6/5/23 09:56, Xia, Chenbo wrote: >> -----Original Message----- >> From: Maxime Coquelin >> Sent: Friday, June 2, 2023 4:08 AM >> To: dev@dpdk.org; Xia, Chenbo ; >> david.marchand@redhat.com; mkp@redhat.com; fbl@redhat.com; >> jasowang@redhat.com; Liang, Cunming ; Xie, Yongji >> ; echaudro@redhat.com; eperezma@redhat.com; >> amorenoz@redhat.com; lulu@redhat.com >> Cc: Maxime Coquelin >> 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 >> --- >> 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 > 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