Re: [patch 1/7] arch: mm: remove obsolete init OOM protection

[Vineet Gupta]

Hi Johannes,

Thk for the cleanup.

On 08/03/2013 10:29 PM, Johannes Weiner wrote:
> 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 
> Reviewed-by: Michal Hocko 
> Acked-by: KOSAKI Motohiro 
> ---
>  arch/arc/mm/fault.c   | 5 -
>  arch/score/mm/fault.c | 6 --
>  arch/tile/mm/fault.c  | 6 --
>  3 files changed, 17 deletions(-)

Acked-by: Vineet Gupta   [arch/arc bits]

-Vineet
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[patch 1/7] arch: mm: remove obsolete init OOM protection

[Johannes Weiner]

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 
Reviewed-by: Michal Hocko 
Acked-by: KOSAKI Motohiro 
---
 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 from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/