From patchwork Tue Jun 26 17:01:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Morse X-Patchwork-Id: 10489605 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 CB7A0604D3 for ; Tue, 26 Jun 2018 17:04:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B71CC286EC for ; Tue, 26 Jun 2018 17:04:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A95EF286C5; Tue, 26 Jun 2018 17:04:01 +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=ham 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 D30292864E for ; Tue, 26 Jun 2018 17:02:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1A2796B027C; Tue, 26 Jun 2018 13:02:33 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1791D6B027D; Tue, 26 Jun 2018 13:02:33 -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 F0EBA6B027E; Tue, 26 Jun 2018 13:02:32 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ot0-f197.google.com (mail-ot0-f197.google.com [74.125.82.197]) by kanga.kvack.org (Postfix) with ESMTP id C02046B027C for ; Tue, 26 Jun 2018 13:02:32 -0400 (EDT) Received: by mail-ot0-f197.google.com with SMTP id r58-v6so12420347otr.0 for ; Tue, 26 Jun 2018 10:02:32 -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=GjqlYQtoaL8hNvDTknpn8Sbw8VhtfoKlqwH5lRkNOsQ=; b=OQxBqA+59tY+CKC/DxMf8m0O0PQp3AxAjLY6+quzBYYjhNYFACgZuEBl3bswYec5kl Ay+TAtLjpP/KnoVyCHnQNcEwaD1rOSZn/tPUO1KFhuovKqQvwVzjaXMO+RSSnpHdpk0M Oqg8ANAj3T0kmk4RYuXo+o2CvluS6TDamXueqmUqw4MeWWjqTF6OJRG1ieXlp2cXmZ5g ejHD1ccih5ThcK25UVl4ssIMFYr/AHTWPa2CymTolBunEpPy2s4p4kzHgK0y+pG8nGUA V0HFKzVzrwKGBw1ssXlj/FJSNRRl8yY0OooKWt/Ki7RgqVhXgrsQsBdYMrnb1U/yAePN ELrA== 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: APt69E3TmHMfdNNjPbNQOegfptIFcgo9ZlNxdWruX+jnEzG4nlnNJjxh vqLbISj6LEEM14Q6CJkKc9LDt9r5OK3T/5EL2WN7b341vn2/YKu+ox30jtbkPwma6rqMAaiogJk M0o3tLkK2w1RIijFX6OKrmN27uty0e71K455ggJU3qOiRwhjYKSAck3TmpAEH6Ayc8w== X-Received: by 2002:a9d:29ce:: with SMTP id g14-v6mr1421835otd.390.1530032552534; Tue, 26 Jun 2018 10:02:32 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeJpMHBzZevhGHohROYr1z40B5QP4QEArQMpNyFshKBSmMoirc+jRUmefgcLEDCR3/BFbTt X-Received: by 2002:a9d:29ce:: with SMTP id g14-v6mr1421781otd.390.1530032551553; Tue, 26 Jun 2018 10:02:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530032551; cv=none; d=google.com; s=arc-20160816; b=wXFn1DIFEyNX+WCL941h2Q0ZnzrrKmkERBHU77XYriuvmomuSW5e2AFbjF+PV8CClZ uFiIOxUqoy7PS96IP5F2bndLGpIdWIuWCS+hYUbZyrqkKd9DSDe4P0voiizF3MvWPxXG bN1230AxJ31cjJQ0XYo0+q/5UyfnRZjnCB3DAtf/1ZZ7qEW7e8IIYc1Izs+QcJIj6iRN PDw8Ykf4eTrEwq60Z7TjrhDR5N+zh5SusbUbpvDmMovJKSn077R3jZQL1mFSglzK7DXw nH8S/b8CpoebNGPWL/eZfyH5H8PJ/e31JJfehmt+Mzcl7TT2oNkUF9r2VxYiT/NT9XII m9Eg== 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=GjqlYQtoaL8hNvDTknpn8Sbw8VhtfoKlqwH5lRkNOsQ=; b=q4UavnDUwYRwqrsxHg9F7Jxqc7/slqdebWrIeTepG/bsNocNYwngu9rb5VZ79jyGm0 xEWtp3JOpYEoXusJq0Jo9OyZ6a0RsQGyRNOFer1N8Nrxxb82dEbOtagJ2eDR88AKPGQ1 JZZTfhxxbU5Pnm3JqbRZFS8e8NQ2XrBPWsDsY3L9+llKyk1eMj4cdFDCUunub8K2et5+ 3ES5gzQctqYUd/TRLRhPMVnsVxEmIITy6gbb8gwUzTBUylOWcCpD0ITptyM+efk0uAzN wcL0jBkucaGeGNC73TpeSSpvJqR72VsX7XcqlJi6NyXs39bPqe3mUJsvRxhHLcqRUBEn 4FJw== 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 p133-v6si623200oig.232.2018.06.26.10.02.31 for ; Tue, 26 Jun 2018 10:02:31 -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 264AB7A9; Tue, 26 Jun 2018 10:02:31 -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 793573F318; Tue, 26 Jun 2018 10:02:27 -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 10/20] ACPI / APEI: preparatory split of ghes->estatus Date: Tue, 26 Jun 2018 18:01:06 +0100 Message-Id: <20180626170116.25825-11-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 The NMI-like notifications scribble over ghes->estatus, before copying it somewhere else. If this interrupts the ghes_probe() code calling ghes_proc() on each struct ghes, the data is corrupted. We want the NMI-like notifications to use a queued estatus entry from the beginning. To that end, break up any use of "ghes->estatus" so that all functions take the estatus as an argument. This patch is just moving types around, no change in behaviour. Signed-off-by: James Morse --- drivers/acpi/apei/ghes.c | 82 ++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 37 deletions(-) diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 77505cfa930e..9bb00a06ba6e 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -289,7 +289,9 @@ static void ghes_copy_tofrom_phys(void *buffer, u64 paddr, u32 len, } } -static int ghes_read_estatus(struct ghes *ghes, int silent, int fixmap_idx) +static int ghes_read_estatus(struct ghes *ghes, + struct acpi_hest_generic_status *estatus, + int silent, int fixmap_idx) { struct acpi_hest_generic *g = ghes->generic; u64 buf_paddr; @@ -307,26 +309,26 @@ static int ghes_read_estatus(struct ghes *ghes, int silent, int fixmap_idx) if (!buf_paddr) return -ENOENT; - ghes_copy_tofrom_phys(ghes->estatus, buf_paddr, - sizeof(*ghes->estatus), 1, fixmap_idx); - if (!ghes->estatus->block_status) + ghes_copy_tofrom_phys(estatus, buf_paddr, + sizeof(*estatus), 1, fixmap_idx); + if (!estatus->block_status) return -ENOENT; ghes->buffer_paddr = buf_paddr; ghes->flags |= GHES_TO_CLEAR; rc = -EIO; - len = cper_estatus_len(ghes->estatus); - if (len < sizeof(*ghes->estatus)) + len = cper_estatus_len(estatus); + if (len < sizeof(*estatus)) goto err_read_block; if (len > ghes->generic->error_block_length) goto err_read_block; - if (cper_estatus_check_header(ghes->estatus)) + if (cper_estatus_check_header(estatus)) goto err_read_block; - ghes_copy_tofrom_phys(ghes->estatus + 1, - buf_paddr + sizeof(*ghes->estatus), - len - sizeof(*ghes->estatus), 1, fixmap_idx); - if (cper_estatus_check(ghes->estatus)) + ghes_copy_tofrom_phys(estatus + 1, + buf_paddr + sizeof(*estatus), + len - sizeof(*estatus), 1, fixmap_idx); + if (cper_estatus_check(estatus)) goto err_read_block; rc = 0; @@ -337,13 +339,15 @@ static int ghes_read_estatus(struct ghes *ghes, int silent, int fixmap_idx) return rc; } -static void ghes_clear_estatus(struct ghes *ghes, int fixmap_idx) +static void ghes_clear_estatus(struct ghes *ghes, + struct acpi_hest_generic_status *estatus, + int fixmap_idx) { - ghes->estatus->block_status = 0; + estatus->block_status = 0; if (!(ghes->flags & GHES_TO_CLEAR)) return; - ghes_copy_tofrom_phys(ghes->estatus, ghes->buffer_paddr, - sizeof(ghes->estatus->block_status), 0, fixmap_idx); + ghes_copy_tofrom_phys(estatus, ghes->buffer_paddr, + sizeof(estatus->block_status), 0, fixmap_idx); ghes->flags &= ~GHES_TO_CLEAR; } @@ -509,9 +513,10 @@ static int ghes_print_estatus(const char *pfx, return 0; } -static void __ghes_panic(struct ghes *ghes) +static void __ghes_panic(struct ghes *ghes, + struct acpi_hest_generic_status *estatus) { - __ghes_print_estatus(KERN_EMERG, ghes->generic, ghes->estatus); + __ghes_print_estatus(KERN_EMERG, ghes->generic, estatus); /* reboot to log the error! */ if (!panic_timeout) @@ -686,16 +691,17 @@ static void ghes_print_queued_estatus(void) } /* Save estatus for further processing in IRQ context */ -static void __process_error(struct ghes *ghes) +static void __process_error(struct ghes *ghes, + struct acpi_hest_generic_status *ghes_estatus) { u32 len, node_len; struct ghes_estatus_node *estatus_node; struct acpi_hest_generic_status *estatus; - if (ghes_estatus_cached(ghes->estatus)) + if (ghes_estatus_cached(ghes_estatus)) return; - len = cper_estatus_len(ghes->estatus); + len = cper_estatus_len(ghes_estatus); node_len = GHES_ESTATUS_NODE_LEN(len); estatus_node = (void *)gen_pool_alloc(ghes_estatus_pool, node_len); @@ -705,35 +711,37 @@ static void __process_error(struct ghes *ghes) estatus_node->ghes = ghes; estatus_node->generic = ghes->generic; estatus = GHES_ESTATUS_FROM_NODE(estatus_node); - memcpy(estatus, ghes->estatus, len); + memcpy(estatus, ghes_estatus, len); llist_add(&estatus_node->llnode, &ghes_estatus_llist); } static int _in_nmi_notify_one(struct ghes *ghes, int fixmap_idx) { int sev; + struct acpi_hest_generic_status *estatus = ghes->estatus; - if (ghes_read_estatus(ghes, 1, fixmap_idx)) { - ghes_clear_estatus(ghes, fixmap_idx); + if (ghes_read_estatus(ghes, estatus, 1, fixmap_idx)) { + ghes_clear_estatus(ghes, estatus, fixmap_idx); return -ENOENT; } - sev = ghes_severity(ghes->estatus->error_severity); + sev = ghes_severity(estatus->error_severity); if (sev >= GHES_SEV_PANIC) { ghes_print_queued_estatus(); - __ghes_panic(ghes); + __ghes_panic(ghes, estatus); } if (!(ghes->flags & GHES_TO_CLEAR)) return 0; - __process_error(ghes); - ghes_clear_estatus(ghes, fixmap_idx); + __process_error(ghes, estatus); + ghes_clear_estatus(ghes, estatus, fixmap_idx); return 0; } -static int ghes_estatus_queue_notified(struct list_head *rcu_list, int fixmap_idx) +static int ghes_estatus_queue_notified(struct list_head *rcu_list, + int fixmap_idx) { int ret = -ENOENT; struct ghes *ghes; @@ -845,25 +853,25 @@ static int ghes_proc(struct ghes *ghes) { int rc; unsigned long flags; + struct acpi_hest_generic_status *estatus = ghes->estatus; spin_lock_irqsave(&ghes_notify_lock_irq, flags); - rc = ghes_read_estatus(ghes, 0, FIX_APEI_GHES_IRQ); + rc = ghes_read_estatus(ghes, estatus, 0, FIX_APEI_GHES_IRQ); if (rc) goto out; - if (ghes_severity(ghes->estatus->error_severity) >= GHES_SEV_PANIC) { - __ghes_panic(ghes); - } + if (ghes_severity(estatus->error_severity) >= GHES_SEV_PANIC) + __ghes_panic(ghes, estatus); - if (!ghes_estatus_cached(ghes->estatus)) { - if (ghes_print_estatus(NULL, ghes->generic, ghes->estatus)) - ghes_estatus_cache_add(ghes->generic, ghes->estatus); + if (!ghes_estatus_cached(estatus)) { + if (ghes_print_estatus(NULL, ghes->generic, estatus)) + ghes_estatus_cache_add(ghes->generic, estatus); } - ghes_do_proc(ghes, ghes->estatus); + ghes_do_proc(ghes, estatus); out: - ghes_clear_estatus(ghes, FIX_APEI_GHES_IRQ); + ghes_clear_estatus(ghes, estatus, FIX_APEI_GHES_IRQ); if (rc == -ENOENT) goto unlock;