summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorChen Yucong <slaoub@gmail.com>2014-05-22 11:54:15 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-07 13:25:31 -0700
commited32bcbb8d5711286f7e4944968a3dfa49c1d1ab (patch)
tree18d499899c1be75807c2f76fafdb54b08be3b2f2 /mm
parent4d5f17381ec0c7a5ead38d9a8dc25cfc245e3a81 (diff)
downloadlinux-3.10-ed32bcbb8d5711286f7e4944968a3dfa49c1d1ab.tar.gz
linux-3.10-ed32bcbb8d5711286f7e4944968a3dfa49c1d1ab.tar.bz2
linux-3.10-ed32bcbb8d5711286f7e4944968a3dfa49c1d1ab.zip
hwpoison, hugetlb: lock_page/unlock_page does not match for handling a free hugepage
commit b985194c8c0a130ed155b71662e39f7eaea4876f upstream. 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> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memory-failure.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 59c62fa75c5..4254eb02158 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1083,15 +1083,16 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
return 0;
} else if (PageHuge(hpage)) {
/*
- * Check "just unpoisoned", "filter hit", and
- * "race with other subpage."
+ * Check "filter hit" and "race with other subpage."
*/
lock_page(hpage);
- if (!PageHWPoison(hpage)
- || (hwpoison_filter(p) && TestClearPageHWPoison(p))
- || (p != hpage && TestSetPageHWPoison(hpage))) {
- atomic_long_sub(nr_pages, &num_poisoned_pages);
- return 0;
+ if (PageHWPoison(hpage)) {
+ if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
+ || (p != hpage && TestSetPageHWPoison(hpage))) {
+ atomic_long_sub(nr_pages, &num_poisoned_pages);
+ unlock_page(hpage);
+ return 0;
+ }
}
set_page_hwpoison_huge_page(hpage);
res = dequeue_hwpoisoned_huge_page(hpage);