From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> To: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: "linux-mm@kvack.org" <linux-mm@kvack.org>, "cgroups@vger.kernel.org" <cgroups@vger.kernel.org>, Michal Hocko <mhocko@suse.cz>, Johannes Weiner <hannes@cmpxchg.org>, Tejun Heo <tj@kernel.org>, Glauber Costa <glommer@parallels.com>, Hugh Dickins <hughd@google.com>, Andrew Morton <akpm@linux-foundation.org> Subject: [PATCH 4/7] memcg: remove 'uncharge' argument from mem_cgroup_move_account() Date: Thu, 12 Apr 2012 20:24:14 +0900 [thread overview] Message-ID: <4F86BB5E.6080509@jp.fujitsu.com> (raw) In-Reply-To: <4F86B9BE.8000105@jp.fujitsu.com> Only one call passes 'true'. remove it and handle it in caller. Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> --- mm/memcontrol.c | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 8246418..9ac7984 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2576,23 +2576,19 @@ void mem_cgroup_split_huge_fixup(struct page *head) * @pc: page_cgroup of the page. * @from: mem_cgroup which the page is moved from. * @to: mem_cgroup which the page is moved to. @from != @to. - * @uncharge: whether we should call uncharge and css_put against @from. * * The caller must confirm following. * - page is not on LRU (isolate_page() is useful.) * - compound_lock is held when nr_pages > 1 * - * This function doesn't do "charge" nor css_get to new cgroup. It should be - * done by a caller(__mem_cgroup_try_charge would be useful). If @uncharge is - * true, this function does "uncharge" from old cgroup, but it doesn't if - * @uncharge is false, so a caller should do "uncharge". + * This function doesn't access res_counter at all. Caller should take + * care of it. */ static int mem_cgroup_move_account(struct page *page, unsigned int nr_pages, struct page_cgroup *pc, struct mem_cgroup *from, - struct mem_cgroup *to, - bool uncharge) + struct mem_cgroup *to) { unsigned long flags; int ret; @@ -2626,9 +2622,6 @@ static int mem_cgroup_move_account(struct page *page, preempt_enable(); } mem_cgroup_charge_statistics(from, anon, -nr_pages); - if (uncharge) - /* This is not "cancel", but cancel_charge does all we need. */ - __mem_cgroup_cancel_charge(from, nr_pages); /* caller should have done css_get */ pc->mem_cgroup = to; @@ -2688,10 +2681,13 @@ static int mem_cgroup_move_parent(struct page *page, if (nr_pages > 1) flags = compound_lock_irqsave(page); - ret = mem_cgroup_move_account(page, nr_pages, pc, child, parent, - need_cancel); - if (!need_cancel && !ret) - __mem_cgroup_move_charge_parent(child, nr_pages); + ret = mem_cgroup_move_account(page, nr_pages, pc, child, parent); + if (!ret) { + if (need_cancel) + __mem_cgroup_cancel_charge(child, nr_pages); + else + __mem_cgroup_move_charge_parent(child, nr_pages); + } if (nr_pages > 1) compound_unlock_irqrestore(page, flags); @@ -5451,8 +5447,7 @@ static int mem_cgroup_move_charge_pte_range(pmd_t *pmd, if (!isolate_lru_page(page)) { pc = lookup_page_cgroup(page); if (!mem_cgroup_move_account(page, HPAGE_PMD_NR, - pc, mc.from, mc.to, - false)) { + pc, mc.from, mc.to)) { mc.precharge -= HPAGE_PMD_NR; mc.moved_charge += HPAGE_PMD_NR; } @@ -5482,7 +5477,7 @@ retry: goto put; pc = lookup_page_cgroup(page); if (!mem_cgroup_move_account(page, 1, pc, - mc.from, mc.to, false)) { + mc.from, mc.to)) { mc.precharge--; /* we uncharge from mc.from later. */ mc.moved_charge++; -- 1.7.4.1 -- 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/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
WARNING: multiple messages have this Message-ID (diff)
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org> To: KAMEZAWA Hiroyuki <kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org> Cc: "linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org" <linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org>, "cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" <cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>, Michal Hocko <mhocko-AlSwsSmVLrQ@public.gmane.org>, Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>, Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Glauber Costa <glommer-bzQdu9zFT3WakBO8gow8eQ@public.gmane.org>, Hugh Dickins <hughd-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>, Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org> Subject: [PATCH 4/7] memcg: remove 'uncharge' argument from mem_cgroup_move_account() Date: Thu, 12 Apr 2012 20:24:14 +0900 [thread overview] Message-ID: <4F86BB5E.6080509@jp.fujitsu.com> (raw) In-Reply-To: <4F86B9BE.8000105-+CUm20s59erQFUHtdCDX3A@public.gmane.org> Only one call passes 'true'. remove it and handle it in caller. Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org> --- mm/memcontrol.c | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 8246418..9ac7984 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2576,23 +2576,19 @@ void mem_cgroup_split_huge_fixup(struct page *head) * @pc: page_cgroup of the page. * @from: mem_cgroup which the page is moved from. * @to: mem_cgroup which the page is moved to. @from != @to. - * @uncharge: whether we should call uncharge and css_put against @from. * * The caller must confirm following. * - page is not on LRU (isolate_page() is useful.) * - compound_lock is held when nr_pages > 1 * - * This function doesn't do "charge" nor css_get to new cgroup. It should be - * done by a caller(__mem_cgroup_try_charge would be useful). If @uncharge is - * true, this function does "uncharge" from old cgroup, but it doesn't if - * @uncharge is false, so a caller should do "uncharge". + * This function doesn't access res_counter at all. Caller should take + * care of it. */ static int mem_cgroup_move_account(struct page *page, unsigned int nr_pages, struct page_cgroup *pc, struct mem_cgroup *from, - struct mem_cgroup *to, - bool uncharge) + struct mem_cgroup *to) { unsigned long flags; int ret; @@ -2626,9 +2622,6 @@ static int mem_cgroup_move_account(struct page *page, preempt_enable(); } mem_cgroup_charge_statistics(from, anon, -nr_pages); - if (uncharge) - /* This is not "cancel", but cancel_charge does all we need. */ - __mem_cgroup_cancel_charge(from, nr_pages); /* caller should have done css_get */ pc->mem_cgroup = to; @@ -2688,10 +2681,13 @@ static int mem_cgroup_move_parent(struct page *page, if (nr_pages > 1) flags = compound_lock_irqsave(page); - ret = mem_cgroup_move_account(page, nr_pages, pc, child, parent, - need_cancel); - if (!need_cancel && !ret) - __mem_cgroup_move_charge_parent(child, nr_pages); + ret = mem_cgroup_move_account(page, nr_pages, pc, child, parent); + if (!ret) { + if (need_cancel) + __mem_cgroup_cancel_charge(child, nr_pages); + else + __mem_cgroup_move_charge_parent(child, nr_pages); + } if (nr_pages > 1) compound_unlock_irqrestore(page, flags); @@ -5451,8 +5447,7 @@ static int mem_cgroup_move_charge_pte_range(pmd_t *pmd, if (!isolate_lru_page(page)) { pc = lookup_page_cgroup(page); if (!mem_cgroup_move_account(page, HPAGE_PMD_NR, - pc, mc.from, mc.to, - false)) { + pc, mc.from, mc.to)) { mc.precharge -= HPAGE_PMD_NR; mc.moved_charge += HPAGE_PMD_NR; } @@ -5482,7 +5477,7 @@ retry: goto put; pc = lookup_page_cgroup(page); if (!mem_cgroup_move_account(page, 1, pc, - mc.from, mc.to, false)) { + mc.from, mc.to)) { mc.precharge--; /* we uncharge from mc.from later. */ mc.moved_charge++; -- 1.7.4.1
next prev parent reply other threads:[~2012-04-12 11:26 UTC|newest] Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-04-12 11:17 [PATCH v1 0/7] memcg remove pre_destroy KAMEZAWA Hiroyuki 2012-04-12 11:20 ` [PATCH 1/7] res_counter: add a function res_counter_move_parent() KAMEZAWA Hiroyuki 2012-04-12 11:20 ` KAMEZAWA Hiroyuki 2012-04-12 13:22 ` Glauber Costa 2012-04-12 14:30 ` Frederic Weisbecker 2012-04-13 0:57 ` KAMEZAWA Hiroyuki 2012-04-13 0:57 ` KAMEZAWA Hiroyuki 2012-04-13 1:04 ` Frederic Weisbecker 2012-04-13 1:04 ` Frederic Weisbecker 2012-04-13 1:05 ` KAMEZAWA Hiroyuki 2012-04-16 22:19 ` Tejun Heo 2012-04-16 22:19 ` Tejun Heo 2012-04-18 6:59 ` KAMEZAWA Hiroyuki 2012-04-18 6:59 ` KAMEZAWA Hiroyuki 2012-04-16 22:31 ` Tejun Heo 2012-04-18 7:04 ` KAMEZAWA Hiroyuki 2012-04-18 7:04 ` KAMEZAWA Hiroyuki 2012-04-18 17:03 ` Tejun Heo 2012-04-18 17:03 ` Tejun Heo 2012-04-12 11:21 ` [PATCH 2/7] memcg: move charge to parent only when necessary KAMEZAWA Hiroyuki 2012-04-12 11:21 ` KAMEZAWA Hiroyuki 2012-04-16 22:21 ` Tejun Heo 2012-04-16 22:21 ` Tejun Heo 2012-04-18 7:01 ` KAMEZAWA Hiroyuki 2012-04-18 7:01 ` KAMEZAWA Hiroyuki 2012-04-12 11:22 ` [PATCH 3/7] memcg: move charges to root at rmdir() KAMEZAWA Hiroyuki 2012-04-12 11:22 ` KAMEZAWA Hiroyuki 2012-04-16 22:30 ` Tejun Heo 2012-04-16 22:30 ` Tejun Heo 2012-04-18 7:02 ` KAMEZAWA Hiroyuki 2012-04-12 11:24 ` KAMEZAWA Hiroyuki [this message] 2012-04-12 11:24 ` [PATCH 4/7] memcg: remove 'uncharge' argument from mem_cgroup_move_account() KAMEZAWA Hiroyuki 2012-04-12 13:27 ` Glauber Costa 2012-04-13 1:01 ` KAMEZAWA Hiroyuki 2012-04-12 11:28 ` [PATCH 5/7] memcg: divide force_empty into 2 functions, avoid memory reclaim at rmdir KAMEZAWA Hiroyuki 2012-04-12 11:28 ` KAMEZAWA Hiroyuki 2012-04-12 13:33 ` Glauber Costa 2012-04-17 17:29 ` Ying Han 2012-04-18 7:14 ` KAMEZAWA Hiroyuki 2012-04-18 7:14 ` KAMEZAWA Hiroyuki 2012-04-12 11:30 ` [PATCH 6/7] memcg: remove pre_destroy() KAMEZAWA Hiroyuki 2012-04-12 11:30 ` KAMEZAWA Hiroyuki 2012-04-16 22:38 ` Tejun Heo 2012-04-18 7:12 ` KAMEZAWA Hiroyuki 2012-04-18 7:12 ` KAMEZAWA Hiroyuki 2012-04-17 17:47 ` Ying Han 2012-04-17 17:47 ` Ying Han 2012-04-12 11:31 ` [PATCH 7/7] memcg: remove drain_all_stock_sync KAMEZAWA Hiroyuki 2012-04-12 11:31 ` KAMEZAWA Hiroyuki 2012-04-12 13:35 ` Glauber Costa 2012-04-12 13:35 ` Glauber Costa 2012-04-12 13:20 ` [PATCH v1 0/7] memcg remove pre_destroy Glauber Costa 2012-04-12 13:20 ` Glauber Costa 2012-04-12 16:06 ` Tejun Heo 2012-04-12 16:06 ` Tejun Heo 2012-04-12 18:57 ` Aneesh Kumar K.V 2012-04-12 18:57 ` Aneesh Kumar K.V 2012-04-12 23:59 ` KAMEZAWA Hiroyuki 2012-04-13 8:50 ` Michal Hocko 2012-04-13 8:50 ` Michal Hocko 2012-04-13 22:19 ` Aneesh Kumar K.V 2012-04-13 22:19 ` Aneesh Kumar K.V 2012-04-16 22:41 ` Tejun Heo 2012-04-16 22:41 ` Tejun Heo 2012-04-17 17:35 ` Ying Han 2012-04-18 7:15 ` KAMEZAWA Hiroyuki 2012-04-18 7:15 ` KAMEZAWA Hiroyuki
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=4F86BB5E.6080509@jp.fujitsu.com \ --to=kamezawa.hiroyu@jp.fujitsu.com \ --cc=akpm@linux-foundation.org \ --cc=cgroups@vger.kernel.org \ --cc=glommer@parallels.com \ --cc=hannes@cmpxchg.org \ --cc=hughd@google.com \ --cc=linux-mm@kvack.org \ --cc=mhocko@suse.cz \ --cc=tj@kernel.org \ /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.