summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorWanpeng Li <wanpeng.li@hotmail.com>2015-08-14 15:34:59 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-09-13 09:07:38 -0700
commitd73eba8c9e33c0d5b487c04a0fc498432f074fea (patch)
tree3f6ea6abd05cefb7b5c43663196229109884fcf4 /mm
parent0ebc1f07b7570ca97734c408b0ba87bf340b2cb0 (diff)
mm/hwpoison: fix fail isolate hugetlbfs page w/ refcount held
commit 036138080a4376e5f3e5d0cca8ac99084c5cf06e upstream. Hugetlbfs pages will get a refcount in get_any_page() or madvise_hwpoison() if soft offlining through madvise. The refcount which is held by the soft offline path should be released if we fail to isolate hugetlbfs pages. Fix it by reducing the refcount for both isolation success and failure. Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com> Acked-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.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.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 79fa29332fa3..9f48145c884f 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1589,13 +1589,12 @@ static int soft_offline_huge_page(struct page *page, int flags)
unlock_page(hpage);
ret = isolate_huge_page(hpage, &pagelist);
- if (ret) {
- /*
- * get_any_page() and isolate_huge_page() takes a refcount each,
- * so need to drop one here.
- */
- put_page(hpage);
- } else {
+ /*
+ * get_any_page() and isolate_huge_page() takes a refcount each,
+ * so need to drop one here.
+ */
+ put_page(hpage);
+ if (!ret) {
pr_info("soft offline: %#lx hugepage failed to isolate\n", pfn);
return -EBUSY;
}