Commit 04adbc3f authored by Miaohe Lin's avatar Miaohe Lin Committed by Linus Torvalds

mm/hugetlb: use some helper functions to cleanup code

Patch series "Some cleanups for hugetlb".

This series contains cleanups to remove unnecessary VM_BUG_ON_PAGE, use
helper function and so on.  I also collect some previous patches into this
series in case they are forgotten.

This patch (of 5):

We could use pages_per_huge_page to get the number of pages per hugepage,
use get_hstate_idx to calculate hstate index, and use hstate_is_gigantic
to check if a hstate is gigantic to make code more succinct.

Link: https://lkml.kernel.org/r/20210308112809.26107-1-linmiaohe@huawei.com
Link: https://lkml.kernel.org/r/20210308112809.26107-2-linmiaohe@huawei.comSigned-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Reviewed-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4bfb68a0
...@@ -1435,7 +1435,7 @@ static int get_hstate_idx(int page_size_log) ...@@ -1435,7 +1435,7 @@ static int get_hstate_idx(int page_size_log)
if (!h) if (!h)
return -1; return -1;
return h - hstates; return hstate_index(h);
} }
/* /*
......
...@@ -1273,7 +1273,7 @@ static void free_gigantic_page(struct page *page, unsigned int order) ...@@ -1273,7 +1273,7 @@ static void free_gigantic_page(struct page *page, unsigned int order)
static struct page *alloc_gigantic_page(struct hstate *h, gfp_t gfp_mask, static struct page *alloc_gigantic_page(struct hstate *h, gfp_t gfp_mask,
int nid, nodemask_t *nodemask) int nid, nodemask_t *nodemask)
{ {
unsigned long nr_pages = 1UL << huge_page_order(h); unsigned long nr_pages = pages_per_huge_page(h);
if (nid == NUMA_NO_NODE) if (nid == NUMA_NO_NODE)
nid = numa_mem_id(); nid = numa_mem_id();
...@@ -3267,10 +3267,10 @@ static int __init hugepages_setup(char *s) ...@@ -3267,10 +3267,10 @@ static int __init hugepages_setup(char *s)
/* /*
* Global state is always initialized later in hugetlb_init. * Global state is always initialized later in hugetlb_init.
* But we need to allocate >= MAX_ORDER hstates here early to still * But we need to allocate gigantic hstates here early to still
* use the bootmem allocator. * use the bootmem allocator.
*/ */
if (hugetlb_max_hstate && parsed_hstate->order >= MAX_ORDER) if (hugetlb_max_hstate && hstate_is_gigantic(parsed_hstate))
hugetlb_hstate_alloc_pages(parsed_hstate); hugetlb_hstate_alloc_pages(parsed_hstate);
last_mhp = mhp; last_mhp = mhp;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment