Commit e2c1ab07 authored by Miaohe Lin's avatar Miaohe Lin Committed by Andrew Morton

mm: memory-failure: fix unexpected return value in soft_offline_page()

When page_handle_poison() fails to handle the hugepage or free page in
retry path, soft_offline_page() will return 0 while -EBUSY is expected in
this case.

Consequently the user will think soft_offline_page succeeds while it in
fact failed.  So the user will not try again later in this case.

Link: https://lkml.kernel.org/r/20230627112808.1275241-1-linmiaohe@huawei.com
Fixes: b94e0282 ("mm,hwpoison: try to narrow window race for free pages")
Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Acked-by: default avatarNaoya Horiguchi <naoya.horiguchi@nec.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent d59070d1
...@@ -2741,11 +2741,14 @@ int soft_offline_page(unsigned long pfn, int flags) ...@@ -2741,11 +2741,14 @@ int soft_offline_page(unsigned long pfn, int flags)
if (ret > 0) { if (ret > 0) {
ret = soft_offline_in_use_page(page); ret = soft_offline_in_use_page(page);
} else if (ret == 0) { } else if (ret == 0) {
if (!page_handle_poison(page, true, false) && try_again) { if (!page_handle_poison(page, true, false)) {
if (try_again) {
try_again = false; try_again = false;
flags &= ~MF_COUNT_INCREASED; flags &= ~MF_COUNT_INCREASED;
goto retry; goto retry;
} }
ret = -EBUSY;
}
} }
mutex_unlock(&mf_mutex); mutex_unlock(&mf_mutex);
......
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