From: Vivek Goyal <vgoyal@redhat.com> To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, virtio-fs@redhat.com Cc: vgoyal@redhat.com, miklos@szeredi.hu, stefanha@redhat.com, dgilbert@redhat.com Subject: [PATCH v2 06/20] virtiofs: Provide a helper function for virtqueue initialization Date: Fri, 7 Aug 2020 15:55:12 -0400 [thread overview] Message-ID: <20200807195526.426056-7-vgoyal@redhat.com> (raw) In-Reply-To: <20200807195526.426056-1-vgoyal@redhat.com> This reduces code duplication and make it little easier to read code. Signed-off-by: Vivek Goyal <vgoyal@redhat.com> --- fs/fuse/virtio_fs.c | 50 +++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c index 4c4ef5d69298..e615edfbd09c 100644 --- a/fs/fuse/virtio_fs.c +++ b/fs/fuse/virtio_fs.c @@ -24,6 +24,8 @@ enum { VQ_REQUEST }; +#define VQ_NAME_LEN 24 + /* Per-virtqueue state */ struct virtio_fs_vq { spinlock_t lock; @@ -36,7 +38,7 @@ struct virtio_fs_vq { bool connected; long in_flight; struct completion in_flight_zero; /* No inflight requests */ - char name[24]; + char name[VQ_NAME_LEN]; } ____cacheline_aligned_in_smp; /* A virtio-fs device instance */ @@ -596,6 +598,26 @@ static void virtio_fs_vq_done(struct virtqueue *vq) schedule_work(&fsvq->done_work); } +static void virtio_fs_init_vq(struct virtio_fs_vq *fsvq, char *name, + int vq_type) +{ + strncpy(fsvq->name, name, VQ_NAME_LEN); + spin_lock_init(&fsvq->lock); + INIT_LIST_HEAD(&fsvq->queued_reqs); + INIT_LIST_HEAD(&fsvq->end_reqs); + init_completion(&fsvq->in_flight_zero); + + if (vq_type == VQ_REQUEST) { + INIT_WORK(&fsvq->done_work, virtio_fs_requests_done_work); + INIT_DELAYED_WORK(&fsvq->dispatch_work, + virtio_fs_request_dispatch_work); + } else { + INIT_WORK(&fsvq->done_work, virtio_fs_hiprio_done_work); + INIT_DELAYED_WORK(&fsvq->dispatch_work, + virtio_fs_hiprio_dispatch_work); + } +} + /* Initialize virtqueues */ static int virtio_fs_setup_vqs(struct virtio_device *vdev, struct virtio_fs *fs) @@ -611,7 +633,7 @@ static int virtio_fs_setup_vqs(struct virtio_device *vdev, if (fs->num_request_queues == 0) return -EINVAL; - fs->nvqs = 1 + fs->num_request_queues; + fs->nvqs = VQ_REQUEST + fs->num_request_queues; fs->vqs = kcalloc(fs->nvqs, sizeof(fs->vqs[VQ_HIPRIO]), GFP_KERNEL); if (!fs->vqs) return -ENOMEM; @@ -625,29 +647,17 @@ static int virtio_fs_setup_vqs(struct virtio_device *vdev, goto out; } + /* Initialize the hiprio/forget request virtqueue */ callbacks[VQ_HIPRIO] = virtio_fs_vq_done; - snprintf(fs->vqs[VQ_HIPRIO].name, sizeof(fs->vqs[VQ_HIPRIO].name), - "hiprio"); + virtio_fs_init_vq(&fs->vqs[VQ_HIPRIO], "hiprio", VQ_HIPRIO); names[VQ_HIPRIO] = fs->vqs[VQ_HIPRIO].name; - INIT_WORK(&fs->vqs[VQ_HIPRIO].done_work, virtio_fs_hiprio_done_work); - INIT_LIST_HEAD(&fs->vqs[VQ_HIPRIO].queued_reqs); - INIT_LIST_HEAD(&fs->vqs[VQ_HIPRIO].end_reqs); - INIT_DELAYED_WORK(&fs->vqs[VQ_HIPRIO].dispatch_work, - virtio_fs_hiprio_dispatch_work); - init_completion(&fs->vqs[VQ_HIPRIO].in_flight_zero); - spin_lock_init(&fs->vqs[VQ_HIPRIO].lock); /* Initialize the requests virtqueues */ for (i = VQ_REQUEST; i < fs->nvqs; i++) { - spin_lock_init(&fs->vqs[i].lock); - INIT_WORK(&fs->vqs[i].done_work, virtio_fs_requests_done_work); - INIT_DELAYED_WORK(&fs->vqs[i].dispatch_work, - virtio_fs_request_dispatch_work); - INIT_LIST_HEAD(&fs->vqs[i].queued_reqs); - INIT_LIST_HEAD(&fs->vqs[i].end_reqs); - init_completion(&fs->vqs[i].in_flight_zero); - snprintf(fs->vqs[i].name, sizeof(fs->vqs[i].name), - "requests.%u", i - VQ_REQUEST); + char vq_name[VQ_NAME_LEN]; + + snprintf(vq_name, VQ_NAME_LEN, "requests.%u", i - VQ_REQUEST); + virtio_fs_init_vq(&fs->vqs[i], vq_name, VQ_REQUEST); callbacks[i] = virtio_fs_vq_done; names[i] = fs->vqs[i].name; } -- 2.25.4
WARNING: multiple messages have this Message-ID (diff)
From: Vivek Goyal <vgoyal@redhat.com> To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, virtio-fs@redhat.com Cc: vgoyal@redhat.com, miklos@szeredi.hu Subject: [Virtio-fs] [PATCH v2 06/20] virtiofs: Provide a helper function for virtqueue initialization Date: Fri, 7 Aug 2020 15:55:12 -0400 [thread overview] Message-ID: <20200807195526.426056-7-vgoyal@redhat.com> (raw) In-Reply-To: <20200807195526.426056-1-vgoyal@redhat.com> This reduces code duplication and make it little easier to read code. Signed-off-by: Vivek Goyal <vgoyal@redhat.com> --- fs/fuse/virtio_fs.c | 50 +++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c index 4c4ef5d69298..e615edfbd09c 100644 --- a/fs/fuse/virtio_fs.c +++ b/fs/fuse/virtio_fs.c @@ -24,6 +24,8 @@ enum { VQ_REQUEST }; +#define VQ_NAME_LEN 24 + /* Per-virtqueue state */ struct virtio_fs_vq { spinlock_t lock; @@ -36,7 +38,7 @@ struct virtio_fs_vq { bool connected; long in_flight; struct completion in_flight_zero; /* No inflight requests */ - char name[24]; + char name[VQ_NAME_LEN]; } ____cacheline_aligned_in_smp; /* A virtio-fs device instance */ @@ -596,6 +598,26 @@ static void virtio_fs_vq_done(struct virtqueue *vq) schedule_work(&fsvq->done_work); } +static void virtio_fs_init_vq(struct virtio_fs_vq *fsvq, char *name, + int vq_type) +{ + strncpy(fsvq->name, name, VQ_NAME_LEN); + spin_lock_init(&fsvq->lock); + INIT_LIST_HEAD(&fsvq->queued_reqs); + INIT_LIST_HEAD(&fsvq->end_reqs); + init_completion(&fsvq->in_flight_zero); + + if (vq_type == VQ_REQUEST) { + INIT_WORK(&fsvq->done_work, virtio_fs_requests_done_work); + INIT_DELAYED_WORK(&fsvq->dispatch_work, + virtio_fs_request_dispatch_work); + } else { + INIT_WORK(&fsvq->done_work, virtio_fs_hiprio_done_work); + INIT_DELAYED_WORK(&fsvq->dispatch_work, + virtio_fs_hiprio_dispatch_work); + } +} + /* Initialize virtqueues */ static int virtio_fs_setup_vqs(struct virtio_device *vdev, struct virtio_fs *fs) @@ -611,7 +633,7 @@ static int virtio_fs_setup_vqs(struct virtio_device *vdev, if (fs->num_request_queues == 0) return -EINVAL; - fs->nvqs = 1 + fs->num_request_queues; + fs->nvqs = VQ_REQUEST + fs->num_request_queues; fs->vqs = kcalloc(fs->nvqs, sizeof(fs->vqs[VQ_HIPRIO]), GFP_KERNEL); if (!fs->vqs) return -ENOMEM; @@ -625,29 +647,17 @@ static int virtio_fs_setup_vqs(struct virtio_device *vdev, goto out; } + /* Initialize the hiprio/forget request virtqueue */ callbacks[VQ_HIPRIO] = virtio_fs_vq_done; - snprintf(fs->vqs[VQ_HIPRIO].name, sizeof(fs->vqs[VQ_HIPRIO].name), - "hiprio"); + virtio_fs_init_vq(&fs->vqs[VQ_HIPRIO], "hiprio", VQ_HIPRIO); names[VQ_HIPRIO] = fs->vqs[VQ_HIPRIO].name; - INIT_WORK(&fs->vqs[VQ_HIPRIO].done_work, virtio_fs_hiprio_done_work); - INIT_LIST_HEAD(&fs->vqs[VQ_HIPRIO].queued_reqs); - INIT_LIST_HEAD(&fs->vqs[VQ_HIPRIO].end_reqs); - INIT_DELAYED_WORK(&fs->vqs[VQ_HIPRIO].dispatch_work, - virtio_fs_hiprio_dispatch_work); - init_completion(&fs->vqs[VQ_HIPRIO].in_flight_zero); - spin_lock_init(&fs->vqs[VQ_HIPRIO].lock); /* Initialize the requests virtqueues */ for (i = VQ_REQUEST; i < fs->nvqs; i++) { - spin_lock_init(&fs->vqs[i].lock); - INIT_WORK(&fs->vqs[i].done_work, virtio_fs_requests_done_work); - INIT_DELAYED_WORK(&fs->vqs[i].dispatch_work, - virtio_fs_request_dispatch_work); - INIT_LIST_HEAD(&fs->vqs[i].queued_reqs); - INIT_LIST_HEAD(&fs->vqs[i].end_reqs); - init_completion(&fs->vqs[i].in_flight_zero); - snprintf(fs->vqs[i].name, sizeof(fs->vqs[i].name), - "requests.%u", i - VQ_REQUEST); + char vq_name[VQ_NAME_LEN]; + + snprintf(vq_name, VQ_NAME_LEN, "requests.%u", i - VQ_REQUEST); + virtio_fs_init_vq(&fs->vqs[i], vq_name, VQ_REQUEST); callbacks[i] = virtio_fs_vq_done; names[i] = fs->vqs[i].name; } -- 2.25.4
next prev parent reply other threads:[~2020-08-07 19:56 UTC|newest] Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-08-07 19:55 [PATCH v2 00/20] virtiofs: Add DAX support Vivek Goyal 2020-08-07 19:55 ` [Virtio-fs] " Vivek Goyal 2020-08-07 19:55 ` [PATCH v2 01/20] dax: Modify bdev_dax_pgoff() to handle NULL bdev Vivek Goyal 2020-08-07 19:55 ` [Virtio-fs] " Vivek Goyal 2020-08-07 19:55 ` Vivek Goyal 2020-08-17 16:57 ` Jan Kara 2020-08-17 16:57 ` [Virtio-fs] " Jan Kara 2020-08-17 16:57 ` Jan Kara 2020-08-07 19:55 ` [PATCH v2 02/20] dax: Create a range version of dax_layout_busy_page() Vivek Goyal 2020-08-07 19:55 ` [Virtio-fs] " Vivek Goyal 2020-08-07 19:55 ` Vivek Goyal 2020-08-17 16:53 ` Jan Kara 2020-08-17 16:53 ` [Virtio-fs] " Jan Kara 2020-08-17 16:53 ` Jan Kara 2020-08-17 17:22 ` Vivek Goyal 2020-08-17 17:22 ` [Virtio-fs] " Vivek Goyal 2020-08-17 17:22 ` Vivek Goyal 2020-08-07 19:55 ` [PATCH v2 03/20] virtio: Add get_shm_region method Vivek Goyal 2020-08-07 19:55 ` [Virtio-fs] " Vivek Goyal 2020-08-10 13:47 ` Michael S. Tsirkin 2020-08-10 13:47 ` [Virtio-fs] " Michael S. Tsirkin 2020-08-10 13:54 ` Vivek Goyal 2020-08-10 13:54 ` [Virtio-fs] " Vivek Goyal 2020-08-10 14:02 ` Michael S. Tsirkin 2020-08-10 14:02 ` [Virtio-fs] " Michael S. Tsirkin 2020-08-10 14:06 ` Michael S. Tsirkin 2020-08-10 14:06 ` [Virtio-fs] " Michael S. Tsirkin 2020-08-07 19:55 ` [PATCH v2 04/20] virtio: Implement get_shm_region for PCI transport Vivek Goyal 2020-08-07 19:55 ` [Virtio-fs] " Vivek Goyal 2020-08-10 14:05 ` Michael S. Tsirkin 2020-08-10 14:05 ` [Virtio-fs] " Michael S. Tsirkin 2020-08-10 14:50 ` Vivek Goyal 2020-08-10 14:50 ` [Virtio-fs] " Vivek Goyal 2020-08-14 2:51 ` Gurchetan Singh 2020-08-17 20:29 ` Vivek Goyal 2020-08-17 20:29 ` [Virtio-fs] " Vivek Goyal 2020-08-07 19:55 ` [PATCH v2 05/20] virtio: Implement get_shm_region for MMIO transport Vivek Goyal 2020-08-07 19:55 ` [Virtio-fs] " Vivek Goyal 2020-08-10 14:03 ` Michael S. Tsirkin 2020-08-10 14:03 ` [Virtio-fs] " Michael S. Tsirkin 2020-08-07 19:55 ` Vivek Goyal [this message] 2020-08-07 19:55 ` [Virtio-fs] [PATCH v2 06/20] virtiofs: Provide a helper function for virtqueue initialization Vivek Goyal 2020-08-07 19:55 ` [PATCH v2 07/20] fuse: Get rid of no_mount_options Vivek Goyal 2020-08-07 19:55 ` [Virtio-fs] " Vivek Goyal 2020-08-07 19:55 ` [PATCH v2 08/20] fuse,virtiofs: Add a mount option to enable dax Vivek Goyal 2020-08-07 19:55 ` [Virtio-fs] [PATCH v2 08/20] fuse, virtiofs: " Vivek Goyal 2020-08-07 19:55 ` [PATCH v2 09/20] virtio_fs, dax: Set up virtio_fs dax_device Vivek Goyal 2020-08-07 19:55 ` [Virtio-fs] " Vivek Goyal 2020-08-07 19:55 ` [PATCH v2 10/20] fuse,virtiofs: Keep a list of free dax memory ranges Vivek Goyal 2020-08-07 19:55 ` [Virtio-fs] [PATCH v2 10/20] fuse, virtiofs: " Vivek Goyal 2020-08-07 19:55 ` [PATCH v2 11/20] fuse: implement FUSE_INIT map_alignment field Vivek Goyal 2020-08-07 19:55 ` [Virtio-fs] " Vivek Goyal 2020-08-07 19:55 ` [PATCH v2 12/20] fuse: Introduce setupmapping/removemapping commands Vivek Goyal 2020-08-07 19:55 ` [Virtio-fs] " Vivek Goyal 2020-08-07 19:55 ` [PATCH v2 13/20] fuse, dax: Implement dax read/write operations Vivek Goyal 2020-08-07 19:55 ` [Virtio-fs] " Vivek Goyal 2020-08-10 22:06 ` Dave Chinner 2020-08-10 22:06 ` [Virtio-fs] " Dave Chinner 2020-08-11 17:44 ` Vivek Goyal 2020-08-11 17:44 ` [Virtio-fs] " Vivek Goyal 2020-08-07 19:55 ` [PATCH v2 14/20] fuse,dax: add DAX mmap support Vivek Goyal 2020-08-07 19:55 ` [Virtio-fs] " Vivek Goyal 2020-08-07 19:55 ` [PATCH v2 15/20] fuse, dax: Take ->i_mmap_sem lock during dax page fault Vivek Goyal 2020-08-07 19:55 ` [Virtio-fs] " Vivek Goyal 2020-08-10 22:22 ` Dave Chinner 2020-08-10 22:22 ` [Virtio-fs] " Dave Chinner 2020-08-11 17:55 ` Vivek Goyal 2020-08-11 17:55 ` [Virtio-fs] " Vivek Goyal 2020-08-12 1:23 ` Dave Chinner 2020-08-12 1:23 ` [Virtio-fs] " Dave Chinner 2020-08-12 21:10 ` Vivek Goyal 2020-08-12 21:10 ` [Virtio-fs] " Vivek Goyal 2020-08-13 5:12 ` Dave Chinner 2020-08-13 5:12 ` [Virtio-fs] " Dave Chinner 2020-08-07 19:55 ` [PATCH v2 16/20] fuse,virtiofs: Define dax address space operations Vivek Goyal 2020-08-07 19:55 ` [Virtio-fs] [PATCH v2 16/20] fuse, virtiofs: " Vivek Goyal 2020-08-07 19:55 ` [PATCH v2 17/20] fuse,virtiofs: Maintain a list of busy elements Vivek Goyal 2020-08-07 19:55 ` [Virtio-fs] [PATCH v2 17/20] fuse, virtiofs: " Vivek Goyal 2020-08-07 19:55 ` [PATCH v2 18/20] fuse: Release file in process context Vivek Goyal 2020-08-07 19:55 ` [Virtio-fs] " Vivek Goyal 2020-08-10 8:29 ` Miklos Szeredi 2020-08-10 8:29 ` [Virtio-fs] " Miklos Szeredi 2020-08-10 15:48 ` Vivek Goyal 2020-08-10 15:48 ` [Virtio-fs] " Vivek Goyal 2020-08-10 19:37 ` Vivek Goyal 2020-08-10 19:37 ` [Virtio-fs] " Vivek Goyal 2020-08-10 19:39 ` Miklos Szeredi 2020-08-10 19:39 ` [Virtio-fs] " Miklos Szeredi 2020-08-07 19:55 ` [PATCH v2 19/20] fuse: Take inode lock for dax inode truncation Vivek Goyal 2020-08-07 19:55 ` [Virtio-fs] " Vivek Goyal 2020-08-07 19:55 ` [PATCH v2 20/20] fuse,virtiofs: Add logic to free up a memory range Vivek Goyal 2020-08-07 19:55 ` [Virtio-fs] [PATCH v2 20/20] fuse, virtiofs: " Vivek Goyal 2020-08-10 7:29 ` [PATCH v2 00/20] virtiofs: Add DAX support Miklos Szeredi 2020-08-10 7:29 ` [Virtio-fs] " Miklos Szeredi 2020-08-10 13:08 ` Vivek Goyal 2020-08-10 13:08 ` [Virtio-fs] " Vivek Goyal 2020-08-10 13:08 ` Vivek Goyal
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=20200807195526.426056-7-vgoyal@redhat.com \ --to=vgoyal@redhat.com \ --cc=dgilbert@redhat.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=miklos@szeredi.hu \ --cc=stefanha@redhat.com \ --cc=virtio-fs@redhat.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.