mm/khugepaged: Cleanup memcg uncharge for failure path
Subsystems (2)
PATCH 1/1 mm/khugepaged: Cleanup memcg uncharge for failure path
Explicit memcg uncharging is not needed when the memcg accounting has the same lifespan of the page/folio. That becomes the case for khugepaged after Yang & Zach's recent rework so the hpage will be allocated for each collapse rather than being cached.
Cleanup the explicit memcg uncharge in khugepaged failure path and leave that for put_page().
--- mm/khugepaged.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
mm/khugepaged.c +2 -6
@@ -1230,10 +1230,8 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, out_up_write:mmap_write_unlock (mm); out_nolock: -if (hpage) { -mem_cgroup_uncharge (page_folio (hpage)); +if (hpage)put_page (hpage); - }trace_mm_collapse_huge_page (mm, result ==SCAN_SUCCEED , result);return result; }
@@ -2250,10 +2248,8 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr,unlock_page (hpage); out:VM_BUG_ON (!list_empty (&pagelist)); -if (hpage) { -mem_cgroup_uncharge (page_folio (hpage)); +if (hpage)put_page (hpage); - }trace_mm_khugepaged_collapse_file (mm, hpage, index, is_shmem, addr, file, nr, result);return result;
Signature · 1 line
2.39.1
Thanks Peter!
Quoted 10 lines · Peter Xu
Explicit memcg uncharging is not needed when the memcg accounting has the same lifespan of the page/folio. That becomes the case for khugepaged after Yang & Zach's recent rework so the hpage will be allocated for each collapse rather than being cached.
Cleanup the explicit memcg uncharge in khugepaged failure path and leave that for
put_page().Suggested-by Zach O'Keefe <[email protected]>Signed-off-by Peter Xu <[email protected]>
Quoted 35 lines
--- mm/khugepaged.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)mm/khugepaged.c +2
-6@@ -1230,10 +1230,8 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, out_up_write:mmap_write_unlock (mm); out_nolock: -if (hpage) { -mem_cgroup_uncharge (page_folio (hpage)); +if (hpage)put_page (hpage); - }trace_mm_collapse_huge_page (mm, result ==SCAN_SUCCEED , result);return result; }@@ -2250,10 +2248,8 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr,unlock_page (hpage); out:VM_BUG_ON (!list_empty (&pagelist)); -if (hpage) { -mem_cgroup_uncharge (page_folio (hpage)); +if (hpage)put_page (hpage); - }trace_mm_khugepaged_collapse_file (mm, hpage, index, is_shmem, addr, file, nr, result);return result;Signature · 1 line
2.39.1
Quoted 8 lines · Peter Xu
Explicit memcg uncharging is not needed when the memcg accounting has the same lifespan of the page/folio. That becomes the case for khugepaged after Yang & Zach's recent rework so the hpage will be allocated for each collapse rather than being cached.
Cleanup the explicit memcg uncharge in khugepaged failure path and leave that for
put_page().
Thanks for the cleanup. Reviewed-by: Yang Shi <[email protected]>
Quoted 38 lines
Suggested-by Zach O'Keefe <[email protected]>Signed-off-by Peter Xu <[email protected]>--- mm/khugepaged.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)mm/khugepaged.c +2
-7@@ -1230,10 +1230,8 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, out_up_write:mmap_write_unlock (mm); out_nolock: -if (hpage) { -mem_cgroup_uncharge (page_folio (hpage)); +if (hpage)put_page (hpage); - }trace_mm_collapse_huge_page (mm, result ==SCAN_SUCCEED , result);return result; }@@ -2250,10 +2248,8 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr,unlock_page (hpage); out:VM_BUG_ON (!list_empty (&pagelist)); -if (hpage) { -mem_cgroup_uncharge (page_folio (hpage)); +if (hpage)put_page (hpage); - }trace_mm_khugepaged_collapse_file (mm, hpage, index, is_shmem, addr, file, nr, result);return result; --2.39.1