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

[ Upstream commit e2c1ab070fdc81010ec44634838d24fce9ff9e53 ]

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: b94e02822deb ("mm,hwpoison: try to narrow window race for free pages")
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Acked-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 6375fe9be87b6399b5da80260d43dfb1ee042a37..0c08e803ed42dbfbe5252546ed88d701e0fd99b2 100644 (file)
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1919,10 +1919,13 @@ retry:
        if (ret > 0) {
                ret = soft_offline_in_use_page(page);
        } else if (ret == 0) {
-               if (!page_handle_poison(page, true, false) && try_again) {
-                       try_again = false;
-                       flags &= ~MF_COUNT_INCREASED;
-                       goto retry;
+               if (!page_handle_poison(page, true, false)) {
+                       if (try_again) {
+                               try_again = false;
+                               flags &= ~MF_COUNT_INCREASED;
+                               goto retry;
+                       }
+                       ret = -EBUSY;
                }
        } else if (ret == -EIO) {
                pr_info("%s: %#lx: unknown page type: %lx (%pGP)\n",