fuse: convert ioctls to use folios

Convert ioctl requests to use folios instead of pages.

No functional changes.

Signed-off-by: Joanne Koong <joannelkoong@gmail.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>

diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index 201b085..c1c7def 100644 (file)
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -1051,6 +1051,16 @@ static inline void fuse_page_descs_length_init(struct fuse_page_desc *descs,
                descs[i].length = PAGE_SIZE - descs[i].offset;
 }
 
+static inline void fuse_folio_descs_length_init(struct fuse_folio_desc *descs,
+                                               unsigned int index,
+                                               unsigned int nr_folios)
+{
+       int i;
+
+       for (i = index; i < index + nr_folios; i++)
+               descs[i].length = PAGE_SIZE - descs[i].offset;
+}
+
 static inline void fuse_sync_bucket_dec(struct fuse_sync_bucket *bucket)
 {
        /* Need RCU protection to prevent use after free after the decrement */

diff --git a/fs/fuse/ioctl.c b/fs/fuse/ioctl.c
index a6c8ee5..1c77d8a 100644 (file)
--- a/fs/fuse/ioctl.c
+++ b/fs/fuse/ioctl.c
@@ -251,12 +251,12 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,
        BUILD_BUG_ON(sizeof(struct fuse_ioctl_iovec) * FUSE_IOCTL_MAX_IOV > PAGE_SIZE);
 
        err = -ENOMEM;
-       ap.pages = fuse_pages_alloc(fm->fc->max_pages, GFP_KERNEL, &ap.descs);
+       ap.folios = fuse_folios_alloc(fm->fc->max_pages, GFP_KERNEL, &ap.folio_descs);
        iov_page = (struct iovec *) __get_free_page(GFP_KERNEL);
-       if (!ap.pages || !iov_page)
+       if (!ap.folios || !iov_page)
                goto out;
 
-       fuse_page_descs_length_init(ap.descs, 0, fm->fc->max_pages);
+       fuse_folio_descs_length_init(ap.folio_descs, 0, fm->fc->max_pages);
 
        /*
         * If restricted, initialize IO parameters as encoded in @cmd.
@@ -306,14 +306,14 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,
        err = -ENOMEM;
        if (max_pages > fm->fc->max_pages)
                goto out;
-       while (ap.num_pages < max_pages) {
-               ap.pages[ap.num_pages] = alloc_page(GFP_KERNEL | __GFP_HIGHMEM);
-               if (!ap.pages[ap.num_pages])
+       ap.uses_folios = true;
+       while (ap.num_folios < max_pages) {
+               ap.folios[ap.num_folios] = folio_alloc(GFP_KERNEL | __GFP_HIGHMEM, 0);
+               if (!ap.folios[ap.num_folios])
                        goto out;
-               ap.num_pages++;
+               ap.num_folios++;
        }
 
-
        /* okay, let's send it to the client */
        ap.args.opcode = FUSE_IOCTL;
        ap.args.nodeid = ff->nodeid;
@@ -327,8 +327,8 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,
 
                err = -EFAULT;
                iov_iter_init(&ii, ITER_SOURCE, in_iov, in_iovs, in_size);
-               for (i = 0; iov_iter_count(&ii) && !WARN_ON(i >= ap.num_pages); i++) {
-                       c = copy_page_from_iter(ap.pages[i], 0, PAGE_SIZE, &ii);
+               for (i = 0; iov_iter_count(&ii) && !WARN_ON(i >= ap.num_folios); i++) {
+                       c = copy_folio_from_iter(ap.folios[i], 0, PAGE_SIZE, &ii);
                        if (c != PAGE_SIZE && iov_iter_count(&ii))
                                goto out;
                }
@@ -366,7 +366,7 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,
                    in_iovs + out_iovs > FUSE_IOCTL_MAX_IOV)
                        goto out;
 
-               vaddr = kmap_local_page(ap.pages[0]);
+               vaddr = kmap_local_folio(ap.folios[0], 0);
                err = fuse_copy_ioctl_iovec(fm->fc, iov_page, vaddr,
                                            transferred, in_iovs + out_iovs,
                                            (flags & FUSE_IOCTL_COMPAT) != 0);
@@ -394,17 +394,17 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,
 
        err = -EFAULT;
        iov_iter_init(&ii, ITER_DEST, out_iov, out_iovs, transferred);
-       for (i = 0; iov_iter_count(&ii) && !WARN_ON(i >= ap.num_pages); i++) {
-               c = copy_page_to_iter(ap.pages[i], 0, PAGE_SIZE, &ii);
+       for (i = 0; iov_iter_count(&ii) && !WARN_ON(i >= ap.num_folios); i++) {
+               c = copy_folio_to_iter(ap.folios[i], 0, PAGE_SIZE, &ii);
                if (c != PAGE_SIZE && iov_iter_count(&ii))
                        goto out;
        }
        err = 0;
  out:
        free_page((unsigned long) iov_page);
-       while (ap.num_pages)
-               __free_page(ap.pages[--ap.num_pages]);
-       kfree(ap.pages);
+       while (ap.num_folios)
+               folio_put(ap.folios[--ap.num_folios]);
+       kfree(ap.folios);
 
        return err ? err : outarg.result;
 }