From: Johannes Weiner <hannes@cmpxchg.org>
To: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
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: Re: [patch 04/11] mm: memcg: push down PageSwapCache check into uncharge entry functions
Date: Mon, 9 Jul 2012 09:36:14 +0200 [thread overview]
Message-ID: <20120709073614.GB1779@cmpxchg.org> (raw)
In-Reply-To: <4FFA4504.4040408@jp.fujitsu.com>
On Mon, Jul 09, 2012 at 11:42:12AM +0900, Kamezawa Hiroyuki wrote:
> (2012/07/05 9:44), Johannes Weiner wrote:
> > @@ -3278,10 +3283,11 @@ void mem_cgroup_end_migration(struct mem_cgroup *memcg,
> > unused = oldpage;
> > }
> > anon = PageAnon(used);
> > - __mem_cgroup_uncharge_common(unused,
> > - anon ? MEM_CGROUP_CHARGE_TYPE_ANON
> > - : MEM_CGROUP_CHARGE_TYPE_CACHE,
> > - true);
> > + if (!PageSwapCache(page))
> > + __mem_cgroup_uncharge_common(unused,
> > + anon ? MEM_CGROUP_CHARGE_TYPE_ANON
> > + : MEM_CGROUP_CHARGE_TYPE_CACHE,
> > + true);
>
> !PageSwapCache(unused) ?
Argh, right.
> But I think unused page's PG_swapcache is always dropped. So, the check is
> not necessary.
Oh, this is intentional: the check was in __mem_cgroup_uncharge_common
before, which means it applied to this entry point as well. This is
supposed to be a mechanical change that does not change any logic.
The check is then removed in the next patch.
---
Subject: mm: memcg: push down PageSwapCache check into uncharge entry functions fix
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
---
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index a3bf414..f4ff18a 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -3283,7 +3283,7 @@ void mem_cgroup_end_migration(struct mem_cgroup *memcg,
unused = oldpage;
}
anon = PageAnon(used);
- if (!PageSwapCache(page))
+ if (!PageSwapCache(unused))
__mem_cgroup_uncharge_common(unused,
anon ? MEM_CGROUP_CHARGE_TYPE_ANON
: MEM_CGROUP_CHARGE_TYPE_CACHE,
--
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-09 7:36 UTC|newest]
Thread overview: 45+ 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 ` [patch 01/11] mm: memcg: fix compaction/migration failing due to memcg limits Johannes Weiner
2012-07-09 2:27 ` Kamezawa Hiroyuki
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-09 2:29 ` Kamezawa Hiroyuki
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-09 2:33 ` Kamezawa Hiroyuki
2012-07-09 14:46 ` Michal Hocko
2012-07-09 20:37 ` Hugh Dickins
2012-07-10 17:16 ` Michal Hocko
2012-07-11 18:48 ` Hugh Dickins
2012-07-12 13:51 ` Michal Hocko
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-09 2:42 ` Kamezawa Hiroyuki
2012-07-09 7:36 ` Johannes Weiner [this message]
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-09 2:49 ` Kamezawa Hiroyuki
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-09 2:50 ` Kamezawa Hiroyuki
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-09 2:51 ` Kamezawa Hiroyuki
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-09 2:53 ` Kamezawa Hiroyuki
2012-07-09 15:20 ` Michal Hocko
2012-07-10 6:10 ` Wanpeng Li
2012-07-10 6:21 ` Michal Hocko
2012-07-10 6:54 ` Wanpeng Li
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-09 2:55 ` Kamezawa Hiroyuki
2012-07-09 15:28 ` Michal Hocko
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 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-09 3:44 ` Kamezawa Hiroyuki
2012-07-09 15:34 ` Michal Hocko
2012-07-09 15:35 ` [patch 00/11] mm: memcg: charge/uncharge improvements 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=20120709073614.GB1779@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox