From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A441E2BE622; Wed, 17 Sep 2025 12:39:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758112798; cv=none; b=nmurbyFjgkWi3r0jzMWXnI47sw+guE1K0UmCHnwZ2BWkxIySrqQtA0ZyC9AKhVyPT1k3WWkGBGC32C3VeRT2rj068R33Vj4EesLUt+mI3lC3bwES6UPwGunWHBdZoJfQGPkUegK9A2ziCtOH8sfOL9lZw9IMYFz/w7NNhr63p7A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758112798; c=relaxed/simple; bh=WX/QXgYMWhA3OVWfGOw3ii3dVCc9yNWDUsq219szXPk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NpW3CU90FBwZOHuJFuF6HmDbCyL7RsKuaMKd+hWmhiY7uAiTTx+xpKNxgsqbguJsLKXfeBjtIHwhpHZkOiLLY0MWcOzcnMnBGOUF7r6q8j4aD7F/kosAi6dx0xVrPX4qxA7ASDYGuooqgL+LcdFgJO2gwXFcEAO0jV10BQ7n1Q0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=pWMHR+xc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="pWMHR+xc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D9C4CC4CEF0; Wed, 17 Sep 2025 12:39:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1758112798; bh=WX/QXgYMWhA3OVWfGOw3ii3dVCc9yNWDUsq219szXPk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pWMHR+xcAqjRkRz6EjZeBpLOJuODv6zXWyQHecCte90EGowlCvKdCO8EYca6Wey6y aiLf6MXkeM1yzpZZoTj43PfXRaUdFb2/yb6D1LJiBlAVW8LGfevCKOIhtN7g5lNPCS GDJOVgxS2Zab63sFc9MipZMUdg/TRSRPfA+CJIoM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kyle Meyer , Jiaqi Yan , David Hildenbrand , Jane Chu , Miaohe Lin , Borislav Betkov , Liam Howlett , Lorenzo Stoakes , "Luck, Tony" , Michal Hocko , Mike Rapoport , Naoya Horiguchi , Oscar Salvador , Russ Anderson , Suren Baghdasaryan , Vlastimil Babka , Andrew Morton Subject: [PATCH 6.16 080/189] mm/memory-failure: fix redundant updates for already poisoned pages Date: Wed, 17 Sep 2025 14:33:10 +0200 Message-ID: <20250917123353.821582158@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250917123351.839989757@linuxfoundation.org> References: <20250917123351.839989757@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kyle Meyer commit 3be306cccdccede13e3cefd0c14e430cc2b7c9c7 upstream. Duplicate memory errors can be reported by multiple sources. Passing an already poisoned page to action_result() causes issues: * The amount of hardware corrupted memory is incorrectly updated. * Per NUMA node MF stats are incorrectly updated. * Redundant "already poisoned" messages are printed. Avoid those issues by: * Skipping hardware corrupted memory updates for already poisoned pages. * Skipping per NUMA node MF stats updates for already poisoned pages. * Dropping redundant "already poisoned" messages. Make MF_MSG_ALREADY_POISONED consistent with other action_page_types and make calls to action_result() consistent for already poisoned normal pages and huge pages. Link: https://lkml.kernel.org/r/aLCiHMy12Ck3ouwC@hpe.com Fixes: b8b9488d50b7 ("mm/memory-failure: improve memory failure action_result messages") Signed-off-by: Kyle Meyer Reviewed-by: Jiaqi Yan Acked-by: David Hildenbrand Reviewed-by: Jane Chu Acked-by: Miaohe Lin Cc: Borislav Betkov Cc: Kyle Meyer Cc: Liam Howlett Cc: Lorenzo Stoakes Cc: "Luck, Tony" Cc: Michal Hocko Cc: Mike Rapoport Cc: Naoya Horiguchi Cc: Oscar Salvador Cc: Russ Anderson Cc: Suren Baghdasaryan Cc: Vlastimil Babka Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- mm/memory-failure.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -950,7 +950,7 @@ static const char * const action_page_ty [MF_MSG_BUDDY] = "free buddy page", [MF_MSG_DAX] = "dax page", [MF_MSG_UNSPLIT_THP] = "unsplit thp", - [MF_MSG_ALREADY_POISONED] = "already poisoned", + [MF_MSG_ALREADY_POISONED] = "already poisoned page", [MF_MSG_UNKNOWN] = "unknown page", }; @@ -1343,9 +1343,10 @@ static int action_result(unsigned long p { trace_memory_failure_event(pfn, type, result); - num_poisoned_pages_inc(pfn); - - update_per_node_mf_stats(pfn, result); + if (type != MF_MSG_ALREADY_POISONED) { + num_poisoned_pages_inc(pfn); + update_per_node_mf_stats(pfn, result); + } pr_err("%#lx: recovery action for %s: %s\n", pfn, action_page_types[type], action_name[result]); @@ -2088,12 +2089,11 @@ retry: *hugetlb = 0; return 0; } else if (res == -EHWPOISON) { - pr_err("%#lx: already hardware poisoned\n", pfn); if (flags & MF_ACTION_REQUIRED) { folio = page_folio(p); res = kill_accessing_process(current, folio_pfn(folio), flags); - action_result(pfn, MF_MSG_ALREADY_POISONED, MF_FAILED); } + action_result(pfn, MF_MSG_ALREADY_POISONED, MF_FAILED); return res; } else if (res == -EBUSY) { if (!(flags & MF_NO_RETRY)) { @@ -2279,7 +2279,6 @@ try_again: goto unlock_mutex; if (TestSetPageHWPoison(p)) { - pr_err("%#lx: already hardware poisoned\n", pfn); res = -EHWPOISON; if (flags & MF_ACTION_REQUIRED) res = kill_accessing_process(current, pfn, flags);