Skip to contentSkip to conversation

mm/khugepaged: alloc_charge_hpage() take care of mem charge errors

PATCH Applied Peter Xu 3 participants 4 messages Feb 22, 2023 – Mar 3, 2023

Subsystems (2)
lore
Share & tools
lore

Peter Xu

author
#0 lore raw

PATCH v2 1/1 mm/khugepaged: alloc_charge_hpage() take care of mem charge errors

If memory charge failed, instead of returning the hpage but with an error, allow the function to cleanup the folio properly, which is normally what a function should do in this case - either return successfully, or return with no side effect of partial runs with an indicated error.

This will also avoid the caller calling mem_cgroup_uncharge() unnecessarily with either anon or shmem path (even if it's safe to do so).

---
v1->v2:
- Enhance commit message, drop "Fixes:" and "Cc: stable" tag, add R-bs.

---
 mm/khugepaged.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
mm/khugepaged.c +8 -1
index 8dbc39896811..941d1c7ea910 100644
@@ -1063,12 +1063,19 @@ static int alloc_charge_hpage(struct page **hpage, struct mm_struct *mm,
 	gfp_t gfp = (cc->is_khugepaged ? alloc_hugepage_khugepaged_gfpmask() :
 		     GFP_TRANSHUGE);
 	int node = hpage_collapse_find_target_node(cc);
+	struct folio *folio;
 
 	if (!hpage_collapse_alloc_page(hpage, gfp, node, &cc->alloc_nmask))
 		return SCAN_ALLOC_HUGE_PAGE_FAIL;
-	if (unlikely(mem_cgroup_charge(page_folio(*hpage), mm, gfp)))
+
+	folio = page_folio(*hpage);
+	if (unlikely(mem_cgroup_charge(folio, mm, gfp))) {
+		folio_put(folio);
+		*hpage = NULL;
 		return SCAN_CGROUP_CHARGE_FAIL;
+	}
 	count_memcg_page_event(*hpage, THP_COLLAPSE_ALLOC);
+
 	return SCAN_SUCCEED;
 }
 
Signature · 1 line
2.39.1
#1 lore raw
Quoted 8 lines · Peter Xu

If memory charge failed, instead of returning the hpage but with an error, allow the function to cleanup the folio properly, which is normally what a function should do in this case - either return successfully, or return with no side effect of partial runs with an indicated error.

This will also avoid the caller calling mem_cgroup_uncharge() unnecessarily with either anon or shmem path (even if it's safe to do so).

Thanks for the cleanup. Reviewed-by: Yang Shi <[email protected]>

Quoted 40 lines

---
v1->v2:
- Enhance commit message, drop "Fixes:" and "Cc: stable" tag, add R-bs.

---
 mm/khugepaged.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
mm/khugepaged.c +8 -2
index 8dbc39896811..941d1c7ea910 100644
@@ -1063,12 +1063,19 @@ static int alloc_charge_hpage(struct page **hpage, struct mm_struct *mm,
        gfp_t gfp = (cc->is_khugepaged ? alloc_hugepage_khugepaged_gfpmask() :
                     GFP_TRANSHUGE);
        int node = hpage_collapse_find_target_node(cc);
+       struct folio *folio;
 
        if (!hpage_collapse_alloc_page(hpage, gfp, node, &cc->alloc_nmask))
                return SCAN_ALLOC_HUGE_PAGE_FAIL;
-       if (unlikely(mem_cgroup_charge(page_folio(*hpage), mm, gfp)))
+
+       folio = page_folio(*hpage);
+       if (unlikely(mem_cgroup_charge(folio, mm, gfp))) {
+               folio_put(folio);
+               *hpage = NULL;
                return SCAN_CGROUP_CHARGE_FAIL;
+       }
        count_memcg_page_event(*hpage, THP_COLLAPSE_ALLOC);
+
        return SCAN_SUCCEED;
 }
 
--

2.39.1

Reviewed-by
#2 lore raw
Quoted 49 lines · Yang Shi
Quoted 8 lines · Peter Xu

If memory charge failed, instead of returning the hpage but with an error, allow the function to cleanup the folio properly, which is normally what a function should do in this case - either return successfully, or return with no side effect of partial runs with an indicated error.

This will also avoid the caller calling mem_cgroup_uncharge() unnecessarily with either anon or shmem path (even if it's safe to do so).

Thanks for the cleanup. Reviewed-by: Yang Shi <[email protected]>

Quoted 37 lines

---
v1->v2:
- Enhance commit message, drop "Fixes:" and "Cc: stable" tag, add R-bs.

---
 mm/khugepaged.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
mm/khugepaged.c +8 -1
index 8dbc39896811..941d1c7ea910 100644
@@ -1063,12 +1063,19 @@ static int alloc_charge_hpage(struct page **hpage, struct mm_struct *mm,
        gfp_t gfp = (cc->is_khugepaged ? alloc_hugepage_khugepaged_gfpmask() :
                     GFP_TRANSHUGE);
        int node = hpage_collapse_find_target_node(cc);
+       struct folio *folio;
 
        if (!hpage_collapse_alloc_page(hpage, gfp, node, &cc->alloc_nmask))
                return SCAN_ALLOC_HUGE_PAGE_FAIL;
-       if (unlikely(mem_cgroup_charge(page_folio(*hpage), mm, gfp)))
+
+       folio = page_folio(*hpage);
+       if (unlikely(mem_cgroup_charge(folio, mm, gfp))) {
+               folio_put(folio);
+               *hpage = NULL;
                return SCAN_CGROUP_CHARGE_FAIL;
+       }
        count_memcg_page_event(*hpage, THP_COLLAPSE_ALLOC);
+
        return SCAN_SUCCEED;
 }
 
Quoted 4 lines
Quoted 3 lines

--
2.39.1

Thanks, Peter.

Can we also get rid of the unnecessary mem_cgroup_uncharge() calls while we're at it? Maybe this deserves a separate patch, but after Yang's cleanup of the !NUMA case (where we would preallocate a hugepage) we can depend on put_page() do take care of that for us.

Regardless, can have my

author
#3 lore raw
Quoted 55 lines · Zach O'Keefe
Quoted 49 lines · Yang Shi
Quoted 8 lines · Peter Xu

If memory charge failed, instead of returning the hpage but with an error, allow the function to cleanup the folio properly, which is normally what a function should do in this case - either return successfully, or return with no side effect of partial runs with an indicated error.

This will also avoid the caller calling mem_cgroup_uncharge() unnecessarily with either anon or shmem path (even if it's safe to do so).

Thanks for the cleanup. Reviewed-by: Yang Shi <[email protected]>

Quoted 37 lines

---
v1->v2:
- Enhance commit message, drop "Fixes:" and "Cc: stable" tag, add R-bs.

---
 mm/khugepaged.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
mm/khugepaged.c +8 -1
index 8dbc39896811..941d1c7ea910 100644
@@ -1063,12 +1063,19 @@ static int alloc_charge_hpage(struct page **hpage, struct mm_struct *mm,
        gfp_t gfp = (cc->is_khugepaged ? alloc_hugepage_khugepaged_gfpmask() :
                     GFP_TRANSHUGE);
        int node = hpage_collapse_find_target_node(cc);
+       struct folio *folio;
 
        if (!hpage_collapse_alloc_page(hpage, gfp, node, &cc->alloc_nmask))
                return SCAN_ALLOC_HUGE_PAGE_FAIL;
-       if (unlikely(mem_cgroup_charge(page_folio(*hpage), mm, gfp)))
+
+       folio = page_folio(*hpage);
+       if (unlikely(mem_cgroup_charge(folio, mm, gfp))) {
+               folio_put(folio);
+               *hpage = NULL;
                return SCAN_CGROUP_CHARGE_FAIL;
+       }
        count_memcg_page_event(*hpage, THP_COLLAPSE_ALLOC);
+
        return SCAN_SUCCEED;
 }
 
Quoted 4 lines
Quoted 3 lines

--
2.39.1

Quoted 6 lines

Thanks, Peter.

Can we also get rid of the unnecessary mem_cgroup_uncharge() calls while we're at it? Maybe this deserves a separate patch, but after Yang's cleanup of the !NUMA case (where we would preallocate a hugepage) we can depend on put_page() do take care of that for us.

Makes sense to me. I can prepare a separate patch to clean it up.

Quoted 4 lines

Regardless, can have my

Thanks!

Signature · 1 line
Peter Xu