[PATCH] hugetlb_cgroup: use helper pages_per_huge_page() in hugetlb_cgroup

[PATCH] hugetlb_cgroup: use helper pages_per_huge_page() in hugetlb_cgroup

[Miaohe Lin]

We could use helper function pages_per_huge_page() to get the number of
pages in a hstate to simplify the code slightly.

Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
 mm/hugetlb_cgroup.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c
index 8909e075d441..86b5cc128584 100644
--- a/mm/hugetlb_cgroup.c
+++ b/mm/hugetlb_cgroup.c
@@ -113,7 +113,7 @@ static void hugetlb_cgroup_init(struct hugetlb_cgroup *h_cgroup,
 			rsvd_parent);
 
 		limit = round_down(PAGE_COUNTER_MAX,
-				   1 << huge_page_order(&hstates[idx]));
+				   pages_per_huge_page(&hstates[idx]));
 
 		ret = page_counter_set_max(
 			hugetlb_cgroup_counter_from_cgroup(h_cgroup, idx),
@@ -466,7 +466,7 @@ static int hugetlb_cgroup_read_u64_max(struct seq_file *seq, void *v)
 	counter = &h_cg->hugepage[idx];
 
 	limit = round_down(PAGE_COUNTER_MAX,
-			   1 << huge_page_order(&hstates[idx]));
+			   pages_per_huge_page(&hstates[idx]));
 
 	switch (MEMFILE_ATTR(cft->private)) {
 	case RES_RSVD_USAGE:
@@ -513,7 +513,7 @@ static ssize_t hugetlb_cgroup_write(struct kernfs_open_file *of,
 		return ret;
 
 	idx = MEMFILE_IDX(of_cft(of)->private);
-	nr_pages = round_down(nr_pages, 1 << huge_page_order(&hstates[idx]));
+	nr_pages = round_down(nr_pages, pages_per_huge_page(&hstates[idx]));
 
 	switch (MEMFILE_ATTR(of_cft(of)->private)) {
 	case RES_RSVD_LIMIT:
-- 
2.19.1

Re: [PATCH] hugetlb_cgroup: use helper pages_per_huge_page() in hugetlb_cgroup

[David Hildenbrand]

On 05.02.21 09:45, Miaohe Lin wrote:
> We could use helper function pages_per_huge_page() to get the number of
> pages in a hstate to simplify the code slightly.
> 
> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
> ---
>   mm/hugetlb_cgroup.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c
> index 8909e075d441..86b5cc128584 100644
> --- a/mm/hugetlb_cgroup.c
> +++ b/mm/hugetlb_cgroup.c
> @@ -113,7 +113,7 @@ static void hugetlb_cgroup_init(struct hugetlb_cgroup *h_cgroup,
>   			rsvd_parent);
>   
>   		limit = round_down(PAGE_COUNTER_MAX,
> -				   1 << huge_page_order(&hstates[idx]));
> +				   pages_per_huge_page(&hstates[idx]));
>   
>   		ret = page_counter_set_max(
>   			hugetlb_cgroup_counter_from_cgroup(h_cgroup, idx),
> @@ -466,7 +466,7 @@ static int hugetlb_cgroup_read_u64_max(struct seq_file *seq, void *v)
>   	counter = &h_cg->hugepage[idx];
>   
>   	limit = round_down(PAGE_COUNTER_MAX,
> -			   1 << huge_page_order(&hstates[idx]));
> +			   pages_per_huge_page(&hstates[idx]));
>   
>   	switch (MEMFILE_ATTR(cft->private)) {
>   	case RES_RSVD_USAGE:
> @@ -513,7 +513,7 @@ static ssize_t hugetlb_cgroup_write(struct kernfs_open_file *of,
>   		return ret;
>   
>   	idx = MEMFILE_IDX(of_cft(of)->private);
> -	nr_pages = round_down(nr_pages, 1 << huge_page_order(&hstates[idx]));
> +	nr_pages = round_down(nr_pages, pages_per_huge_page(&hstates[idx]));
>   
>   	switch (MEMFILE_ATTR(of_cft(of)->private)) {
>   	case RES_RSVD_LIMIT:
> 

Reviewed-by: David Hildenbrand <david@redhat.com>

-- 
Thanks,

David / dhildenb