From: Michal Hocko <mhocko@suse.cz> To: Johannes Weiner <hannes@cmpxchg.org> Cc: azurIt <azurit@pobox.sk>, Andrew Morton <akpm@linux-foundation.org>, David Rientjes <rientjes@google.com>, KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>, KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>, linux-mm@kvack.org, cgroups@vger.kernel.org, x86@kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [patch 0/7] improve memcg oom killer robustness v2 Date: Thu, 5 Sep 2013 15:24:15 +0200 [thread overview] Message-ID: <20130905132415.GD13666@dhcp22.suse.cz> (raw) In-Reply-To: <20130905115430.GB856@cmpxchg.org> On Thu 05-09-13 07:54:30, Johannes Weiner wrote: [...] > From: Johannes Weiner <hannes@cmpxchg.org> > Subject: [patch] mm: memcg: handle non-error OOM situations more gracefully > > Many places that can trigger a memcg OOM situation return gracefully > and don't propagate VM_FAULT_OOM up the fault stack. > > It's not practical to annotate all of them to disable the memcg OOM > killer. Instead, just clean up any set OOM state without warning in > case the fault is not returning VM_FAULT_OOM. > > Also fail charges immediately when the current task already is in an > OOM context. Otherwise, the previous context gets overwritten and the > memcg reference is leaked. Could you paste find_or_create_page called from __get_blk as an example here, please? So that we do not have to scratch our heads again later... Also task_in_memcg_oom could be stuffed into mem_cgroup_disable_oom branch to reduce an overhead for in-kernel faults. The overhead shouldn't be noticeable so I am not sure this is that important. > Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> I do not see any easier way to fix this without returning back to the old behavior which is much worse. Acked-by: Michal Hocko <mhocko@suse.cz> Thanks! > diff --git a/mm/memory.c b/mm/memory.c > index cdbe41b..cdad471 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -57,7 +57,6 @@ > #include <linux/swapops.h> > #include <linux/elf.h> > #include <linux/gfp.h> > -#include <linux/stacktrace.h> > > #include <asm/io.h> > #include <asm/pgalloc.h> > @@ -3521,11 +3520,8 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, > if (flags & FAULT_FLAG_USER) > mem_cgroup_disable_oom(); > > - if (WARN_ON(task_in_memcg_oom(current) && !(ret & VM_FAULT_OOM))) { > - printk("Fixing unhandled memcg OOM context set up from:\n"); > - print_stack_trace(¤t->memcg_oom.trace, 0); > - mem_cgroup_oom_synchronize(); > - } > + if (task_in_memcg_oom(current) && !(ret & VM_FAULT_OOM)) > + mem_cgroup_oom_synchronize(false); > > return ret; > } > diff --git a/mm/oom_kill.c b/mm/oom_kill.c > index aa60863..3bf664c 100644 > --- a/mm/oom_kill.c > +++ b/mm/oom_kill.c > @@ -785,7 +785,7 @@ out: > */ > void pagefault_out_of_memory(void) > { > - if (mem_cgroup_oom_synchronize()) > + if (mem_cgroup_oom_synchronize(true)) > return; > if (try_set_system_oom()) { > out_of_memory(NULL, 0, 0, NULL); > -- > 1.8.4 > -- Michal Hocko SUSE Labs
WARNING: multiple messages have this Message-ID (diff)
From: Michal Hocko <mhocko@suse.cz> To: Johannes Weiner <hannes@cmpxchg.org> Cc: azurIt <azurit@pobox.sk>, Andrew Morton <akpm@linux-foundation.org>, David Rientjes <rientjes@google.com>, KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>, KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>, linux-mm@kvack.org, cgroups@vger.kernel.org, x86@kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [patch 0/7] improve memcg oom killer robustness v2 Date: Thu, 5 Sep 2013 15:24:15 +0200 [thread overview] Message-ID: <20130905132415.GD13666@dhcp22.suse.cz> (raw) In-Reply-To: <20130905115430.GB856@cmpxchg.org> On Thu 05-09-13 07:54:30, Johannes Weiner wrote: [...] > From: Johannes Weiner <hannes@cmpxchg.org> > Subject: [patch] mm: memcg: handle non-error OOM situations more gracefully > > Many places that can trigger a memcg OOM situation return gracefully > and don't propagate VM_FAULT_OOM up the fault stack. > > It's not practical to annotate all of them to disable the memcg OOM > killer. Instead, just clean up any set OOM state without warning in > case the fault is not returning VM_FAULT_OOM. > > Also fail charges immediately when the current task already is in an > OOM context. Otherwise, the previous context gets overwritten and the > memcg reference is leaked. Could you paste find_or_create_page called from __get_blk as an example here, please? So that we do not have to scratch our heads again later... Also task_in_memcg_oom could be stuffed into mem_cgroup_disable_oom branch to reduce an overhead for in-kernel faults. The overhead shouldn't be noticeable so I am not sure this is that important. > Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> I do not see any easier way to fix this without returning back to the old behavior which is much worse. Acked-by: Michal Hocko <mhocko@suse.cz> Thanks! > diff --git a/mm/memory.c b/mm/memory.c > index cdbe41b..cdad471 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -57,7 +57,6 @@ > #include <linux/swapops.h> > #include <linux/elf.h> > #include <linux/gfp.h> > -#include <linux/stacktrace.h> > > #include <asm/io.h> > #include <asm/pgalloc.h> > @@ -3521,11 +3520,8 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, > if (flags & FAULT_FLAG_USER) > mem_cgroup_disable_oom(); > > - if (WARN_ON(task_in_memcg_oom(current) && !(ret & VM_FAULT_OOM))) { > - printk("Fixing unhandled memcg OOM context set up from:\n"); > - print_stack_trace(¤t->memcg_oom.trace, 0); > - mem_cgroup_oom_synchronize(); > - } > + if (task_in_memcg_oom(current) && !(ret & VM_FAULT_OOM)) > + mem_cgroup_oom_synchronize(false); > > return ret; > } > diff --git a/mm/oom_kill.c b/mm/oom_kill.c > index aa60863..3bf664c 100644 > --- a/mm/oom_kill.c > +++ b/mm/oom_kill.c > @@ -785,7 +785,7 @@ out: > */ > void pagefault_out_of_memory(void) > { > - if (mem_cgroup_oom_synchronize()) > + if (mem_cgroup_oom_synchronize(true)) > return; > if (try_set_system_oom()) { > out_of_memory(NULL, 0, 0, NULL); > -- > 1.8.4 > -- Michal Hocko SUSE Labs -- 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:[~2013-09-05 13:24 UTC|newest] Thread overview: 227+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-08-03 16:59 [patch 0/7] improve memcg oom killer robustness v2 Johannes Weiner 2013-08-03 16:59 ` Johannes Weiner 2013-08-03 16:59 ` [patch 1/7] arch: mm: remove obsolete init OOM protection Johannes Weiner 2013-08-03 16:59 ` Johannes Weiner 2013-08-06 6:34 ` Vineet Gupta 2013-08-06 6:34 ` Vineet Gupta 2013-08-06 6:34 ` Vineet Gupta 2013-08-03 16:59 ` [patch 2/7] arch: mm: do not invoke OOM killer on kernel fault OOM Johannes Weiner 2013-08-03 16:59 ` Johannes Weiner 2013-08-03 16:59 ` [patch 3/7] arch: mm: pass userspace fault flag to generic fault handler Johannes Weiner 2013-08-03 16:59 ` Johannes Weiner 2013-08-05 22:06 ` Andrew Morton 2013-08-05 22:06 ` Andrew Morton 2013-08-05 22:25 ` Johannes Weiner 2013-08-05 22:25 ` Johannes Weiner 2013-08-03 16:59 ` [patch 4/7] x86: finish user fault error path with fatal signal Johannes Weiner 2013-08-03 16:59 ` Johannes Weiner 2013-08-03 16:59 ` [patch 5/7] mm: memcg: enable memcg OOM killer only for user faults Johannes Weiner 2013-08-03 16:59 ` Johannes Weiner 2013-08-05 9:18 ` Michal Hocko 2013-08-05 9:18 ` Michal Hocko 2013-08-03 16:59 ` [patch 6/7] mm: memcg: rework and document OOM waiting and wakeup Johannes Weiner 2013-08-03 16:59 ` Johannes Weiner 2013-08-03 17:00 ` [patch 7/7] mm: memcg: do not trap chargers with full callstack on OOM Johannes Weiner 2013-08-03 17:00 ` Johannes Weiner 2013-08-05 9:54 ` Michal Hocko 2013-08-05 9:54 ` Michal Hocko 2013-08-05 9:54 ` Michal Hocko 2013-08-05 20:56 ` Johannes Weiner 2013-08-05 20:56 ` Johannes Weiner 2013-08-03 17:08 ` [patch 0/7] improve memcg oom killer robustness v2 Johannes Weiner 2013-08-03 17:08 ` Johannes Weiner 2013-08-09 9:06 ` azurIt 2013-08-09 9:06 ` azurIt 2013-08-09 9:06 ` azurIt 2013-08-30 19:58 ` azurIt 2013-08-30 19:58 ` azurIt 2013-09-02 10:38 ` azurIt 2013-09-02 10:38 ` azurIt 2013-09-03 20:48 ` Johannes Weiner 2013-09-03 20:48 ` Johannes Weiner 2013-09-04 7:53 ` azurIt 2013-09-04 7:53 ` azurIt 2013-09-04 7:53 ` azurIt 2013-09-04 7:53 ` azurIt 2013-09-04 8:18 ` azurIt 2013-09-04 8:18 ` azurIt 2013-09-05 11:54 ` Johannes Weiner 2013-09-05 11:54 ` Johannes Weiner 2013-09-05 12:43 ` Michal Hocko 2013-09-05 12:43 ` Michal Hocko 2013-09-05 16:18 ` Johannes Weiner 2013-09-05 16:18 ` Johannes Weiner 2013-09-09 12:36 ` Michal Hocko 2013-09-09 12:36 ` Michal Hocko 2013-09-09 12:56 ` Michal Hocko 2013-09-09 12:56 ` Michal Hocko 2013-09-12 12:59 ` Johannes Weiner 2013-09-12 12:59 ` Johannes Weiner 2013-09-16 14:03 ` Michal Hocko 2013-09-16 14:03 ` Michal Hocko 2013-09-16 14:03 ` Michal Hocko 2013-09-05 13:24 ` Michal Hocko [this message] 2013-09-05 13:24 ` Michal Hocko 2013-09-09 13:10 ` azurIt 2013-09-09 13:10 ` azurIt 2013-09-09 17:28 ` Johannes Weiner 2013-09-09 17:28 ` Johannes Weiner 2013-09-09 19:59 ` azurIt 2013-09-09 19:59 ` azurIt 2013-09-09 20:12 ` Johannes Weiner 2013-09-09 20:12 ` Johannes Weiner 2013-09-09 20:18 ` azurIt 2013-09-09 20:18 ` azurIt 2013-09-09 21:08 ` azurIt 2013-09-09 21:08 ` azurIt 2013-09-10 18:13 ` azurIt 2013-09-10 18:13 ` azurIt 2013-09-10 18:37 ` Johannes Weiner 2013-09-10 18:37 ` Johannes Weiner 2013-09-10 19:32 ` azurIt 2013-09-10 19:32 ` azurIt 2013-09-10 20:12 ` Johannes Weiner 2013-09-10 20:12 ` Johannes Weiner 2013-09-10 21:08 ` azurIt 2013-09-10 21:08 ` azurIt 2013-09-10 21:08 ` azurIt 2013-09-10 21:18 ` Johannes Weiner 2013-09-10 21:18 ` Johannes Weiner 2013-09-10 21:32 ` azurIt 2013-09-10 21:32 ` azurIt 2013-09-10 22:03 ` Johannes Weiner 2013-09-10 22:03 ` Johannes Weiner 2013-09-11 12:33 ` azurIt 2013-09-11 12:33 ` azurIt 2013-09-11 18:03 ` Johannes Weiner 2013-09-11 18:03 ` Johannes Weiner 2013-09-11 18:03 ` Johannes Weiner 2013-09-11 18:54 ` azurIt 2013-09-11 18:54 ` azurIt 2013-09-11 19:11 ` Johannes Weiner 2013-09-11 19:11 ` Johannes Weiner 2013-09-11 19:41 ` azurIt 2013-09-11 19:41 ` azurIt 2013-09-11 20:04 ` Johannes Weiner 2013-09-11 20:04 ` Johannes Weiner 2013-09-14 10:48 ` azurIt 2013-09-14 10:48 ` azurIt 2013-09-16 13:40 ` Michal Hocko 2013-09-16 13:40 ` Michal Hocko 2013-09-16 14:01 ` azurIt 2013-09-16 14:01 ` azurIt 2013-09-16 14:06 ` Michal Hocko 2013-09-16 14:06 ` Michal Hocko 2013-09-16 14:13 ` azurIt 2013-09-16 14:13 ` azurIt 2013-09-16 14:13 ` azurIt 2013-09-16 14:57 ` Michal Hocko 2013-09-16 14:57 ` Michal Hocko 2013-09-16 15:05 ` azurIt 2013-09-16 15:05 ` azurIt 2013-09-16 15:17 ` Johannes Weiner 2013-09-16 15:17 ` Johannes Weiner 2013-09-16 15:17 ` Johannes Weiner 2013-09-16 15:24 ` azurIt 2013-09-16 15:24 ` azurIt 2013-09-16 15:25 ` Michal Hocko 2013-09-16 15:25 ` Michal Hocko 2013-09-16 15:40 ` azurIt 2013-09-16 15:40 ` azurIt 2013-09-16 20:52 ` azurIt 2013-09-16 20:52 ` azurIt 2013-09-17 0:02 ` Johannes Weiner 2013-09-17 0:02 ` Johannes Weiner 2013-09-17 11:15 ` azurIt 2013-09-17 11:15 ` azurIt 2013-09-17 11:15 ` azurIt 2013-09-17 14:10 ` Michal Hocko 2013-09-17 14:10 ` Michal Hocko 2013-09-18 14:03 ` azurIt 2013-09-18 14:03 ` azurIt 2013-09-18 14:03 ` azurIt 2013-09-18 14:24 ` Michal Hocko 2013-09-18 14:24 ` Michal Hocko 2013-09-18 14:33 ` azurIt 2013-09-18 14:33 ` azurIt 2013-09-18 14:42 ` Michal Hocko 2013-09-18 14:42 ` Michal Hocko 2013-09-18 14:42 ` Michal Hocko 2013-09-18 18:02 ` azurIt 2013-09-18 18:02 ` azurIt 2013-09-18 18:36 ` Michal Hocko 2013-09-18 18:36 ` Michal Hocko 2013-09-18 18:36 ` Michal Hocko 2013-09-18 18:04 ` Johannes Weiner 2013-09-18 18:04 ` Johannes Weiner 2013-09-18 18:19 ` Johannes Weiner 2013-09-18 18:19 ` Johannes Weiner 2013-09-18 19:55 ` Johannes Weiner 2013-09-18 19:55 ` Johannes Weiner 2013-09-18 19:55 ` Johannes Weiner 2013-09-18 20:52 ` azurIt 2013-09-18 20:52 ` azurIt 2013-09-18 20:52 ` azurIt 2013-09-25 7:26 ` azurIt 2013-09-25 7:26 ` azurIt 2013-09-25 7:26 ` azurIt 2013-09-26 16:54 ` azurIt 2013-09-26 16:54 ` azurIt 2013-09-26 16:54 ` azurIt 2013-09-26 19:27 ` Johannes Weiner 2013-09-26 19:27 ` Johannes Weiner 2013-09-27 2:04 ` azurIt 2013-09-27 2:04 ` azurIt 2013-09-27 2:04 ` azurIt 2013-09-27 2:04 ` azurIt 2013-10-07 11:01 ` azurIt 2013-10-07 11:01 ` azurIt 2013-10-07 11:01 ` azurIt 2013-10-07 11:01 ` azurIt 2013-10-07 19:23 ` Johannes Weiner 2013-10-07 19:23 ` Johannes Weiner 2013-10-09 18:44 ` azurIt 2013-10-09 18:44 ` azurIt 2013-10-09 18:44 ` azurIt 2013-10-10 0:14 ` Johannes Weiner 2013-10-10 0:14 ` Johannes Weiner 2013-10-10 0:14 ` Johannes Weiner 2013-10-10 22:59 ` azurIt 2013-10-10 22:59 ` azurIt 2013-10-10 22:59 ` azurIt 2013-09-17 11:20 ` azurIt 2013-09-17 11:20 ` azurIt 2013-09-16 10:22 ` azurIt 2013-09-16 10:22 ` azurIt 2013-09-04 9:45 ` azurIt 2013-09-04 9:45 ` azurIt 2013-09-04 11:57 ` Michal Hocko 2013-09-04 11:57 ` Michal Hocko 2013-09-04 12:10 ` azurIt 2013-09-04 12:10 ` azurIt 2013-09-04 12:10 ` azurIt 2013-09-04 12:26 ` Michal Hocko 2013-09-04 12:26 ` Michal Hocko 2013-09-04 12:26 ` Michal Hocko 2013-09-04 12:39 ` azurIt 2013-09-04 12:39 ` azurIt 2013-09-05 9:14 ` azurIt 2013-09-05 9:14 ` azurIt 2013-09-05 9:53 ` Michal Hocko 2013-09-05 9:53 ` Michal Hocko 2013-09-05 10:17 ` azurIt 2013-09-05 10:17 ` azurIt 2013-09-05 11:17 ` Michal Hocko 2013-09-05 11:17 ` Michal Hocko 2013-09-05 11:17 ` Michal Hocko 2013-09-05 11:47 ` azurIt 2013-09-05 11:47 ` azurIt 2013-09-05 12:03 ` Michal Hocko 2013-09-05 12:03 ` Michal Hocko 2013-09-05 12:33 ` azurIt 2013-09-05 12:33 ` azurIt 2013-09-05 12:33 ` azurIt 2013-09-05 12:45 ` Michal Hocko 2013-09-05 12:45 ` Michal Hocko 2013-09-05 13:00 ` azurIt 2013-09-05 13:00 ` azurIt
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=20130905132415.GD13666@dhcp22.suse.cz \ --to=mhocko@suse.cz \ --cc=akpm@linux-foundation.org \ --cc=azurit@pobox.sk \ --cc=cgroups@vger.kernel.org \ --cc=hannes@cmpxchg.org \ --cc=kamezawa.hiroyu@jp.fujitsu.com \ --cc=kosaki.motohiro@jp.fujitsu.com \ --cc=linux-arch@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=rientjes@google.com \ --cc=x86@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.