From: Song Liu <songliubraving@fb.com> To: <linux-mm@kvack.org> Cc: <kernel-team@fb.com>, Song Liu <songliubraving@fb.com>, <linux-kernel@vger.kernel.org> Subject: [PATCH] mm/THP: use hugepage_vma_check() in khugepaged_enter_vma_merge() Date: Mon, 21 May 2018 12:38:53 -0700 [thread overview] Message-ID: <20180521193853.3089484-1-songliubraving@fb.com> (raw) khugepaged_enter_vma_merge() is using a different approach to check whether a vma is valid for khugepaged_enter(): if (!vma->anon_vma) /* * Not yet faulted in so we will register later in the * page fault if needed. */ return 0; if (vma->vm_ops || (vm_flags & VM_NO_KHUGEPAGED)) /* khugepaged not yet working on file or special mappings */ return 0; This check has some problems. One of the obvious problems is that it doesn't check shmem_file(), so that vma backed with shmem files will not call khugepaged_enter(). This patch fixes these problems by reusing hugepage_vma_check() in khugepaged_enter_vma_merge(). Signed-off-by: Song Liu <songliubraving@fb.com> --- mm/khugepaged.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index d7b2a4b..e50c2bd 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -430,18 +430,14 @@ int __khugepaged_enter(struct mm_struct *mm) return 0; } +static bool hugepage_vma_check(struct vm_area_struct *vma); + int khugepaged_enter_vma_merge(struct vm_area_struct *vma, unsigned long vm_flags) { unsigned long hstart, hend; - if (!vma->anon_vma) - /* - * Not yet faulted in so we will register later in the - * page fault if needed. - */ - return 0; - if (vma->vm_ops || (vm_flags & VM_NO_KHUGEPAGED)) - /* khugepaged not yet working on file or special mappings */ + + if (!hugepage_vma_check(vma)) return 0; hstart = (vma->vm_start + ~HPAGE_PMD_MASK) & HPAGE_PMD_MASK; hend = vma->vm_end & HPAGE_PMD_MASK; -- 2.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Song Liu <songliubraving@fb.com> To: linux-mm@kvack.org Cc: kernel-team@fb.com, Song Liu <songliubraving@fb.com>, linux-kernel@vger.kernel.org Subject: [PATCH] mm/THP: use hugepage_vma_check() in khugepaged_enter_vma_merge() Date: Mon, 21 May 2018 12:38:53 -0700 [thread overview] Message-ID: <20180521193853.3089484-1-songliubraving@fb.com> (raw) khugepaged_enter_vma_merge() is using a different approach to check whether a vma is valid for khugepaged_enter(): if (!vma->anon_vma) /* * Not yet faulted in so we will register later in the * page fault if needed. */ return 0; if (vma->vm_ops || (vm_flags & VM_NO_KHUGEPAGED)) /* khugepaged not yet working on file or special mappings */ return 0; This check has some problems. One of the obvious problems is that it doesn't check shmem_file(), so that vma backed with shmem files will not call khugepaged_enter(). This patch fixes these problems by reusing hugepage_vma_check() in khugepaged_enter_vma_merge(). Signed-off-by: Song Liu <songliubraving@fb.com> --- mm/khugepaged.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index d7b2a4b..e50c2bd 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -430,18 +430,14 @@ int __khugepaged_enter(struct mm_struct *mm) return 0; } +static bool hugepage_vma_check(struct vm_area_struct *vma); + int khugepaged_enter_vma_merge(struct vm_area_struct *vma, unsigned long vm_flags) { unsigned long hstart, hend; - if (!vma->anon_vma) - /* - * Not yet faulted in so we will register later in the - * page fault if needed. - */ - return 0; - if (vma->vm_ops || (vm_flags & VM_NO_KHUGEPAGED)) - /* khugepaged not yet working on file or special mappings */ + + if (!hugepage_vma_check(vma)) return 0; hstart = (vma->vm_start + ~HPAGE_PMD_MASK) & HPAGE_PMD_MASK; hend = vma->vm_end & HPAGE_PMD_MASK; -- 2.9.5
next reply other threads:[~2018-05-21 19:39 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-21 19:38 Song Liu [this message] 2018-05-21 19:38 ` [PATCH] mm/THP: use hugepage_vma_check() in khugepaged_enter_vma_merge() Song Liu 2018-05-21 19:53 ` Rik van Riel 2018-05-21 21:19 ` David Rientjes 2018-05-22 12:13 ` Michal Hocko 2018-05-22 19:31 ` Song Liu
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=20180521193853.3089484-1-songliubraving@fb.com \ --to=songliubraving@fb.com \ --cc=kernel-team@fb.com \ --cc=linux-kernel@vger.kernel.org \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.