[PATCH 1/6] fuse: drop usage of folio_index

[PATCH 1/6] fuse: drop usage of folio_index

[Kairui Song]

From: Kairui Song <kasong@tencent.com>

folio_index is only needed for mixed usage of page cache and swap
cache, for pure page cache usage, the caller can just use
folio->index instead.

It can't be a swap cache folio here.  Swap mapping may only call into fs
through `swap_rw` and that is not supported for fuse.  So just drop it
and use folio->index instead.

uigned-off-by: Kairui Song <kasong@tencent.com>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Cc: Joanne Koong <joannelkoong@gmail.com>
Cc: Josef Bacik <josef@toxicpanda.com>
Cc: linux-fsdevel@vger.kernel.org
Signed-off-by: Kairui Song <kasong@tencent.com>
---
 fs/fuse/file.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 754378dd9f71..6f19a4daa559 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -487,7 +487,7 @@ static inline bool fuse_folio_is_writeback(struct inode *inode,
 					   struct folio *folio)
 {
 	pgoff_t last = folio_next_index(folio) - 1;
-	return fuse_range_is_writeback(inode, folio_index(folio), last);
+	return fuse_range_is_writeback(inode, folio->index, last);
 }
 
 static void fuse_wait_on_folio_writeback(struct inode *inode,
@@ -2349,7 +2349,7 @@ static bool fuse_writepage_need_send(struct fuse_conn *fc, struct folio *folio,
 		return true;
 
 	/* Discontinuity */
-	if (data->orig_folios[ap->num_folios - 1]->index + 1 != folio_index(folio))
+	if (data->orig_folios[ap->num_folios - 1]->index + 1 != folio->index)
 		return true;
 
 	/* Need to grow the pages array?  If so, did the expansion fail? */
-- 
2.49.0

Re: [PATCH 1/6] fuse: drop usage of folio_index

[Matthew Wilcox]

On Mon, Apr 28, 2025 at 02:59:03AM +0800, Kairui Song wrote:
> folio_index is only needed for mixed usage of page cache and swap
> cache, for pure page cache usage, the caller can just use
> folio->index instead.
> 
> It can't be a swap cache folio here.  Swap mapping may only call into fs
> through `swap_rw` and that is not supported for fuse.  So just drop it
> and use folio->index instead.
> 
> uigned-off-by: Kairui Song <kasong@tencent.com>
> Cc: Miklos Szeredi <miklos@szeredi.hu>
> Cc: Joanne Koong <joannelkoong@gmail.com>
> Cc: Josef Bacik <josef@toxicpanda.com>
> Cc: linux-fsdevel@vger.kernel.org
> Signed-off-by: Kairui Song <kasong@tencent.com>

Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org>

> @@ -2349,7 +2349,7 @@ static bool fuse_writepage_need_send(struct fuse_conn *fc, struct folio *folio,
>  		return true;
>  
>  	/* Discontinuity */
> -	if (data->orig_folios[ap->num_folios - 1]->index + 1 != folio_index(folio))
> +	if (data->orig_folios[ap->num_folios - 1]->index + 1 != folio->index)
>  		return true;

This looks like a pre-existing bug.

-	if (data->orig_folios[ap->num_folios - 1]->index + 1 != folio_index(folio))
+	prev_folio = data->orig_folios[ap->num_folios - 1];
+	if (prev_folio->index + folio_nr_pages(prev_folio) != folio->index)
		return true;

Re: [PATCH 1/6] fuse: drop usage of folio_index

[Kairui Song]

On Mon, Apr 28, 2025 at 8:38 AM Matthew Wilcox <willy@infradead.org> wrote:
>
> On Mon, Apr 28, 2025 at 02:59:03AM +0800, Kairui Song wrote:
> > folio_index is only needed for mixed usage of page cache and swap
> > cache, for pure page cache usage, the caller can just use
> > folio->index instead.
> >
> > It can't be a swap cache folio here.  Swap mapping may only call into fs
> > through `swap_rw` and that is not supported for fuse.  So just drop it
> > and use folio->index instead.
> >
> > uigned-off-by: Kairui Song <kasong@tencent.com>
> > Cc: Miklos Szeredi <miklos@szeredi.hu>
> > Cc: Joanne Koong <joannelkoong@gmail.com>
> > Cc: Josef Bacik <josef@toxicpanda.com>
> > Cc: linux-fsdevel@vger.kernel.org
> > Signed-off-by: Kairui Song <kasong@tencent.com>
>
> Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org>

Thanks for the review.

>
> > @@ -2349,7 +2349,7 @@ static bool fuse_writepage_need_send(struct fuse_conn *fc, struct folio *folio,
> >               return true;
> >
> >       /* Discontinuity */
> > -     if (data->orig_folios[ap->num_folios - 1]->index + 1 != folio_index(folio))
> > +     if (data->orig_folios[ap->num_folios - 1]->index + 1 != folio->index)
> >               return true;
>
> This looks like a pre-existing bug.
>
> -       if (data->orig_folios[ap->num_folios - 1]->index + 1 != folio_index(folio))
> +       prev_folio = data->orig_folios[ap->num_folios - 1];
> +       if (prev_folio->index + folio_nr_pages(prev_folio) != folio->index)
>                 return true;
>

It seems FUSE does not work with high order folios yet, a lot of
allocation and operation here are assuming folio size == PAGE_SIZE. I
think I'll just leave it here.