nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

hwpoison, hugetlb: lock_page/unlock_page does not match for handling a free hugepage

Browse source 
For handling a free hugepage in memory failure, the race will happen if
another thread hwpoisoned this hugepage concurrently.  So we need to
check PageHWPoison instead of !PageHWPoison.

If hwpoison_filter(p) returns true or a race happens, then we need to
unlock_page(hpage).

Signed-off-by: Chen Yucong <slaoub@gmail.com>
Reviewed-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Tested-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Reviewed-by: Andi Kleen <ak@linux.intel.com>
Cc: <stable@vger.kernel.org>	[2.6.36+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Chen Yucong 2014-05-22 11:54:15 -07:00 committed by Linus Torvalds
parent 4b660a7f5c
commit b985194c8c
1 changed files with 8 additions and 7 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

9
mm/memory-failure.c
View file

@ -1081,16 +1081,17 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
return 0; return 0;
} else if (PageHuge(hpage)) { } else if (PageHuge(hpage)) {
/* /*
* Check "just unpoisoned", "filter hit", and * Check "filter hit" and "race with other subpage."
* "race with other subpage."
*/ */
lock_page(hpage); lock_page(hpage);
if (!PageHWPoison(hpage) if (PageHWPoison(hpage)) {
|| (hwpoison_filter(p) && TestClearPageHWPoison(p)) if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
|| (p != hpage && TestSetPageHWPoison(hpage))) { || (p != hpage && TestSetPageHWPoison(hpage))) {
atomic_long_sub(nr_pages, &num_poisoned_pages); atomic_long_sub(nr_pages, &num_poisoned_pages);
unlock_page(hpage);
return 0; return 0;
} }
}
set_page_hwpoison_huge_page(hpage); set_page_hwpoison_huge_page(hpage);
res = dequeue_hwpoisoned_huge_page(hpage); res = dequeue_hwpoisoned_huge_page(hpage);
action_result(pfn, "free huge", action_result(pfn, "free huge",