From: Miaohe Lin <linmiaohe@huawei.com>
To: Yang Shi <shy828301@gmail.com>
Cc: <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>,
<vbabka@suse.cz>, <kirill.shutemov@linux.intel.com>,
<willy@infradead.org>, <akpm@linux-foundation.org>
Subject: Re: [v3 PATCH 2/7] mm: thp: introduce transhuge_vma_size_ok() helper
Date: Fri, 10 Jun 2022 15:20:05 +0800 [thread overview]
Message-ID: <8ba0f470-af80-1087-4361-eacbcbc52d90@huawei.com> (raw)
In-Reply-To: <20220606214414.736109-3-shy828301@gmail.com>
On 2022/6/7 5:44, Yang Shi wrote:
> There are couple of places that check whether the vma size is ok for
> THP or not, they are open coded and duplicate, introduce
> transhuge_vma_size_ok() helper to do the job.
>
> Signed-off-by: Yang Shi <shy828301@gmail.com>
> ---
> include/linux/huge_mm.h | 17 +++++++++++++++++
> mm/huge_memory.c | 5 +----
> mm/khugepaged.c | 12 ++++++------
> 3 files changed, 24 insertions(+), 10 deletions(-)
>
> diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
> index 648cb3ce7099..a8f61db47f2a 100644
> --- a/include/linux/huge_mm.h
> +++ b/include/linux/huge_mm.h
> @@ -116,6 +116,18 @@ extern struct kobj_attribute shmem_enabled_attr;
>
> extern unsigned long transparent_hugepage_flags;
>
> +/*
> + * The vma size has to be large enough to hold an aligned HPAGE_PMD_SIZE area.
> + */
> +static inline bool transhuge_vma_size_ok(struct vm_area_struct *vma)
> +{
> + if (round_up(vma->vm_start, HPAGE_PMD_SIZE) <
> + (vma->vm_end & HPAGE_PMD_MASK))
> + return true;
> +
> + return false;
> +}
> +
> static inline bool transhuge_vma_suitable(struct vm_area_struct *vma,
> unsigned long addr)
> {
> @@ -345,6 +357,11 @@ static inline bool transparent_hugepage_active(struct vm_area_struct *vma)
> return false;
> }
>
> +static inline bool transhuge_vma_size_ok(struct vm_area_struct *vma)
> +{
> + return false;
> +}
> +
> static inline bool transhuge_vma_suitable(struct vm_area_struct *vma,
> unsigned long addr)
> {
> diff --git a/mm/huge_memory.c b/mm/huge_memory.c
> index 48182c8fe151..36ada544e494 100644
> --- a/mm/huge_memory.c
> +++ b/mm/huge_memory.c
> @@ -71,10 +71,7 @@ unsigned long huge_zero_pfn __read_mostly = ~0UL;
>
> bool transparent_hugepage_active(struct vm_area_struct *vma)
> {
> - /* The addr is used to check if the vma size fits */
> - unsigned long addr = (vma->vm_end & HPAGE_PMD_MASK) - HPAGE_PMD_SIZE;
> -
> - if (!transhuge_vma_suitable(vma, addr))
There is also pgoff check for file page in transhuge_vma_suitable. Is it ignored
deliberately?
> + if (!transhuge_vma_size_ok(vma))
> return false;
> if (vma_is_anonymous(vma))
> return __transparent_hugepage_enabled(vma);
> diff --git a/mm/khugepaged.c b/mm/khugepaged.c
> index 84b9cf4b9be9..d0f8020164fc 100644
> --- a/mm/khugepaged.c
> +++ b/mm/khugepaged.c
> @@ -454,6 +454,9 @@ bool hugepage_vma_check(struct vm_area_struct *vma,
> vma->vm_pgoff, HPAGE_PMD_NR))
> return false;
>
> + if (!transhuge_vma_size_ok(vma))
> + return false;
> +
> /* Enabled via shmem mount options or sysfs settings. */
> if (shmem_file(vma->vm_file))
> return shmem_huge_enabled(vma);
> @@ -512,9 +515,7 @@ void khugepaged_enter_vma(struct vm_area_struct *vma,
> unsigned long vm_flags)
> {
> if (!test_bit(MMF_VM_HUGEPAGE, &vma->vm_mm->flags) &&
> - khugepaged_enabled() &&
> - (((vma->vm_start + ~HPAGE_PMD_MASK) & HPAGE_PMD_MASK) <
> - (vma->vm_end & HPAGE_PMD_MASK))) {
> + khugepaged_enabled()) {
> if (hugepage_vma_check(vma, vm_flags))
> __khugepaged_enter(vma->vm_mm);
> }
After this change, khugepaged_enter_vma is identical to khugepaged_enter. Should one of
them be removed?
Thanks!
> @@ -2142,10 +2143,9 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages,
> progress++;
> continue;
> }
> - hstart = (vma->vm_start + ~HPAGE_PMD_MASK) & HPAGE_PMD_MASK;
> +
> + hstart = round_up(vma->vm_start, HPAGE_PMD_SIZE);
> hend = vma->vm_end & HPAGE_PMD_MASK;
> - if (hstart >= hend)
> - goto skip;
> if (khugepaged_scan.address > hend)
> goto skip;
> if (khugepaged_scan.address < hstart)
>
next prev parent reply other threads:[~2022-06-10 7:20 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-06 21:44 [mm-unstable v3 PATCH 0/7] Cleanup transhuge_xxx helpers Yang Shi
2022-06-06 21:44 ` [v3 PATCH 1/7] mm: khugepaged: check THP flag in hugepage_vma_check() Yang Shi
2022-06-09 17:49 ` Zach O'Keefe
2022-06-10 7:09 ` Miaohe Lin
2022-06-06 21:44 ` [v3 PATCH 2/7] mm: thp: introduce transhuge_vma_size_ok() helper Yang Shi
2022-06-09 22:21 ` Zach O'Keefe
2022-06-10 0:08 ` Yang Shi
2022-06-10 0:51 ` Zach O'Keefe
2022-06-10 16:38 ` Yang Shi
2022-06-10 21:24 ` Yang Shi
2022-06-10 7:20 ` Miaohe Lin [this message]
2022-06-10 16:47 ` Yang Shi
2022-06-06 21:44 ` [v3 PATCH 3/7] mm: khugepaged: remove the redundant anon vma check Yang Shi
2022-06-09 23:23 ` Zach O'Keefe
2022-06-10 0:01 ` Yang Shi
2022-06-10 7:23 ` Miaohe Lin
2022-06-10 7:28 ` Miaohe Lin
2022-06-06 21:44 ` [v3 PATCH 4/7] mm: khugepaged: use transhuge_vma_suitable replace open-code Yang Shi
2022-06-10 1:51 ` Zach O'Keefe
2022-06-10 16:59 ` Yang Shi
2022-06-10 22:03 ` Yang Shi
2022-06-11 0:27 ` Zach O'Keefe
2022-06-11 3:25 ` Yang Shi
2022-06-11 21:43 ` Zach O'Keefe
2022-06-14 17:40 ` Yang Shi
2022-06-06 21:44 ` [v3 PATCH 5/7] mm: thp: kill transparent_hugepage_active() Yang Shi
2022-06-10 1:02 ` Zach O'Keefe
2022-06-10 17:02 ` Yang Shi
2022-06-13 15:06 ` Zach O'Keefe
2022-06-14 19:16 ` Yang Shi
2022-06-06 21:44 ` [v3 PATCH 6/7] mm: thp: kill __transhuge_page_enabled() Yang Shi
2022-06-10 2:22 ` Zach O'Keefe
2022-06-10 17:24 ` Yang Shi
2022-06-10 21:07 ` Yang Shi
2022-06-13 14:54 ` Zach O'Keefe
2022-06-14 18:51 ` Yang Shi
2022-06-14 23:55 ` Zach O'Keefe
2022-06-06 21:44 ` [v3 PATCH 7/7] mm: khugepaged: reorg some khugepaged helpers Yang Shi
2022-06-09 23:32 ` [mm-unstable v3 PATCH 0/7] Cleanup transhuge_xxx helpers Zach O'Keefe
2022-06-10 7:08 ` Miaohe Lin
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=8ba0f470-af80-1087-4361-eacbcbc52d90@huawei.com \
--to=linmiaohe@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=shy828301@gmail.com \
--cc=vbabka@suse.cz \
--cc=willy@infradead.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).