Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754174AbaJUBIX (ORCPT ); Mon, 20 Oct 2014 21:08:23 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:39718 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754155AbaJUBIV (ORCPT ); Mon, 20 Oct 2014 21:08:21 -0400 X-SecurityPolicyCheck: OK by SHieldMailChecker v2.2.3 X-SHieldMailCheckerPolicyVersion: FJ-ISEC-20140219-2 Message-ID: <5445B1E8.1010100@jp.fujitsu.com> Date: Tue, 21 Oct 2014 10:07:52 +0900 From: Kamezawa Hiroyuki User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: Johannes Weiner , Andrew Morton CC: Hugh Dickins , Michal Hocko , Vladimir Davydov , , , Subject: Re: [patch 1/4] mm: memcontrol: uncharge pages on swapout References: <1413818532-11042-1-git-send-email-hannes@cmpxchg.org> <1413818532-11042-2-git-send-email-hannes@cmpxchg.org> In-Reply-To: <1413818532-11042-2-git-send-email-hannes@cmpxchg.org> Content-Type: text/plain; charset="ISO-2022-JP" Content-Transfer-Encoding: 7bit X-SecurityPolicyCheck-GC: OK by FENCE-Mail Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org (2014/10/21 0:22), Johannes Weiner wrote: > mem_cgroup_swapout() is called with exclusive access to the page at > the end of the page's lifetime. Instead of clearing the PCG_MEMSW > flag and deferring the uncharge, just do it right away. This allows > follow-up patches to simplify the uncharge code. > > Signed-off-by: Johannes Weiner > --- > mm/memcontrol.c | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index bea3fddb3372..7709f17347f3 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -5799,6 +5799,7 @@ static void __init enable_swap_cgroup(void) > */ > void mem_cgroup_swapout(struct page *page, swp_entry_t entry) > { > + struct mem_cgroup *memcg; > struct page_cgroup *pc; > unsigned short oldid; > > @@ -5815,13 +5816,21 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry) > return; > > VM_BUG_ON_PAGE(!(pc->flags & PCG_MEMSW), page); shouldn't be removed ? > + memcg = pc->mem_cgroup; > > - oldid = swap_cgroup_record(entry, mem_cgroup_id(pc->mem_cgroup)); > + oldid = swap_cgroup_record(entry, mem_cgroup_id(memcg)); > VM_BUG_ON_PAGE(oldid, page); > + mem_cgroup_swap_statistics(memcg, true); > > - pc->flags &= ~PCG_MEMSW; > - css_get(&pc->mem_cgroup->css); > - mem_cgroup_swap_statistics(pc->mem_cgroup, true); > + pc->flags = 0; > + > + if (!mem_cgroup_is_root(memcg)) > + page_counter_uncharge(&memcg->memory, 1); > + > + local_irq_disable(); > + mem_cgroup_charge_statistics(memcg, page, -1); > + memcg_check_events(memcg, page); > + local_irq_enable(); > } > Reviewed-by: KAMEZAWA Hiroyuki -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/