From: Matthew Wilcox <willy@infradead.org>
To: Alexander Duyck <alexander.duyck@gmail.com>
Cc: linux-mm <linux-mm@kvack.org>,
"Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>
Subject: Re: [PATCH 2/6] mm: Optimise find_subpage for !THP
Date: Tue, 3 Mar 2020 13:47:51 -0800 [thread overview]
Message-ID: <20200303214751.GW29971@bombadil.infradead.org> (raw)
In-Reply-To: <CAKgT0UexbGe8P=DG23BWCRfnpDK40pCVU+DVqwP8BL-oktijAA@mail.gmail.com>
On Tue, Mar 03, 2020 at 01:28:13PM -0800, Alexander Duyck wrote:
> On Mon, Mar 2, 2020 at 8:11 PM Matthew Wilcox <willy@infradead.org> wrote:
> > From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
> >
> > If THP is disabled, find_subpage can become a no-op.
> >
> > Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> > Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> > ---
> > include/linux/pagemap.h | 15 ++++++++++-----
> > 1 file changed, 10 insertions(+), 5 deletions(-)
> >
> > diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
> > index b4ea3a5d00e5..8785f60b05f8 100644
> > --- a/include/linux/pagemap.h
> > +++ b/include/linux/pagemap.h
> > @@ -333,14 +333,19 @@ static inline struct page *grab_cache_page_nowait(struct address_space *mapping,
> > mapping_gfp_mask(mapping));
> > }
> >
> > -static inline struct page *find_subpage(struct page *page, pgoff_t offset)
> > +/*
> > + * Given the page we found in the page cache, return the page corresponding
> > + * to this offset in the file
> > + */
> > +static inline struct page *find_subpage(struct page *head, pgoff_t offset)
> > {
> > - if (PageHuge(page))
> > - return page;
> > + /* HugeTLBfs wants the head page regardless */
> > + if (PageHuge(head))
> > + return head;
> >
> > - VM_BUG_ON_PAGE(PageTail(page), page);
> > + VM_BUG_ON_PAGE(PageTail(head), head);
>
> Is there any specific reason for renaming page to head? Just wondering
Christoph Hellwig asked for the rename in an earlier version of this
patchset.
> since it adds some noise to the patch that wasn't really called out in
> the patch description. From what I can tell none of the changes above
> this point have any explanation to them in the patch description, and
> until I noticed the change below I thought maybe you had the wrong
> patch description for this patch.
>
> > - return page + (offset & (compound_nr(page) - 1));
> > + return head + (offset & (hpage_nr_pages(head) - 1));
> > }
>
> So the patch description refers to this line here, correct?
Yes, that's the actual change.
> One thing I am noticing is that it looks like the VM_BUG_ON_PAGE is
> now redundant. If I am not not mistaken hpage_nr_pages will call
> PageTransHuge which also performs the same check. So do you still need
> the VM_BUG_ON_PAGE call in this function?
Huh, I didn't know PageTransHuge had that. I suppose it can go, although
there's only a call to PageTransHuge() in the CONFIG_TRANSPARENT_HUGEPAGE
enabled case. You might ask how a tail page could get into the page
cache if CONFIG_TRANSPARENT_HUGEPAGE is not enabled, and I would not
have a good answer for that ... although if one has, I think we'd want
to know about it. So maybe that's a good reason to keep the explicit
check, or maybe it's a good reason to make hpage_nr_pages() check that
assertion if !CONFIG_TRANSPARENT_HUGEPAGE.
next prev parent reply other threads:[~2020-03-03 21:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-03 4:11 [PATCH 0/6] Misc MM patches Matthew Wilcox
2020-03-03 4:11 ` [PATCH 1/6] mm: Use vm_fault error code directly Matthew Wilcox
2020-03-03 4:11 ` [PATCH 2/6] mm: Optimise find_subpage for !THP Matthew Wilcox
2020-03-03 21:28 ` Alexander Duyck
2020-03-03 21:47 ` Matthew Wilcox [this message]
2020-03-05 9:54 ` William Kucharski
2020-03-03 4:11 ` [PATCH 3/6] mm: Remove CONFIG_TRANSPARENT_HUGE_PAGECACHE Matthew Wilcox
2020-03-03 21:52 ` Alexander Duyck
2020-03-03 22:34 ` Matthew Wilcox
2020-03-03 22:54 ` Alexander Duyck
2020-03-04 2:06 ` Matthew Wilcox
2020-03-03 4:11 ` [PATCH 4/6] mm: Use VM_BUG_ON_PAGE in clear_page_dirty_for_io Matthew Wilcox
2020-03-03 4:11 ` [PATCH 5/6] mm: Unexport find_get_entry Matthew Wilcox
2020-03-03 4:11 ` [PATCH 6/6] mm: Rewrite pagecache_get_page documentation Matthew Wilcox
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=20200303214751.GW29971@bombadil.infradead.org \
--to=willy@infradead.org \
--cc=alexander.duyck@gmail.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-mm@kvack.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).