From: "Xia, Chenbo" <chenbo.xia@intel.com>
To: Maxime Coquelin <maxime.coquelin@redhat.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 v5 24/26] vhost: add VDUSE device startup
Date: Thu, 8 Jun 2023 02:10:46 +0000 [thread overview]
Message-ID: <SN6PR11MB35044781E20DCA43AAEE76F69C50A@SN6PR11MB3504.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20230606081852.71003-25-maxime.coquelin@redhat.com>
> -----Original Message-----
> From: Maxime Coquelin <maxime.coquelin@redhat.com>
> Sent: Tuesday, June 6, 2023 4:19 PM
> 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 v5 24/26] vhost: add VDUSE device startup
>
> This patch adds the device and its virtqueues
> initialization once the Virtio driver has set the DRIVER_OK
> in the Virtio status register.
>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
> lib/vhost/vduse.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 126 insertions(+)
>
> diff --git a/lib/vhost/vduse.c b/lib/vhost/vduse.c
> index 110654ec68..ff4c54c321 100644
> --- a/lib/vhost/vduse.c
> +++ b/lib/vhost/vduse.c
> @@ -141,6 +141,128 @@ static struct vhost_backend_ops vduse_backend_ops =
> {
> .inject_irq = vduse_inject_irq,
> };
>
> +static void
> +vduse_vring_setup(struct virtio_net *dev, unsigned int index)
> +{
> + struct vhost_virtqueue *vq = dev->virtqueue[index];
> + struct vhost_vring_addr *ra = &vq->ring_addrs;
> + struct vduse_vq_info vq_info;
> + struct vduse_vq_eventfd vq_efd;
> + int ret;
> +
> + vq_info.index = index;
> + ret = ioctl(dev->vduse_dev_fd, VDUSE_VQ_GET_INFO, &vq_info);
> + if (ret) {
> + VHOST_LOG_CONFIG(dev->ifname, ERR, "Failed to get VQ %u
> info: %s\n",
> + index, strerror(errno));
> + return;
> + }
> +
> + VHOST_LOG_CONFIG(dev->ifname, INFO, "VQ %u info:\n", index);
> + VHOST_LOG_CONFIG(dev->ifname, INFO, "\tnum: %u\n", vq_info.num);
> + VHOST_LOG_CONFIG(dev->ifname, INFO, "\tdesc_addr: %llx\n",
> vq_info.desc_addr);
> + VHOST_LOG_CONFIG(dev->ifname, INFO, "\tdriver_addr: %llx\n",
> vq_info.driver_addr);
> + VHOST_LOG_CONFIG(dev->ifname, INFO, "\tdevice_addr: %llx\n",
> vq_info.device_addr);
> + VHOST_LOG_CONFIG(dev->ifname, INFO, "\tavail_idx: %u\n",
> vq_info.split.avail_index);
> + VHOST_LOG_CONFIG(dev->ifname, INFO, "\tready: %u\n", vq_info.ready);
> +
> + vq->last_avail_idx = vq_info.split.avail_index;
> + vq->size = vq_info.num;
> + vq->ready = true;
> + vq->enabled = vq_info.ready;
> + ra->desc_user_addr = vq_info.desc_addr;
> + ra->avail_user_addr = vq_info.driver_addr;
> + ra->used_user_addr = vq_info.device_addr;
> +
> + vq->kickfd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
> + if (vq->kickfd < 0) {
> + VHOST_LOG_CONFIG(dev->ifname, ERR, "Failed to init kickfd for
> VQ %u: %s\n",
> + index, strerror(errno));
> + vq->kickfd = VIRTIO_INVALID_EVENTFD;
> + return;
> + }
> + VHOST_LOG_CONFIG(dev->ifname, INFO, "\tkick fd: %d\n", vq->kickfd);
> +
> + vq->shadow_used_split = rte_malloc_socket(NULL,
> + vq->size * sizeof(struct vring_used_elem),
> + RTE_CACHE_LINE_SIZE, 0);
> + vq->batch_copy_elems = rte_malloc_socket(NULL,
> + vq->size * sizeof(struct batch_copy_elem),
> + RTE_CACHE_LINE_SIZE, 0);
> +
> + vhost_user_iotlb_rd_lock(vq);
> + if (vring_translate(dev, vq))
> + VHOST_LOG_CONFIG(dev->ifname, ERR, "Failed to translate
> vring %d addresses\n",
> + index);
> +
> + if (vhost_enable_guest_notification(dev, vq, 0))
> + VHOST_LOG_CONFIG(dev->ifname, ERR,
> + "Failed to disable guest notifications on
> vring %d\n",
> + index);
> + vhost_user_iotlb_rd_unlock(vq);
> +
> + vq_efd.index = index;
> + vq_efd.fd = vq->kickfd;
> +
> + ret = ioctl(dev->vduse_dev_fd, VDUSE_VQ_SETUP_KICKFD, &vq_efd);
> + if (ret) {
> + VHOST_LOG_CONFIG(dev->ifname, ERR, "Failed to setup kickfd for
> VQ %u: %s\n",
> + index, strerror(errno));
> + close(vq->kickfd);
> + vq->kickfd = VIRTIO_UNINITIALIZED_EVENTFD;
> + return;
> + }
> +}
> +
> +static void
> +vduse_device_start(struct virtio_net *dev)
> +{
> + unsigned int i, ret;
> +
> + VHOST_LOG_CONFIG(dev->ifname, INFO, "Starting device...\n");
> +
> + dev->notify_ops = vhost_driver_callback_get(dev->ifname);
> + if (!dev->notify_ops) {
> + VHOST_LOG_CONFIG(dev->ifname, ERR,
> + "Failed to get callback ops for driver\n");
> + return;
> + }
> +
> + ret = ioctl(dev->vduse_dev_fd, VDUSE_DEV_GET_FEATURES, &dev-
> >features);
> + if (ret) {
> + VHOST_LOG_CONFIG(dev->ifname, ERR, "Failed to get
> features: %s\n",
> + strerror(errno));
> + return;
> + }
> +
> + VHOST_LOG_CONFIG(dev->ifname, INFO, "Negotiated Virtio features:
> 0x%" PRIx64 "\n",
> + dev->features);
> +
> + if (dev->features &
> + ((1ULL << VIRTIO_NET_F_MRG_RXBUF) |
> + (1ULL << VIRTIO_F_VERSION_1) |
> + (1ULL << VIRTIO_F_RING_PACKED))) {
> + dev->vhost_hlen = sizeof(struct virtio_net_hdr_mrg_rxbuf);
> + } else {
> + dev->vhost_hlen = sizeof(struct virtio_net_hdr);
> + }
> +
> + for (i = 0; i < dev->nr_vring; i++)
> + vduse_vring_setup(dev, i);
> +
> + dev->flags |= VIRTIO_DEV_READY;
> +
> + if (dev->notify_ops->new_device(dev->vid) == 0)
> + dev->flags |= VIRTIO_DEV_RUNNING;
> +
> + for (i = 0; i < dev->nr_vring; i++) {
> + struct vhost_virtqueue *vq = dev->virtqueue[i];
> +
> + if (dev->notify_ops->vring_state_changed)
> + dev->notify_ops->vring_state_changed(dev->vid, i, vq-
> >enabled);
> + }
> +}
> +
> static void
> vduse_events_handler(int fd, void *arg, int *remove __rte_unused)
> {
> @@ -199,6 +321,10 @@ vduse_events_handler(int fd, void *arg, int *remove
> __rte_unused)
> strerror(errno));
> return;
> }
> +
> + if (dev->status & VIRTIO_DEVICE_STATUS_DRIVER_OK)
> + vduse_device_start(dev);
> +
> VHOST_LOG_CONFIG(dev->ifname, INFO, "Request %s (%u) handled
> successfully\n",
> vduse_req_id_to_str(req.type), req.type);
> }
> --
> 2.40.1
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
next prev parent reply other threads:[~2023-06-08 2:10 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-06 8:18 [PATCH v5 00/26] Add VDUSE support to Vhost library Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 01/26] vhost: fix IOTLB entries overlap check with previous entry Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 02/26] vhost: add helper of IOTLB entries coredump Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 03/26] vhost: add helper for IOTLB entries shared page check Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 04/26] vhost: don't dump unneeded pages with IOTLB Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 05/26] vhost: change to single IOTLB cache per device Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 06/26] vhost: add offset field to IOTLB entries Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 07/26] vhost: add page size info to IOTLB entry Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 08/26] vhost: retry translating IOVA after IOTLB miss Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 09/26] vhost: introduce backend ops Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 10/26] vhost: add IOTLB cache entry removal callback Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 11/26] vhost: add helper for IOTLB misses Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 12/26] vhost: add helper for interrupt injection Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 13/26] vhost: add API to set max queue pairs Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 14/26] net/vhost: use " Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 15/26] vhost: add control virtqueue support Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 16/26] vhost: add VDUSE device creation and destruction Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 17/26] vhost: add VDUSE callback for IOTLB miss Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 18/26] vhost: add VDUSE callback for IOTLB entry removal Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 19/26] vhost: add VDUSE callback for IRQ injection Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 20/26] vhost: add VDUSE events handler Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 21/26] vhost: add support for virtqueue state get event Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 22/26] vhost: add support for VDUSE status set event Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 23/26] vhost: add support for VDUSE IOTLB update event Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 24/26] vhost: add VDUSE device startup Maxime Coquelin
2023-06-08 2:10 ` Xia, Chenbo [this message]
2023-06-06 8:18 ` [PATCH v5 25/26] vhost: add multiqueue support to VDUSE Maxime Coquelin
2023-06-06 8:18 ` [PATCH v5 26/26] vhost: add VDUSE device stop Maxime Coquelin
2023-06-08 2:11 ` Xia, Chenbo
2023-06-07 6:48 ` [PATCH v5 00/26] Add VDUSE support to Vhost library Xia, Chenbo
2023-06-07 14:58 ` Maxime Coquelin
2023-06-08 1:53 ` Xia, Chenbo
2023-06-07 8:05 ` David Marchand
2023-06-08 9:17 ` Maxime Coquelin
2023-06-08 12:44 ` David Marchand
2023-06-08 14:29 ` 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=SN6PR11MB35044781E20DCA43AAEE76F69C50A@SN6PR11MB3504.namprd11.prod.outlook.com \
--to=chenbo.xia@intel.com \
--cc=amorenoz@redhat.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=maxime.coquelin@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).