* [PATCH] mm/hugetlb: Use helper huge_page_order and pages_per_huge_page
@ 2021-01-14 11:44 Miaohe Lin
2021-01-14 12:32 ` David Hildenbrand
2021-01-14 19:19 ` Mike Kravetz
0 siblings, 2 replies; 3+ messages in thread
From: Miaohe Lin @ 2021-01-14 11:44 UTC (permalink / raw)
To: akpm, mike.kravetz; +Cc: linux-mm, linux-kernel, linmiaohe
Since commit a5516438959d ("hugetlb: modular state for hugetlb page size"),
we can use huge_page_order to access hstate->order and pages_per_huge_page
to fetch the pages per huge page. But gather_bootmem_prealloc() forgot to
use it.
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
mm/hugetlb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index fe2da9ad6233..c04d922757c7 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2476,7 +2476,7 @@ static void __init gather_bootmem_prealloc(void)
struct hstate *h = m->hstate;
WARN_ON(page_count(page) != 1);
- prep_compound_huge_page(page, h->order);
+ prep_compound_huge_page(page, huge_page_order(h));
WARN_ON(PageReserved(page));
prep_new_huge_page(h, page, page_to_nid(page));
put_page(page); /* free it into the hugepage allocator */
@@ -2488,7 +2488,7 @@ static void __init gather_bootmem_prealloc(void)
* side-effects, like CommitLimit going negative.
*/
if (hstate_is_gigantic(h))
- adjust_managed_page_count(page, 1 << h->order);
+ adjust_managed_page_count(page, pages_per_huge_page(h));
cond_resched();
}
}
--
2.19.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] mm/hugetlb: Use helper huge_page_order and pages_per_huge_page
2021-01-14 11:44 [PATCH] mm/hugetlb: Use helper huge_page_order and pages_per_huge_page Miaohe Lin
@ 2021-01-14 12:32 ` David Hildenbrand
2021-01-14 19:19 ` Mike Kravetz
1 sibling, 0 replies; 3+ messages in thread
From: David Hildenbrand @ 2021-01-14 12:32 UTC (permalink / raw)
To: Miaohe Lin, akpm, mike.kravetz; +Cc: linux-mm, linux-kernel
On 14.01.21 12:44, Miaohe Lin wrote:
> Since commit a5516438959d ("hugetlb: modular state for hugetlb page size"),
> we can use huge_page_order to access hstate->order and pages_per_huge_page
> to fetch the pages per huge page. But gather_bootmem_prealloc() forgot to
> use it.
>
> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
> ---
> mm/hugetlb.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> index fe2da9ad6233..c04d922757c7 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -2476,7 +2476,7 @@ static void __init gather_bootmem_prealloc(void)
> struct hstate *h = m->hstate;
>
> WARN_ON(page_count(page) != 1);
> - prep_compound_huge_page(page, h->order);
> + prep_compound_huge_page(page, huge_page_order(h));
> WARN_ON(PageReserved(page));
> prep_new_huge_page(h, page, page_to_nid(page));
> put_page(page); /* free it into the hugepage allocator */
> @@ -2488,7 +2488,7 @@ static void __init gather_bootmem_prealloc(void)
> * side-effects, like CommitLimit going negative.
> */
> if (hstate_is_gigantic(h))
> - adjust_managed_page_count(page, 1 << h->order);
> + adjust_managed_page_count(page, pages_per_huge_page(h));
> cond_resched();
> }
> }
>
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] mm/hugetlb: Use helper huge_page_order and pages_per_huge_page
2021-01-14 11:44 [PATCH] mm/hugetlb: Use helper huge_page_order and pages_per_huge_page Miaohe Lin
2021-01-14 12:32 ` David Hildenbrand
@ 2021-01-14 19:19 ` Mike Kravetz
1 sibling, 0 replies; 3+ messages in thread
From: Mike Kravetz @ 2021-01-14 19:19 UTC (permalink / raw)
To: Miaohe Lin, akpm; +Cc: linux-mm, linux-kernel
On 1/14/21 3:44 AM, Miaohe Lin wrote:
> Since commit a5516438959d ("hugetlb: modular state for hugetlb page size"),
> we can use huge_page_order to access hstate->order and pages_per_huge_page
> to fetch the pages per huge page. But gather_bootmem_prealloc() forgot to
> use it.
>
> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
> ---
> mm/hugetlb.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Thanks,
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
--
Mike Kravetz
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-14 19:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-14 11:44 [PATCH] mm/hugetlb: Use helper huge_page_order and pages_per_huge_page Miaohe Lin
2021-01-14 12:32 ` David Hildenbrand
2021-01-14 19:19 ` Mike Kravetz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox