From nobody Sat Feb 7 07:25:45 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 943E8EB64D9 for ; Tue, 27 Jun 2023 11:29:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230413AbjF0L3H (ORCPT ); Tue, 27 Jun 2023 07:29:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229501AbjF0L26 (ORCPT ); Tue, 27 Jun 2023 07:28:58 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C75C26A9 for ; Tue, 27 Jun 2023 04:28:57 -0700 (PDT) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Qr2T42PkBzMpbK; Tue, 27 Jun 2023 19:25:44 +0800 (CST) Received: from huawei.com (10.175.104.170) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Tue, 27 Jun 2023 19:28:54 +0800 From: Miaohe Lin To: , CC: , , Subject: [PATCH] mm: memory-failure: fix unexpected return value in soft_offline_page() Date: Tue, 27 Jun 2023 19:28:08 +0800 Message-ID: <20230627112808.1275241-1-linmiaohe@huawei.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.104.170] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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. Fixes: b94e02822deb ("mm,hwpoison: try to narrow window race for free pages= ") Signed-off-by: Miaohe Lin Acked-by: Naoya Horiguchi --- mm/memory-failure.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index aada6ac72fe5..dc1572818b7d 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -2737,10 +2737,13 @@ int soft_offline_page(unsigned long pfn, int flags) if (ret > 0) { ret =3D soft_offline_in_use_page(page); } else if (ret =3D=3D 0) { - if (!page_handle_poison(page, true, false) && try_again) { - try_again =3D false; - flags &=3D ~MF_COUNT_INCREASED; - goto retry; + if (!page_handle_poison(page, true, false)) { + if (try_again) { + try_again =3D false; + flags &=3D ~MF_COUNT_INCREASED; + goto retry; + } + ret =3D -EBUSY; } } =20 --=20 2.27.0