From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29BCEC433F5 for ; Thu, 30 Sep 2021 16:11:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A40DE613A9 for ; Thu, 30 Sep 2021 16:11:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A40DE613A9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:48284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVyf2-0001it-NO for qemu-devel@archiver.kernel.org; Thu, 30 Sep 2021 12:11:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVy1a-00053f-DF for qemu-devel@nongnu.org; Thu, 30 Sep 2021 11:31:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:42387) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVy1W-0002TS-43 for qemu-devel@nongnu.org; Thu, 30 Sep 2021 11:31:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633015861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=r/u/fjgANOyKBgiNvEeiUlOjEnrW34JQFDABOt3fZqg=; b=QsX514HyE9/L4kNC3I4bKyrENEYecWzzUcFlY+f9h7np62CMFcT+YAt6E/9dtNGVw65mQz Me9+EQCBJelVKGVeoc0jKu8YM07p0SAC+gjPL7w/KhGRI/ZYttVhlw7lniYavFjwUOW+S9 B4l1LlwWfDBPxOQxHz4JcYFp2LYzCD8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-403-L2BBFy71ONKKyZpahOqAkA-1; Thu, 30 Sep 2021 11:30:57 -0400 X-MC-Unique: L2BBFy71ONKKyZpahOqAkA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AC29184A5E3; Thu, 30 Sep 2021 15:30:56 +0000 (UTC) Received: from horse.redhat.com (unknown [10.22.16.146]) by smtp.corp.redhat.com (Postfix) with ESMTP id 70B781024866; Thu, 30 Sep 2021 15:30:56 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id ECC52228287; Thu, 30 Sep 2021 11:30:47 -0400 (EDT) From: Vivek Goyal To: qemu-devel@nongnu.org, virtio-fs@redhat.com, stefanha@redhat.com Subject: [PATCH 08/13] virtiofsd: Create a notification queue Date: Thu, 30 Sep 2021 11:30:32 -0400 Message-Id: <20210930153037.1194279-9-vgoyal@redhat.com> In-Reply-To: <20210930153037.1194279-1-vgoyal@redhat.com> References: <20210930153037.1194279-1-vgoyal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=vgoyal@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Received-SPF: pass client-ip=216.205.24.124; envelope-from=vgoyal@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jaggel@bu.edu, iangelak@redhat.com, dgilbert@redhat.com, vgoyal@redhat.com, miklos@szeredi.hu Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Add a notification queue which will be used to send async notifications for file lock availability. Signed-off-by: Vivek Goyal Signed-off-by: Ioannis Angelakopoulos --- hw/virtio/vhost-user-fs-pci.c | 4 +- hw/virtio/vhost-user-fs.c | 62 +++++++++++++++++++++++++-- include/hw/virtio/vhost-user-fs.h | 2 + tools/virtiofsd/fuse_i.h | 1 + tools/virtiofsd/fuse_virtio.c | 70 +++++++++++++++++++++++-------- 5 files changed, 116 insertions(+), 23 deletions(-) diff --git a/hw/virtio/vhost-user-fs-pci.c b/hw/virtio/vhost-user-fs-pci.c index 2ed8492b3f..cdb9471088 100644 --- a/hw/virtio/vhost-user-fs-pci.c +++ b/hw/virtio/vhost-user-fs-pci.c @@ -41,8 +41,8 @@ static void vhost_user_fs_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) DeviceState *vdev = DEVICE(&dev->vdev); if (vpci_dev->nvectors == DEV_NVECTORS_UNSPECIFIED) { - /* Also reserve config change and hiprio queue vectors */ - vpci_dev->nvectors = dev->vdev.conf.num_request_queues + 2; + /* Also reserve config change, hiprio and notification queue vectors */ + vpci_dev->nvectors = dev->vdev.conf.num_request_queues + 3; } qdev_realize(vdev, BUS(&vpci_dev->bus), errp); diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c index d1efbc5b18..6bafcf0243 100644 --- a/hw/virtio/vhost-user-fs.c +++ b/hw/virtio/vhost-user-fs.c @@ -31,6 +31,7 @@ static const int user_feature_bits[] = { VIRTIO_F_NOTIFY_ON_EMPTY, VIRTIO_F_RING_PACKED, VIRTIO_F_IOMMU_PLATFORM, + VIRTIO_FS_F_NOTIFICATION, VHOST_INVALID_FEATURE_BIT }; @@ -147,7 +148,7 @@ static void vuf_handle_output(VirtIODevice *vdev, VirtQueue *vq) */ } -static void vuf_create_vqs(VirtIODevice *vdev) +static void vuf_create_vqs(VirtIODevice *vdev, bool notification_vq) { VHostUserFS *fs = VHOST_USER_FS(vdev); unsigned int i; @@ -155,6 +156,15 @@ static void vuf_create_vqs(VirtIODevice *vdev) /* Hiprio queue */ fs->hiprio_vq = virtio_add_queue(vdev, fs->conf.queue_size, vuf_handle_output); + /* + * Notification queue. Feature negotiation happens later. So at this + * point of time we don't know if driver will use notification queue + * or not. + */ + if (notification_vq) { + fs->notification_vq = virtio_add_queue(vdev, fs->conf.queue_size, + vuf_handle_output); + } /* Request queues */ fs->req_vqs = g_new(VirtQueue *, fs->conf.num_request_queues); @@ -163,8 +173,12 @@ static void vuf_create_vqs(VirtIODevice *vdev) vuf_handle_output); } - /* 1 high prio queue, plus the number configured */ - fs->vhost_dev.nvqs = 1 + fs->conf.num_request_queues; + /* 1 high prio queue, 1 notification queue plus the number configured */ + if (notification_vq) { + fs->vhost_dev.nvqs = 2 + fs->conf.num_request_queues; + } else { + fs->vhost_dev.nvqs = 1 + fs->conf.num_request_queues; + } fs->vhost_dev.vqs = g_new0(struct vhost_virtqueue, fs->vhost_dev.nvqs); } @@ -176,6 +190,11 @@ static void vuf_cleanup_vqs(VirtIODevice *vdev) virtio_delete_queue(fs->hiprio_vq); fs->hiprio_vq = NULL; + if (fs->notification_vq) { + virtio_delete_queue(fs->notification_vq); + } + fs->notification_vq = NULL; + for (i = 0; i < fs->conf.num_request_queues; i++) { virtio_delete_queue(fs->req_vqs[i]); } @@ -194,9 +213,43 @@ static uint64_t vuf_get_features(VirtIODevice *vdev, { VHostUserFS *fs = VHOST_USER_FS(vdev); + virtio_add_feature(&features, VIRTIO_FS_F_NOTIFICATION); + return vhost_get_features(&fs->vhost_dev, user_feature_bits, features); } +static void vuf_set_features(VirtIODevice *vdev, uint64_t features) +{ + VHostUserFS *fs = VHOST_USER_FS(vdev); + + if (virtio_has_feature(features, VIRTIO_FS_F_NOTIFICATION)) { + fs->notify_enabled = true; + /* + * If guest first booted with no notification queue support and + * later rebooted with kernel which supports notification, we + * can end up here + */ + if (!fs->notification_vq) { + vuf_cleanup_vqs(vdev); + vuf_create_vqs(vdev, true); + } + return; + } + + fs->notify_enabled = false; + if (!fs->notification_vq) { + return; + } + /* + * Driver does not support notification queue. Reconfigure queues + * and do not create notification queue. + */ + vuf_cleanup_vqs(vdev); + + /* Create queues again */ + vuf_create_vqs(vdev, false); +} + static void vuf_guest_notifier_mask(VirtIODevice *vdev, int idx, bool mask) { @@ -262,7 +315,7 @@ static void vuf_device_realize(DeviceState *dev, Error **errp) virtio_init(vdev, "vhost-user-fs", VIRTIO_ID_FS, sizeof(struct virtio_fs_config)); - vuf_create_vqs(vdev); + vuf_create_vqs(vdev, true); ret = vhost_dev_init(&fs->vhost_dev, &fs->vhost_user, VHOST_BACKEND_TYPE_USER, 0, errp); if (ret < 0) { @@ -327,6 +380,7 @@ static void vuf_class_init(ObjectClass *klass, void *data) vdc->realize = vuf_device_realize; vdc->unrealize = vuf_device_unrealize; vdc->get_features = vuf_get_features; + vdc->set_features = vuf_set_features; vdc->get_config = vuf_get_config; vdc->set_status = vuf_set_status; vdc->guest_notifier_mask = vuf_guest_notifier_mask; diff --git a/include/hw/virtio/vhost-user-fs.h b/include/hw/virtio/vhost-user-fs.h index 0d62834c25..95dc0dd402 100644 --- a/include/hw/virtio/vhost-user-fs.h +++ b/include/hw/virtio/vhost-user-fs.h @@ -39,7 +39,9 @@ struct VHostUserFS { VhostUserState vhost_user; VirtQueue **req_vqs; VirtQueue *hiprio_vq; + VirtQueue *notification_vq; int32_t bootindex; + bool notify_enabled; /*< public >*/ }; diff --git a/tools/virtiofsd/fuse_i.h b/tools/virtiofsd/fuse_i.h index 492e002181..4942d080da 100644 --- a/tools/virtiofsd/fuse_i.h +++ b/tools/virtiofsd/fuse_i.h @@ -73,6 +73,7 @@ struct fuse_session { int vu_socketfd; struct fv_VuDev *virtio_dev; int thread_pool_size; + bool notify_enabled; }; struct fuse_chan { diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index baead08b28..f5b87a508a 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" #include "qemu/iov.h" #include "qapi/error.h" +#include "standard-headers/linux/virtio_fs.h" #include "fuse_i.h" #include "standard-headers/linux/fuse.h" #include "fuse_misc.h" @@ -85,12 +86,25 @@ struct fv_VuDev { /* Callback from libvhost-user */ static uint64_t fv_get_features(VuDev *dev) { - return 1ULL << VIRTIO_F_VERSION_1; + uint64_t features; + + features = 1ull << VIRTIO_F_VERSION_1 | + 1ull << VIRTIO_FS_F_NOTIFICATION; + + return features; } /* Callback from libvhost-user */ static void fv_set_features(VuDev *dev, uint64_t features) { + struct fv_VuDev *vud = container_of(dev, struct fv_VuDev, dev); + struct fuse_session *se = vud->se; + + if ((1ull << VIRTIO_FS_F_NOTIFICATION) & features) { + se->notify_enabled = true; + } else { + se->notify_enabled = false; + } } /* @@ -719,22 +733,25 @@ static void fv_queue_cleanup_thread(struct fv_VuDev *vud, int qidx) { int ret; struct fv_QueueInfo *ourqi; + struct fuse_session *se = vud->se; assert(qidx < vud->nqueues); ourqi = vud->qi[qidx]; - /* Kill the thread */ - if (eventfd_write(ourqi->kill_fd, 1)) { - fuse_log(FUSE_LOG_ERR, "Eventfd_write for queue %d: %s\n", - qidx, strerror(errno)); - } - ret = pthread_join(ourqi->thread, NULL); - if (ret) { - fuse_log(FUSE_LOG_ERR, "%s: Failed to join thread idx %d err %d\n", - __func__, qidx, ret); + /* qidx == 1 is the notification queue if notifications are enabled */ + if (!se->notify_enabled || qidx != 1) { + /* Kill the thread */ + if (eventfd_write(ourqi->kill_fd, 1)) { + fuse_log(FUSE_LOG_ERR, "Eventfd_read for queue: %m\n"); + } + ret = pthread_join(ourqi->thread, NULL); + if (ret) { + fuse_log(FUSE_LOG_ERR, "%s: Failed to join thread idx %d err" + " %d\n", __func__, qidx, ret); + } + close(ourqi->kill_fd); } pthread_mutex_destroy(&ourqi->vq_lock); - close(ourqi->kill_fd); ourqi->kick_fd = -1; g_free(vud->qi[qidx]); vud->qi[qidx] = NULL; @@ -757,6 +774,9 @@ static void fv_queue_set_started(VuDev *dev, int qidx, bool started) { struct fv_VuDev *vud = container_of(dev, struct fv_VuDev, dev); struct fv_QueueInfo *ourqi; + int valid_queues = 2; /* One hiprio queue and one request queue */ + bool notification_q = false; + struct fuse_session *se = vud->se; fuse_log(FUSE_LOG_INFO, "%s: qidx=%d started=%d\n", __func__, qidx, started); @@ -768,10 +788,19 @@ static void fv_queue_set_started(VuDev *dev, int qidx, bool started) * well-behaved client in mind and may not protect against all types of * races yet. */ - if (qidx > 1) { - fuse_log(FUSE_LOG_ERR, - "%s: multiple request queues not yet implemented, please only " - "configure 1 request queue\n", + if (se->notify_enabled) { + valid_queues++; + /* + * If notification queue is enabled, then qidx 1 is notificaiton queue. + */ + if (qidx == 1) { + notification_q = true; + } + } + + if (qidx >= valid_queues) { + fuse_log(FUSE_LOG_ERR, "%s: multiple request queues not yet" + "implemented, please only configure 1 request queue\n", __func__); exit(EXIT_FAILURE); } @@ -793,11 +822,18 @@ static void fv_queue_set_started(VuDev *dev, int qidx, bool started) assert(vud->qi[qidx]->kick_fd == -1); } ourqi = vud->qi[qidx]; + pthread_mutex_init(&ourqi->vq_lock, NULL); + /* + * For notification queue, we don't have to start a thread yet. + */ + if (notification_q) { + return; + } + ourqi->kick_fd = dev->vq[qidx].kick_fd; ourqi->kill_fd = eventfd(0, EFD_CLOEXEC | EFD_SEMAPHORE); assert(ourqi->kill_fd != -1); - pthread_mutex_init(&ourqi->vq_lock, NULL); if (pthread_create(&ourqi->thread, NULL, fv_queue_thread, ourqi)) { fuse_log(FUSE_LOG_ERR, "%s: Failed to create thread for queue %d\n", @@ -1048,7 +1084,7 @@ int virtio_session_mount(struct fuse_session *se) se->vu_socketfd = data_sock; se->virtio_dev->se = se; pthread_rwlock_init(&se->virtio_dev->vu_dispatch_rwlock, NULL); - if (!vu_init(&se->virtio_dev->dev, 2, se->vu_socketfd, fv_panic, NULL, + if (!vu_init(&se->virtio_dev->dev, 3, se->vu_socketfd, fv_panic, NULL, fv_set_watch, fv_remove_watch, &fv_iface)) { fuse_log(FUSE_LOG_ERR, "%s: vu_init failed\n", __func__); return -1; -- 2.31.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vivek Goyal Date: Thu, 30 Sep 2021 11:30:32 -0400 Message-Id: <20210930153037.1194279-9-vgoyal@redhat.com> In-Reply-To: <20210930153037.1194279-1-vgoyal@redhat.com> References: <20210930153037.1194279-1-vgoyal@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Virtio-fs] [PATCH 08/13] virtiofsd: Create a notification queue List-Id: Development discussions about virtio-fs List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, virtio-fs@redhat.com, stefanha@redhat.com Cc: vgoyal@redhat.com, miklos@szeredi.hu Add a notification queue which will be used to send async notifications for file lock availability. Signed-off-by: Vivek Goyal Signed-off-by: Ioannis Angelakopoulos --- hw/virtio/vhost-user-fs-pci.c | 4 +- hw/virtio/vhost-user-fs.c | 62 +++++++++++++++++++++++++-- include/hw/virtio/vhost-user-fs.h | 2 + tools/virtiofsd/fuse_i.h | 1 + tools/virtiofsd/fuse_virtio.c | 70 +++++++++++++++++++++++-------- 5 files changed, 116 insertions(+), 23 deletions(-) diff --git a/hw/virtio/vhost-user-fs-pci.c b/hw/virtio/vhost-user-fs-pci.c index 2ed8492b3f..cdb9471088 100644 --- a/hw/virtio/vhost-user-fs-pci.c +++ b/hw/virtio/vhost-user-fs-pci.c @@ -41,8 +41,8 @@ static void vhost_user_fs_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) DeviceState *vdev = DEVICE(&dev->vdev); if (vpci_dev->nvectors == DEV_NVECTORS_UNSPECIFIED) { - /* Also reserve config change and hiprio queue vectors */ - vpci_dev->nvectors = dev->vdev.conf.num_request_queues + 2; + /* Also reserve config change, hiprio and notification queue vectors */ + vpci_dev->nvectors = dev->vdev.conf.num_request_queues + 3; } qdev_realize(vdev, BUS(&vpci_dev->bus), errp); diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c index d1efbc5b18..6bafcf0243 100644 --- a/hw/virtio/vhost-user-fs.c +++ b/hw/virtio/vhost-user-fs.c @@ -31,6 +31,7 @@ static const int user_feature_bits[] = { VIRTIO_F_NOTIFY_ON_EMPTY, VIRTIO_F_RING_PACKED, VIRTIO_F_IOMMU_PLATFORM, + VIRTIO_FS_F_NOTIFICATION, VHOST_INVALID_FEATURE_BIT }; @@ -147,7 +148,7 @@ static void vuf_handle_output(VirtIODevice *vdev, VirtQueue *vq) */ } -static void vuf_create_vqs(VirtIODevice *vdev) +static void vuf_create_vqs(VirtIODevice *vdev, bool notification_vq) { VHostUserFS *fs = VHOST_USER_FS(vdev); unsigned int i; @@ -155,6 +156,15 @@ static void vuf_create_vqs(VirtIODevice *vdev) /* Hiprio queue */ fs->hiprio_vq = virtio_add_queue(vdev, fs->conf.queue_size, vuf_handle_output); + /* + * Notification queue. Feature negotiation happens later. So at this + * point of time we don't know if driver will use notification queue + * or not. + */ + if (notification_vq) { + fs->notification_vq = virtio_add_queue(vdev, fs->conf.queue_size, + vuf_handle_output); + } /* Request queues */ fs->req_vqs = g_new(VirtQueue *, fs->conf.num_request_queues); @@ -163,8 +173,12 @@ static void vuf_create_vqs(VirtIODevice *vdev) vuf_handle_output); } - /* 1 high prio queue, plus the number configured */ - fs->vhost_dev.nvqs = 1 + fs->conf.num_request_queues; + /* 1 high prio queue, 1 notification queue plus the number configured */ + if (notification_vq) { + fs->vhost_dev.nvqs = 2 + fs->conf.num_request_queues; + } else { + fs->vhost_dev.nvqs = 1 + fs->conf.num_request_queues; + } fs->vhost_dev.vqs = g_new0(struct vhost_virtqueue, fs->vhost_dev.nvqs); } @@ -176,6 +190,11 @@ static void vuf_cleanup_vqs(VirtIODevice *vdev) virtio_delete_queue(fs->hiprio_vq); fs->hiprio_vq = NULL; + if (fs->notification_vq) { + virtio_delete_queue(fs->notification_vq); + } + fs->notification_vq = NULL; + for (i = 0; i < fs->conf.num_request_queues; i++) { virtio_delete_queue(fs->req_vqs[i]); } @@ -194,9 +213,43 @@ static uint64_t vuf_get_features(VirtIODevice *vdev, { VHostUserFS *fs = VHOST_USER_FS(vdev); + virtio_add_feature(&features, VIRTIO_FS_F_NOTIFICATION); + return vhost_get_features(&fs->vhost_dev, user_feature_bits, features); } +static void vuf_set_features(VirtIODevice *vdev, uint64_t features) +{ + VHostUserFS *fs = VHOST_USER_FS(vdev); + + if (virtio_has_feature(features, VIRTIO_FS_F_NOTIFICATION)) { + fs->notify_enabled = true; + /* + * If guest first booted with no notification queue support and + * later rebooted with kernel which supports notification, we + * can end up here + */ + if (!fs->notification_vq) { + vuf_cleanup_vqs(vdev); + vuf_create_vqs(vdev, true); + } + return; + } + + fs->notify_enabled = false; + if (!fs->notification_vq) { + return; + } + /* + * Driver does not support notification queue. Reconfigure queues + * and do not create notification queue. + */ + vuf_cleanup_vqs(vdev); + + /* Create queues again */ + vuf_create_vqs(vdev, false); +} + static void vuf_guest_notifier_mask(VirtIODevice *vdev, int idx, bool mask) { @@ -262,7 +315,7 @@ static void vuf_device_realize(DeviceState *dev, Error **errp) virtio_init(vdev, "vhost-user-fs", VIRTIO_ID_FS, sizeof(struct virtio_fs_config)); - vuf_create_vqs(vdev); + vuf_create_vqs(vdev, true); ret = vhost_dev_init(&fs->vhost_dev, &fs->vhost_user, VHOST_BACKEND_TYPE_USER, 0, errp); if (ret < 0) { @@ -327,6 +380,7 @@ static void vuf_class_init(ObjectClass *klass, void *data) vdc->realize = vuf_device_realize; vdc->unrealize = vuf_device_unrealize; vdc->get_features = vuf_get_features; + vdc->set_features = vuf_set_features; vdc->get_config = vuf_get_config; vdc->set_status = vuf_set_status; vdc->guest_notifier_mask = vuf_guest_notifier_mask; diff --git a/include/hw/virtio/vhost-user-fs.h b/include/hw/virtio/vhost-user-fs.h index 0d62834c25..95dc0dd402 100644 --- a/include/hw/virtio/vhost-user-fs.h +++ b/include/hw/virtio/vhost-user-fs.h @@ -39,7 +39,9 @@ struct VHostUserFS { VhostUserState vhost_user; VirtQueue **req_vqs; VirtQueue *hiprio_vq; + VirtQueue *notification_vq; int32_t bootindex; + bool notify_enabled; /*< public >*/ }; diff --git a/tools/virtiofsd/fuse_i.h b/tools/virtiofsd/fuse_i.h index 492e002181..4942d080da 100644 --- a/tools/virtiofsd/fuse_i.h +++ b/tools/virtiofsd/fuse_i.h @@ -73,6 +73,7 @@ struct fuse_session { int vu_socketfd; struct fv_VuDev *virtio_dev; int thread_pool_size; + bool notify_enabled; }; struct fuse_chan { diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index baead08b28..f5b87a508a 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" #include "qemu/iov.h" #include "qapi/error.h" +#include "standard-headers/linux/virtio_fs.h" #include "fuse_i.h" #include "standard-headers/linux/fuse.h" #include "fuse_misc.h" @@ -85,12 +86,25 @@ struct fv_VuDev { /* Callback from libvhost-user */ static uint64_t fv_get_features(VuDev *dev) { - return 1ULL << VIRTIO_F_VERSION_1; + uint64_t features; + + features = 1ull << VIRTIO_F_VERSION_1 | + 1ull << VIRTIO_FS_F_NOTIFICATION; + + return features; } /* Callback from libvhost-user */ static void fv_set_features(VuDev *dev, uint64_t features) { + struct fv_VuDev *vud = container_of(dev, struct fv_VuDev, dev); + struct fuse_session *se = vud->se; + + if ((1ull << VIRTIO_FS_F_NOTIFICATION) & features) { + se->notify_enabled = true; + } else { + se->notify_enabled = false; + } } /* @@ -719,22 +733,25 @@ static void fv_queue_cleanup_thread(struct fv_VuDev *vud, int qidx) { int ret; struct fv_QueueInfo *ourqi; + struct fuse_session *se = vud->se; assert(qidx < vud->nqueues); ourqi = vud->qi[qidx]; - /* Kill the thread */ - if (eventfd_write(ourqi->kill_fd, 1)) { - fuse_log(FUSE_LOG_ERR, "Eventfd_write for queue %d: %s\n", - qidx, strerror(errno)); - } - ret = pthread_join(ourqi->thread, NULL); - if (ret) { - fuse_log(FUSE_LOG_ERR, "%s: Failed to join thread idx %d err %d\n", - __func__, qidx, ret); + /* qidx == 1 is the notification queue if notifications are enabled */ + if (!se->notify_enabled || qidx != 1) { + /* Kill the thread */ + if (eventfd_write(ourqi->kill_fd, 1)) { + fuse_log(FUSE_LOG_ERR, "Eventfd_read for queue: %m\n"); + } + ret = pthread_join(ourqi->thread, NULL); + if (ret) { + fuse_log(FUSE_LOG_ERR, "%s: Failed to join thread idx %d err" + " %d\n", __func__, qidx, ret); + } + close(ourqi->kill_fd); } pthread_mutex_destroy(&ourqi->vq_lock); - close(ourqi->kill_fd); ourqi->kick_fd = -1; g_free(vud->qi[qidx]); vud->qi[qidx] = NULL; @@ -757,6 +774,9 @@ static void fv_queue_set_started(VuDev *dev, int qidx, bool started) { struct fv_VuDev *vud = container_of(dev, struct fv_VuDev, dev); struct fv_QueueInfo *ourqi; + int valid_queues = 2; /* One hiprio queue and one request queue */ + bool notification_q = false; + struct fuse_session *se = vud->se; fuse_log(FUSE_LOG_INFO, "%s: qidx=%d started=%d\n", __func__, qidx, started); @@ -768,10 +788,19 @@ static void fv_queue_set_started(VuDev *dev, int qidx, bool started) * well-behaved client in mind and may not protect against all types of * races yet. */ - if (qidx > 1) { - fuse_log(FUSE_LOG_ERR, - "%s: multiple request queues not yet implemented, please only " - "configure 1 request queue\n", + if (se->notify_enabled) { + valid_queues++; + /* + * If notification queue is enabled, then qidx 1 is notificaiton queue. + */ + if (qidx == 1) { + notification_q = true; + } + } + + if (qidx >= valid_queues) { + fuse_log(FUSE_LOG_ERR, "%s: multiple request queues not yet" + "implemented, please only configure 1 request queue\n", __func__); exit(EXIT_FAILURE); } @@ -793,11 +822,18 @@ static void fv_queue_set_started(VuDev *dev, int qidx, bool started) assert(vud->qi[qidx]->kick_fd == -1); } ourqi = vud->qi[qidx]; + pthread_mutex_init(&ourqi->vq_lock, NULL); + /* + * For notification queue, we don't have to start a thread yet. + */ + if (notification_q) { + return; + } + ourqi->kick_fd = dev->vq[qidx].kick_fd; ourqi->kill_fd = eventfd(0, EFD_CLOEXEC | EFD_SEMAPHORE); assert(ourqi->kill_fd != -1); - pthread_mutex_init(&ourqi->vq_lock, NULL); if (pthread_create(&ourqi->thread, NULL, fv_queue_thread, ourqi)) { fuse_log(FUSE_LOG_ERR, "%s: Failed to create thread for queue %d\n", @@ -1048,7 +1084,7 @@ int virtio_session_mount(struct fuse_session *se) se->vu_socketfd = data_sock; se->virtio_dev->se = se; pthread_rwlock_init(&se->virtio_dev->vu_dispatch_rwlock, NULL); - if (!vu_init(&se->virtio_dev->dev, 2, se->vu_socketfd, fv_panic, NULL, + if (!vu_init(&se->virtio_dev->dev, 3, se->vu_socketfd, fv_panic, NULL, fv_set_watch, fv_remove_watch, &fv_iface)) { fuse_log(FUSE_LOG_ERR, "%s: vu_init failed\n", __func__); return -1; -- 2.31.1