Re: +oom-thaw-threads-if-oom-killed-thread-is-frozen-before-deferring.patch addedto -mm tree

[Michal Hocko]

Sorry for the really late reply.

On Mon 10-10-11 15:46:25, akpm@xxxxxxxxxx wrote:
> From: David Rientjes <rientjes@xxxxxxxxxx>
> Subject: oom: thaw threads if oom killed thread is frozen before deferring
> 
> If a thread has been oom killed and is frozen, thaw it before returning to
> the page allocator.  Otherwise, it can stay frozen indefinitely and no
> memory will be freed.
> 
> Signed-off-by: David Rientjes <rientjes@xxxxxxxxxx>
> Reported-by: Michal Hocko <mhocko@xxxxxxx>
> Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
> Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
> Cc: "Rafael J. Wysocki" <rjw@xxxxxxx>
> Cc: Michal Hocko <mhocko@xxxxxxx>
> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxx>

Can we still update the tags?
The issue has been reported by Konstantin Khlebnikov <khlebnikov@xxxxxxxxxx>
and I think that we want SOB from Rafael here (he originally SOB the
previous patch which thawed tasks from oom_kill_task). You can also add
my Acked-by.

> ---
> 
>  mm/oom_kill.c |    6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff -puN mm/oom_kill.c~oom-thaw-threads-if-oom-killed-thread-is-frozen-before-deferring mm/oom_kill.c
> --- a/mm/oom_kill.c~oom-thaw-threads-if-oom-killed-thread-is-frozen-before-deferring
> +++ a/mm/oom_kill.c
> @@ -32,6 +32,7 @@
>  #include <linux/mempolicy.h>
>  #include <linux/security.h>
>  #include <linux/ptrace.h>
> +#include <linux/freezer.h>
>  
>  int sysctl_panic_on_oom;
>  int sysctl_oom_kill_allocating_task;
> @@ -320,8 +321,11 @@ static struct task_struct *select_bad_pr
>  		 * blocked waiting for another task which itself is waiting
>  		 * for memory. Is there a better alternative?
>  		 */
> -		if (test_tsk_thread_flag(p, TIF_MEMDIE))
> +		if (test_tsk_thread_flag(p, TIF_MEMDIE)) {
> +			if (unlikely(frozen(p)))
> +				thaw_process(p);
>  			return ERR_PTR(-1UL);
> +		}
>  		if (!p->mm)
>  			continue;
>  
> _
> Subject: Subject: oom: thaw threads if oom killed thread is frozen before deferring
> 
> Patches currently in -mm which might be from rientjes@xxxxxxxxxx are
> 
> origin.patch
> linux-next.patch
> oom-avoid-killing-kthreads-if-they-assume-the-oom-killed-threads-mm.patch
> oom-remove-oom_disable_count.patch
> oom-fix-race-while-temporarily-setting-currents-oom_score_adj.patch
> mm-avoid-null-pointer-access-in-vm_struct-via-proc-vmallocinfo.patch
> mm-compaction-make-compact_zone_order-static.patch
> oom-thaw-threads-if-oom-killed-thread-is-frozen-before-deferring.patch
> cpusets-avoid-looping-when-storing-to-mems_allowed-if-one-node-remains-set.patch
> 

-- 
Michal Hocko
SUSE Labs
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9    
Czech Republic
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/