From: Lucian Grijincu <lucian@fb.com>
To: Michal Hocko <mhocko@kernel.org>
Cc: "linux-mm@kvack.org" <linux-mm@kvack.org>,
Souptick Joarder <jrdr.linux@gmail.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Rik van Riel <riel@fb.com>, Roman Gushchin <guro@fb.com>,
Hugh Dickins <hughd@google.com>
Subject: Re: [PATCH v3] mm: memory: fix /proc/meminfo reporting for MLOCK_ONFAULT
Date: Mon, 16 Sep 2019 21:34:50 +0000 [thread overview]
Message-ID: <01045F3D-B141-42E8-86C9-FA17B0E5EEE2@fb.com> (raw)
In-Reply-To: <20190916113532.GE10231@dhcp22.suse.cz>
> On 9/16/19, 04:35, "Michal Hocko" <mhocko@kernel.org> wrote:
> > diff --git a/mm/memory.c b/mm/memory.c
> > index e0c232fe81d9..55da24f33bc4 100644
> > --- a/mm/memory.c
> > +++ b/mm/memory.c
> > @@ -3311,6 +3311,8 @@ vm_fault_t alloc_set_pte(struct vm_fault *vmf, struct mem_cgroup *memcg,
> > } else {
> > inc_mm_counter_fast(vma->vm_mm, mm_counter_file(page));
> > page_add_file_rmap(page, false);
> > + if (vma->vm_flags & VM_LOCKED && !PageTransCompound(page))
> > + mlock_vma_page(page);
> > }
> > set_pte_at(vma->vm_mm, vmf->address, vmf->pte, entry);
> I dunno. Handling it here in alloc_set_pte sounds a bit weird to me.
> Altough we already do mlock for CoW pages there, I thought this was more
> of an exception.
> Is there any real reason why this cannot be done in the standard #PF
> path? finish_fault for example?
alloc_set_pte is called from finish_fault https://github.com/torvalds/linux/blob/v5.2/mm/memory.c#L3400
vm_fault_t finish_fault(struct vm_fault *vmf)
...
if (!ret)
ret = alloc_set_pte(vmf, vmf->memcg, page);
and inside alloc_set_pte one of the branches of the if-clause already handled mlocked pages:
https://github.com/torvalds/linux/blob/v5.2/mm/memory.c#L3348-L3356
I added it to the else-branch as that seemed like the least intrusive change, but I will move this to finish_fault, probably like this (after I'm done testing):
vm_fault_t finish_fault(struct vm_fault *vmf)
...
if (!ret)
ret = alloc_set_pte(vmf, vmf->memcg, page);
+ if (!ret && (vmf->vma->vm_flags & VM_LOCKED) && !PageTransCompound(page))
+ mlock_vma_page(page);
Thanks for the review and suggestions!
--
Lucian
next prev parent reply other threads:[~2019-09-16 21:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-13 21:11 [PATCH v3] mm: memory: fix /proc/meminfo reporting for MLOCK_ONFAULT Lucian Adrian Grijincu
2019-09-13 21:17 ` [Potential Spoof] " Roman Gushchin
2019-09-16 11:35 ` Michal Hocko
2019-09-16 21:34 ` Lucian Grijincu [this message]
2019-09-16 15:26 ` Kirill A. Shutemov
2019-09-17 10:15 ` Michal Hocko
2019-09-17 11:35 ` Kirill A. Shutemov
2019-09-23 8:50 ` Michal Hocko
2019-09-17 11:37 ` Kirill A. Shutemov
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=01045F3D-B141-42E8-86C9-FA17B0E5EEE2@fb.com \
--to=lucian@fb.com \
--cc=akpm@linux-foundation.org \
--cc=guro@fb.com \
--cc=hughd@google.com \
--cc=jrdr.linux@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@kernel.org \
--cc=riel@fb.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;
as well as URLs for NNTP newsgroup(s).