From patchwork Tue May 21 23:54:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jane Chu X-Patchwork-Id: 13669814 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42848C25B7A for ; Tue, 21 May 2024 23:55:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D0D7B6B008C; Tue, 21 May 2024 19:55:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C95FB6B0092; Tue, 21 May 2024 19:55:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B5DCB6B0093; Tue, 21 May 2024 19:55:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 98D906B008C for ; Tue, 21 May 2024 19:55:11 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 3CEC0140D0C for ; Tue, 21 May 2024 23:55:11 +0000 (UTC) X-FDA: 82144061622.29.74FD77E Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf21.hostedemail.com (Postfix) with ESMTP id 8E0601C000D for ; Tue, 21 May 2024 23:55:08 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=ozaHhLK3; dmarc=pass (policy=quarantine) header.from=oracle.com; spf=pass (imf21.hostedemail.com: domain of jane.chu@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=jane.chu@oracle.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716335708; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=aVvMSdU9di+/pg8Z/YTSNT+1WpNBkHB9jxFSgsTIf2I=; b=VaeRJcPkB3gpGtUl01P0qSM7YlZgDTYiiW57a1S1sLaOwrYaFy9lBb6oqNrO99z3k0ze8S QJNyCP5eqiygEabAaIvmI9iwPfFEl0NzGf9xhx8Gp5MpthIPgkc5x8aeA+0YFmF0rKavH6 3pilsXwTESaRtXRxScKoi0h2xuoLaiQ= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=ozaHhLK3; dmarc=pass (policy=quarantine) header.from=oracle.com; spf=pass (imf21.hostedemail.com: domain of jane.chu@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=jane.chu@oracle.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716335708; a=rsa-sha256; cv=none; b=NTGtN+I/Mlb9Mv3Dqm3Py8SY8UYdjonzvplKM3T90YifpouV9X6DFMdQhFCLWgTKCgjCDH Thd949O6lfrtz+UE6IJXdChc+LIwZt03FUM659/c4YfqnMbRg7rhhG2MNkS9sM+Rn0ffZm moK8ECb5e8WS/WC4I2gbEC7s6Cem+pI= Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 44LJi3AL011519; Tue, 21 May 2024 23:55:01 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=corp-2023-11-20; bh=aVvMSdU9di+/pg8Z/YTSNT+1WpNBkHB9jxFSgsTIf2I=; b=ozaHhLK3zTKdc2Hph/rlUXGL/acHXan8W2VjZFKVnfmWjoysXZ+EKLGG0vFyu/tvrPya YCF8MOAdfRcfbqCoYhyYwZHcEC7A5CVpcihcTC4H4SLMcSosNGiRqLRREaNFvk5+Yph+ /3ODhSVoGnP4hTcU0GttTiST2tUhqyX85HZ3zgnZ0EO5B4s2SHY2HcRwqGaZGnhk4/k1 HKVu+8RM0pY6Zdo6223C17NDHPOs9lkC+Y2hCkNWK+9R0JpRMivj9X4oytzJRRBN1Xi2 rq2q/ELDQkZKru9HB5FqHGtqk1ArG7jiEjBhpZN48XcBjCr8hpjLdN9oFYWX0+olMErw Cw== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3y6mcdxkkd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 21 May 2024 23:55:01 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 44LMZkKS002667; Tue, 21 May 2024 23:55:00 GMT Received: from brm-x62-16.us.oracle.com (brm-x62-16.us.oracle.com [10.80.150.37]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3y6js8erce-2; Tue, 21 May 2024 23:55:00 +0000 From: Jane Chu To: linmiaohe@huawei.com, nao.horiguchi@gmail.com, akpm@linux-foundation.org, osalvador@suse.de, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/5] mm/memory-failure: try to send SIGBUS even if unmap failed Date: Tue, 21 May 2024 17:54:25 -0600 Message-Id: <20240521235429.2368017-2-jane.chu@oracle.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240521235429.2368017-1-jane.chu@oracle.com> References: <20240521235429.2368017-1-jane.chu@oracle.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16 definitions=2024-05-21_14,2024-05-21_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 suspectscore=0 spamscore=0 mlxscore=0 adultscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2405210181 X-Proofpoint-ORIG-GUID: B4WTxpJGzidQZfA17erZRzLWZ4zjq7Hs X-Proofpoint-GUID: B4WTxpJGzidQZfA17erZRzLWZ4zjq7Hs X-Rspamd-Queue-Id: 8E0601C000D X-Stat-Signature: 64h9megbpb4rprg3hsnsq1t9xqrogjc4 X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1716335708-445005 X-HE-Meta: U2FsdGVkX1+Jc8dhiuuGb2+AHpqIFCbT/MVtIf35saU2vDEsoHpVBu4m3Yzb+T3QtWYe5jEqYS0wuxWdkmXjf9C+ae/cY6HjS9hx6NHl3sY248sNh0OFRDZBLopUbW0ii5qsUgi9GrhQlb7z/fT/H9cX03gj/nVvdMavCRNjcWq/WNAtTsIArfJ0EAhMKMt9GQraKbCCCWB8ksvzME58yEIZ1k0HAP7esRUHtgHlKjyjAOYF/Yc1/8cXvUU94tJ35DECndvuD29YzGp1IIQLkKNSDhefMmX5dYFaRIBGUNTtt3FrxC6LOOXXwV2H+HwocnJefuxZgjyJw0BnojQwCcBZ7LfPuVyvV7twx5yIQL5BznLJK8mjT6vv+ZkY5OJtVFQDS0rrzhLw78KApKCg7zXpXyoX0eA/i6c0DaSi6EpvoTUcNqLbsgsf6BAPAN52ryqYQV5ENg9OAPC7a/+es/ouAakPecefCu8G7L2+3EkiobERgiEOi29PiR3enYr3eo13TIGisiJm4wtUDYqXY6YGrQNa+LJnotGyfwj6Hh8rUobBTy0gn8jV0K0sUNb2iEctM5QCN4Pd3VRNccjskncOMmkU3gMgUYqQ8MQcjqKxq7dGNayhj2lWx4b8ksZtrl1tVaTPGiJyPiqjzpcLDBJ8BDnFXVdTafn7olLaYB6jqpRB2OYY5s7KIBBqg670vYMJBzmX/oOhCzEDeL3Oue1DkTQdwtGIv9bTBCTJJRm38FAUen4b3mCbYmPnBj34ZZEm+su/54JbT/xAHDQYP5bmvbttLlz2zfqgTq1iQFF65HfbSnpwwlS0zNvuCU5n4hF5wm+80ragVW5HKAx48QSOQ+Z5xcVZmT55iYpcbbJWu1BjqgUO/l7mLhN1MpkTPtrSoY4s7emTwi/kqUxNRa1QDTMGZ8jxM9Oa7JSoF5zIc7uxO4G06+yq9SimJNulV5NBz+VdbK694VpMjtr uDkmxrja Fnfzj X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: For years when it comes down to kill a process due to hwpoison, a SIGBUS is delivered only if unmap has been successful. Otherwise, a SIGKILL is delivered. And the reason for that is to prevent the involved process from accessing the hwpoisoned page again. Since then a lot has changed, a hwpoisoned page is marked and upon being re-accessed, the memory-failure handler invokes kill_accessing_process() to kill the process immediately. So let's take out the '!unmap_success' factor and try to deliver SIGBUS if possible. Signed-off-by: Jane Chu Reviewed-by: Oscar Salvador Acked-by: Miaohe Lin --- mm/memory-failure.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 16ada4fb02b7..739311e121af 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -514,22 +514,15 @@ void add_to_kill_ksm(struct task_struct *tsk, struct page *p, * * Only do anything when FORCEKILL is set, otherwise just free the * list (this is used for clean pages which do not need killing) - * Also when FAIL is set do a force kill because something went - * wrong earlier. */ -static void kill_procs(struct list_head *to_kill, int forcekill, bool fail, +static void kill_procs(struct list_head *to_kill, int forcekill, unsigned long pfn, int flags) { struct to_kill *tk, *next; list_for_each_entry_safe(tk, next, to_kill, nd) { if (forcekill) { - /* - * In case something went wrong with munmapping - * make sure the process doesn't catch the - * signal and then access the memory. Just kill it. - */ - if (fail || tk->addr == -EFAULT) { + if (tk->addr == -EFAULT) { pr_err("%#lx: forcibly killing %s:%d because of failure to unmap corrupted page\n", pfn, tk->tsk->comm, tk->tsk->pid); do_send_sig_info(SIGKILL, SEND_SIG_PRIV, @@ -1660,7 +1653,7 @@ static bool hwpoison_user_mappings(struct folio *folio, struct page *p, */ forcekill = folio_test_dirty(folio) || (flags & MF_MUST_KILL) || !unmap_success; - kill_procs(&tokill, forcekill, !unmap_success, pfn, flags); + kill_procs(&tokill, forcekill, pfn, flags); return unmap_success; } @@ -1724,7 +1717,7 @@ static void unmap_and_kill(struct list_head *to_kill, unsigned long pfn, unmap_mapping_range(mapping, start, size, 0); } - kill_procs(to_kill, flags & MF_MUST_KILL, false, pfn, flags); + kill_procs(to_kill, flags & MF_MUST_KILL, pfn, flags); } /* From patchwork Tue May 21 23:54:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jane Chu X-Patchwork-Id: 13669815 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C410EC25B74 for ; Tue, 21 May 2024 23:55:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 547C76B0093; Tue, 21 May 2024 19:55:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4CDB06B0095; Tue, 21 May 2024 19:55:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 370186B0096; Tue, 21 May 2024 19:55:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 14ACE6B0093 for ; Tue, 21 May 2024 19:55:14 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id BDDF712103D for ; Tue, 21 May 2024 23:55:13 +0000 (UTC) X-FDA: 82144061706.15.3435076 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf12.hostedemail.com (Postfix) with ESMTP id C4C6D40018 for ; Tue, 21 May 2024 23:55:11 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=g6cUrmqR; dmarc=pass (policy=quarantine) header.from=oracle.com; spf=pass (imf12.hostedemail.com: domain of jane.chu@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=jane.chu@oracle.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716335712; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=uGf2vROyvg6ZwMJ/Hw9eQH29lzC7eJMyJb27dxpCla8=; b=L07g9nwSEoep9MnR0sLLpyDjvF2DOiKDB7iHpZiXc9dNDtojvWfxDT6QkBdYBOtQLmscpx R3Iuf0wGY5Y6HNko9/MsiA7CuMAn995XOklR5w6an2x2bKFgO77GMIpbhMZE4ZQXArsglt Ta0+Rqp4oyU0gW4jnSe4dIUBv20OoEc= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=g6cUrmqR; dmarc=pass (policy=quarantine) header.from=oracle.com; spf=pass (imf12.hostedemail.com: domain of jane.chu@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=jane.chu@oracle.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716335712; a=rsa-sha256; cv=none; b=Cfi3GaRvm3BBfeR9/KQImSnSAK6YKbWcz/EeuEQJnpoa4q008Cbi79W1LsQ6cdinwk9ocv 4f91uFW0HjOQIuJZrBuxG1n+ZJ16RpE02IYT3t6GlTa5A77y/kES4TKjMqTzgsrN9zGMbF QQFEjFTXFYl3MAxSqQ1DyznAHr3AaCg= Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 44LJkCvG016732; Tue, 21 May 2024 23:55:07 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=corp-2023-11-20; bh=uGf2vROyvg6ZwMJ/Hw9eQH29lzC7eJMyJb27dxpCla8=; b=g6cUrmqR0x6RsZLklZW3C4yPOprOOlqOabivyLBi5K34GjPi1uBH4gEk33FmgbZijwgo yL5DHU5SbsvaTOe2Mpsin+IDSQyt3m5kix9y2mHjY1GsheO09ZlAvUT0wTGZ9q4ZHMc4 SCMHgSJDmicGy1fnDevChzwRdfStdVdgExvqtnuDDeR7s24DtvJkXfIXJIQ7VbklfuGo xNvCuTtvOXVZvoPsFT1Xdb0PH4SfStl41HmzY0K/Rov+ETG5RUKOTOL4kt/WiPD1pzaG ktn4cwsBAGqOdsUapynVBGGDWyfDHn8rYty9cHDU5+MHNSFB930W16IhsUwIeoflVuCx bQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3y6jx2efc5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 21 May 2024 23:55:07 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 44LMZkKT002667; Tue, 21 May 2024 23:55:05 GMT Received: from brm-x62-16.us.oracle.com (brm-x62-16.us.oracle.com [10.80.150.37]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3y6js8erce-3; Tue, 21 May 2024 23:55:05 +0000 From: Jane Chu To: linmiaohe@huawei.com, nao.horiguchi@gmail.com, akpm@linux-foundation.org, osalvador@suse.de, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/5] mm/madvise: Add MF_ACTION_REQUIRED to madvise(MADV_HWPOISON) Date: Tue, 21 May 2024 17:54:26 -0600 Message-Id: <20240521235429.2368017-3-jane.chu@oracle.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240521235429.2368017-1-jane.chu@oracle.com> References: <20240521235429.2368017-1-jane.chu@oracle.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16 definitions=2024-05-21_14,2024-05-21_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 suspectscore=0 spamscore=0 mlxscore=0 adultscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2405210181 X-Proofpoint-GUID: s8TZqutMV_sNhtOaqmw9r6gFiSZXwMpt X-Proofpoint-ORIG-GUID: s8TZqutMV_sNhtOaqmw9r6gFiSZXwMpt X-Rspamd-Queue-Id: C4C6D40018 X-Stat-Signature: i7mbi8fbhgicmj9qyczf673obeobzs7y X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1716335711-349898 X-HE-Meta: U2FsdGVkX18Fz+KgQFo35TRsb6PsWrEsWB04WK4SN01+DVxUks/E7xa0XzBITvNaKdvagcmLQ4dp2KCBGnF9tpfZUaoXhZRqC5I43LdP5nu1hOLs3JRt737EWGtu0wYAmFrcIRY9CRxyk8vB8lJOAGbKNcwfbmwWGtqFZpveBWF/LXsfDo/eqIsIczUL9+M3Z3cufCmjRjdnDZgxFbJxuXah0+cVoc94WGgiJr0A41cxSv1PAswJW1MPhCucmQazcs5TFYvYZlDKVweO36Fp99OKalxvIRl/I99dMZdAz2AoYCjZck+H61Wx6cKjQYd/oxcEZ5SyklvmKdsyOem/DTXZvrQLui+PPmflcvl7NuXC2WHgzh4GAvQ1lg0tckOCBl7u+uQprOR+0eOCiWYqzFepMXDHFK2GKmv8S5mSkMD1fcjG9GOPeKDdvLFM0tImJoJGveOW6T16HZySfWElnZ6TyfH5IGFTF2BvtKa9i6XEm+pXiVmlZSqrirT72yOZ7Lhlwiq0R3mB5OrcqnPEVFzBMoLvAL7FTju9WNq92nKgqyMZvAvWJ77bNhKVwyXeIZSwoAx3tEr5B62ko2xmBGLejK9KYxuJui7BCXl9Iq0AbfDNH0+JvkJTy6RRFI9YTdlhZar+Y9DM4y/uJyzpqPIeidF/ieYYuLKVejqjWxt4Q0Fd2uA9Ka6MXwNg3ClChEmHsFe2I/HxKEqL+KH1m1sijT2LO7E+S3o5uwXe6gd+/UHCigh/v2oSMrCiGGAB1kHFWD0kDhVQFTlnJ5mN8CN1QyIFnONkgVA4Kgw2MRGrEKLdFd5/LEI5rZ/rhlOftPTGEzoRDK/X4dV743f1LW9Jt+LZ+ymZCutlIvuj3ZTSu2vjGQHS+eVsrVqDgzKzlFLwZVFbxjP9pNwoKQWhQxnJtiQ7x8aG/u8NDs/4vnnB0V0BVJ4bCKadyQHoZoWVAFW+a+CyEsiS1ezUybf axlL8bDq l58Qy1oxRn4R3AUDQuMzGeHVZmhI1oUEfahgWrERX3r7NfYFynRVCUTeg64EIFAgk6BnfkjE1zXviDPXbQ4SLOXvQJDBJ5VdhrI0oHOk2pedKasRFFwz3sHmd/1Tt1YPJZ5tSKz7OhL4vm41pE7lL/ya0ewzsmZgX2g1AqfDgKovIQLxqIYnyDaJDoBT64IEyMbUzAUDQT3e5LQVGLDcsFe5pec2PsHomKsDr72GftMWhoAP83DZ51oXnfVskPSMdM0zK0S4lAmGUrIuA6dR1KteHlZh+4WS8yb+ncwcvMrwEJljfHJ8crW2mtN902+4wLGFkDnlfk6/29cc= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: The soft hwpoison injector via madvise(MADV_HWPOISON) operates in a synchrous way in a sense, the injector is also a process under test, and should it have the poisoned page mapped in its address space, it should get killed as much as in a real UE situation. Doing so align with what the madvise(2) man page says: " "This operation may result in the calling process receiving a SIGBUS and the page being unmapped." Signed-off-by: Jane Chu Reviewed-by: Oscar Salvador Acked-by: Miaohe Lin --- mm/madvise.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/madvise.c b/mm/madvise.c index c8ba3f3eb54d..d8a01d7b2860 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -1147,7 +1147,7 @@ static int madvise_inject_error(int behavior, } else { pr_info("Injecting memory failure for pfn %#lx at process virtual address %#lx\n", pfn, start); - ret = memory_failure(pfn, MF_COUNT_INCREASED | MF_SW_SIMULATED); + ret = memory_failure(pfn, MF_ACTION_REQUIRED | MF_COUNT_INCREASED | MF_SW_SIMULATED); if (ret == -EOPNOTSUPP) ret = 0; } From patchwork Tue May 21 23:54:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jane Chu X-Patchwork-Id: 13669816 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4CFCCC25B74 for ; Tue, 21 May 2024 23:55:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D830C6B0096; Tue, 21 May 2024 19:55:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D333C6B0098; Tue, 21 May 2024 19:55:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BFB086B0099; Tue, 21 May 2024 19:55:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id A35206B0096 for ; Tue, 21 May 2024 19:55:47 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 4005D120FFA for ; Tue, 21 May 2024 23:55:45 +0000 (UTC) X-FDA: 82144063050.22.603C46F Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf22.hostedemail.com (Postfix) with ESMTP id 589F8C0007 for ; Tue, 21 May 2024 23:55:43 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=eQwrzgK3; spf=pass (imf22.hostedemail.com: domain of jane.chu@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=jane.chu@oracle.com; dmarc=pass (policy=quarantine) header.from=oracle.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716335743; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=z1prDriYsI1wDXlPHr/vQoqHCvjGzLHUUrEOL1odZwA=; b=pYacovYdgEOyuUB6eWk7CBqPrX+v0Zxz/1/ypFF07P8ElRce7tS6+gP7xxEEQE7E0ZKBv3 gN4tCVt5Trqv897sd+FBGZ3aCWxIWfmqDaLDg0iCouh5vy8jYiR3gmzPoRm+i5Xj8KrrcA Vdx05e+iWa9zGFSL5NnEher9qyj0OS0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716335743; a=rsa-sha256; cv=none; b=bthEHxq3JZpIk5aXUQEW+xT0PNjYQcqudYmpQY8SfIDOK4G14L7Sgm9U+16uLfAf7W5YQz vDjtekH8zHfQOk50V5WqFsMkWk57LrUY1vTOGWdEnQdDDMMDr/EViixhdKObjwwbTEvFx+ wEVqyq3ydHPvA2L8YVvl9+HBs68H9ww= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=eQwrzgK3; spf=pass (imf22.hostedemail.com: domain of jane.chu@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=jane.chu@oracle.com; dmarc=pass (policy=quarantine) header.from=oracle.com Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 44LJkHCC013661; Tue, 21 May 2024 23:55:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=corp-2023-11-20; bh=z1prDriYsI1wDXlPHr/vQoqHCvjGzLHUUrEOL1odZwA=; b=eQwrzgK3aMomHfB7BcblbNJAV6zG7N5li0pTBG3/PANsHRjFFClVxSG/0iv1hdzzVik0 v43Hb76Z/loeDVLJ25W7WhaSHhRI4wYwUVUhHGG1w35EOwGBUH1M5nBLCpGYC/NbcFEs 6HFrOyPu8EKSaLfiB5MaJHGD3g/zm97+lDJz8ODp7TGXc1xZ0wr793eHT0qmlNaBU4h3 kOM81VIUcEodc/lAR1XqpfzongQK+7JQR9ijLMP9JoPpBk1IBhk7+fTvmwqDN7ez0gAC 9eWxMn7u+VgfQbpzYDDaJdZbSpbgknlAe9LgiAMQsIRaW/KSOgnWCwNgu0d4cvMG/Dl6 SQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3y6mvv6gts-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 21 May 2024 23:55:36 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 44LMZkKX002667; Tue, 21 May 2024 23:55:35 GMT Received: from brm-x62-16.us.oracle.com (brm-x62-16.us.oracle.com [10.80.150.37]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3y6js8erce-4; Tue, 21 May 2024 23:55:34 +0000 From: Jane Chu To: linmiaohe@huawei.com, nao.horiguchi@gmail.com, akpm@linux-foundation.org, osalvador@suse.de, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/5] mm/memory-failure: improve memory failure action_result messages Date: Tue, 21 May 2024 17:54:27 -0600 Message-Id: <20240521235429.2368017-4-jane.chu@oracle.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240521235429.2368017-1-jane.chu@oracle.com> References: <20240521235429.2368017-1-jane.chu@oracle.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16 definitions=2024-05-21_14,2024-05-21_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 suspectscore=0 spamscore=0 mlxscore=0 adultscore=0 mlxlogscore=869 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2405210182 X-Proofpoint-ORIG-GUID: KXCpqkLnQd7MXtvCJkmrwN85KoMMhWcb X-Proofpoint-GUID: KXCpqkLnQd7MXtvCJkmrwN85KoMMhWcb X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 589F8C0007 X-Rspam-User: X-Stat-Signature: oiusw7ypt7ket4wxmirswmkyg4mr6twa X-HE-Tag: 1716335743-709629 X-HE-Meta: U2FsdGVkX190MB4n4GxQ4P2Ivgky1sD6FpWkyKw8Oe/OwlDxjKMj2jWkjamiAK6VVKETsuaLe7JDXmiQOY23WBu8fdg8kswnCSwyl2CDmACNRx9dUVDGt9u5lROmlFsf+xGtdXrTgM8taSNJxW4593beWB3TdxSzDKJu9uzQkGhnmX+xCQqHmpCEqm2fOLVMsRc8Z7g+hGctGxbzTndHi0NXSm55Q5aKk9D7rg7z3pGcIdNmM0X/3v7yaPOS/PV+/W7Api4yryFht/UxGCeBWOk5iav2NrbDjhbNwwPlntBSZ4DxgdkEN3u2ExfKAlA6iVbbnIklVzOQ7LQzRbTlMi9FaEQWWbjJBczvg3Vhu/ODLaOy7/zOQXAB80ak+Sd5GQumzoPaBleaeqVfaRvXrOGkrbaxI08RMLQ/Y/koVv74fuIIY9lmX24jQ2Gj8Iu+JhB+oRFczNmB12Hl31OHhkBHNurgniJ9xGmY3PFsg2pTti9Wddp6R3CnhrIq1muLnYQs6nNLIZrltOZKs51mnGhTYbPsFFsgf8X3TSCcY+bJopNrWsH+l141AQTzz1N75vlUs4VzIqc6WQNKDYFInnt/y3+nM7mfGCQfWSBjgklK5yZ8onQf5CQeKxAt/ksCgleq3WPTu/v/XO30M7p7K0U9OpR4iAPtAtntkfXYucYmWTC69jLJi99vmzT9Rqg5Z7GlQ1COvu1dtvYxAlDTIgfypE5v+EMT/tYRejGONVhiU8ogWIBAuMKq5Ba7Ov5RXB4l/jBEeUJJl6jjo5a9fuvOiY3ft0pRhp2WBOAM3+edbxbrCZidBJXLxdG9zEbxtKR1zF2988JFgFXkKrXc9VxfBUmreA77QPzxyOu1SUur/FkJqb6wFM9e95ZhgkfzpU/93nqI4H38ZW7OgkZNLqdmjNrw19KTsQsTwTza56F6yE0OChyaprW+dnLYeDvDBL4IRQkVZLenUEgyD93 A1suTLkc KSDsLXLcioYsygv0KdXcIpaZDiT9kR/zM7LNXYzcfhRNJ4fz8/qWKpdR9J1NGr33N+67h5xaV48Dkw+S9rK1xGVPAARy0I2YgTAopIU2Ksl7B7/FIlgpP3iBE7+RbKIftgRRuDz4TDlGJau/sVkX+6yitFch6caFaOLTcCGyyZSNuZEV4l9EkA8NtLAkr3XuTdPsx09e8/iPYTdyfE9efPaA236KvtlT7MbADsoABfgq0q8OeP7wzKZe1YLCMvaf+ojAJenkKzJaFsRv9DHRHC11jomU5iB4g0qw60Y7ffLzlNnGlMJvoRR+DyA/aHMlFRlR7AysNlFYzhgs= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Added two explicit MF_MSG messages describing failure in get_hwpoison_page. Attemped to document the definition of various action names, and made a few adjustment to the action_result() calls. Signed-off-by: Jane Chu Reviewed-by: Oscar Salvador Acked-by: Miaohe Lin --- include/linux/mm.h | 2 ++ include/ras/ras_event.h | 2 ++ mm/memory-failure.c | 38 +++++++++++++++++++++++++++++++++----- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 9849dfda44d4..b4598c6a393a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -4111,6 +4111,7 @@ enum mf_action_page_type { MF_MSG_DIFFERENT_COMPOUND, MF_MSG_HUGE, MF_MSG_FREE_HUGE, + MF_MSG_GET_HWPOISON, MF_MSG_UNMAP_FAILED, MF_MSG_DIRTY_SWAPCACHE, MF_MSG_CLEAN_SWAPCACHE, @@ -4124,6 +4125,7 @@ enum mf_action_page_type { MF_MSG_BUDDY, MF_MSG_DAX, MF_MSG_UNSPLIT_THP, + MF_MSG_ALREADY_POISONED, MF_MSG_UNKNOWN, }; diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h index c011ea236e9b..b3f6832a94fe 100644 --- a/include/ras/ras_event.h +++ b/include/ras/ras_event.h @@ -360,6 +360,7 @@ TRACE_EVENT(aer_event, EM ( MF_MSG_DIFFERENT_COMPOUND, "different compound page after locking" ) \ EM ( MF_MSG_HUGE, "huge page" ) \ EM ( MF_MSG_FREE_HUGE, "free huge page" ) \ + EM ( MF_MSG_GET_HWPOISON, "get hwpoison page" ) \ EM ( MF_MSG_UNMAP_FAILED, "unmapping failed page" ) \ EM ( MF_MSG_DIRTY_SWAPCACHE, "dirty swapcache page" ) \ EM ( MF_MSG_CLEAN_SWAPCACHE, "clean swapcache page" ) \ @@ -373,6 +374,7 @@ TRACE_EVENT(aer_event, EM ( MF_MSG_BUDDY, "free buddy page" ) \ EM ( MF_MSG_DAX, "dax page" ) \ EM ( MF_MSG_UNSPLIT_THP, "unsplit thp" ) \ + EM ( MF_MSG_ALREADY_POISONED, "already poisoned" ) \ EMe ( MF_MSG_UNKNOWN, "unknown page" ) /* diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 739311e121af..1e22d73c9329 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -879,6 +879,28 @@ static int kill_accessing_process(struct task_struct *p, unsigned long pfn, return ret > 0 ? -EHWPOISON : -EFAULT; } +/* + * MF_IGNORED - The m-f() handler marks the page as PG_hwpoisoned'ed. + * But it could not do more to isolate the page from being accessed again, + * nor does it kill the process. This is extremely rare and one of the + * potential causes is that the page state has been changed due to + * underlying race condition. This is the most severe outcomes. + * + * MF_FAILED - The m-f() handler marks the page as PG_hwpoisoned'ed. It + * should have killed the process, but it can't isolate the page, due to + * conditions such as extra pin, unmap failure, etc. Accessing the page + * again will trigger another MCE and the process will be killed by the + * m-f() handler immediately. + * + * MF_DELAYED - The m-f() handler marks the page as PG_hwpoisoned'ed. The + * page is unmapped, but perhaps remains in LRU or file mapping. An attempt + * to access the page again will trigger page fault and the PF handler + * will kill the process. + * + * MF_RECOVERED - The m-f() handler marks the page as PG_hwpoisoned'ed. + * The page has been completely isolated, that is, unmapped, taken out of + * the buddy system, or hole-punnched out of the file mapping. + */ static const char *action_name[] = { [MF_IGNORED] = "Ignored", [MF_FAILED] = "Failed", @@ -893,6 +915,7 @@ static const char * const action_page_types[] = { [MF_MSG_DIFFERENT_COMPOUND] = "different compound page after locking", [MF_MSG_HUGE] = "huge page", [MF_MSG_FREE_HUGE] = "free huge page", + [MF_MSG_GET_HWPOISON] = "get hwpoison page", [MF_MSG_UNMAP_FAILED] = "unmapping failed page", [MF_MSG_DIRTY_SWAPCACHE] = "dirty swapcache page", [MF_MSG_CLEAN_SWAPCACHE] = "clean swapcache page", @@ -906,6 +929,7 @@ static const char * const action_page_types[] = { [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_UNKNOWN] = "unknown page", }; @@ -1013,12 +1037,13 @@ static int me_kernel(struct page_state *ps, struct page *p) /* * Page in unknown state. Do nothing. + * This is a catch-all in case we fail to make sense of the page state. */ static int me_unknown(struct page_state *ps, struct page *p) { pr_err("%#lx: Unknown page state\n", page_to_pfn(p)); unlock_page(p); - return MF_FAILED; + return MF_IGNORED; } /* @@ -2055,6 +2080,8 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb 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); + return res; } return res; } else if (res == -EBUSY) { @@ -2062,7 +2089,7 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb flags |= MF_NO_RETRY; goto retry; } - return action_result(pfn, MF_MSG_UNKNOWN, MF_IGNORED); + return action_result(pfn, MF_MSG_GET_HWPOISON, MF_IGNORED); } folio = page_folio(p); @@ -2097,7 +2124,7 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb if (!hwpoison_user_mappings(folio, p, pfn, flags)) { folio_unlock(folio); - return action_result(pfn, MF_MSG_UNMAP_FAILED, MF_IGNORED); + return action_result(pfn, MF_MSG_UNMAP_FAILED, MF_FAILED); } return identify_page_state(pfn, p, page_flags); @@ -2231,6 +2258,7 @@ int memory_failure(unsigned long pfn, int flags) res = kill_accessing_process(current, pfn, flags); if (flags & MF_COUNT_INCREASED) put_page(p); + action_result(pfn, MF_MSG_ALREADY_POISONED, MF_FAILED); goto unlock_mutex; } @@ -2267,7 +2295,7 @@ int memory_failure(unsigned long pfn, int flags) } goto unlock_mutex; } else if (res < 0) { - res = action_result(pfn, MF_MSG_UNKNOWN, MF_IGNORED); + res = action_result(pfn, MF_MSG_GET_HWPOISON, MF_IGNORED); goto unlock_mutex; } } @@ -2363,7 +2391,7 @@ int memory_failure(unsigned long pfn, int flags) * Abort on fail: __filemap_remove_folio() assumes unmapped page. */ if (!hwpoison_user_mappings(folio, p, pfn, flags)) { - res = action_result(pfn, MF_MSG_UNMAP_FAILED, MF_IGNORED); + res = action_result(pfn, MF_MSG_UNMAP_FAILED, MF_FAILED); goto unlock_page; } From patchwork Tue May 21 23:54:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jane Chu X-Patchwork-Id: 13669817 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75338C25B7C for ; Tue, 21 May 2024 23:55:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F30806B0098; Tue, 21 May 2024 19:55:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EE3696B0099; Tue, 21 May 2024 19:55:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DA8776B009A; Tue, 21 May 2024 19:55:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id BE29B6B0098 for ; Tue, 21 May 2024 19:55:49 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 7E2C7C102E for ; Tue, 21 May 2024 23:55:49 +0000 (UTC) X-FDA: 82144063218.20.7EA6A36 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf14.hostedemail.com (Postfix) with ESMTP id A4925100007 for ; Tue, 21 May 2024 23:55:47 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=h3CrhepT; spf=pass (imf14.hostedemail.com: domain of jane.chu@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=jane.chu@oracle.com; dmarc=pass (policy=quarantine) header.from=oracle.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716335747; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=frA7aS1vLKTncyYL7L1DmGtD13xbXGlpWxyw+e4B7WM=; b=yk/03eEitvfXfiWfWhGvGsgPTuvy8FF9RJu1f+4UKlHYwbQcc+b+/MS+9gzd1ZT0OycWOx Pwc4WtWjN1BN4se+89wEtuD3xwz1CLCAEkxjlq168ICf6xSaRatjAqlRxbbWktE6o8FT8A aqaRAs2epcM3Sbof3Ci/tnTjyHXprEk= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=h3CrhepT; spf=pass (imf14.hostedemail.com: domain of jane.chu@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=jane.chu@oracle.com; dmarc=pass (policy=quarantine) header.from=oracle.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716335747; a=rsa-sha256; cv=none; b=eGSidFGINUKZrPH+OFDJzdnQ7lkGiyRV19NsO9Ts4we7gsbgJYBBrtNvqY+1W7f4q83x9Z v+5O6pSbrVJa0tTihVXolqgCGRIZRPIpCwcpEMoMYsIR07bljQB5+DbqRgOTV6F1/QESL6 Tv8DfCwcjlwtHVT759orSj11J6Sn5+o= Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 44LJi8dZ025724; Tue, 21 May 2024 23:55:40 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=corp-2023-11-20; bh=frA7aS1vLKTncyYL7L1DmGtD13xbXGlpWxyw+e4B7WM=; b=h3CrhepTNn/GaGgIJzZhqtsA7faeT1QZf89SKUeSOVcUQEJKLeokWgdytocXbQ/tR6wd mvdIHTnqEutpHvRGnRnDRNy0BeIXtqXtEbZ19zn0/AMebwZaz97AqmHJl6VA8GQ9RSTX pkUkL+cbnjeDIQ9wc72PTtUQeyieP/pbryXb98HMIJAmqNl+yM1zEXbTU2pRXuNfmKWU FPTPhJh4CglqeOBXb7DRzY9IM3xTiV1SHJRB6BybSR0VEj91El9FE9C8CCVzQpW2w7w1 ORy8M037XhGzohEkU3LnrD3PKhweG9vEWPfIaeaIiUMP5WMgGC7tBF7q/V3BPMrYnm8H 2g== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3y6k466m2a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 21 May 2024 23:55:40 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 44LMZkKi002667; Tue, 21 May 2024 23:55:39 GMT Received: from brm-x62-16.us.oracle.com (brm-x62-16.us.oracle.com [10.80.150.37]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3y6js8erce-5; Tue, 21 May 2024 23:55:39 +0000 From: Jane Chu To: linmiaohe@huawei.com, nao.horiguchi@gmail.com, akpm@linux-foundation.org, osalvador@suse.de, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/5] mm/memory-failure: move hwpoison_filter() higher up Date: Tue, 21 May 2024 17:54:28 -0600 Message-Id: <20240521235429.2368017-5-jane.chu@oracle.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240521235429.2368017-1-jane.chu@oracle.com> References: <20240521235429.2368017-1-jane.chu@oracle.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16 definitions=2024-05-21_14,2024-05-21_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 suspectscore=0 spamscore=0 mlxscore=0 adultscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2405210182 X-Proofpoint-ORIG-GUID: fN-L7z8FkqKuAIhlYwvx_1gv1456QLzQ X-Proofpoint-GUID: fN-L7z8FkqKuAIhlYwvx_1gv1456QLzQ X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: A4925100007 X-Stat-Signature: fcuy1gxkw8cwfbq9smt1ugzsnowo4w8g X-HE-Tag: 1716335747-619197 X-HE-Meta: U2FsdGVkX19lVFSCsNHCDAk+WZpARzzdOCCz2vvnJM2uE8c0xkasPMQ8REozl9Rk8nHWeOwrbedXKv/Y9DukcMW6/KRF7n4cSGLfNkpvaFFOFpiDAjV0gZkWnxB3kvjf6HM6zqev/Ocz0A7MrStiZG/BnIBtY84f6VfNoJYFkt3gOzZ6OLDhAJa5QHzG5Z4YkuaF6ksus6xk2N01GuFpZtuvc2A3WT6Syaz+jveSPbFVUmRQDkQAUDbPdN18GSnybeQ/FzpRG0YB2BebLj9yiFoZCTakPLRrdFkiDzJ4XeS3PMMD+yv+WnWoEGMRbCai3o1/1sKczEMLUCyIkktzXzurKdrdhUgCjXzLH1sh6aCft9sAAbSiQNTcFEt5K1D+kS5lTVSb8+r0ycFlbrD5kyfOqPgEQSexfrG7heCG2HtfXamCKP7Y8blU5V9xSc0ii3RPYrdZ4NpXQuI3mYBZWgSLf+jAdw/U1es9x6H1DtX67JXJ/iKbFOj4BPBsYhia+zkIH+FJbC1qc3tIXhisCZjh2GgCu1hbjCN8lEmOYDyEOusy7Z0zNeLTyRE2yPPE0XpNZcGJ0E7oC5rRYm0D1pgM+55L27YwNQGO23xGdDwQetag434SF+sUPW11mLUFBgDuqvgpQBC8+mSPSCMZkDW8HLMbNrZihBJOqTJp7BpOYM9zcB5hjBN07OmoJ9YhKzjr1izEDCvprS1R5MXpnANO1MyOgQqiNyGJrt2Eln/tXmPhZO0MFJmTvFErUdspmFfe5CUNTOgOV9NqAnxTNiuSc6ST5tYnBW3B0iN/SrLGRFvX01Qck9Y+Kcvzaw2i9+K2DkvQGHtjltbTAJcZpgbJaX2oaQNAvaifAMqa4Gao6aZ8IrqXO0w2dqOteL5/79IRVu/7osYickPZyTQg5sHiT81Mz0MSUkLOqzcLelehewGSW1LVa9oyNEyAus3FlHEKdrYpL2eCc0xmRcn 9AGO5mgW KU0rFWwsmamcfmkb1asFLCV6vHg2izbFwYg/zXc7EisMTklViD9bzZXVsqY6YV6RBlj7Yokp7YS3A7PIcDmTxpRuA0tlWgs48JN15bPsRZDFRPs4DQ6ATS1/oNxvCFmHNBm6zXiymOKQJvRhfI1gzySe2gExlCBKdP5yIfmMZzkkG2i87OgYGeMrGqMvj/joN0lqtZAx6TsNyyXzrarCqPeDFCotjmLPG3CQ9JthdJgndiVIx8Bb/gNiEjmWx3KLr+Z7BKoGn0hvUmUg9dROc65XNjHc+aVy+zgUeyvLQ2whZbKc0Vi5kGdXOvRlqC3Lnvg4gVnGNzdA/IzU= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Move hwpoison_filter() higher up as there is no need to spend a lot cycles only to find out later that the page is supposed to be skipped from hwpoison handling. Signed-off-by: Jane Chu Reviewed-by: Oscar Salvador Acked-by: Miaohe Lin --- mm/memory-failure.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 1e22d73c9329..794196951a04 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -2301,6 +2301,18 @@ int memory_failure(unsigned long pfn, int flags) } folio = page_folio(p); + + /* filter pages that are protected from hwpoison test by users */ + folio_lock(folio); + if (hwpoison_filter(p)) { + ClearPageHWPoison(p); + folio_unlock(folio); + folio_put(folio); + res = -EOPNOTSUPP; + goto unlock_mutex; + } + folio_unlock(folio); + if (folio_test_large(folio)) { /* * The flag must be set after the refcount is bumped @@ -2364,14 +2376,6 @@ int memory_failure(unsigned long pfn, int flags) */ page_flags = folio->flags; - if (hwpoison_filter(p)) { - ClearPageHWPoison(p); - folio_unlock(folio); - folio_put(folio); - res = -EOPNOTSUPP; - goto unlock_mutex; - } - /* * __munlock_folio() may clear a writeback folio's LRU flag without * the folio lock. We need to wait for writeback completion for this From patchwork Tue May 21 23:54:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jane Chu X-Patchwork-Id: 13669818 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B74ADC25B74 for ; Tue, 21 May 2024 23:55:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4363D6B0099; Tue, 21 May 2024 19:55:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3E5466B009C; Tue, 21 May 2024 19:55:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 286836B009D; Tue, 21 May 2024 19:55:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 0905A6B0099 for ; Tue, 21 May 2024 19:55:53 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B5F8B1C16AB for ; Tue, 21 May 2024 23:55:52 +0000 (UTC) X-FDA: 82144063344.15.10242FC Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf10.hostedemail.com (Postfix) with ESMTP id E4039C0021 for ; Tue, 21 May 2024 23:55:50 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=cIVRSMsq; spf=pass (imf10.hostedemail.com: domain of jane.chu@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=jane.chu@oracle.com; dmarc=pass (policy=quarantine) header.from=oracle.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716335751; a=rsa-sha256; cv=none; b=w9TlqS0cqOqWUOL3wGwkl0IMThzuKtdfbgZJ+0nG401LtEbwmS31h5JjIVuLknBGqzj2hO gdCoW16owRIEheBABQSH7n6yy1rLjDWm2lMOO44667GNGdcQvWux4i7sZ0QKSb/U5ML58e UhH9kGaTQmJdk+Uf7aIz3InMdFv1Xoc= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=cIVRSMsq; spf=pass (imf10.hostedemail.com: domain of jane.chu@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=jane.chu@oracle.com; dmarc=pass (policy=quarantine) header.from=oracle.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716335751; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=I3L1LQIelw9oqT+0T41Q58pEC5gWfYbgn8T4h8gRVP4=; b=DADSQSxPFl1Gk0K+rP19gH1gRYKM+DQfliGItzLbypeEe+VI54Ndls64BdU1bjG57RHiJs dWHHMWV6eC3TRTa9o/f3WNW7rcPJepDageNovIPdR1tOYoylFbvMYlFxMT3VMPjZAg+zxO AB9HieG8f1hMJWGsAwTzwS/lkwXCL5U= Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 44LJi9Ws025744; Tue, 21 May 2024 23:55:44 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=corp-2023-11-20; bh=I3L1LQIelw9oqT+0T41Q58pEC5gWfYbgn8T4h8gRVP4=; b=cIVRSMsqlLYYsVPR2FJWLHywyYr1y2WfWRRswKtAInrkSKhipcwyIHgLKtg5aCPx3weg 4/MikqcfOxA1ATOm9swY1+lkMIpxUz75w0nP6P5ImYo/RrVGREO6UMDCS8R7TPSbFnRf 8fVjE8ZNv6d73S00tKQeZZ3qnP4VREXyaznOoNR2OrLzSBNissq+dH2UqJYWEub8Q+Qn 1otMtmDfbAtipTA5aSl1oyPWfz1LaQdp2Ga/DMc7sIVCoX/2dyv+MMR3VBeeTAQvbgc7 79vOJtMhSKQjW6JFNFhr2k2tAYTmoozCsYCkl6OxIwUlQ3OqWFn8oMWe6KVVYV/DDPm8 0A== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3y6k466m2c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 21 May 2024 23:55:44 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 44LMZkKk002667; Tue, 21 May 2024 23:55:43 GMT Received: from brm-x62-16.us.oracle.com (brm-x62-16.us.oracle.com [10.80.150.37]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3y6js8erce-6; Tue, 21 May 2024 23:55:43 +0000 From: Jane Chu To: linmiaohe@huawei.com, nao.horiguchi@gmail.com, akpm@linux-foundation.org, osalvador@suse.de, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 5/5] mm/memory-failure: send SIGBUS in the event of thp split fail Date: Tue, 21 May 2024 17:54:29 -0600 Message-Id: <20240521235429.2368017-6-jane.chu@oracle.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240521235429.2368017-1-jane.chu@oracle.com> References: <20240521235429.2368017-1-jane.chu@oracle.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16 definitions=2024-05-21_14,2024-05-21_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 suspectscore=0 spamscore=0 mlxscore=0 adultscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2405210182 X-Proofpoint-ORIG-GUID: 79GQpZ_jzEgc6Qmkdeqa_86YlEdLM5cy X-Proofpoint-GUID: 79GQpZ_jzEgc6Qmkdeqa_86YlEdLM5cy X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: E4039C0021 X-Stat-Signature: do9nyhyey9sdsu9nnjzihcjeecmjbgbd X-HE-Tag: 1716335750-385644 X-HE-Meta: U2FsdGVkX18xY6ISvjiWBRW0AgUxf2AVm1j4h/fcKLQ6z8sxdDtNMXCNO1y6f17F1un/GS6LO09/AK6dgcTxRXQvhaE6RMjg/T7IyGbUrq/qubW0PJHMKk6l0U28MA5ZxHMGuc307Up3XUxdnyO/ZTQUtdzkMmJw1SDN1tItoEwUZWIha2+3kq9MlJU8CzSsT5O2M8NFlR98j1Cx+h165NcXI3NKT9oZLaeTPSFSxVQlgZzgPzz4h1ncCGbLEnpsuWgc2XO4K9ZWfma4S2vJGjmy/SOjeigA40HKx8yu5XQx7nUMQNgcB5AkRFS2miMMKoP84TmL96Mi3RK7LMlQ+dC/ME5Zo2wSGm7h10F5BSJO3NG1/UCrNVK1dJ+Stz4uSVX4BCH+J6k1etfa73ZK73qh32PEhaAJk5CP7+YDAye6Tz7IW9yRui8/crco1Elf404Atqsoich21kb61VwbmwUzg9NdwaVDBNj3GLz7FKwU5lqIkkJItYMsZ1iue/31rEKPcuEWDE94XAJYZiLiMiLuydCoHl6fZxz4Q6XwJP/GpiEDVj+6XNcgdnPL80VbJ8KJAu/20upd4qftkcAFnCEqSyK4H1HXQ/jFYNeG/LdTqZG4DnO6Zy6Q4URMsjzV4uzn+AVFY96yk6mIrF9hlCN1zIR2ZEmhGLDvyqPgq1N6wHHEqJsbqlV8M+8oxJmsR4c5OUs9nK5PFVmCnfW1pu/G4IaKtH/xJpFWfguSKdNCM8eZ9AFhabZmWceCkDhc8ixWRjDQir7oDWdtF5Jxvpw3OSEjxrxR7qxZyPAHgYEPIfxg1POPbUE3gTs5w0BZr/HghdwjqgeD+v76EJwCK9wrXfImWWtnaN4OzbF5kXwtx0VymZOWmRIvbwwJDEk7jKzfQedaAYkH5F8XZIZaeTBvqmXO3SXdH7aBFYOlxkxmlZkUtFIUZD1GgfRJds+Q2GdaTK0A7ygFJV1KZ7F A/qs62is IvTilrEJDJpHlDxub+1saPwXcC8k0/iuYEB2pmzLjR1tA+MCa+KGe/KlgwEMw4Y/UY7auBxqrBgDMjfCRMBEtFVhXihSQZJqDYcP5mGaB3HXxRdms8DNkNafmiDdpk16RaZbQngStLtVckKQSIRyp1fDe/gWOgM9mzQIGfnqQOTLHy+Ce2pNizI7l0QDes+xjAMKCTwwj3XGqeqFp9EnzL+GR6MTyDev9DdDQRK4S5biwI2d2n+REtVgfF1MEt31Z6ue3baw8NGnjZWGwqVIeuUn/VrU2LIXUozpc X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: While handling hwpoison in a THP page, it is possible that try_to_split_thp_page() fails. For example, when the THP page has been RDMA pinned. At this point, the kernel cannot isolate the poisoned THP page, all it could do is to send a SIGBUS to the user process with meaningful payload to give user-level recovery a chance. Signed-off-by: Jane Chu Reviewed-by: Oscar Salvador Acked-by: Miaohe Lin --- mm/memory-failure.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 794196951a04..a14d56e66902 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1706,7 +1706,12 @@ static int identify_page_state(unsigned long pfn, struct page *p, return page_action(ps, p, pfn); } -static int try_to_split_thp_page(struct page *page) +/* + * When 'release' is 'false', it means that if thp split has failed, + * there is still more to do, hence the page refcount we took earlier + * is still needed. + */ +static int try_to_split_thp_page(struct page *page, bool release) { int ret; @@ -1714,7 +1719,7 @@ static int try_to_split_thp_page(struct page *page) ret = split_huge_page(page); unlock_page(page); - if (unlikely(ret)) + if (ret && release) put_page(page); return ret; @@ -2187,6 +2192,24 @@ static int memory_failure_dev_pagemap(unsigned long pfn, int flags, return rc; } +/* + * The calling condition is as such: thp split failed, page might have + * been RDMA pinned, not much can be done for recovery. + * But a SIGBUS should be delivered with vaddr provided so that the user + * application has a chance to recover. Also, application processes' + * election for MCE early killed will be honored. + */ +static int kill_procs_now(struct page *p, unsigned long pfn, int flags, + struct folio *folio) +{ + LIST_HEAD(tokill); + + collect_procs(folio, p, &tokill, flags & MF_ACTION_REQUIRED); + kill_procs(&tokill, true, pfn, flags); + + return -EHWPOISON; +} + /** * memory_failure - Handle memory failure of a page. * @pfn: Page Number of the corrupted page @@ -2328,8 +2351,10 @@ int memory_failure(unsigned long pfn, int flags) * page is a valid handlable page. */ folio_set_has_hwpoisoned(folio); - if (try_to_split_thp_page(p) < 0) { - res = action_result(pfn, MF_MSG_UNSPLIT_THP, MF_IGNORED); + if (try_to_split_thp_page(p, false) < 0) { + res = kill_procs_now(p, pfn, flags, folio); + put_page(p); + action_result(pfn, MF_MSG_UNSPLIT_THP, MF_FAILED); goto unlock_mutex; } VM_BUG_ON_PAGE(!page_count(p), p); @@ -2703,7 +2728,7 @@ static int soft_offline_in_use_page(struct page *page) }; if (!huge && folio_test_large(folio)) { - if (try_to_split_thp_page(page)) { + if (try_to_split_thp_page(page, true)) { pr_info("soft offline: %#lx: thp split failed\n", pfn); return -EBUSY; }