From mboxrd@z Thu Jan 1 00:00:00 1970 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 53E09C83F11 for ; Sat, 26 Aug 2023 20:18:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229762AbjHZUR6 (ORCPT ); Sat, 26 Aug 2023 16:17:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229750AbjHZURh (ORCPT ); Sat, 26 Aug 2023 16:17:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 887D31AD for ; Sat, 26 Aug 2023 13:17:35 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2548161463 for ; Sat, 26 Aug 2023 20:17:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E185C433C7; Sat, 26 Aug 2023 20:17:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1693081054; bh=q5FbqE6pYN+T0ZpAbNVQz1sM5T8zFBF+DKoKXszvA1k=; h=Subject:To:Cc:From:Date:From; b=dwY8ZZP1shlfcwpGaKQ/3jRwBPVU706Gw1c1QCMomqg1YRD//eQqBrccfvcDUbdj9 XGvuTA0hRSn+ud3lCz5GFs4lH83LJrD/u5jILMV2oqf2OGx1V6UrhBwHNgBL4WVX8V L/yyRD4u9WwxEvCeRb/dXkJWlkSm3RJMZ9QOfkN8= Subject: FAILED: patch "[PATCH] mm: memory-failure: fix unexpected return value in" failed to apply to 5.15-stable tree To: linmiaohe@huawei.com, akpm@linux-foundation.org, naoya.horiguchi@nec.com, stable@vger.kernel.org Cc: From: Date: Sat, 26 Aug 2023 22:17:31 +0200 Message-ID: <2023082631-preacher-spousal-e0e5@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x e2c1ab070fdc81010ec44634838d24fce9ff9e53 # git commit -s git send-email --to '' --in-reply-to '2023082631-preacher-spousal-e0e5@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: e2c1ab070fdc ("mm: memory-failure: fix unexpected return value in soft_offline_page()") 7adb45887c8a ("mm: memory-failure: kill soft_offline_free_page()") 2a57d83c78f8 ("mm/hwpoison: clear MF_COUNT_INCREASED before retrying get_any_page()") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From e2c1ab070fdc81010ec44634838d24fce9ff9e53 Mon Sep 17 00:00:00 2001 From: Miaohe Lin Date: Tue, 27 Jun 2023 19:28:08 +0800 Subject: [PATCH] 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: b94e02822deb ("mm,hwpoison: try to narrow window race for free pages") Signed-off-by: Miaohe Lin Acked-by: Naoya Horiguchi Cc: Signed-off-by: Andrew Morton diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 139b31fdb678..fe121fdb05f7 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -2741,10 +2741,13 @@ int soft_offline_page(unsigned long pfn, int flags) 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; } }