From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Hugh Dickins <hughd@google.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
Andrea Arcangeli <aarcange@redhat.com>,
Andres Lagar-Cavilla <andreslc@google.com>,
Yang Shi <yang.shi@linaro.org>, Ning Qu <quning@gmail.com>,
kbuild test robot <fengguang.wu@linux.intel.com>,
linux-kernel@vger.kernel.org, linux-mm@kvack.org
Subject: Re: [PATCH mmotm 2/5] huge tmpfs: fix mlocked meminfo track huge unhuge mlocks fix
Date: Thu, 21 Apr 2016 09:48:11 +1000 [thread overview]
Message-ID: <20160421094811.6552f22b@canb.auug.org.au> (raw)
In-Reply-To: <alpine.LSU.2.11.1604161627260.1907@eggly.anvils>
Hi Hugh,
On Sat, 16 Apr 2016 16:29:44 -0700 (PDT) Hugh Dickins <hughd@google.com> wrote:
>
> Please add this fix after
> huge-tmpfs-fix-mlocked-meminfo-track-huge-unhuge-mlocks.patch
> for later merging into it. I expect this to fix a build problem found
> by robot on an x86_64 randconfig. I was not able to reproduce the error,
> but I'm growing to realize that different optimizers behave differently.
>
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Signed-off-by: Hugh Dickins <hughd@google.com>
> ---
> mm/rmap.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> --- a/mm/rmap.c
> +++ b/mm/rmap.c
> @@ -1445,8 +1445,12 @@ static int try_to_unmap_one(struct page
> */
> if (!(flags & TTU_IGNORE_MLOCK)) {
> if (vma->vm_flags & VM_LOCKED) {
> + int nr_pages = 1;
> +
> + if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) && !pte)
> + nr_pages = HPAGE_PMD_NR;
> /* Holding pte lock, we do *not* need mmap_sem here */
> - mlock_vma_pages(page, pte ? 1 : HPAGE_PMD_NR);
> + mlock_vma_pages(page, nr_pages);
> ret = SWAP_MLOCK;
> goto out_unmap;
> }
Added to linux-next today.
--
Cheers,
Stephen Rothwell
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2016-04-20 23:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-16 23:27 [PATCH mmotm 1/5] huge tmpfs: try to allocate huge pages split into a team fix Hugh Dickins
2016-04-16 23:29 ` [PATCH mmotm 2/5] huge tmpfs: fix mlocked meminfo track huge unhuge mlocks fix Hugh Dickins
2016-04-20 23:48 ` Stephen Rothwell [this message]
2016-04-16 23:33 ` [PATCH mmotm 3/5] huge tmpfs recovery: tweak shmem_getpage_gfp to fill team fix Hugh Dickins
2016-04-20 23:50 ` Stephen Rothwell
2016-04-16 23:38 ` [PATCH mmotm 4/5] huge tmpfs: avoid premature exposure of new pagetable revert Hugh Dickins
2016-04-20 23:55 ` Stephen Rothwell
2016-04-16 23:41 ` [PATCH mmotm 5/5] huge tmpfs: add shmem_pmd_fault() Hugh Dickins
2016-04-17 0:46 ` Kirill A. Shutemov
2016-04-17 1:21 ` Hugh Dickins
2016-04-20 23:56 ` Stephen Rothwell
2016-04-20 23:45 ` [PATCH mmotm 1/5] huge tmpfs: try to allocate huge pages split into a team fix Stephen Rothwell
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=20160421094811.6552f22b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=andreslc@google.com \
--cc=fengguang.wu@linux.intel.com \
--cc=hughd@google.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=quning@gmail.com \
--cc=yang.shi@linaro.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