From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail137.messagelabs.com (mail137.messagelabs.com [216.82.249.19]) by kanga.kvack.org (Postfix) with ESMTP id 73F626B01F4 for ; Tue, 24 Aug 2010 19:57:14 -0400 (EDT) From: Naoya Horiguchi Subject: [PATCH 7/8] HWPOISON, hugetlb: fix unpoison for hugepage Date: Wed, 25 Aug 2010 08:55:26 +0900 Message-Id: <1282694127-14609-8-git-send-email-n-horiguchi@ah.jp.nec.com> In-Reply-To: <1282694127-14609-1-git-send-email-n-horiguchi@ah.jp.nec.com> References: <1282694127-14609-1-git-send-email-n-horiguchi@ah.jp.nec.com> Sender: owner-linux-mm@kvack.org To: Andi Kleen Cc: Andrew Morton , Christoph Lameter , Mel Gorman , Wu Fengguang , Jun'ichi Nomura , linux-mm , LKML List-ID: Currently unpoisoning hugepages doesn't work because it's not enough to just clear PG_HWPoison bits and we need to link the hugepage to be unpoisoned back to the free hugepage list. To do this, we get and put hwpoisoned hugepage whose refcount is 0. Signed-off-by: Naoya Horiguchi Signed-off-by: Jun'ichi Nomura --- mm/memory-failure.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git v2.6.36-rc2/mm/memory-failure.c v2.6.36-rc2/mm/memory-failure.c index 60178d2..ab36690 100644 --- v2.6.36-rc2/mm/memory-failure.c +++ v2.6.36-rc2/mm/memory-failure.c @@ -1154,9 +1154,19 @@ int unpoison_memory(unsigned long pfn) nr_pages = 1 << compound_order(page); if (!get_page_unless_zero(page)) { - if (TestClearPageHWPoison(p)) + /* The page to be unpoisoned was free one when hwpoisoned */ + if (TestClearPageHWPoison(page)) atomic_long_sub(nr_pages, &mce_bad_pages); pr_debug("MCE: Software-unpoisoned free page %#lx\n", pfn); + if (PageHuge(page)) { + /* + * To unpoison free hugepage, we get and put it + * to move it back to the free list. + */ + get_page(page); + clear_page_hwpoison_huge_page(page); + put_page(page); + } return 0; } @@ -1171,9 +1181,9 @@ int unpoison_memory(unsigned long pfn) pr_debug("MCE: Software-unpoisoned page %#lx\n", pfn); atomic_long_sub(nr_pages, &mce_bad_pages); freeit = 1; + if (PageHuge(page)) + clear_page_hwpoison_huge_page(page); } - if (PageHuge(p)) - clear_page_hwpoison_huge_page(page); unlock_page(page); put_page(page); -- 1.7.2.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org