From patchwork Tue Jun 26 17:01:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Morse X-Patchwork-Id: 10489649 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 93B7660386 for ; Tue, 26 Jun 2018 17:04:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7ED0828675 for ; Tue, 26 Jun 2018 17:04:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 725D42621D; Tue, 26 Jun 2018 17:04:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D154286AE for ; Tue, 26 Jun 2018 17:03:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1FEC16B0290; Tue, 26 Jun 2018 13:03:15 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 179BF6B0292; Tue, 26 Jun 2018 13:03:15 -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 01ED86B0293; Tue, 26 Jun 2018 13:03:14 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-oi0-f71.google.com (mail-oi0-f71.google.com [209.85.218.71]) by kanga.kvack.org (Postfix) with ESMTP id C24F76B0290 for ; Tue, 26 Jun 2018 13:03:14 -0400 (EDT) Received: by mail-oi0-f71.google.com with SMTP id 22-v6so4250421oij.10 for ; Tue, 26 Jun 2018 10:03:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=PrKuPsdoiLnu6sZq2Vt+6SgxoOrM0JX6kK+hbUWU/kA=; b=A1z34nv+fnORjGTC8/wAaINIi/vf9PwglvOP5jB+UnbX1mXGWdkzuOGag7WSN918uZ merI0e8XGkUy1xXOUgqCbpUaGhdfXOwroPR0HO9DFHIfcD5Mq/weF7k7D2vj+3Uphdc1 ipSbKGo8qAr6LO0SoZkvYa70t/GceVAQotTLd6utDeQpZ/uycfqa0NO+8dtS21fqfZdM 7bcU9QR2ZsQOy//9LFrR+zH0F2rGLs6tPDqBNbNCeT1xcUoRbqwiI5HU1WGjJFuHPCe3 YQq22WBu/+lLMlbFORTGKksRjfddmOOc53+TkH1Bh7A3k78FqBZFdsQfrspKQIZe7MP9 yeXA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of james.morse@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=james.morse@arm.com X-Gm-Message-State: APt69E2zmOqgFT5gB72wUKpPE6XSVLh0l89bnF3LB8h1N5fvOVBmkd9+ EHIch52WI+ZloeRPlW39gos/e8UWQBBDLS5shVuXv5Pmextp6CL/ovaczZ63iglU59DsvbW188F hTSZyw/AwTcZql2pk3kwu6+KkXyTAU3qhmv+hbzRUYEfjcdhj6+BrNKgkpBDUm7QpoQ== X-Received: by 2002:a9d:7492:: with SMTP id t18-v6mr1438718otk.132.1530032594564; Tue, 26 Jun 2018 10:03:14 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfE8WMyzp2EIEd6JznsYWfY3aLDa1dJ/hJmbTeEiXppkUCHdEDZHqFQ51FkZu+0hJbg+l0q X-Received: by 2002:a9d:7492:: with SMTP id t18-v6mr1438671otk.132.1530032593613; Tue, 26 Jun 2018 10:03:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530032593; cv=none; d=google.com; s=arc-20160816; b=UfbOsYMRP3ISvx/GKai3tFRwW9MM70cvZqdRC0A0ITSLgE0AWE/e1jXawe/jfRW8Xq 8j+uzSnXgvKPv+hD9NueEiyUzZBFZq/IT4MidmQVKEnobPFJBKiPDuJ6bboy2sBIYlB8 jgj4Ie32vlbAGNg1w+FK5ipWklO5tLylWhTbasPqG23E1dEeh5qbittKutVyJh3VdLFq T/5GNSNk/+JZGhGHrx5R3vdnq36TszH8FRHpF3PPnh6o7KeKawBD7wRdgPtzEWU+5Xpq EB1/7efbhxrjdjffdWCHBHtV48xzwdb0AZpNWKIiZu6V0IbfP7MSUqf37GUQUlzKIhTY indQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=PrKuPsdoiLnu6sZq2Vt+6SgxoOrM0JX6kK+hbUWU/kA=; b=oEpxol7oJI/BPerpgkkPOI/lqVbz4LQYrBd6IBwmSQBt6nKXmGbNibK6AHLTZAwl7u OJ/S9MkvUHdSTvFw7wqCxcF+S2ff2XVchkTRQ7B5tY1q/CshGn02/xENrtUdoCmhCbyQ D/6rQ6Zv7VSSbqNi8MdziVvgBEFkaDtttHkDpwYmtTico9d50ab1a++p/27ZX0wEPKv9 FgWXh9ofoKkIm5TgYY0eHIBEY+I6Vky6URLyRliA/bxCEWzduLv2sljGejjRvt7dKxTO 6ouWlNKQcikpmwzXRYZ0Ogc57r1CoLv5DDNl8SiinlsV2pq4YscKYi6hpibgT/PM3yNH qIww== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of james.morse@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=james.morse@arm.com Received: from foss.arm.com (foss.arm.com. [217.140.101.70]) by mx.google.com with ESMTP id u23-v6si684609otj.449.2018.06.26.10.03.13 for ; Tue, 26 Jun 2018 10:03:13 -0700 (PDT) Received-SPF: pass (google.com: domain of james.morse@arm.com designates 217.140.101.70 as permitted sender) client-ip=217.140.101.70; Authentication-Results: mx.google.com; spf=pass (google.com: domain of james.morse@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=james.morse@arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 296BF7A9; Tue, 26 Jun 2018 10:03:13 -0700 (PDT) Received: from melchizedek.cambridge.arm.com (melchizedek.cambridge.arm.com [10.1.206.34]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 162BF3F318; Tue, 26 Jun 2018 10:03:09 -0700 (PDT) From: James Morse To: linux-acpi@vger.kernel.org Cc: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, Borislav Petkov , Marc Zyngier , Christoffer Dall , Will Deacon , Catalin Marinas , Naoya Horiguchi , Rafael Wysocki , Len Brown , Tony Luck , Tyler Baicar , Dongjiu Geng , Xie XiuQi , Punit Agrawal , jonathan.zhang@cavium.com, James Morse Subject: [PATCH v5 20/20] arm64: acpi: Make apei_claim_sea() synchronise with APEI's irq work Date: Tue, 26 Jun 2018 18:01:16 +0100 Message-Id: <20180626170116.25825-21-james.morse@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180626170116.25825-1-james.morse@arm.com> References: <20180626170116.25825-1-james.morse@arm.com> 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: X-Virus-Scanned: ClamAV using ClamSMTP APEI is unable to do all of its error handling work in nmi-context, so it defers non-fatal work onto the irq_work queue. arch_irq_work_raise() sends an IPI to the calling cpu, but we can't guarantee this will be taken before we return. Unless we interrupted a context with irqs-masked, we can call irq_work_run() to do the work now. Otherwise return -EINPROGRESS to indicate ghes_notify_sea() found some work to do, but it hasn't finished yet. With this we can take apei_claim_sea() returning '0' to mean this external-abort was also notification of a firmware-first RAS error, and that APEI has processed the CPER records. Signed-off-by: James Morse Reviewed-by: Punit Agrawal Tested-by: Tyler Baicar CC: Xie XiuQi CC: gengdongjiu --- Changes since v2: * Removed IS_ENABLED() check, done by the caller unless we have a dummy definition. --- arch/arm64/kernel/acpi.c | 19 +++++++++++++++++++ arch/arm64/mm/fault.c | 9 ++++----- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index df2c6bff8c58..9ef2d91f0000 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -275,10 +276,14 @@ int apei_claim_sea(struct pt_regs *regs) { int err = -ENOENT; unsigned long current_flags = arch_local_save_flags(); + unsigned long interrupted_flags = current_flags; if (!IS_ENABLED(CONFIG_ACPI_APEI_SEA)) return err; + if (regs) + interrupted_flags = regs->pstate; + /* * SEA can interrupt SError, mask it and describe this as an NMI so * that APEI defers the handling. @@ -287,6 +292,20 @@ int apei_claim_sea(struct pt_regs *regs) nmi_enter(); err = ghes_notify_sea(); nmi_exit(); + + /* + * APEI NMI-like notifications are deferred to irq_work. Unless + * we interrupted irqs-masked code, we can do that now. + */ + if (!err) { + if (!arch_irqs_disabled_flags(interrupted_flags)) { + local_daif_restore(DAIF_PROCCTX_NOIRQ); + irq_work_run(); + } else { + err = -EINPROGRESS; + } + } + local_daif_restore(current_flags); return err; diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index fb2761172cd4..7e5985559a79 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -630,11 +630,10 @@ static int do_sea(unsigned long addr, unsigned int esr, struct pt_regs *regs) inf = esr_to_fault_info(esr); - /* - * Return value ignored as we rely on signal merging. - * Future patches will make this more robust. - */ - apei_claim_sea(regs); + if (apei_claim_sea(regs) == 0) { + /* APEI claimed this as a firmware-first notification */ + return 0; + } clear_siginfo(&info); info.si_signo = inf->sig;