From: Vishal Moola <vishal.moola@gmail.com>
To: miklos@szeredi.hu
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
linux-fsdevel@vger.kernel.org, akpm@linux-foundation.org,
Matthew Wilcox <willy@infradead.org>
Subject: Re: [PATCH 2/5] fuse: Convert fuse_try_move_page() to use folios
Date: Thu, 10 Nov 2022 10:36:43 -0800 [thread overview]
Message-ID: <CAOzc2px2POjBU-6X=YB+rd-87vhDx0cUu0m8EFWA=Q_Peu1gUg@mail.gmail.com> (raw)
In-Reply-To: <Y2FkV0wogVhMHkkO@casper.infradead.org>
On Tue, Nov 1, 2022 at 11:24 AM Matthew Wilcox <willy@infradead.org> wrote:
>
> On Tue, Nov 01, 2022 at 10:53:23AM -0700, Vishal Moola (Oracle) wrote:
> > Converts the function to try to move folios instead of pages. Also
> > converts fuse_check_page() to fuse_get_folio() since this is its only
> > caller. This change removes 15 calls to compound_head().
>
> This all looks good. I wonder if we should't add an assertion that the
> page we're trying to steal is !large? It seems to me that there are
> assumptions in this part of fuse that it's only dealing with order-0
> pages, and if someone gives it a page that's part of a large folio,
> it's going to be messy. Miklos, any thoughts?
Miklos, could you please look over this patch?
> > Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
> > ---
> > fs/fuse/dev.c | 55 ++++++++++++++++++++++++++-------------------------
> > 1 file changed, 28 insertions(+), 27 deletions(-)
> >
> > diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
> > index 26817a2db463..204c332cd343 100644
> > --- a/fs/fuse/dev.c
> > +++ b/fs/fuse/dev.c
> > @@ -764,11 +764,11 @@ static int fuse_copy_do(struct fuse_copy_state *cs, void **val, unsigned *size)
> > return ncpy;
> > }
> >
> > -static int fuse_check_page(struct page *page)
> > +static int fuse_check_folio(struct folio *folio)
> > {
> > - if (page_mapcount(page) ||
> > - page->mapping != NULL ||
> > - (page->flags & PAGE_FLAGS_CHECK_AT_PREP &
> > + if (folio_mapped(folio) ||
> > + folio->mapping != NULL ||
> > + (folio->flags & PAGE_FLAGS_CHECK_AT_PREP &
> > ~(1 << PG_locked |
> > 1 << PG_referenced |
> > 1 << PG_uptodate |
> > @@ -778,7 +778,7 @@ static int fuse_check_page(struct page *page)
> > 1 << PG_reclaim |
> > 1 << PG_waiters |
> > LRU_GEN_MASK | LRU_REFS_MASK))) {
> > - dump_page(page, "fuse: trying to steal weird page");
> > + dump_page(&folio->page, "fuse: trying to steal weird page");
> > return 1;
> > }
> > return 0;
> > @@ -787,11 +787,11 @@ static int fuse_check_page(struct page *page)
> > static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)
> > {
> > int err;
> > - struct page *oldpage = *pagep;
> > - struct page *newpage;
> > + struct folio *oldfolio = page_folio(*pagep);
> > + struct folio *newfolio;
> > struct pipe_buffer *buf = cs->pipebufs;
> >
> > - get_page(oldpage);
> > + folio_get(oldfolio);
> > err = unlock_request(cs->req);
> > if (err)
> > goto out_put_old;
> > @@ -814,35 +814,36 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)
> > if (!pipe_buf_try_steal(cs->pipe, buf))
> > goto out_fallback;
> >
> > - newpage = buf->page;
> > + newfolio = page_folio(buf->page);
> >
> > - if (!PageUptodate(newpage))
> > - SetPageUptodate(newpage);
> > + if (!folio_test_uptodate(newfolio))
> > + folio_mark_uptodate(newfolio);
> >
> > - ClearPageMappedToDisk(newpage);
> > + folio_clear_mappedtodisk(newfolio);
> >
> > - if (fuse_check_page(newpage) != 0)
> > + if (fuse_check_folio(newfolio) != 0)
> > goto out_fallback_unlock;
> >
> > /*
> > * This is a new and locked page, it shouldn't be mapped or
> > * have any special flags on it
> > */
> > - if (WARN_ON(page_mapped(oldpage)))
> > + if (WARN_ON(folio_mapped(oldfolio)))
> > goto out_fallback_unlock;
> > - if (WARN_ON(page_has_private(oldpage)))
> > + if (WARN_ON(folio_has_private(oldfolio)))
> > goto out_fallback_unlock;
> > - if (WARN_ON(PageDirty(oldpage) || PageWriteback(oldpage)))
> > + if (WARN_ON(folio_test_dirty(oldfolio) ||
> > + folio_test_writeback(oldfolio)))
> > goto out_fallback_unlock;
> > - if (WARN_ON(PageMlocked(oldpage)))
> > + if (WARN_ON(folio_test_mlocked(oldfolio)))
> > goto out_fallback_unlock;
> >
> > - replace_page_cache_folio(page_folio(oldpage), page_folio(newpage));
> > + replace_page_cache_folio(oldfolio, newfolio);
> >
> > - get_page(newpage);
> > + folio_get(newfolio);
> >
> > if (!(buf->flags & PIPE_BUF_FLAG_LRU))
> > - lru_cache_add(newpage);
> > + folio_add_lru(newfolio);
> >
> > /*
> > * Release while we have extra ref on stolen page. Otherwise
> > @@ -855,28 +856,28 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)
> > if (test_bit(FR_ABORTED, &cs->req->flags))
> > err = -ENOENT;
> > else
> > - *pagep = newpage;
> > + *pagep = &newfolio->page;
> > spin_unlock(&cs->req->waitq.lock);
> >
> > if (err) {
> > - unlock_page(newpage);
> > - put_page(newpage);
> > + folio_unlock(newfolio);
> > + folio_put(newfolio);
> > goto out_put_old;
> > }
> >
> > - unlock_page(oldpage);
> > + folio_unlock(oldfolio);
> > /* Drop ref for ap->pages[] array */
> > - put_page(oldpage);
> > + folio_put(oldfolio);
> > cs->len = 0;
> >
> > err = 0;
> > out_put_old:
> > /* Drop ref obtained in this function */
> > - put_page(oldpage);
> > + folio_put(oldfolio);
> > return err;
> >
> > out_fallback_unlock:
> > - unlock_page(newpage);
> > + folio_unlock(newfolio);
> > out_fallback:
> > cs->pg = buf->page;
> > cs->offset = buf->offset;
> > --
> > 2.38.1
> >
> >
next prev parent reply other threads:[~2022-11-10 18:37 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-01 17:53 [PATCH 0/5] Removing the lru_cache_add() wrapper Vishal Moola (Oracle)
2022-11-01 17:53 ` [PATCH 1/5] filemap: Convert replace_page_cache_page() to replace_page_cache_folio() Vishal Moola (Oracle)
2022-11-01 18:20 ` Matthew Wilcox
2022-11-01 17:53 ` [PATCH 2/5] fuse: Convert fuse_try_move_page() to use folios Vishal Moola (Oracle)
2022-11-01 18:24 ` Matthew Wilcox
2022-11-10 18:36 ` Vishal Moola [this message]
2022-11-14 13:25 ` Miklos Szeredi
2022-11-01 17:53 ` [PATCH 3/5] userfualtfd: Replace lru_cache functions with folio_add functions Vishal Moola (Oracle)
2022-11-01 18:31 ` Matthew Wilcox
2022-11-02 19:02 ` Peter Xu
2022-11-02 19:21 ` Matthew Wilcox
2022-11-02 20:44 ` Peter Xu
2022-11-03 17:34 ` Axel Rasmussen
2022-11-03 17:56 ` Peter Xu
2022-11-02 20:47 ` Andrew Morton
2022-11-01 17:53 ` [PATCH 4/5] khugepage: Replace lru_cache_add() with folio_add_lru() Vishal Moola (Oracle)
2022-11-01 18:32 ` Matthew Wilcox
2022-11-01 17:53 ` [PATCH 5/5] folio-compat: Remove lru_cache_add() Vishal Moola (Oracle)
2022-11-01 18:33 ` Matthew Wilcox
2022-11-29 19:25 ` [PATCH 0/5] Removing the lru_cache_add() wrapper Vishal Moola
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='CAOzc2px2POjBU-6X=YB+rd-87vhDx0cUu0m8EFWA=Q_Peu1gUg@mail.gmail.com' \
--to=vishal.moola@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=miklos@szeredi.hu \
--cc=willy@infradead.org \
/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).