Skip to contentSkip to conversation

hugetlb_cgroup: use helper pages_per_huge_page() in hugetlb_cgroup

PATCH Applied Miaohe Lin 2 participants 2 messages Feb 5, 2021

Subsystems (2)
lore
Share & tools
lore

Miaohe Lin

author
#0 lore raw

PATCH 1/1 hugetlb_cgroup: use helper pages_per_huge_page() in hugetlb_cgroup

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

---
 mm/hugetlb_cgroup.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
mm/hugetlb_cgroup.c +3 -3
index 8909e075d441..86b5cc128584 100644
@@ -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:
Signature · 1 line
2.19.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 32 lines · 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.

---
  mm/hugetlb_cgroup.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
mm/hugetlb_cgroup.c +2 -2
index 8909e075d441..86b5cc128584 100644
@@ -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:

mm/hugetlb_cgroup.c static ssize_t hugetlb_cgroup_write(struct kernfs_open_file *of, · line 519

Quoted 8 lines
mm/hugetlb_cgroup.c +1 -1
@@ -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:
Signature · 3 lines
Thanks,

David / dhildenb