[RFC,4/4] mm/hugetlb: add hpage_shift to alloc_hugetlb_folio

Commit Message

Sidhartha Kumar April 13, 2023, 11:14 p.m. UTC

adjust the return value of hugepage_subpool_{put,get}_pages() by
hpage_shift to be consistent with previous values.

Signed-off-by: Sidhartha Kumar <[e-mail]>
---
 mm/hugetlb.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

Patch

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index a28fbdff886ff..258c211020c3a 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2992,6 +2992,7 @@  struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma,
 {
 	struct hugepage_subpool *spool = subpool_vma(vma);
 	struct hstate *h = hstate_vma(vma);
+	unsigned long hpage_shift = huge_page_shift(h);
 	struct folio *folio;
 	long map_chg, map_commit;
 	long gbl_chg;
@@ -3017,7 +3018,7 @@  struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma,
 	 * checked against any subpool limit.
 	 */
 	if (map_chg || avoid_reserve) {
-		gbl_chg = hugepage_subpool_get_pages(spool, 1);
+		gbl_chg = hugepage_subpool_get_pages(spool, 1) >> hpage_shift;
 		if (gbl_chg < 0) {
 			vma_end_reservation(h, vma, addr);
 			return ERR_PTR(-ENOSPC);
@@ -4778,6 +4779,7 @@  static void hugetlb_vm_op_close(struct vm_area_struct *vma)
 {
 	struct hstate *h = hstate_vma(vma);
 	unsigned int order = huge_page_order(h);
+	unsigned long hpage_shift = huge_page_shift(h);
 	struct resv_map *resv;
 	struct hugepage_subpool *spool = subpool_vma(vma);
 	unsigned long reserve, start, end;
@@ -4799,7 +4801,7 @@  static void hugetlb_vm_op_close(struct vm_area_struct *vma)
 		 * Decrement reserve counts.  The global reserve count may be
 		 * adjusted if the subpool has a minimum size.
 		 */
-		gbl_reserve = hugepage_subpool_put_pages(spool, reserve);
+		gbl_reserve = hugepage_subpool_put_pages(spool, reserve) >> hpage_shift;
 		hugetlb_acct_memory(h, -gbl_reserve);
 	}
 
@@ -6871,7 +6873,7 @@  bool hugetlb_reserve_pages(struct inode *inode,
 				(chg - add) * pages_per_huge_page(h), h_cg);
 
 			rsv_adjust = hugepage_subpool_put_pages(spool,
-								chg - add);
+								chg - add) >> hpage_shift;
 			hugetlb_acct_memory(h, -rsv_adjust);
 		} else if (h_cg) {
 			/*
@@ -6908,6 +6910,7 @@  long hugetlb_unreserve_pages(struct inode *inode, long start, long end,
 								long freed)
 {
 	struct hstate *h = hstate_inode(inode);
+	unsigned long hpage_shift = huge_page_shift(h);
 	struct resv_map *resv_map = inode_resv_map(inode);
 	long chg = 0;
 	struct hugepage_subpool *spool = subpool_inode(inode);
@@ -6939,7 +6942,7 @@  long hugetlb_unreserve_pages(struct inode *inode, long start, long end,
 	 * Note that !resv_map implies freed == 0. So (chg - freed)
 	 * won't go negative.
 	 */
-	gbl_reserve = hugepage_subpool_put_pages(spool, (chg - freed));
+	gbl_reserve = hugepage_subpool_put_pages(spool, (chg - freed)) >> hpage_shift;
 	hugetlb_acct_memory(h, -gbl_reserve);
 
 	return 0;