From patchwork Fri Sep 21 22:17:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Morse X-Patchwork-Id: 10611057 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8A8F514BD for ; Fri, 21 Sep 2018 22:18:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D4792DDC8 for ; Fri, 21 Sep 2018 22:18:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71AB82DDD4; Fri, 21 Sep 2018 22:18:48 +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 0B1772DDC8 for ; Fri, 21 Sep 2018 22:18:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D46078E001E; Fri, 21 Sep 2018 18:18:46 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id CF62C8E0001; Fri, 21 Sep 2018 18:18:46 -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 C0C738E001E; Fri, 21 Sep 2018 18:18:46 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ot1-f69.google.com (mail-ot1-f69.google.com [209.85.210.69]) by kanga.kvack.org (Postfix) with ESMTP id 973C08E0001 for ; Fri, 21 Sep 2018 18:18:46 -0400 (EDT) Received: by mail-ot1-f69.google.com with SMTP id b9-v6so13829623otl.4 for ; Fri, 21 Sep 2018 15:18:46 -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:mime-version :content-transfer-encoding; bh=bboPjrhPBdZVtPAqzi8WofR0+B9wPN9MRHdT7ciiho8=; b=X+dshElLcITpGZWK5qZdL2zKgIz35fb0fCziOcTUl2YZ2zaFXDTLctz1yId8bAZHKy FES4YWZXXWHbqbABkyeBC6nrgCHx1TZVR8fsvffxLYi+HqlNcGzP9QdzQ9lyHX0uDAJW JgMHOFGuPzW/qGprvnLun9+SmjFPE7T9CWxAMqaJzXNT3eshy9Bd841uIIJrAKM4afyV 4I1tJZYD6ge8qWh9rF6niHEjOlAXWfo9mPzHlTPu1BNfuF3xmdU9AwuQXscyscdzEcZV o5xdMPGfP7VtLsR6NG6tZ6JPif65mObSMxjIuT7LGoY3WcyNPEKNcis6iGUsTcU+Sd/u jvmg== 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: APzg51DRVtVMwmSHCuy9ul9XR8Jwpl1xs/Q1hZ7hv4VDmmSUfkB8yIxA 8aAYyCxQciB5OoVJOCkNObeO76iEdZ+C8h6YaSwV6wJuQkx28bSiVdO/dK/78ffWMC/JHxpvN/F cCbKkcpzad+sVZI4Z7u+Ow17wJ8RBwtgFD9fSoZZL6TqBd2krF62H0CHzUlvCyvNiBQ== X-Received: by 2002:a9d:1ea5:: with SMTP id n34-v6mr25101828otn.313.1537568326353; Fri, 21 Sep 2018 15:18:46 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZ6PiOdHoyt7sf8Lug2sRbWuSN/3vDwzuBRevV99ITTXJafd7p2yjItkkcUlGBTub82oS0r X-Received: by 2002:a9d:1ea5:: with SMTP id n34-v6mr25101803otn.313.1537568325495; Fri, 21 Sep 2018 15:18:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537568325; cv=none; d=google.com; s=arc-20160816; b=BcQnZ+U/jgOXzSduA+FpklSZRDSsGzkmrlHqv2glQs6wDHTYRnm9Tdqtzzhv3qEtBr 8wdFvI5tTIkjOsXWrN4iMdyy1LmIaepu6zcs+VxQC4JQBZEVu8IkWIMEK7coaK1kNXyO EbzPm9MVWFMLwAZZTxZH6pj3zbDB5inLifkr0YTw3IsDGIFPPeGyxXaMgiwyeRWt5uLP 1OOi0QOw2gT9VlKUWj0HwHyqQba7dWGHgM+F4Dz/5dEcuARQ6qXoblN3AcnWg8ryQvH5 1FQ+7uyMR6X78n8anUbvnaCeaxW72VxJAZ2mKX6Wn1qjRAcJhMrYgicwsj6jPNvRZttM bZOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=bboPjrhPBdZVtPAqzi8WofR0+B9wPN9MRHdT7ciiho8=; b=OfUCO6tH34YaKA3RSvy4LmuFzWczsS3lh1aSnFJHCdArBXqRtE8C49kSQNt/aJnKoT hnITQCnXSNiD180jaaOJvsdX5EkwPp+vHIKkX6nXdN2eqdDq+YspyULRL3bLtRcLlV07 W5cUAWwYfHiYkF7C4GBO29YvPEvGWn+YLRnG+xBECoHIh4q5Re5Ub/NpTYv2nkZeFiMg R5+rBDCSaPhxrDetHgPFfOZVn0nkXnSygAALNTLkXS9RfJAJk/CHRc6Bt6bFzo3hbrEr EZikVJ6pZ/7F/l655GIEuPGyOPKZs4HJUmuYHUC/dnlGBwEEcFYGN2f1+Jn//KF62gaT DYjw== 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 (usa-sjc-mx-foss1.foss.arm.com. [217.140.101.70]) by mx.google.com with ESMTP id u142-v6si12775372oiu.234.2018.09.21.15.18.45 for ; Fri, 21 Sep 2018 15:18:45 -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 EDAA61684; Fri, 21 Sep 2018 15:18:44 -0700 (PDT) Received: from melchizedek.Emea.Arm.com (melchizedek.emea.arm.com [10.4.12.81]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D87523F557; Fri, 21 Sep 2018 15:18:41 -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 v6 13/18] ACPI / APEI: Don't update struct ghes' flags in read/clear estatus Date: Fri, 21 Sep 2018 23:17:00 +0100 Message-Id: <20180921221705.6478-14-james.morse@arm.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180921221705.6478-1-james.morse@arm.com> References: <20180921221705.6478-1-james.morse@arm.com> MIME-Version: 1.0 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 Reviewed-by: Borislav Petkov --- 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 c58f9b330ed3..3028487d43a3 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -319,10 +319,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); @@ -346,16 +346,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, u64 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) @@ -729,7 +727,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; } @@ -739,11 +737,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; } @@ -877,7 +875,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) return rc; diff --git a/include/acpi/ghes.h b/include/acpi/ghes.h index 6dc021e9cdad..536f90dd1e34 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 {