[patch 49/50] fix OOM killing of swapoff
-stable review patch. If anyone has any objections, please let us know. -- From: Hugh Dickins <[EMAIL PROTECTED]> These days, if you swapoff when there isn't enough memory, OOM killer gives "BUG: scheduling while atomic" and the machine hangs: badness() needs to do its PF_SWAPOFF return after the task_unlock (tasklist_lock is also held here, so p isn't going to be freed: PF_SWAPOFF might get turned off at any moment, but that doesn't really matter). Signed-off-by: Hugh Dickins <[EMAIL PROTECTED]> Cc: <[EMAIL PROTECTED]> Signed-off-by: Andrew Morton <[EMAIL PROTECTED]> Signed-off-by: Chris Wright <[EMAIL PROTECTED]> --- mm/oom_kill.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) --- linux-2.6.19.1.orig/mm/oom_kill.c +++ linux-2.6.19.1/mm/oom_kill.c @@ -61,12 +61,6 @@ unsigned long badness(struct task_struct } /* -* swapoff can easily use up all memory, so kill those first. -*/ - if (p->flags & PF_SWAPOFF) - return ULONG_MAX; - - /* * The memory size of the process is the basis for the badness. */ points = mm->total_vm; @@ -77,6 +71,12 @@ unsigned long badness(struct task_struct task_unlock(p); /* +* swapoff can easily use up all memory, so kill those first. +*/ + if (p->flags & PF_SWAPOFF) + return ULONG_MAX; + + /* * Processes which fork a lot of child processes are likely * a good choice. We add half the vmsize of the children if they * have an own mm. This prevents forking servers to flood the -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[patch 49/50] fix OOM killing of swapoff
-stable review patch. If anyone has any objections, please let us know. -- From: Hugh Dickins [EMAIL PROTECTED] These days, if you swapoff when there isn't enough memory, OOM killer gives BUG: scheduling while atomic and the machine hangs: badness() needs to do its PF_SWAPOFF return after the task_unlock (tasklist_lock is also held here, so p isn't going to be freed: PF_SWAPOFF might get turned off at any moment, but that doesn't really matter). Signed-off-by: Hugh Dickins [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Signed-off-by: Andrew Morton [EMAIL PROTECTED] Signed-off-by: Chris Wright [EMAIL PROTECTED] --- mm/oom_kill.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) --- linux-2.6.19.1.orig/mm/oom_kill.c +++ linux-2.6.19.1/mm/oom_kill.c @@ -61,12 +61,6 @@ unsigned long badness(struct task_struct } /* -* swapoff can easily use up all memory, so kill those first. -*/ - if (p-flags PF_SWAPOFF) - return ULONG_MAX; - - /* * The memory size of the process is the basis for the badness. */ points = mm-total_vm; @@ -77,6 +71,12 @@ unsigned long badness(struct task_struct task_unlock(p); /* +* swapoff can easily use up all memory, so kill those first. +*/ + if (p-flags PF_SWAPOFF) + return ULONG_MAX; + + /* * Processes which fork a lot of child processes are likely * a good choice. We add half the vmsize of the children if they * have an own mm. This prevents forking servers to flood the -- - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
