From: "Kirill A. Shutemov" <kirill@shutemov.name>
To: Yang Shi <shy828301@gmail.com>
Cc: David Rientjes <rientjes@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
Mike Rapoport <rppt@linux.ibm.com>,
Jeremy Cline <jcline@redhat.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux MM <linux-mm@kvack.org>
Subject: Re: [patch 1/2] mm, shmem: add thp fault alloc and fallback stats
Date: Thu, 20 Feb 2020 16:12:02 +0300 [thread overview]
Message-ID: <20200220131202.i77zt3zj53mimrnu@box> (raw)
In-Reply-To: <CAHbLzkq20hzLdYM-EMOfWRqPOr+OQF8uq5yWR=Yb6vQY51LKwg@mail.gmail.com>
On Wed, Feb 19, 2020 at 09:01:23AM -0800, Yang Shi wrote:
> On Tue, Feb 18, 2020 at 7:44 PM David Rientjes <rientjes@google.com> wrote:
> >
> > On Tue, 18 Feb 2020, Yang Shi wrote:
> >
> > > > diff --git a/mm/shmem.c b/mm/shmem.c
> > > > --- a/mm/shmem.c
> > > > +++ b/mm/shmem.c
> > > > @@ -1502,9 +1502,8 @@ static struct page *shmem_alloc_page(gfp_t gfp,
> > > > return page;
> > > > }
> > > >
> > > > -static struct page *shmem_alloc_and_acct_page(gfp_t gfp,
> > > > - struct inode *inode,
> > > > - pgoff_t index, bool huge)
> > > > +static struct page *shmem_alloc_and_acct_page(gfp_t gfp, struct inode *inode,
> > > > + pgoff_t index, bool fault, bool huge)
> > > > {
> > > > struct shmem_inode_info *info = SHMEM_I(inode);
> > > > struct page *page;
> > > > @@ -1518,9 +1517,11 @@ static struct page *shmem_alloc_and_acct_page(gfp_t gfp,
> > > > if (!shmem_inode_acct_block(inode, nr))
> > > > goto failed;
> > > >
> > > > - if (huge)
> > > > + if (huge) {
> > > > page = shmem_alloc_hugepage(gfp, info, index);
> > > > - else
> > > > + if (!page && fault)
> > > > + count_vm_event(THP_FAULT_FALLBACK);
> > > > + } else
> > > > page = shmem_alloc_page(gfp, info, index);
> > > > if (page) {
> > > > __SetPageLocked(page);
> > > > @@ -1832,11 +1833,10 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index,
> > > > }
> > > >
> > > > alloc_huge:
> > > > - page = shmem_alloc_and_acct_page(gfp, inode, index, true);
> > > > + page = shmem_alloc_and_acct_page(gfp, inode, index, vmf, true);
> > > > if (IS_ERR(page)) {
> > > > alloc_nohuge:
> > > > - page = shmem_alloc_and_acct_page(gfp, inode,
> > > > - index, false);
> > > > + page = shmem_alloc_and_acct_page(gfp, inode, index, vmf, false);
> > > > }
> > > > if (IS_ERR(page)) {
> > > > int retry = 5;
> > > > @@ -1871,8 +1871,11 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index,
> > > >
> > > > error = mem_cgroup_try_charge_delay(page, charge_mm, gfp, &memcg,
> > > > PageTransHuge(page));
> > > > - if (error)
> > > > + if (error) {
> > > > + if (vmf && PageTransHuge(page))
> > > > + count_vm_event(THP_FAULT_FALLBACK);
> > > > goto unacct;
> > > > + }
> > > > error = shmem_add_to_page_cache(page, mapping, hindex,
> > > > NULL, gfp & GFP_RECLAIM_MASK);
> > > > if (error) {
> > > > @@ -1883,6 +1886,8 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index,
> > > > mem_cgroup_commit_charge(page, memcg, false,
> > > > PageTransHuge(page));
> > > > lru_cache_add_anon(page);
> > > > + if (vmf && PageTransHuge(page))
> > > > + count_vm_event(THP_FAULT_ALLOC);
> > >
> > > I think shmem THP alloc is accounted to THP_FILE_ALLOC. And it has
> > > been accounted by shmem_add_to_page_cache(). So, it sounds like a
> > > double count.
> > >
> >
> > I think we can choose to either include file allocations into both
> > thp_fault_alloc and thp_fault_fallback or we can exclude them from both of
> > them. I don't think we can account for only one of them.
>
> How's about the 3rd option, adding THP_FILE_FALLBACK.
I like this option.
Problem with THP_FAULT_* is that shmem_getpage_gfp() is called not only
from fault path, but also from syscalls.
--
Kirill A. Shutemov
next prev parent reply other threads:[~2020-02-20 13:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-18 5:41 [patch] mm, thp: track fallbacks due to failed memcg charges separately David Rientjes
2020-02-18 8:26 ` Kirill A. Shutemov
2020-02-19 1:59 ` David Rientjes
2020-02-18 9:34 ` Mike Rapoport
2020-02-19 2:29 ` [patch 1/2] mm, shmem: add thp fault alloc and fallback stats David Rientjes
2020-02-19 2:29 ` [patch 2/2] mm, thp: track fallbacks due to failed memcg charges separately David Rientjes
2020-02-19 8:23 ` Mike Rapoport
2020-02-19 3:22 ` [patch 1/2] mm, shmem: add thp fault alloc and fallback stats Yang Shi
2020-02-19 3:44 ` David Rientjes
2020-02-19 17:01 ` Yang Shi
2020-02-20 13:12 ` Kirill A. Shutemov [this message]
2020-03-06 17:23 ` Yang Shi
2020-03-06 21:27 ` David Rientjes
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=20200220131202.i77zt3zj53mimrnu@box \
--to=kirill@shutemov.name \
--cc=akpm@linux-foundation.org \
--cc=jcline@redhat.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=rientjes@google.com \
--cc=rppt@linux.ibm.com \
--cc=shy828301@gmail.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: 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