From: Greg Kroah-Hartman Date: Sun, 26 Apr 2015 09:56:47 +0000 (+0200) Subject: 3.14-stable patches X-Git-Tag: v4.0.1~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=495a95aa9ba55be53118b1d3ce321b251b65f370;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: mm-hwpoison-drop-lru_add_drain_all-in-__soft_offline_page.patch --- diff --git a/queue-3.14/mm-hwpoison-drop-lru_add_drain_all-in-__soft_offline_page.patch b/queue-3.14/mm-hwpoison-drop-lru_add_drain_all-in-__soft_offline_page.patch new file mode 100644 index 00000000000..7783316faba --- /dev/null +++ b/queue-3.14/mm-hwpoison-drop-lru_add_drain_all-in-__soft_offline_page.patch @@ -0,0 +1,48 @@ +From 9ab3b598d2dfbdb0153ffa7e4b1456bbff59a25d Mon Sep 17 00:00:00 2001 +From: Naoya Horiguchi +Date: Thu, 12 Feb 2015 15:00:25 -0800 +Subject: mm: hwpoison: drop lru_add_drain_all() in __soft_offline_page() + +From: Naoya Horiguchi + +commit 9ab3b598d2dfbdb0153ffa7e4b1456bbff59a25d upstream. + +A race condition starts to be visible in recent mmotm, where a PG_hwpoison +flag is set on a migration source page *before* it's back in buddy page +poo= l. + +This is problematic because no page flag is supposed to be set when +freeing (see __free_one_page().) So the user-visible effect of this race +is that it could trigger the BUG_ON() when soft-offlining is called. + +The root cause is that we call lru_add_drain_all() to make sure that the +page is in buddy, but that doesn't work because this function just +schedule= s a work item and doesn't wait its completion. +drain_all_pages() does drainin= g directly, so simply dropping +lru_add_drain_all() solves this problem. + +[n-horiguchi@ah.jp.nec.com: resolve conflict to apply on v3.11.10] +Fixes: f15bdfa802bf ("mm/memory-failure.c: fix memory leak in successful soft offlining") +Signed-off-by: Naoya Horiguchi +Cc: Andi Kleen +Cc: Tony Luck +Cc: Chen Gong +Cc: [3.11+] +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman +--- + mm/memory-failure.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/mm/memory-failure.c ++++ b/mm/memory-failure.c +@@ -1645,8 +1645,6 @@ static int __soft_offline_page(struct pa + * setting PG_hwpoison. + */ + if (!is_free_buddy_page(page)) +- lru_add_drain_all(); +- if (!is_free_buddy_page(page)) + drain_all_pages(); + SetPageHWPoison(page); + if (!is_free_buddy_page(page)) diff --git a/queue-3.14/series b/queue-3.14/series index 9baf78a724e..3ee7765d2bb 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -27,3 +27,4 @@ add-a-new-pid-vid-0227-0930-for-ar3012.patch bluetooth-add-support-for-acer-2.patch bluetooth-ath3k-add-support-of-mci-13d3-3408-bt-device.patch bluetooth-add-usb-device-04ca-3010-as-atheros-ar3012.patch +mm-hwpoison-drop-lru_add_drain_all-in-__soft_offline_page.patch