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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1922FC43217 for ; Tue, 22 Feb 2022 05:33:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229665AbiBVFd3 (ORCPT ); Tue, 22 Feb 2022 00:33:29 -0500 Received: from gmail-smtp-in.l.google.com ([23.128.96.19]:35322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229680AbiBVFdA (ORCPT ); Tue, 22 Feb 2022 00:33:00 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71EAA96836 for ; Mon, 21 Feb 2022 21:32:33 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 1575AB81866 for ; Tue, 22 Feb 2022 04:57:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5AD5C340E8; Tue, 22 Feb 2022 04:57:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1645505826; bh=ibhB1x9NZkhuqJrquWOcIeSBB9Eo5U16Twx/yrR4Qeg=; h=Date:To:From:Subject:From; b=W0/RmlXZgf7D4eyQBOYh1ZL6GwrDFnepukaWYTmZhfeC0az+GDEsfEmu8mOr6e1vu eOQ6wyso4UtU2PiFS+PhoFu74i8VR7A6sWAJjxLyNvpb2dvBUykFNvC6bM32HAKLgH BpuCgVz2718E7qmkd1K13udFJEIYRbec9/iffI+Q= Date: Mon, 21 Feb 2022 20:57:06 -0800 To: mm-commits@vger.kernel.org, naoya.horiguchi@nec.com, linmiaohe@huawei.com, akpm@linux-foundation.org From: Andrew Morton Subject: + mm-memory-failurec-rework-the-signaling-logic-in-kill_proc.patch added to -mm tree Message-Id: <20220222045706.C5AD5C340E8@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: mm/memory-failure.c: rework the signaling logic in kill_proc has been added to the -mm tree. Its filename is mm-memory-failurec-rework-the-signaling-logic-in-kill_proc.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-memory-failurec-rework-the-signaling-logic-in-kill_proc.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-memory-failurec-rework-the-signaling-logic-in-kill_proc.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Miaohe Lin Subject: mm/memory-failure.c: rework the signaling logic in kill_proc BUS_MCEERR_AR code is only sent when MF_ACTION_REQUIRED is set and the target is current. Rework the code to make this clear. Link: https://lkml.kernel.org/r/20220218090118.1105-4-linmiaohe@huawei.com Signed-off-by: Miaohe Lin Acked-by: Naoya Horiguchi Signed-off-by: Andrew Morton --- mm/memory-failure.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) --- a/mm/memory-failure.c~mm-memory-failurec-rework-the-signaling-logic-in-kill_proc +++ a/mm/memory-failure.c @@ -258,16 +258,13 @@ static int kill_proc(struct to_kill *tk, pr_err("Memory failure: %#lx: Sending SIGBUS to %s:%d due to hardware memory corruption\n", pfn, t->comm, t->pid); - if (flags & MF_ACTION_REQUIRED) { - if (t == current) - ret = force_sig_mceerr(BUS_MCEERR_AR, - (void __user *)tk->addr, addr_lsb); - else - /* Signal other processes sharing the page if they have PF_MCE_EARLY set. */ - ret = send_sig_mceerr(BUS_MCEERR_AO, (void __user *)tk->addr, - addr_lsb, t); - } else { + if ((flags & MF_ACTION_REQUIRED) && (t == current)) + ret = force_sig_mceerr(BUS_MCEERR_AR, + (void __user *)tk->addr, addr_lsb); + else /* + * Signal other processes sharing the page if they have + * PF_MCE_EARLY set. * Don't use force here, it's convenient if the signal * can be temporarily blocked. * This could cause a loop when the user sets SIGBUS @@ -275,7 +272,6 @@ static int kill_proc(struct to_kill *tk, */ ret = send_sig_mceerr(BUS_MCEERR_AO, (void __user *)tk->addr, addr_lsb, t); /* synchronous? */ - } if (ret < 0) pr_info("Memory failure: Error sending signal to %s:%d: %d\n", t->comm, t->pid, ret); _ Patches currently in -mm which might be from linmiaohe@huawei.com are mm-memremap-avoid-calling-kasan_remove_zero_shadow-for-device-private-memory.patch filemap-remove-find_get_pages.patch mm-use-helper-function-range_in_vma.patch mm-sparse-make-mminit_validate_memmodel_limits-static.patch mm-vmalloc-remove-unneeded-function-forward-declaration.patch mm-mmzoneh-remove-unused-macros.patch mm-memory-failurec-minor-clean-up-for-memory_failure_dev_pagemap.patch mm-memory-failurec-catch-unexpected-efault-from-vma_address.patch mm-memory-failurec-rework-the-signaling-logic-in-kill_proc.patch mm-memory-failurec-fix-race-with-changing-page-more-robustly.patch mm-memory-failurec-remove-pageslab-check-in-hwpoison_filter_dev.patch mm-memory-failurec-rework-the-try_to_unmap-logic-in-hwpoison_user_mappings.patch mm-memory-failurec-remove-obsolete-comment-in-__soft_offline_page.patch mm-memory-failurec-remove-unnecessary-pagetranstail-check.patch mm-hwpoison-inject-support-injecting-hwpoison-to-free-page.patch mm-ksm-use-helper-macro-__attr_rw.patch mm-balloon_compaction-make-balloon-page-compaction-callbacks-static.patch mm-memory_hotplug-remove-obsolete-comment-of-__add_pages.patch mm-memory_hotplug-avoid-calling-zone_intersects-for-zone_normal.patch mm-memory_hotplug-clean-up-try_offline_node.patch mm-memory_hotplug-fix-misplaced-comment-in-offline_pages.patch mm-highmem-remove-unnecessary-done-label.patch mm-hmmc-remove-unneeded-local-variable-ret.patch