From patchwork Tue Jun 26 17:01:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Morse X-Patchwork-Id: 10489665 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 2C7B16053B for ; Tue, 26 Jun 2018 17:04:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 18CA71FE82 for ; Tue, 26 Jun 2018 17:04:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0CE1A2621D; Tue, 26 Jun 2018 17:04:06 +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 50A6F28791 for ; Tue, 26 Jun 2018 17:02:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C76CE6B0282; Tue, 26 Jun 2018 13:02:45 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C26146B0283; Tue, 26 Jun 2018 13:02:45 -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 AEDF86B0284; Tue, 26 Jun 2018 13:02:45 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ot0-f198.google.com (mail-ot0-f198.google.com [74.125.82.198]) by kanga.kvack.org (Postfix) with ESMTP id 7FAF96B0282 for ; Tue, 26 Jun 2018 13:02:45 -0400 (EDT) Received: by mail-ot0-f198.google.com with SMTP id p12-v6so12419447oti.6 for ; Tue, 26 Jun 2018 10:02:45 -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=IkgFppgU97u0EcBERcKO6RG3CqDL4mVQyLUgJFyJKUs=; b=LJI8cI3LAxd8JyQFZ3BWngXkr1deuBPh9uo3eG/BtXX4l5zPIT/+q/koViZnPxup2g n5m30nKWjncycInrf9cDCgMZi+AGcx/IpO2HFLJrnEDH7ebGveUDBXi4i7PMdaiyOLMD ErurzDvOCN97DdYRtygbZQj9+eG1S/7rVFZmdtipPUuwOcEg4D8WxHK//IDldQl7Lo8f nUmfo3LDt1m6nZKU45fTd9yYPYqPohs2smpO63dvL8FTrZjWqErpwULnukZ9i+pQgNUe wi+d8ThZ3UqKeLcMTqX2Y+5g8UnyO0lAPMNhyB8Q9LlcriSrzFRV1e+3SXbj98ZGAEOE C+Tw== 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: APt69E3NBi7bwdEvmoPuNapy2VAt69WUo4KKaY6l14WogdyQx9AzH2AF tl+JqiSkXbwAHOKemOyKYp+W/2k1r8TUN4c6ZkLJPBdJ6x0x/1MfHNcaX1y8HJkUuabeUT6eAvF PVpvnSqpDxDOj6xSykMRGBb1BrQfozRN0ltNEgtPgZ8Q3wlucr6uteQvQ5TFrdtoV6Q== X-Received: by 2002:aca:ce03:: with SMTP id e3-v6mr1242735oig.340.1530032565313; Tue, 26 Jun 2018 10:02:45 -0700 (PDT) X-Google-Smtp-Source: AAOMgpculb4geB80RS8GJVSkPNTa4m3q8AA74+0GD2q3WckhAVV45rAhAT51L+R56ENB41sS1j65 X-Received: by 2002:aca:ce03:: with SMTP id e3-v6mr1242664oig.340.1530032563981; Tue, 26 Jun 2018 10:02:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530032563; cv=none; d=google.com; s=arc-20160816; b=Ff81InzQBODsA0nH+oMEwudNMbnjE9Q6iqY6RBB7XN44bdMdDApjlA3wUMjM0UNVSd lILVTZU7EdKwnEZjR70rbtPUdzYXVjiGVM4bRcx5/LH4gqzhXWqbnl7DGxwKjlzHLOUx H8xSNhF8KqKURcIqWXzulrUFn/c7SqTDStfPJsIHhjCQCgYKjkdpoF1QPpSoA01Ym/P8 3Dfa3k4d+ukl9fbrSBtLVNkw/g1Kj0bVPvNQ1TZCPc0g3qzc8dKn9LK4o0skBwHmpmM1 zB8CAjHAKZdswR8IcPznkhynf0ikaz2K/gWTi5zZ0Ypm7rbSBvQha15eVmRXUokfsSGh 6BEQ== 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=IkgFppgU97u0EcBERcKO6RG3CqDL4mVQyLUgJFyJKUs=; b=rVQc1was3fvzx4Ud21wCsf9dYVPbD09evs42wZp1XnhHAdEdavhhmHvg42Q47TlixD IflLG8IGvcRCicuXGqEFpnF/H1RihZeuNp6yls2u+z1s9X5LpVOldhobLCAHE9LlAK+L 70SUE8pW7yV+7m51InVmgRmlaXjS8fwago9C1dVbZjMq8V/ylVG38qcaZ6+Vz+/iRDnC 5kkRcRepoC0t/lMLEahEScRFgzkfQj2pRDBFYclLuzDWfqIJEztGUJw/BXKfGybJr84K +ygSstUS6BqnJ8vxUxERAhuHOlOcZBIhkgZYVfgimTu8mdoDbAg8L/hGgEsJQR2SLNMS dTHA== 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 a22-v6si722909ote.424.2018.06.26.10.02.43 for ; Tue, 26 Jun 2018 10:02:43 -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 831707A9; Tue, 26 Jun 2018 10:02:43 -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 25D523F318; Tue, 26 Jun 2018 10:02:40 -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 13/20] ACPI / APEI: Don't update struct ghes' flags in read/clear estatus Date: Tue, 26 Jun 2018 18:01:09 +0100 Message-Id: <20180626170116.25825-14-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 ghes_read_estatus() sets a flag in struct ghes if the buffer of CPER records needs to be cleared once the records have been processed. This global flags value is a problem if a struct ghes can be processed concurrently, as happens at probe time if an NMI arrives for the same error source. The GHES_TO_CLEAR flags was only set at the same time as buffer_paddr, which is now owned by the caller and passed to ghes_clear_estatus(). Use this as the flag. A non-zero buf_paddr returned by ghes_read_estatus() means ghes_clear_estatus() will clear this address. ghes_read_estatus() already checks for a read of error_status_address being zero, so we can never get CPER records written at zero. After this ghes_clear_estatus() no longer needs the struct ghes. Signed-off-by: James Morse --- drivers/acpi/apei/ghes.c | 26 ++++++++++++-------------- include/acpi/ghes.h | 1 - 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index b0054dfad9cc..75360525935d 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -310,10 +310,10 @@ static int ghes_read_estatus(struct ghes *ghes, ghes_copy_tofrom_phys(estatus, *buf_paddr, sizeof(*estatus), 1, fixmap_idx); - if (!estatus->block_status) + if (!estatus->block_status) { + *buf_paddr = 0; return -ENOENT; - - ghes->flags |= GHES_TO_CLEAR; + } rc = -EIO; len = cper_estatus_len(estatus); @@ -337,16 +337,14 @@ static int ghes_read_estatus(struct ghes *ghes, return rc; } -static void ghes_clear_estatus(struct ghes *ghes, - struct acpi_hest_generic_status *estatus, +static void ghes_clear_estatus(struct acpi_hest_generic_status *estatus, phys_addr_t buf_paddr, int fixmap_idx) { estatus->block_status = 0; - if (!(ghes->flags & GHES_TO_CLEAR)) - return; - ghes_copy_tofrom_phys(estatus, buf_paddr, - sizeof(estatus->block_status), 0, fixmap_idx); - ghes->flags &= ~GHES_TO_CLEAR; + if (buf_paddr) + ghes_copy_tofrom_phys(estatus, buf_paddr, + sizeof(estatus->block_status), 0, + fixmap_idx); } static void ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata, int sev) @@ -720,7 +718,7 @@ static int _in_nmi_notify_one(struct ghes *ghes, int fixmap_idx) struct acpi_hest_generic_status *estatus = ghes->estatus; if (ghes_read_estatus(ghes, estatus, &buf_paddr, fixmap_idx)) { - ghes_clear_estatus(ghes, estatus, buf_paddr, fixmap_idx); + ghes_clear_estatus(estatus, buf_paddr, fixmap_idx); return -ENOENT; } @@ -730,11 +728,11 @@ static int _in_nmi_notify_one(struct ghes *ghes, int fixmap_idx) __ghes_panic(ghes, estatus); } - if (!(ghes->flags & GHES_TO_CLEAR)) + if (!buf_paddr) return 0; __process_error(ghes, estatus); - ghes_clear_estatus(ghes, estatus, buf_paddr, fixmap_idx); + ghes_clear_estatus(estatus, buf_paddr, fixmap_idx); return 0; } @@ -871,7 +869,7 @@ static int ghes_proc(struct ghes *ghes) ghes_do_proc(ghes, estatus); out: - ghes_clear_estatus(ghes, estatus, buf_paddr, FIX_APEI_GHES_IRQ); + ghes_clear_estatus(estatus, buf_paddr, FIX_APEI_GHES_IRQ); if (rc == -ENOENT) goto unlock; diff --git a/include/acpi/ghes.h b/include/acpi/ghes.h index 3d77452e3a1d..0b6fe48e6671 100644 --- a/include/acpi/ghes.h +++ b/include/acpi/ghes.h @@ -13,7 +13,6 @@ * estatus: memory buffer for error status block, allocated during * HEST parsing. */ -#define GHES_TO_CLEAR 0x0001 #define GHES_EXITING 0x0002 struct ghes {