Commit 03613808 authored by Wanpeng Li's avatar Wanpeng Li Committed by Linus Torvalds

mm/hwpoison: fix fail isolate hugetlbfs page w/ refcount held

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: default avatarWanpeng Li <wanpeng.li@hotmail.com>
Acked-by: default avatarNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: <stable@vger.kernel.org>	[3.9+]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4f32be67
...@@ -1569,13 +1569,12 @@ static int soft_offline_huge_page(struct page *page, int flags) ...@@ -1569,13 +1569,12 @@ static int soft_offline_huge_page(struct page *page, int flags)
unlock_page(hpage); unlock_page(hpage);
ret = isolate_huge_page(hpage, &pagelist); ret = isolate_huge_page(hpage, &pagelist);
if (ret) {
/* /*
* get_any_page() and isolate_huge_page() takes a refcount each, * get_any_page() and isolate_huge_page() takes a refcount each,
* so need to drop one here. * so need to drop one here.
*/ */
put_page(hpage); put_page(hpage);
} else { if (!ret) {
pr_info("soft offline: %#lx hugepage failed to isolate\n", pfn); pr_info("soft offline: %#lx hugepage failed to isolate\n", pfn);
return -EBUSY; return -EBUSY;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment