From: Johannes Weiner <hannes@cmpxchg.org> To: Andrew Morton <akpm@linux-foundation.org> Cc: Michal Hocko <mhocko@suse.cz>, David Rientjes <rientjes@google.com>, KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>, azurIt <azurit@pobox.sk>, 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: [patch 1/7] arch: mm: remove obsolete init OOM protection Date: Sat, 3 Aug 2013 12:59:54 -0400 [thread overview] Message-ID: <1375549200-19110-2-git-send-email-hannes@cmpxchg.org> (raw) In-Reply-To: <1375549200-19110-1-git-send-email-hannes@cmpxchg.org> Back before smart OOM killing, when faulting tasks where killed directly on allocation failures, the arch-specific fault handlers needed special protection for the init process. Now that all fault handlers call into the generic OOM killer (609838c "mm: invoke oom-killer from remaining unconverted page fault handlers"), which already provides init protection, the arch-specific leftovers can be removed. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Reviewed-by: Michal Hocko <mhocko@suse.cz> Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> --- arch/arc/mm/fault.c | 5 ----- arch/score/mm/fault.c | 6 ------ arch/tile/mm/fault.c | 6 ------ 3 files changed, 17 deletions(-) diff --git a/arch/arc/mm/fault.c b/arch/arc/mm/fault.c index 0fd1f0d..6b0bb41 100644 --- a/arch/arc/mm/fault.c +++ b/arch/arc/mm/fault.c @@ -122,7 +122,6 @@ good_area: goto bad_area; } -survive: /* * If for any reason at all we couldn't handle the fault, * make sure we exit gracefully rather than endlessly redo @@ -201,10 +200,6 @@ no_context: die("Oops", regs, address); out_of_memory: - if (is_global_init(tsk)) { - yield(); - goto survive; - } up_read(&mm->mmap_sem); if (user_mode(regs)) { diff --git a/arch/score/mm/fault.c b/arch/score/mm/fault.c index 6b18fb0..4b71a62 100644 --- a/arch/score/mm/fault.c +++ b/arch/score/mm/fault.c @@ -100,7 +100,6 @@ good_area: goto bad_area; } -survive: /* * If for any reason at all we couldn't handle the fault, * make sure we exit gracefully rather than endlessly redo @@ -167,11 +166,6 @@ no_context: */ out_of_memory: up_read(&mm->mmap_sem); - if (is_global_init(tsk)) { - yield(); - down_read(&mm->mmap_sem); - goto survive; - } if (!user_mode(regs)) goto no_context; pagefault_out_of_memory(); diff --git a/arch/tile/mm/fault.c b/arch/tile/mm/fault.c index f7f99f9..ac553ee 100644 --- a/arch/tile/mm/fault.c +++ b/arch/tile/mm/fault.c @@ -430,7 +430,6 @@ good_area: goto bad_area; } - survive: /* * If for any reason at all we couldn't handle the fault, * make sure we exit gracefully rather than endlessly redo @@ -568,11 +567,6 @@ no_context: */ out_of_memory: up_read(&mm->mmap_sem); - if (is_global_init(tsk)) { - yield(); - down_read(&mm->mmap_sem); - goto survive; - } if (is_kernel_mode) goto no_context; pagefault_out_of_memory(); -- 1.8.3.2
WARNING: multiple messages have this Message-ID (diff)
From: Johannes Weiner <hannes@cmpxchg.org> To: Andrew Morton <akpm@linux-foundation.org> Cc: Michal Hocko <mhocko@suse.cz>, David Rientjes <rientjes@google.com>, KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>, azurIt <azurit@pobox.sk>, 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: [patch 1/7] arch: mm: remove obsolete init OOM protection Date: Sat, 3 Aug 2013 12:59:54 -0400 [thread overview] Message-ID: <1375549200-19110-2-git-send-email-hannes@cmpxchg.org> (raw) In-Reply-To: <1375549200-19110-1-git-send-email-hannes@cmpxchg.org> Back before smart OOM killing, when faulting tasks where killed directly on allocation failures, the arch-specific fault handlers needed special protection for the init process. Now that all fault handlers call into the generic OOM killer (609838c "mm: invoke oom-killer from remaining unconverted page fault handlers"), which already provides init protection, the arch-specific leftovers can be removed. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Reviewed-by: Michal Hocko <mhocko@suse.cz> Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> --- arch/arc/mm/fault.c | 5 ----- arch/score/mm/fault.c | 6 ------ arch/tile/mm/fault.c | 6 ------ 3 files changed, 17 deletions(-) diff --git a/arch/arc/mm/fault.c b/arch/arc/mm/fault.c index 0fd1f0d..6b0bb41 100644 --- a/arch/arc/mm/fault.c +++ b/arch/arc/mm/fault.c @@ -122,7 +122,6 @@ good_area: goto bad_area; } -survive: /* * If for any reason at all we couldn't handle the fault, * make sure we exit gracefully rather than endlessly redo @@ -201,10 +200,6 @@ no_context: die("Oops", regs, address); out_of_memory: - if (is_global_init(tsk)) { - yield(); - goto survive; - } up_read(&mm->mmap_sem); if (user_mode(regs)) { diff --git a/arch/score/mm/fault.c b/arch/score/mm/fault.c index 6b18fb0..4b71a62 100644 --- a/arch/score/mm/fault.c +++ b/arch/score/mm/fault.c @@ -100,7 +100,6 @@ good_area: goto bad_area; } -survive: /* * If for any reason at all we couldn't handle the fault, * make sure we exit gracefully rather than endlessly redo @@ -167,11 +166,6 @@ no_context: */ out_of_memory: up_read(&mm->mmap_sem); - if (is_global_init(tsk)) { - yield(); - down_read(&mm->mmap_sem); - goto survive; - } if (!user_mode(regs)) goto no_context; pagefault_out_of_memory(); diff --git a/arch/tile/mm/fault.c b/arch/tile/mm/fault.c index f7f99f9..ac553ee 100644 --- a/arch/tile/mm/fault.c +++ b/arch/tile/mm/fault.c @@ -430,7 +430,6 @@ good_area: goto bad_area; } - survive: /* * If for any reason at all we couldn't handle the fault, * make sure we exit gracefully rather than endlessly redo @@ -568,11 +567,6 @@ no_context: */ out_of_memory: up_read(&mm->mmap_sem); - if (is_global_init(tsk)) { - yield(); - down_read(&mm->mmap_sem); - goto survive; - } if (is_kernel_mode) goto no_context; pagefault_out_of_memory(); -- 1.8.3.2 -- 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-08-03 17:00 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 ` Johannes Weiner [this message] 2013-08-03 16:59 ` [patch 1/7] arch: mm: remove obsolete init OOM protection 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 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=1375549200-19110-2-git-send-email-hannes@cmpxchg.org \ --to=hannes@cmpxchg.org \ --cc=akpm@linux-foundation.org \ --cc=azurit@pobox.sk \ --cc=cgroups@vger.kernel.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=mhocko@suse.cz \ --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.