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 EDE0F2AD04; Tue, 26 Aug 2025 13:34:01 +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=1756215242; cv=none; b=jZiOatHQpzp+VXxSTnJgO0Y4is3dLjC6ZxthzmqjIe+1XNWf4sy8Yc5ij0HBkrOEJcbhfGuVz0xIVviBwb+zl354oy0PH9PuT2tDnigciLPPCvRSg7+YF+hBA2/olsLYNcJsgnUPOyE+rINhuWhVHGy/mri+7jhuTj4lVPoAW4s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756215242; c=relaxed/simple; bh=k6tg3G4gqbCke98isBJmR5YAC8NCQGxWjUCEdUaR2o4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZZz5zk9254weqPID56etup11zBPV3/otouAvbTF7RnFZGOzOdo9vn45CIWlugpZyMEQjUwiaoshDyKSOn3Jz0Kf3L2p/PatcccVJpgw/a0T9WDckmlqvfZAhO43X9UQEUJ55oyRP2dFMODkKfm3HhvGVwIRi9LuLVAX3c7HRHrw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=EaTpDOHt; 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="EaTpDOHt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2AACEC4CEF1; Tue, 26 Aug 2025 13:34:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756215241; bh=k6tg3G4gqbCke98isBJmR5YAC8NCQGxWjUCEdUaR2o4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EaTpDOHt/Riee+Fy9w0JU7EdFAL4dNHfSfsGaleeo+Pc7FRn9nJ6Y2pr8upQP58ab /HowDPEJTP9R0Cw1dzQekRvw+z6vWgaGq42zUWkT+3S4Xg09i0Gtq+C4sVxQT4jM01 UjGOGXg89rwmZf3Bapwg+SyWmeF8dqjTmhLTvxJw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jinjiang Tu , David Hildenbrand , Miaohe Lin , Jane Chu , Kefeng Wang , Naoya Horiguchi , Oscar Salvador , Shuai Xue , Zi Yan , Andrew Morton , Sasha Levin Subject: [PATCH 6.1 440/482] mm/memory-failure: fix infinite UCE for VM_PFNMAP pfn Date: Tue, 26 Aug 2025 13:11:33 +0200 Message-ID: <20250826110941.701462757@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110930.769259449@linuxfoundation.org> References: <20250826110930.769259449@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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jinjiang Tu [ Upstream commit 2e6053fea379806269c4f7f5e36b523c9c0fb35c ] When memory_failure() is called for a already hwpoisoned pfn, kill_accessing_process() will be called to kill current task. However, if the vma of the accessing vaddr is VM_PFNMAP, walk_page_range() will skip the vma in walk_page_test() and return 0. Before commit aaf99ac2ceb7 ("mm/hwpoison: do not send SIGBUS to processes with recovered clean pages"), kill_accessing_process() will return EFAULT. For x86, the current task will be killed in kill_me_maybe(). However, after this commit, kill_accessing_process() simplies return 0, that means UCE is handled properly, but it doesn't actually. In such case, the user task will trigger UCE infinitely. To fix it, add .test_walk callback for hwpoison_walk_ops to scan all vmas. Link: https://lkml.kernel.org/r/20250815073209.1984582-1-tujinjiang@huawei.com Fixes: aaf99ac2ceb7 ("mm/hwpoison: do not send SIGBUS to processes with recovered clean pages") Signed-off-by: Jinjiang Tu Acked-by: David Hildenbrand Acked-by: Miaohe Lin Reviewed-by: Jane Chu Cc: Kefeng Wang Cc: Naoya Horiguchi Cc: Oscar Salvador Cc: Shuai Xue Cc: Zi Yan Cc: Signed-off-by: Andrew Morton [ Adjust context ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- mm/memory-failure.c | 8 ++++++++ 1 file changed, 8 insertions(+) --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -731,9 +731,17 @@ static int hwpoison_hugetlb_range(pte_t #define hwpoison_hugetlb_range NULL #endif +static int hwpoison_test_walk(unsigned long start, unsigned long end, + struct mm_walk *walk) +{ + /* We also want to consider pages mapped into VM_PFNMAP. */ + return 0; +} + static const struct mm_walk_ops hwp_walk_ops = { .pmd_entry = hwpoison_pte_range, .hugetlb_entry = hwpoison_hugetlb_range, + .test_walk = hwpoison_test_walk, }; /*