From nobody Wed Dec 17 23:27:11 2025 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (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 41BEA1581E3 for ; Wed, 1 May 2024 23:27:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.165.32 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714606063; cv=none; b=iaPXev608Sa+1uhX2e28NRZDbJJyHaqmoSa2RoZApPAWaZ8akKLSQS+Mw+PV98vz1uLyOQHq5AYcGtjG4cFLb8QM/9hBSZoeAnBrDw6GgLW2aUXAbkLlopR1ChbXhyc/bGiBLOptl7uGceiyYObm57ng42LZ6C4orh4SDSulhso= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714606063; c=relaxed/simple; bh=Vejiy+vf8zrb4REZkuafU7dlCh5bhHcQ7BKMFAFU0Eo=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dcdBWYPUTO/WToW+wksYh/j1fKDH4mmdgmws7QCZAULlmK8BrNxKMp0is8XtnfOJeq3tPK1pinwFIs+LHfQuwHtfANjHV4w7wmujwjaD942OSZIiEJWo9ua0to5uO99sHSiq1KGKh2xLBUJj2RUx5hjHaxCIpIjTzCbV9JEJZC0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=O30NH25c; arc=none smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="O30NH25c" 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 441MJoFZ018832; Wed, 1 May 2024 23:27:34 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=wY3UVMyMfxgmoJifRLcjAmBE75B0nsP3Ptes0P01A1M=; b=O30NH25cEiHmaQi1UYG/GI/J9vkfjdSG/p9zThfthrKfqpArV/XvmpJlQSzOC6Zu+XBn xH1usMXR+tIYLDXSYDtvLXksqQFvQRzk+0jvH3c0QsoIubAVPBo8sBnJrbrL6dgrzuX/ H1d/VZImw3KYAraRssEdn515z8ouf6MLQ48AZtykRMb6S0WsUSvlklyQSlkq59del6QS CQxWa4qGwyY0v+m3KSb5qn8pQF8yq6eS21J1pb1m9qeP0VWax8QkxFn9ydAmNGX0QIzP d2gVRZWbmU+0R+uAQ1FNHT6uyCr15X5Nh7b6CaTF7AMUapMQGFeCROsBl3upOYn5/hKh 2Q== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xrqy31xa6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 01 May 2024 23:27:32 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 441MBS4A033172; Wed, 1 May 2024 23:25:06 GMT Received: from brm-x62-16.us.oracle.com (brm-x62-16.us.oracle.com [10.80.150.37]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3xrqt9vbuq-2; Wed, 01 May 2024 23:25:06 +0000 From: Jane Chu To: linmiaohe@huawei.com, nao.horiguchi@gmail.com, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] mm/memory-failure: try to send SIGBUS even if unmap failed Date: Wed, 1 May 2024 17:24:56 -0600 Message-Id: <20240501232458.3919593-2-jane.chu@oracle.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240501232458.3919593-1-jane.chu@oracle.com> References: <20240501232458.3919593-1-jane.chu@oracle.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1011,Hydra:6.0.650,FMLib:17.11.176.26 definitions=2024-05-01_16,2024-04-30_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 phishscore=0 bulkscore=0 suspectscore=0 malwarescore=0 spamscore=0 adultscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2405010165 X-Proofpoint-ORIG-GUID: SNkRBuHMGLGZMo7XtV4v_r1aq305_slf X-Proofpoint-GUID: SNkRBuHMGLGZMo7XtV4v_r1aq305_slf Content-Type: text/plain; charset="utf-8" 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 process will be killed immediately. So let's take out the '!unmap_success' factor and try to deliver SIGBUS if possible. Signed-off-by: Jane Chu --- mm/memory-failure.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 9e62a00b46dd..7fcf182abb96 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -519,19 +519,14 @@ void add_to_kill_ksm(struct task_struct *tsk, struct = page *p, * 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; =20 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 =3D=3D -EFAULT) { + if (tk->addr =3D=3D -EFAULT) { pr_err("%#lx: forcibly killing %s:%d because of failure to unmap corru= pted page\n", pfn, tk->tsk->comm, tk->tsk->pid); do_send_sig_info(SIGKILL, SEND_SIG_PRIV, @@ -1666,7 +1661,7 @@ static bool hwpoison_user_mappings(struct page *p, un= signed long pfn, */ forcekill =3D PageDirty(hpage) || (flags & MF_MUST_KILL) || !unmap_success; - kill_procs(&tokill, forcekill, !unmap_success, pfn, flags); + kill_procs(&tokill, forcekill, pfn, flags); =20 return unmap_success; } @@ -1730,7 +1725,7 @@ static void unmap_and_kill(struct list_head *to_kill,= unsigned long pfn, unmap_mapping_range(mapping, start, size, 0); } =20 - kill_procs(to_kill, flags & MF_MUST_KILL, false, pfn, flags); + kill_procs(to_kill, flags & MF_MUST_KILL, pfn, flags); } =20 /* --=20 2.39.3 From nobody Wed Dec 17 23:27:11 2025 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (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 24AED168B0A for ; Wed, 1 May 2024 23:27:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.165.32 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714606044; cv=none; b=YECKkHC40otqA1c31khRRFK97VghGsqd0L8hPzR8e8qvP6Jzx+cC79gB4S/WHlcvG+n5YtftQZfaglYQQje630jZ0Hf2yFn+f1CcqEf/xUOOE157jZqaRfXwkYD0e+tiQybSLlNxub7Hoy8+Y0HlgmW9OO27I6GXnXX75/BuU3g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714606044; c=relaxed/simple; bh=KF22Q91ftKg+StGyAe4vPvXYgZR+4DvQ7bXUDl4Lk1M=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Brept6HSU5FaHvqx+FgUd648YoJRimg1FLtwFOrHFo8Ju0g17rLr2ieK4aHcz1K6XLFHpjRaIvCxPIcf5aKTxdLEGuxJrPoPwtp9pkpZhQznBxf2qs/08PhpsTgl+C/Oz/lt7/Sams2shs7NGK5pRCDWAtFJaEPQHTtEyV+A2xc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=YqTkUYed; arc=none smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="YqTkUYed" 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 441MK3Z7031546; Wed, 1 May 2024 23:27:12 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=5+PFPryu85fPUhHvvBmVJI7+H9PqDvUVFzqR0jjWF1Y=; b=YqTkUYedogVvSCK4kM9rrwbF71TU1YEkkcaGMRNRVzcr5cYLUKudzAv2KpqTh1pqZf7o yf/vsAFC3dRx6rMA3QENwyJU9JR9PIcxGFE9OdEaKQoWvq952Oxl+wQHo4jRXbJBi23x GLVk6+R2bl8f8l0OAKpMxHgKrN3vzXIPTlWZSi21JstIa68JsvTqb7F7YIrSNjbfm6Yq zbzBGMzXFZyX9z6osQz+o3Aygge3m/lkbjjvRgn5YbFU2gNB8/dbfwj41VQ+ObswyI3f cE2r6bZ1SexRuIeYBzpfidVbO1O5kz9LGAZ+mc55QU8Wpw9tJpctx6flchfQQQNCf/5q Fg== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xrswvsyk5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 01 May 2024 23:26:57 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 441MBS4B033172; Wed, 1 May 2024 23:25:08 GMT Received: from brm-x62-16.us.oracle.com (brm-x62-16.us.oracle.com [10.80.150.37]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3xrqt9vbuq-3; Wed, 01 May 2024 23:25:08 +0000 From: Jane Chu To: linmiaohe@huawei.com, nao.horiguchi@gmail.com, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] mm/madvise: Add MF_ACTION_REQUIRED to madvise(MADV_HWPOISON) Date: Wed, 1 May 2024 17:24:57 -0600 Message-Id: <20240501232458.3919593-3-jane.chu@oracle.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240501232458.3919593-1-jane.chu@oracle.com> References: <20240501232458.3919593-1-jane.chu@oracle.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1011,Hydra:6.0.650,FMLib:17.11.176.26 definitions=2024-05-01_16,2024-04-30_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 phishscore=0 bulkscore=0 suspectscore=0 malwarescore=0 spamscore=0 adultscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2405010165 X-Proofpoint-GUID: xYRc7ttZpJPOgWhFHPkn8aug1OV-_T7v X-Proofpoint-ORIG-GUID: xYRc7ttZpJPOgWhFHPkn8aug1OV-_T7v Content-Type: text/plain; charset="utf-8" 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 legitimately get killed as much as in a real UE situation. Signed-off-by: Jane Chu --- mm/madvise.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/madvise.c b/mm/madvise.c index 1a073fcc4c0c..eaeae5252c02 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -1127,7 +1127,7 @@ static int madvise_inject_error(int behavior, } else { pr_info("Injecting memory failure for pfn %#lx at process virtual addre= ss %#lx\n", pfn, start); - ret =3D memory_failure(pfn, MF_COUNT_INCREASED | MF_SW_SIMULATED); + ret =3D memory_failure(pfn, MF_ACTION_REQUIRED | MF_COUNT_INCREASED | M= F_SW_SIMULATED); if (ret =3D=3D -EOPNOTSUPP) ret =3D 0; } --=20 2.39.3 From nobody Wed Dec 17 23:27:11 2025 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (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 94078367 for ; Thu, 2 May 2024 00:02:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.177.32 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714608181; cv=none; b=clg/EqL80F6CXygt56XDxrcEcpB+JMjdUNyWO4gO5llOapSnmG2yxPHZ0dmUe7FDpTSF+6O6Na12z7MeIdFUU6N744ZI+7gRildI1CFH3TC8DEnDeru6EglEuLtMR+O+u4+vMJ5YJbvv2hFaq4igVMh6HwEkejnOSS1dRWOJkk0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714608181; c=relaxed/simple; bh=MQnQdiNVTwTDDyeL4S/RcdxCDIpsfhbfXDclL6IJ44s=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dW904ToCNzMLe09fowcY4AoKEVc2rKRaX/khsAbW3QnWLtX90PZ9YIKPb/nHJ6Ibk4UM45xQxuiCBu+zfbdzXlphBXM101jDPolWLyaB7i88ZRaiIO3jw0i9QiAoL4gt6vK2J/sq0aXzoCDWcaB8bUpgFKrnsb3uuWKp58rFuAU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=cOAW+aeJ; arc=none smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="cOAW+aeJ" 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 441NKAPw010464; Thu, 2 May 2024 00:02:50 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=iBNgjATm1g/dvs/mF70E3zaHDPEr1jQSRo6dBQGN4Yc=; b=cOAW+aeJW6MGxJkg049vVzz2Zzrb8XnTgk5GVZgHLiP74GRfVHXxw7mt9e2OxPnwPT8R t3+s32yTrY/ROVhL2IlZ1BJixpwJMqTOJhPM2JSztBbn2Sq16rfeuex6hKuxwpNHlsK8 1SC4qfcynTe3dxcCdxXZOmlwnvGwixyZdzlITCGCTuholKSh1CQP6x6cAUO6j8vYpNee P5BU2EzhcktlZAo6gYwGm9bGcwpcMl9JbDSh/kLwk1ePIgpiMWlXygpHMp/LcAjs8GL6 uq++DN7DScLxq5wM5tN4bqMK6X1YvKjOvm5L10vZbUZWZUPh8zN4QGvrk9zRU4+JcoWt dQ== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xrsdetpj7-261 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 02 May 2024 00:02:47 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 441MBS4E033172; Wed, 1 May 2024 23:25:12 GMT Received: from brm-x62-16.us.oracle.com (brm-x62-16.us.oracle.com [10.80.150.37]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3xrqt9vbuq-4; Wed, 01 May 2024 23:25:12 +0000 From: Jane Chu To: linmiaohe@huawei.com, nao.horiguchi@gmail.com, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] mm/memory-failure: send SIGBUS in the event of thp split fail Date: Wed, 1 May 2024 17:24:58 -0600 Message-Id: <20240501232458.3919593-4-jane.chu@oracle.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240501232458.3919593-1-jane.chu@oracle.com> References: <20240501232458.3919593-1-jane.chu@oracle.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1011,Hydra:6.0.650,FMLib:17.11.176.26 definitions=2024-05-01_16,2024-04-30_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 phishscore=0 bulkscore=0 suspectscore=0 malwarescore=0 spamscore=0 adultscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2405010165 X-Proofpoint-GUID: ovlQb9iG_YSm1K2_mAapQrq0LojExnvH X-Proofpoint-ORIG-GUID: ovlQb9iG_YSm1K2_mAapQrq0LojExnvH Content-Type: text/plain; charset="utf-8" When handle hwpoison in a GUP longterm pin'ed thp page, try_to_split_thp_page() will fail. And at this point, there is little else the kernel could do except sending a SIGBUS to the user process, thus give it a chance to recover. Signed-off-by: Jane Chu --- mm/memory-failure.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 7fcf182abb96..67f4d24a98e7 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -2168,6 +2168,37 @@ static int memory_failure_dev_pagemap(unsigned long = pfn, int flags, return rc; } =20 +/* + * The calling condition is as such: thp split failed, page might have + * been GUP longterm 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 page *hpage) +{ + struct folio *folio =3D page_folio(hpage); + LIST_HEAD(tokill); + int res =3D -EHWPOISON; + + /* deal with user pages only */ + if (PageReserved(p) || PageSlab(p) || PageTable(p) || PageOffline(p)) + res =3D -EBUSY; + if (!(PageLRU(hpage) || PageHuge(p))) + res =3D -EBUSY; + + if (res =3D=3D -EHWPOISON) { + collect_procs(folio, p, &tokill, flags & MF_ACTION_REQUIRED); + kill_procs(&tokill, true, pfn, flags); + } + + if (flags & MF_COUNT_INCREASED) + put_page(p); + + return res; +} + /** * memory_failure - Handle memory failure of a page. * @pfn: Page Number of the corrupted page @@ -2297,6 +2328,11 @@ int memory_failure(unsigned long pfn, int flags) */ SetPageHasHWPoisoned(hpage); if (try_to_split_thp_page(p) < 0) { + if (flags & MF_ACTION_REQUIRED) { + pr_err("%#lx: thp split failed\n", pfn); + res =3D kill_procs_now(p, pfn, flags, hpage); + goto unlock_mutex; + } res =3D action_result(pfn, MF_MSG_UNSPLIT_THP, MF_IGNORED); goto unlock_mutex; } --=20 2.39.3