From patchwork Fri Jun 13 11:03:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 4348601 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 55D9DBEEAA for ; Fri, 13 Jun 2014 11:04:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6966E2034C for ; Fri, 13 Jun 2014 11:04:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 760D9202F0 for ; Fri, 13 Jun 2014 11:04:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753234AbaFMLDg (ORCPT ); Fri, 13 Jun 2014 07:03:36 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:49366 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753245AbaFMLDa (ORCPT ); Fri, 13 Jun 2014 07:03:30 -0400 Received: by mail-wi0-f178.google.com with SMTP id n15so654385wiw.17 for ; Fri, 13 Jun 2014 04:03:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VD2Ma1bTOT8j7OVmwu5l4Clty4sqI0kzqvr0TITM4aw=; b=SLh9dX5wsg3ylr7Fbwqsg0H2iwDto8vlLjUpgNtq03QiMAzxn5C0ZxhaR1MTYMZHP6 FIVHZ4WV3M31XlU8eFJ0A/xXoewIG9KConL0FAr5n99ZQmk92ySo8Kv5j61re/irJ9GV F42rpS8YGKmkdEWhTMYsDBF4t6ZrdbOUIvsNfbmFrc8iyyrpM2FDHX+icieRL0Ag6RRN ne9iKtY0OmESwGcBMDEitspKxJY5Bbkx+r8DCKSh6D5RjXEPeQv8u1TTrhCwJeNs/TMM xWtnpm8gPDW0Tu0zb7J2O/4jShwLgaiHZVHsUZhYOwfYQGmTV/SYqtcK4Ax/ADkTnxgD GFow== X-Gm-Message-State: ALoCoQmyptjVDKztPbyar6UNDrZbsbSbbIUZgQa9geUBI3GDMnPuqM2juilM+6d7sBkR1EkB91ia X-Received: by 10.180.99.71 with SMTP id eo7mr3100013wib.49.1402657409238; Fri, 13 Jun 2014 04:03:29 -0700 (PDT) Received: from tn-HP3-PC.semihalf.com ([80.82.22.190]) by mx.google.com with ESMTPSA id w6sm11206942eef.20.2014.06.13.04.03.27 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Jun 2014 04:03:28 -0700 (PDT) From: Tomasz Nowicki To: rjw@rjwysocki.net, lenb@kernel.org, tony.luck@intel.com, bp@alien8.de, m.chehab@samsung.com, bp@suse.de Cc: linux-edac@vger.kernel.org, x86@kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, rric@kernel.org, Tomasz Nowicki Subject: [PATCH v3 5/5] acpi, apei, ghes: Factor out ioremap virtual memory for IRQ and NMI context. Date: Fri, 13 Jun 2014 13:03:00 +0200 Message-Id: <1402657380-18539-6-git-send-email-tomasz.nowicki@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1402657380-18539-1-git-send-email-tomasz.nowicki@linaro.org> References: <1402657380-18539-1-git-send-email-tomasz.nowicki@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP GHES currently maps two pages with atomic_ioremap. From now on, NMI is optional so there is no need to allocate an NMI page for platforms without NMI support. To make it possible to not use a second page, swap the existing page order so that the IRQ context page is first, and the optional NMI context page is second. Then, use ARCH_HAS_ACPI_APEI_NMI to decide at runtime how many pages are to be allocated. Finally, put in sanity checks to avoid accessing unallocated memory. Signed-off-by: Tomasz Nowicki --- arch/x86/kernel/acpi/apei.c | 6 ++++++ drivers/acpi/apei/ghes.c | 16 ++++++++-------- include/acpi/apei.h | 1 + 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/acpi/apei.c b/arch/x86/kernel/acpi/apei.c index 221a3a6..842d158 100644 --- a/arch/x86/kernel/acpi/apei.c +++ b/arch/x86/kernel/acpi/apei.c @@ -79,3 +79,9 @@ void arch_apei_nmi_oops_begin(void) { oops_begin(); } + +void arch_apei_flush_tlb_one(unsigned long addr) +{ + __flush_tlb_one(addr); +} +EXPORT_SYMBOL_GPL(arch_apei_flush_tlb_one); diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 21aeac5..93a4d0b 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -113,12 +113,11 @@ static DEFINE_RAW_SPINLOCK(ghes_nmi_lock); */ /* - * Two virtual pages are used, one for NMI context, the other for - * IRQ/PROCESS context + * Two virtual pages are used, one for IRQ/PROCESS context, the other for + * NMI context (optionally). */ -#define GHES_IOREMAP_PAGES 2 -#define GHES_IOREMAP_NMI_PAGE(base) (base) -#define GHES_IOREMAP_IRQ_PAGE(base) ((base) + PAGE_SIZE) +#define GHES_IOREMAP_IRQ_PAGE(base) (base) +#define GHES_IOREMAP_NMI_PAGE(base) ((base) + PAGE_SIZE) /* virtual memory area for atomic ioremap */ static struct vm_struct *ghes_ioremap_area; @@ -155,7 +154,8 @@ static struct ghes_notify_setup ghes_notify_tab[]; static int ghes_ioremap_init(void) { - ghes_ioremap_area = __get_vm_area(PAGE_SIZE * GHES_IOREMAP_PAGES, + ghes_ioremap_area = __get_vm_area( + PAGE_SIZE * (IS_ENABLED(ARCH_HAS_ACPI_APEI_NMI) ? 2 : 1), VM_IOREMAP, VMALLOC_START, VMALLOC_END); if (!ghes_ioremap_area) { pr_err(GHES_PFX "Failed to allocate virtual memory area for atomic ioremap.\n"); @@ -199,7 +199,7 @@ static void ghes_iounmap_nmi(void __iomem *vaddr_ptr) BUG_ON(vaddr != (unsigned long)GHES_IOREMAP_NMI_PAGE(base)); unmap_kernel_range_noflush(vaddr, PAGE_SIZE); - __flush_tlb_one(vaddr); + arch_apei_flush_tlb_one(vaddr); } static void ghes_iounmap_irq(void __iomem *vaddr_ptr) @@ -209,7 +209,7 @@ static void ghes_iounmap_irq(void __iomem *vaddr_ptr) BUG_ON(vaddr != (unsigned long)GHES_IOREMAP_IRQ_PAGE(base)); unmap_kernel_range_noflush(vaddr, PAGE_SIZE); - __flush_tlb_one(vaddr); + arch_apei_flush_tlb_one(vaddr); } static int ghes_estatus_pool_init(void) diff --git a/include/acpi/apei.h b/include/acpi/apei.h index 348e1ea..ff2bb7e 100644 --- a/include/acpi/apei.h +++ b/include/acpi/apei.h @@ -51,6 +51,7 @@ int arch_apei_register_nmi(int (*nmi_handler)(unsigned int, struct pt_regs *), const char *name); void arch_apei_unregister_nmi(const char *name); void arch_apei_nmi_oops_begin(void); +void arch_apei_flush_tlb_one(unsigned long addr); #endif #endif