[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240821074541.516249-2-hanchuanhua@oppo.com>
Date: Wed, 21 Aug 2024 15:45:39 +0800
From: <hanchuanhua@...o.com>
To: <akpm@...ux-foundation.org>, <linux-mm@...ck.org>
CC: <baolin.wang@...ux.alibaba.com>, <chrisl@...nel.org>, <david@...hat.com>,
<hannes@...xchg.org>, <hughd@...gle.com>, <kaleshsingh@...gle.com>,
<kasong@...cent.com>, <linux-kernel@...r.kernel.org>, <mhocko@...e.com>,
<minchan@...nel.org>, <nphamcs@...il.com>, <ryan.roberts@....com>,
<senozhatsky@...omium.org>, <shakeel.butt@...ux.dev>, <shy828301@...il.com>,
<surenb@...gle.com>, <v-songbaohua@...o.com>, <willy@...radead.org>,
<xiang@...nel.org>, <ying.huang@...el.com>, <yosryahmed@...gle.com>,
<hch@...radead.org>, <ryncsn@...il.com>, Chuanhua Han <hanchuanhua@...o.com>
Subject: [PATCH v7 1/2] mm: add nr argument in mem_cgroup_swapin_uncharge_swap() helper to support large folios
From: Barry Song <v-songbaohua@...o.com>
With large folios swap-in, we might need to uncharge multiple entries
all together, add nr argument in mem_cgroup_swapin_uncharge_swap().
For the existing two users, just pass nr=1.
Signed-off-by: Barry Song <v-songbaohua@...o.com>
Signed-off-by: Chuanhua Han <hanchuanhua@...o.com>
Acked-by: Chris Li <chrisl@...nel.org>
---
include/linux/memcontrol.h | 5 +++--
mm/memcontrol.c | 7 ++++---
mm/memory.c | 2 +-
mm/swap_state.c | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index fe05fdb92779..780120f7b9dd 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -699,7 +699,8 @@ int mem_cgroup_hugetlb_try_charge(struct mem_cgroup *memcg, gfp_t gfp,
int mem_cgroup_swapin_charge_folio(struct folio *folio, struct mm_struct *mm,
gfp_t gfp, swp_entry_t entry);
-void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry);
+
+void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry, unsigned int nr_pages);
void __mem_cgroup_uncharge(struct folio *folio);
@@ -1206,7 +1207,7 @@ static inline int mem_cgroup_swapin_charge_folio(struct folio *folio,
return 0;
}
-static inline void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry)
+static inline void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry, unsigned int nr)
{
}
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 42c826eec124..fd74a20f23a7 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -4574,14 +4574,15 @@ int mem_cgroup_swapin_charge_folio(struct folio *folio, struct mm_struct *mm,
/*
* mem_cgroup_swapin_uncharge_swap - uncharge swap slot
- * @entry: swap entry for which the page is charged
+ * @entry: the first swap entry for which the pages are charged
+ * @nr_pages: number of pages which will be uncharged
*
* Call this function after successfully adding the charged page to swapcache.
*
* Note: This function assumes the page for which swap slot is being uncharged
* is order 0 page.
*/
-void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry)
+void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry, unsigned int nr_pages)
{
/*
* Cgroup1's unified memory+swap counter has been charged with the
@@ -4601,7 +4602,7 @@ void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry)
* let's not wait for it. The page already received a
* memory+swap charge, drop the swap entry duplicate.
*/
- mem_cgroup_uncharge_swap(entry, 1);
+ mem_cgroup_uncharge_swap(entry, nr_pages);
}
}
diff --git a/mm/memory.c b/mm/memory.c
index 93c0c25433d0..b9fe2f354878 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -4101,7 +4101,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
ret = VM_FAULT_OOM;
goto out_page;
}
- mem_cgroup_swapin_uncharge_swap(entry);
+ mem_cgroup_swapin_uncharge_swap(entry, 1);
shadow = get_shadow_from_swap_cache(entry);
if (shadow)
diff --git a/mm/swap_state.c b/mm/swap_state.c
index a042720554a7..4669f29cf555 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -522,7 +522,7 @@ struct folio *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
if (add_to_swap_cache(new_folio, entry, gfp_mask & GFP_RECLAIM_MASK, &shadow))
goto fail_unlock;
- mem_cgroup_swapin_uncharge_swap(entry);
+ mem_cgroup_swapin_uncharge_swap(entry, 1);
if (shadow)
workingset_refault(new_folio, shadow);
--
2.43.0
Powered by blists - more mailing lists