From: Michal Hocko <mhocko@suse.cz>
To: Johannes Weiner <hannes@cmpxchg.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
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 06/11] mm: memcg: move swapin charge functions above callsites
Date: Mon, 9 Jul 2012 17:10:30 +0200 [thread overview]
Message-ID: <20120709151029.GI4627@tiehlicka.suse.cz> (raw)
In-Reply-To: <1341449103-1986-7-git-send-email-hannes@cmpxchg.org>
On Thu 05-07-12 02:44:58, Johannes Weiner wrote:
> Charging cache pages may require swapin in the shmem case. Save the
> forward declaration and just move the swapin functions above the cache
> charging functions.
>
> Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
OK
Acked-by: Michal Hocko <mhocko@suse.cz>
> ---
> mm/memcontrol.c | 68 +++++++++++++++++++++++++-----------------------------
> 1 files changed, 32 insertions(+), 36 deletions(-)
>
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 3d56b4e..4a41b55 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -2729,37 +2729,6 @@ int mem_cgroup_newpage_charge(struct page *page,
> MEM_CGROUP_CHARGE_TYPE_ANON);
> }
>
> -static void
> -__mem_cgroup_commit_charge_swapin(struct page *page, struct mem_cgroup *ptr,
> - enum charge_type ctype);
> -
> -int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm,
> - gfp_t gfp_mask)
> -{
> - struct mem_cgroup *memcg = NULL;
> - enum charge_type type = MEM_CGROUP_CHARGE_TYPE_CACHE;
> - int ret;
> -
> - if (mem_cgroup_disabled())
> - return 0;
> - if (PageCompound(page))
> - return 0;
> -
> - if (unlikely(!mm))
> - mm = &init_mm;
> - if (!page_is_file_cache(page))
> - type = MEM_CGROUP_CHARGE_TYPE_SHMEM;
> -
> - if (!PageSwapCache(page))
> - ret = mem_cgroup_charge_common(page, mm, gfp_mask, type);
> - else { /* page is swapcache/shmem */
> - ret = mem_cgroup_try_charge_swapin(mm, page, gfp_mask, &memcg);
> - if (!ret)
> - __mem_cgroup_commit_charge_swapin(page, memcg, type);
> - }
> - return ret;
> -}
> -
> /*
> * While swap-in, try_charge -> commit or cancel, the page is locked.
> * And when try_charge() successfully returns, one refcnt to memcg without
> @@ -2806,6 +2775,15 @@ int mem_cgroup_try_charge_swapin(struct mm_struct *mm,
> return ret;
> }
>
> +void mem_cgroup_cancel_charge_swapin(struct mem_cgroup *memcg)
> +{
> + if (mem_cgroup_disabled())
> + return;
> + if (!memcg)
> + return;
> + __mem_cgroup_cancel_charge(memcg, 1);
> +}
> +
> static void
> __mem_cgroup_commit_charge_swapin(struct page *page, struct mem_cgroup *memcg,
> enum charge_type ctype)
> @@ -2843,13 +2821,31 @@ void mem_cgroup_commit_charge_swapin(struct page *page,
> MEM_CGROUP_CHARGE_TYPE_ANON);
> }
>
> -void mem_cgroup_cancel_charge_swapin(struct mem_cgroup *memcg)
> +int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm,
> + gfp_t gfp_mask)
> {
> + struct mem_cgroup *memcg = NULL;
> + enum charge_type type = MEM_CGROUP_CHARGE_TYPE_CACHE;
> + int ret;
> +
> if (mem_cgroup_disabled())
> - return;
> - if (!memcg)
> - return;
> - __mem_cgroup_cancel_charge(memcg, 1);
> + return 0;
> + if (PageCompound(page))
> + return 0;
> +
> + if (unlikely(!mm))
> + mm = &init_mm;
> + if (!page_is_file_cache(page))
> + type = MEM_CGROUP_CHARGE_TYPE_SHMEM;
> +
> + if (!PageSwapCache(page))
> + ret = mem_cgroup_charge_common(page, mm, gfp_mask, type);
> + else { /* page is swapcache/shmem */
> + ret = mem_cgroup_try_charge_swapin(mm, page, gfp_mask, &memcg);
> + if (!ret)
> + __mem_cgroup_commit_charge_swapin(page, memcg, type);
> + }
> + return ret;
> }
>
> static void mem_cgroup_do_uncharge(struct mem_cgroup *memcg,
> --
> 1.7.7.6
>
--
Michal Hocko
SUSE Labs
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9
Czech Republic
--
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 15:10 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
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 [this message]
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=20120709151029.GI4627@tiehlicka.suse.cz \
--to=mhocko@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=hannes@cmpxchg.org \
--cc=hughd@google.com \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--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