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 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 Content-Transfer-Encoding: 8bit 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); } /* -- 2.39.3