Skip to content

Commit

Permalink
hwpoison: always unset MIGRATE_ISOLATE before returning from soft_off…
Browse files Browse the repository at this point in the history
…line_page()

Soft offline code expects that MIGRATE_ISOLATE is set on the target page
only during soft offlining work.  But currenly it doesn't work as expected
when get_any_page() fails and returns negative value.  In the result, end
users can have unexpectedly isolated pages.  This patch just fixes it.

Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Reviewed-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Fengguang Wu <fengguang.wu@intel.com>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Naoya Horiguchi authored and torvalds committed Sep 11, 2013
1 parent cf6fe94 commit 0d6fdbd
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion mm/memory-failure.c
Original file line number Diff line number Diff line change
Expand Up @@ -1553,7 +1553,7 @@ int soft_offline_page(struct page *page, int flags)

ret = get_any_page(page, pfn, flags);
if (ret < 0)
return ret;
goto unset;
if (ret) { /* for in-use pages */
if (PageHuge(page))
ret = soft_offline_huge_page(page, flags);
Expand All @@ -1570,6 +1570,7 @@ int soft_offline_page(struct page *page, int flags)
atomic_long_inc(&num_poisoned_pages);
}
}
unset:
unset_migratetype_isolate(page, MIGRATE_MOVABLE);
return ret;
}
Expand Down

0 comments on commit 0d6fdbd

Please sign in to comment.