From: Greg Kroah-Hartman Date: Thu, 22 Mar 2018 14:48:24 +0000 (+0100) Subject: drop oom patch from 4.9.y X-Git-Tag: v3.18.102~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a89ab06b1adef520243198acd115486f4dbb0de;p=thirdparty%2Fkernel%2Fstable-queue.git drop oom patch from 4.9.y --- diff --git a/queue-4.9/oom-improve-oom-disable-handling.patch b/queue-4.9/oom-improve-oom-disable-handling.patch deleted file mode 100644 index b381eed8636..00000000000 --- a/queue-4.9/oom-improve-oom-disable-handling.patch +++ /dev/null @@ -1,79 +0,0 @@ -From foo@baz Thu Mar 22 14:40:24 CET 2018 -From: Michal Hocko -Date: Wed, 3 May 2017 14:54:57 -0700 -Subject: oom: improve oom disable handling - -From: Michal Hocko - - -[ Upstream commit d75da004c708c9fca7b53f7da293a295522414d9 ] - -Tetsuo has reported that sysrq triggered OOM killer will print a -misleading information when no tasks are selected: - - sysrq: SysRq : Manual OOM execution - Out of memory: Kill process 4468 ((agetty)) score 0 or sacrifice child - Killed process 4468 ((agetty)) total-vm:43704kB, anon-rss:1760kB, file-rss:0kB, shmem-rss:0kB - sysrq: SysRq : Manual OOM execution - Out of memory: Kill process 4469 (systemd-cgroups) score 0 or sacrifice child - Killed process 4469 (systemd-cgroups) total-vm:10704kB, anon-rss:120kB, file-rss:0kB, shmem-rss:0kB - sysrq: SysRq : Manual OOM execution - sysrq: OOM request ignored because killer is disabled - sysrq: SysRq : Manual OOM execution - sysrq: OOM request ignored because killer is disabled - sysrq: SysRq : Manual OOM execution - sysrq: OOM request ignored because killer is disabled - -The real reason is that there are no eligible tasks for the OOM killer -to select but since commit 7c5f64f84483 ("mm: oom: deduplicate victim -selection code for memcg and global oom") the semantic of out_of_memory -has changed without updating moom_callback. - -This patch updates moom_callback to tell that no task was eligible which -is the case for both oom killer disabled and no eligible tasks. In -order to help distinguish first case from the second add printk to both -oom_killer_{enable,disable}. This information is useful on its own -because it might help debugging potential memory allocation failures. - -Fixes: 7c5f64f84483 ("mm: oom: deduplicate victim selection code for memcg and global oom") -Link: http://lkml.kernel.org/r/20170404134705.6361-1-mhocko@kernel.org -Signed-off-by: Michal Hocko -Reported-by: Tetsuo Handa -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/tty/sysrq.c | 2 +- - mm/oom_kill.c | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - ---- a/drivers/tty/sysrq.c -+++ b/drivers/tty/sysrq.c -@@ -375,7 +375,7 @@ static void moom_callback(struct work_st - - mutex_lock(&oom_lock); - if (!out_of_memory(&oc)) -- pr_info("OOM request ignored because killer is disabled\n"); -+ pr_info("OOM request ignored. No task eligible\n"); - mutex_unlock(&oom_lock); - } - ---- a/mm/oom_kill.c -+++ b/mm/oom_kill.c -@@ -706,6 +706,7 @@ void exit_oom_victim(void) - void oom_killer_enable(void) - { - oom_killer_disabled = false; -+ pr_info("OOM killer enabled.\n"); - } - - /** -@@ -742,6 +743,7 @@ bool oom_killer_disable(signed long time - oom_killer_enable(); - return false; - } -+ pr_info("OOM killer disabled.\n"); - - return true; - } diff --git a/queue-4.9/series b/queue-4.9/series index 529c1649e5b..ee48b072810 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -125,7 +125,6 @@ net-hns-fix-ethtool_get_strings-overflow-in-hns-driver.patch cifs-small-underflow-in-cnvrtdosunixtm.patch mm-fix-check-for-reclaimable-pages-in-pf_memalloc-reclaim-throttling.patch mm-vmstat-suppress-pcp-stats-for-unpopulated-zones-in-zoneinfo.patch -oom-improve-oom-disable-handling.patch mm-hwpoison-call-shake_page-after-try_to_unmap-for-mlocked-page.patch rtc-ds1374-wdt-fix-issue-with-timeout-scaling-from-secs-to-wdt-ticks.patch rtc-ds1374-wdt-fix-stop-start-ioctl-always-returning-einval.patch