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 308A342B9D; Thu, 25 May 2023 18:23:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C8EF940DF8; Thu, 25 May 2023 18:23:31 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 0850E40DDB for ; Thu, 25 May 2023 18:23:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685031809; 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=6NI5eNX2sHzVGFR43MnSH2vWc6bDB2ds2cy0UVKlCr8=; b=Mhw8+d6DXjzxA2168UGjmOIGlyXyp6+wEOSAxijVVcSg7MghSodpgpqq2F+9ALrjJ+3R4S dGzybNEbF+VAqMGIHdJXOSptPOi6NHGoWNn+0EKMmFcUBOnT+25KmmEqZ5PawJmNbiv5jy csUKhHZmt8D8q6QFlWLj2WM57ZFD+GY= 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-103-XagIgtNSN7-59myOhEWKpA-1; Thu, 25 May 2023 12:23:26 -0400 X-MC-Unique: XagIgtNSN7-59myOhEWKpA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0D78C101A531; Thu, 25 May 2023 16:23:26 +0000 (UTC) Received: from [10.39.208.23] (unknown [10.39.208.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BEFDFC154D1; Thu, 25 May 2023 16:23:22 +0000 (UTC) Message-ID: Date: Thu, 25 May 2023 18:23:21 +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 28/28] vhost: Add VDUSE device stop To: dev@dpdk.org, chenbo.xia@intel.com, david.marchand@redhat.com, mkp@redhat.com, fbl@redhat.com, jasowang@redhat.com, cunming.liang@intel.com, xieyongji@bytedance.com, echaudro@redhat.com, eperezma@redhat.com, amorenoz@redhat.com, lulu@redhat.com References: <20230525161551.70002-1-maxime.coquelin@redhat.com> <20230525161551.70002-29-maxime.coquelin@redhat.com> From: Maxime Coquelin In-Reply-To: <20230525161551.70002-29-maxime.coquelin@redhat.com> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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 Sorry, something went wrong when sending the series. I'm sending a v3 as the series is broken in two in patchwork because of this leftover patch. On 5/25/23 18:15, Maxime Coquelin wrote: > 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 fa889a5ee7..66ba9e25dd 100644 > --- a/doc/guides/rel_notes/release_23_07.rst > +++ b/doc/guides/rel_notes/release_23_07.rst > @@ -60,6 +60,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);