[PATCH -mm 10/13] memcg, THP, swap: Avoid to duplicated charge THP in swap cache

From	"Huang, Ying" <ying.huang@intel.com>
Newsgroups	linux.kernel
Subject	[PATCH -mm 10/13] memcg, THP, swap: Avoid to duplicated charge THP in swap cache
Date	2017-05-25 08:50 +0200
Message-ID	<tKUKR-4K0-1@gated-at.bofh.it> (permalink)
References	<tKUKR-4K0-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Huang Ying <ying.huang@intel.com>

For a THP (Transparent Huge Page), tail_page->mem_cgroup is NULL.  So
to check whether the page is charged already, we need to check the
head page.  This is not an issue before because it is impossible for a
THP to be in the swap cache before.  But after we add delaying
splitting THP after swapped out support, it is possible now.

Signed-off-by: "Huang, Ying" <ying.huang@intel.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>
---
 mm/memcontrol.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 1f36bb61a6de..7de1fa07f77d 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -5372,7 +5372,7 @@ int mem_cgroup_try_charge(struct page *page, struct mm_struct *mm,
 		 * in turn serializes uncharging.
 		 */
 		VM_BUG_ON_PAGE(!PageLocked(page), page);
-		if (page->mem_cgroup)
+		if (compound_head(page)->mem_cgroup)
 			goto out;
 
 		if (do_swap_account) {
-- 
2.11.0

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH -mm 10/13] memcg, THP, swap: Avoid to duplicated charge THP in swap cache "Huang, Ying" <ying.huang@intel.com> - 2017-05-25 08:50 +0200

csiph-web