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, Ingo Molnar <mingo@kernel.org>
Subject: Re: [patch 01/11] mm: memcg: fix compaction/migration failing due to memcg limits
Date: Mon, 9 Jul 2012 16:15:54 +0200 [thread overview]
Message-ID: <20120709141554.GD4627@tiehlicka.suse.cz> (raw)
In-Reply-To: <1341449103-1986-2-git-send-email-hannes@cmpxchg.org>
[CCing Ingo for the memcg-devel vs tip/sched/numa inter tree dependency
- see bellow]
On Thu 05-07-12 02:44:53, Johannes Weiner wrote:
> Compaction (and page migration in general) can currently be hindered
> through pages being owned by memory cgroups that are at their limits
> and unreclaimable.
>
> The reason is that the replacement page is being charged against the
> limit while the page being replaced is also still charged. But this
> seems unnecessary, given that only one of the two pages will still be
> in use after migration finishes.
>
> This patch changes the memcg migration sequence so that the
> replacement page is not charged. Whatever page is still in use after
> successful or failed migration gets to keep the charge of the page
> that was going to be replaced.
Could you mention the side effect on the stat vs charges discrepancy,
please?
> Reported-by: David Rientjes <rientjes@google.com>
> Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.cz>
[...]
> diff --git a/mm/migrate.c b/mm/migrate.c
> index 8137aea..aa06bf4 100644
> --- a/mm/migrate.c
> +++ b/mm/migrate.c
[...]
> @@ -1519,10 +1512,9 @@ migrate_misplaced_page(struct page *page, struct mm_struct *mm, int node)
> {
> struct page *oldpage = page, *newpage;
> struct address_space *mapping = page_mapping(page);
> - struct mem_cgroup *mcg;
> + struct mem_cgroup *memcg;
> unsigned int gfp;
> int rc = 0;
> - int charge = -ENOMEM;
>
> VM_BUG_ON(!PageLocked(page));
> VM_BUG_ON(page_mapcount(page));
> @@ -1556,12 +1548,7 @@ migrate_misplaced_page(struct page *page, struct mm_struct *mm, int node)
> if (!trylock_page(newpage))
> BUG(); /* new page should be unlocked!!! */
>
> - // XXX hnaz, is this right?
> - charge = mem_cgroup_prepare_migration(page, newpage, &mcg, gfp);
> - if (charge == -ENOMEM) {
> - rc = charge;
> - goto out;
> - }
> + mem_cgroup_prepare_migration(page, newpage, &memcg);
>
> newpage->index = page->index;
> newpage->mapping = page->mapping;
> @@ -1581,11 +1568,9 @@ migrate_misplaced_page(struct page *page, struct mm_struct *mm, int node)
> page = newpage;
> }
>
> + mem_cgroup_end_migration(memcg, oldpage, newpage, !rc);
> out:
> - if (!charge)
> - mem_cgroup_end_migration(mcg, oldpage, newpage, !rc);
> -
> - if (oldpage != page)
> + if (oldpage != page)
> put_page(oldpage);
>
> if (rc) {
Hmm, this depends on 4783af47 (mm: Migrate misplaced page) from
tip/sched/numa which adds an inter tree dependency which is quite
unfortunate from memcg-devel (aka mmotm git tree) tree POV.
I can cherry-pick this patch into memcg-devel but I am not sure what
is the merging status of the patch (XXX sounds like it is going to be
updated later). Ingo?
--
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 14:15 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 [this message]
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
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=20120709141554.GD4627@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=mingo@kernel.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