From: Johannes Weiner <hannes@cmpxchg.org>
To: linux-mm@kvack.org
Cc: Michal Hocko <mhocko@suse.cz>, Hugh Dickins <hughd@google.com>,
Tejun Heo <tj@kernel.org>,
cgroups@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [patch 2/9] mm: memcontrol: rearrange charging fast path
Date: Wed, 30 Apr 2014 16:25:36 -0400 [thread overview]
Message-ID: <1398889543-23671-3-git-send-email-hannes@cmpxchg.org> (raw)
In-Reply-To: <1398889543-23671-1-git-send-email-hannes@cmpxchg.org>
The charging path currently starts out with OOM condition checks when
OOM is the rarest possible case.
Rearrange this code to run OOM/task dying checks only after trying the
percpu charge and the res_counter charge and bail out before entering
reclaim. Attempting a charge does not hurt an (oom-)killed task as
much as every charge attempt having to check OOM conditions. Also,
only check __GFP_NOFAIL when the charge would actually fail.
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
---
mm/memcontrol.c | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 75dfeb8fa98b..6ce59146fec7 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2598,21 +2598,6 @@ static int mem_cgroup_try_charge(struct mem_cgroup *memcg,
if (mem_cgroup_is_root(memcg))
goto done;
- /*
- * Unlike in global OOM situations, memcg is not in a physical
- * memory shortage. Allow dying and OOM-killed tasks to
- * bypass the last charges so that they can exit quickly and
- * free their memory.
- */
- if (unlikely(test_thread_flag(TIF_MEMDIE) ||
- fatal_signal_pending(current)))
- goto bypass;
-
- if (unlikely(task_in_memcg_oom(current)))
- goto nomem;
-
- if (gfp_mask & __GFP_NOFAIL)
- oom = false;
retry:
if (consume_stock(memcg, nr_pages))
goto done;
@@ -2634,6 +2619,19 @@ retry:
goto retry;
}
+ /*
+ * Unlike in global OOM situations, memcg is not in a physical
+ * memory shortage. Allow dying and OOM-killed tasks to
+ * bypass the last charges so that they can exit quickly and
+ * free their memory.
+ */
+ if (unlikely(test_thread_flag(TIF_MEMDIE) ||
+ fatal_signal_pending(current)))
+ goto bypass;
+
+ if (unlikely(task_in_memcg_oom(current)))
+ goto nomem;
+
if (!(gfp_mask & __GFP_WAIT))
goto nomem;
@@ -2662,6 +2660,9 @@ retry:
if (mem_cgroup_wait_acct_move(mem_over_limit))
goto retry;
+ if (gfp_mask & __GFP_NOFAIL)
+ goto bypass;
+
if (fatal_signal_pending(current))
goto bypass;
--
1.9.2
next prev parent reply other threads:[~2014-04-30 20:28 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-30 20:25 [patch 0/9] mm: memcontrol: naturalize charge lifetime Johannes Weiner
2014-04-30 20:25 ` [patch 1/9] mm: memcontrol: fold mem_cgroup_do_charge() Johannes Weiner
2014-04-30 20:25 ` Johannes Weiner [this message]
2014-05-07 14:33 ` [patch 2/9] mm: memcontrol: rearrange charging fast path Michal Hocko
2014-05-08 18:22 ` Johannes Weiner
2014-05-12 7:59 ` Michal Hocko
2014-04-30 20:25 ` [patch 3/9] mm: memcontrol: retry reclaim for oom-disabled and __GFP_NOFAIL charges Johannes Weiner
2014-05-07 14:43 ` Michal Hocko
2014-05-08 18:28 ` Johannes Weiner
2014-04-30 20:25 ` [patch 4/9] mm: memcontrol: catch root bypass in move precharge Johannes Weiner
2014-05-07 14:55 ` Michal Hocko
2014-05-08 18:30 ` Johannes Weiner
2014-04-30 20:25 ` [patch 5/9] mm: memcontrol: use root_mem_cgroup res_counter Johannes Weiner
2014-05-07 15:14 ` Michal Hocko
2014-04-30 20:25 ` [patch 6/9] mm: memcontrol: remove ordering between pc->mem_cgroup and PageCgroupUsed Johannes Weiner
2014-05-23 13:20 ` Michal Hocko
2014-05-27 19:45 ` Johannes Weiner
2014-05-28 11:31 ` Michal Hocko
2014-04-30 20:25 ` [patch 7/9] mm: memcontrol: do not acquire page_cgroup lock for kmem pages Johannes Weiner
2014-05-23 13:39 ` Michal Hocko
2014-05-23 13:40 ` Michal Hocko
2014-05-23 14:29 ` Vladimir Davydov
2014-05-27 19:53 ` Johannes Weiner
2014-05-28 11:33 ` Michal Hocko
2014-04-30 20:25 ` [patch 8/9] mm: memcontrol: rewrite charge API Johannes Weiner
2014-05-23 14:18 ` Michal Hocko
2014-05-23 14:54 ` Michal Hocko
2014-05-23 15:18 ` Michal Hocko
2014-05-27 20:05 ` Johannes Weiner
2014-05-28 11:37 ` Michal Hocko
2014-04-30 20:25 ` [patch 9/9] mm: memcontrol: rewrite uncharge API Johannes Weiner
2014-05-04 14:32 ` Johannes Weiner
2014-05-27 7:43 ` Kamezawa Hiroyuki
2014-05-27 18:59 ` Johannes Weiner
2014-05-02 11:26 ` [patch 0/9] mm: memcontrol: naturalize charge lifetime 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=1398889543-23671-3-git-send-email-hannes@cmpxchg.org \
--to=hannes@cmpxchg.org \
--cc=cgroups@vger.kernel.org \
--cc=hughd@google.com \
--cc=linux-kernel@vger.kernel.org \
--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: 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
all inboxes | Powered by JetHome®