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).

Link: https://lkml.kernel.org/r/20230222195247.791227-1-peterx@redhat.com
Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: David Stevens <stevensd@chromium.org>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Yang Shi <shy828301@gmail.com>
Reviewed-by: Zach O'Keefe <zokeefe@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 92e6f56..17562c6 100644 (file)
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -972,12 +972,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;
 }