From patchwork Tue May 26 07:06:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wetp X-Patchwork-Id: 11570025 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0D2A01392 for ; Tue, 26 May 2020 07:06:56 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E54682053B for ; Tue, 26 May 2020 07:06:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E54682053B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 1F05E80085; Tue, 26 May 2020 03:06:55 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1A0DD80061; Tue, 26 May 2020 03:06:55 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0DD9680085; Tue, 26 May 2020 03:06:55 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0251.hostedemail.com [216.40.44.251]) by kanga.kvack.org (Postfix) with ESMTP id EAB5280061 for ; Tue, 26 May 2020 03:06:54 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id AFFD4180AD817 for ; Tue, 26 May 2020 07:06:54 +0000 (UTC) X-FDA: 76857987948.25.drug36_767392d7f3918 X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,wetp.zy@linux.alibaba.com,,RULES_HIT:30051:30054:30056:30065:30083:30090,0,RBL:47.88.44.36:@linux.alibaba.com:.lbl8.mailshell.net-62.18.0.100 64.10.201.10;47.88.44.36-irl.urbl.hostedemail.com-127.0.0.150,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:23,LUA_SUMMARY:none X-HE-Tag: drug36_767392d7f3918 X-Filterd-Recvd-Size: 2372 Received: from out4436.biz.mail.alibaba.com (out4436.biz.mail.alibaba.com [47.88.44.36]) by imf46.hostedemail.com (Postfix) with ESMTP for ; Tue, 26 May 2020 07:06:53 +0000 (UTC) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R111e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01f04427;MF=wetp.zy@linux.alibaba.com;NM=1;PH=DS;RN=4;SR=0;TI=SMTPD_---0TzhXv2Y_1590476801; Received: from localhost(mailfrom:wetp.zy@linux.alibaba.com fp:SMTPD_---0TzhXv2Y_1590476801) by smtp.aliyun-inc.com(127.0.0.1); Tue, 26 May 2020 15:06:50 +0800 From: Wetp Zhang To: n-horiguchi@ah.jp.nec.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm, memory_failure: only send BUS_MCEERR_AO to early-kill process Date: Tue, 26 May 2020 15:06:41 +0800 Message-Id: <1590476801-19882-1-git-send-email-wetp.zy@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 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: From: Zhang Yi If a process don't need early-kill, it may not care the BUS_MCEERR_AO. Let the process to be killed when it really access the corrupted memory. Signed-off-by: Zhang Yi --- mm/memory-failure.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index a96364be8ab4..2db13d48865c 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -210,7 +210,7 @@ static int kill_proc(struct to_kill *tk, unsigned long pfn, int flags) { struct task_struct *t = tk->tsk; short addr_lsb = tk->size_shift; - int ret; + int ret = 0; pr_err("Memory failure: %#lx: Sending SIGBUS to %s:%d due to hardware memory corruption\n", pfn, t->comm, t->pid); @@ -225,8 +225,9 @@ static int kill_proc(struct to_kill *tk, unsigned long pfn, int flags) * This could cause a loop when the user sets SIGBUS * to SIG_IGN, but hopefully no one will do that? */ - ret = send_sig_mceerr(BUS_MCEERR_AO, (void __user *)tk->addr, - addr_lsb, t); /* synchronous? */ + if ((t->flags & PF_MCE_PROCESS) && (t->flags & PF_MCE_EARLY)) + ret = send_sig_mceerr(BUS_MCEERR_AO, + (void __user *)tk->addr, addr_lsb, t); } if (ret < 0) pr_info("Memory failure: Error sending signal to %s:%d: %d\n",