From: Johannes Weiner <hannes@cmpxchg.org> To: Andrew Morton <akpm@linux-foundation.org> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>, Michal Hocko <mhocko@suse.cz>, Hugh Dickins <hughd@google.com>, David Rientjes <rientjes@google.com>, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [patch 10/11] mm: memcg: only check swap cache pages for repeated charging Date: Thu, 5 Jul 2012 02:45:02 +0200 [thread overview] Message-ID: <1341449103-1986-11-git-send-email-hannes@cmpxchg.org> (raw) In-Reply-To: <1341449103-1986-1-git-send-email-hannes@cmpxchg.org> Only anon and shmem pages in the swap cache are attempted to be charged multiple times, from every swap pte fault or from shmem_unuse(). No other pages require checking PageCgroupUsed(). Charging pages in the swap cache is also serialized by the page lock, and since both the try_charge and commit_charge are called under the same page lock section, the PageCgroupUsed() check might as well happen before the counter charging, let alone reclaim. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> --- mm/memcontrol.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index a8bf86a..d3701cd 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2471,11 +2471,7 @@ static void __mem_cgroup_commit_charge(struct mem_cgroup *memcg, bool anon; lock_page_cgroup(pc); - if (unlikely(PageCgroupUsed(pc))) { - unlock_page_cgroup(pc); - __mem_cgroup_cancel_charge(memcg, nr_pages); - return; - } + VM_BUG_ON(PageCgroupUsed(pc)); /* * we don't need page_cgroup_lock about tail pages, becase they are not * accessed by any other context at this point. @@ -2740,8 +2736,19 @@ static int __mem_cgroup_try_charge_swapin(struct mm_struct *mm, struct mem_cgroup **memcgp) { struct mem_cgroup *memcg; + struct page_cgroup *pc; int ret; + pc = lookup_page_cgroup(page); + /* + * Every swap fault against a single page tries to charge the + * page, bail as early as possible. shmem_unuse() encounters + * already charged pages, too. The USED bit is protected by + * the page lock, which serializes swap cache removal, which + * in turn serializes uncharging. + */ + if (PageCgroupUsed(pc)) + return 0; if (!do_swap_account) goto charge_cur_mm; /* -- 1.7.7.6
WARNING: multiple messages have this Message-ID (diff)
From: Johannes Weiner <hannes@cmpxchg.org> To: Andrew Morton <akpm@linux-foundation.org> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>, Michal Hocko <mhocko@suse.cz>, Hugh Dickins <hughd@google.com>, David Rientjes <rientjes@google.com>, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [patch 10/11] mm: memcg: only check swap cache pages for repeated charging Date: Thu, 5 Jul 2012 02:45:02 +0200 [thread overview] Message-ID: <1341449103-1986-11-git-send-email-hannes@cmpxchg.org> (raw) In-Reply-To: <1341449103-1986-1-git-send-email-hannes@cmpxchg.org> Only anon and shmem pages in the swap cache are attempted to be charged multiple times, from every swap pte fault or from shmem_unuse(). No other pages require checking PageCgroupUsed(). Charging pages in the swap cache is also serialized by the page lock, and since both the try_charge and commit_charge are called under the same page lock section, the PageCgroupUsed() check might as well happen before the counter charging, let alone reclaim. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> --- mm/memcontrol.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index a8bf86a..d3701cd 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2471,11 +2471,7 @@ static void __mem_cgroup_commit_charge(struct mem_cgroup *memcg, bool anon; lock_page_cgroup(pc); - if (unlikely(PageCgroupUsed(pc))) { - unlock_page_cgroup(pc); - __mem_cgroup_cancel_charge(memcg, nr_pages); - return; - } + VM_BUG_ON(PageCgroupUsed(pc)); /* * we don't need page_cgroup_lock about tail pages, becase they are not * accessed by any other context at this point. @@ -2740,8 +2736,19 @@ static int __mem_cgroup_try_charge_swapin(struct mm_struct *mm, struct mem_cgroup **memcgp) { struct mem_cgroup *memcg; + struct page_cgroup *pc; int ret; + pc = lookup_page_cgroup(page); + /* + * Every swap fault against a single page tries to charge the + * page, bail as early as possible. shmem_unuse() encounters + * already charged pages, too. The USED bit is protected by + * the page lock, which serializes swap cache removal, which + * in turn serializes uncharging. + */ + if (PageCgroupUsed(pc)) + return 0; if (!do_swap_account) goto charge_cur_mm; /* -- 1.7.7.6 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2012-07-05 0:46 UTC|newest] Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-07-05 0:44 [patch 00/11] mm: memcg: charge/uncharge improvements Johannes Weiner 2012-07-05 0:44 ` Johannes Weiner 2012-07-05 0:44 ` Johannes Weiner 2012-07-05 0:44 ` [patch 01/11] mm: memcg: fix compaction/migration failing due to memcg limits Johannes Weiner 2012-07-05 0:44 ` Johannes Weiner 2012-07-09 2:27 ` Kamezawa Hiroyuki 2012-07-09 2:27 ` Kamezawa Hiroyuki 2012-07-09 2:27 ` Kamezawa Hiroyuki 2012-07-09 14:15 ` Michal Hocko 2012-07-09 14:15 ` Michal Hocko 2012-07-09 14:15 ` Michal Hocko 2012-07-05 0:44 ` [patch 02/11] mm: swapfile: clean up unuse_pte race handling Johannes Weiner 2012-07-05 0:44 ` Johannes Weiner 2012-07-09 2:29 ` Kamezawa Hiroyuki 2012-07-09 2:29 ` Kamezawa Hiroyuki 2012-07-09 14:22 ` Michal Hocko 2012-07-09 14:22 ` Michal Hocko 2012-07-09 14:22 ` Michal Hocko 2012-07-05 0:44 ` [patch 03/11] mm: shmem: do not try to uncharge known swapcache pages Johannes Weiner 2012-07-05 0:44 ` Johannes Weiner 2012-07-09 2:33 ` Kamezawa Hiroyuki 2012-07-09 2:33 ` Kamezawa Hiroyuki 2012-07-09 14:46 ` Michal Hocko 2012-07-09 14:46 ` Michal Hocko 2012-07-09 20:37 ` Hugh Dickins 2012-07-09 20:37 ` Hugh Dickins 2012-07-10 17:16 ` Michal Hocko 2012-07-10 17:16 ` Michal Hocko 2012-07-10 17:16 ` Michal Hocko 2012-07-11 18:48 ` Hugh Dickins 2012-07-11 18:48 ` Hugh Dickins 2012-07-11 18:48 ` Hugh Dickins 2012-07-12 13:51 ` Michal Hocko 2012-07-12 13:51 ` Michal Hocko 2012-07-09 20:11 ` Hugh Dickins 2012-07-09 20:11 ` Hugh Dickins 2012-07-09 20:11 ` Hugh Dickins 2012-07-05 0:44 ` [patch 04/11] mm: memcg: push down PageSwapCache check into uncharge entry functions Johannes Weiner 2012-07-05 0:44 ` Johannes Weiner 2012-07-09 2:42 ` Kamezawa Hiroyuki 2012-07-09 2:42 ` Kamezawa Hiroyuki 2012-07-09 2:42 ` Kamezawa Hiroyuki 2012-07-09 7:36 ` Johannes Weiner 2012-07-09 7:36 ` Johannes Weiner 2012-07-09 7:36 ` Johannes Weiner 2012-07-09 15:02 ` Michal Hocko 2012-07-09 15:02 ` Michal Hocko 2012-07-09 15:02 ` Michal Hocko 2012-07-05 0:44 ` [patch 05/11] mm: memcg: only check for PageSwapCache when uncharging anon Johannes Weiner 2012-07-05 0:44 ` Johannes Weiner 2012-07-09 2:49 ` Kamezawa Hiroyuki 2012-07-09 2:49 ` Kamezawa Hiroyuki 2012-07-09 2:49 ` Kamezawa Hiroyuki 2012-07-09 15:05 ` Michal Hocko 2012-07-09 15:05 ` Michal Hocko 2012-07-05 0:44 ` [patch 06/11] mm: memcg: move swapin charge functions above callsites Johannes Weiner 2012-07-05 0:44 ` Johannes Weiner 2012-07-09 2:50 ` Kamezawa Hiroyuki 2012-07-09 2:50 ` Kamezawa Hiroyuki 2012-07-09 2:50 ` Kamezawa Hiroyuki 2012-07-09 15:10 ` Michal Hocko 2012-07-09 15:10 ` Michal Hocko 2012-07-05 0:44 ` [patch 07/11] mm: memcg: remove unneeded shmem charge type Johannes Weiner 2012-07-05 0:44 ` Johannes Weiner 2012-07-09 2:51 ` Kamezawa Hiroyuki 2012-07-09 2:51 ` Kamezawa Hiroyuki 2012-07-09 15:17 ` Michal Hocko 2012-07-09 15:17 ` Michal Hocko 2012-07-09 15:17 ` Michal Hocko 2012-07-05 0:45 ` [patch 08/11] mm: memcg: remove needless !mm fixup to init_mm when charging Johannes Weiner 2012-07-05 0:45 ` Johannes Weiner 2012-07-09 2:53 ` Kamezawa Hiroyuki 2012-07-09 2:53 ` Kamezawa Hiroyuki 2012-07-09 15:20 ` Michal Hocko 2012-07-09 15:20 ` Michal Hocko 2012-07-09 15:20 ` Michal Hocko 2012-07-10 6:10 ` Wanpeng Li 2012-07-10 6:10 ` Wanpeng Li 2012-07-10 6:10 ` Wanpeng Li 2012-07-10 6:21 ` Michal Hocko 2012-07-10 6:21 ` Michal Hocko 2012-07-10 6:21 ` Michal Hocko 2012-07-10 6:54 ` Wanpeng Li 2012-07-10 6:54 ` Wanpeng Li 2012-07-10 16:22 ` Michal Hocko 2012-07-10 16:22 ` Michal Hocko 2012-07-10 16:22 ` Michal Hocko 2012-07-05 0:45 ` [patch 09/11] mm: memcg: split swapin charge function into private and public part Johannes Weiner 2012-07-05 0:45 ` Johannes Weiner 2012-07-09 2:55 ` Kamezawa Hiroyuki 2012-07-09 2:55 ` Kamezawa Hiroyuki 2012-07-09 2:55 ` Kamezawa Hiroyuki 2012-07-09 15:28 ` Michal Hocko 2012-07-09 15:28 ` Michal Hocko 2012-07-09 15:28 ` Michal Hocko 2012-07-05 0:45 ` Johannes Weiner [this message] 2012-07-05 0:45 ` [patch 10/11] mm: memcg: only check swap cache pages for repeated charging Johannes Weiner 2012-07-09 3:26 ` Kamezawa Hiroyuki 2012-07-09 3:26 ` Kamezawa Hiroyuki 2012-07-09 15:32 ` Michal Hocko 2012-07-09 15:32 ` Michal Hocko 2012-07-05 0:45 ` [patch 11/11] mm: memcg: only check anon swapin page charges for swap cache Johannes Weiner 2012-07-05 0:45 ` Johannes Weiner 2012-07-09 3:44 ` Kamezawa Hiroyuki 2012-07-09 3:44 ` Kamezawa Hiroyuki 2012-07-09 3:44 ` Kamezawa Hiroyuki 2012-07-09 15:34 ` Michal Hocko 2012-07-09 15:34 ` Michal Hocko 2012-07-09 15:34 ` Michal Hocko 2012-07-09 15:35 ` [patch 00/11] mm: memcg: charge/uncharge improvements Michal Hocko 2012-07-09 15:35 ` Michal Hocko 2012-07-09 15:35 ` Michal Hocko
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1341449103-1986-11-git-send-email-hannes@cmpxchg.org \ --to=hannes@cmpxchg.org \ --cc=akpm@linux-foundation.org \ --cc=cgroups@vger.kernel.org \ --cc=hughd@google.com \ --cc=kamezawa.hiroyu@jp.fujitsu.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mhocko@suse.cz \ --cc=rientjes@google.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.