On Wed, Mar 11, 2015 at 02:40:09PM +0100, [email protected] wrote: > > The patch below does not apply to the 3.11-stable tree. > If someone wants it applied there, or to any other stable or longterm > tree, then please email the backport, including the original git commit > id to <[email protected]>. > > thanks, > > greg k-h > > ------------------ original commit in Linus's tree ------------------ > > From 9ab3b598d2dfbdb0153ffa7e4b1456bbff59a25d Mon Sep 17 00:00:00 2001 > From: Naoya Horiguchi <[email protected]> > Date: Thu, 12 Feb 2015 15:00:25 -0800 > Subject: [PATCH] mm: hwpoison: drop lru_add_drain_all() in > __soft_offline_page()
The conflict is trivial enough to resolve, so please apply the below one. Thanks, Naoya Horiguchi ---- >From 51415c2ab1aacb85facab85526ea246e3d2a2d23 Mon Sep 17 00:00:00 2001 From: Naoya Horiguchi <[email protected]> Date: Mon, 16 Mar 2015 15:46:51 +0900 Subject: [PATCH] mm: hwpoison: drop lru_add_drain_all() in __soft_offline_page() 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. [[email protected]: 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 <[email protected]> Cc: Andi Kleen <[email protected]> Cc: Tony Luck <[email protected]> Cc: Chen Gong <[email protected]> Cc: <[email protected]> [3.11+] Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]> --- mm/memory-failure.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 2c13aa7a0164..3af40105c122 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1633,8 +1633,6 @@ static int __soft_offline_page(struct page *page, int flags) * 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)) -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
