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: 31870 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f199.google.com (mail-vc0-f199.google.com [209.85.220.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 56E252054B for ; Fri, 13 Jun 2014 11:03:50 +0000 (UTC) Received: by mail-vc0-f199.google.com with SMTP id ij19sf6996866vcb.2 for ; Fri, 13 Jun 2014 04:03:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=XDfVyExabiN8iaI11T//p01ayth7qYUH3e/LXtilL8o=; b=D+nhcUCMHnX1yw8sqUqfk+SpQ2rtIUxotu0xcvQ0EQTzTqx6gjWi5vZqGtKLXhs9UL RRqNs/k73CpCbkMkvTSpqzFfDNSnYtge2QmIjpOCeHgYRlf98vcXn05Wi0EfPYXQm7X4 xe9bqbUOpCMzaYzBXp4dj9BSNPnrfSlxClV1WS9+Vnaq+kF2Dh9RWKa30G3sYJnakYhj 3vsGoHXVk4MroafF4Lt4BloCafK7ss62SPTWLqN2LeHqLueDF/Sv7aoxeSFzPN6NCtzF SJ9jwso6aD+eROiJjZhGIsqNal0/CBxajvQTVAjYoqFqjrI0GgdjXUC+2ZWZbDTyTetQ Kh6g== X-Gm-Message-State: ALoCoQniCvmoz15zl51WNzu1PwFNVeeCqjp+rC8raG6ggekE0Fs23PFqFvFbPBRiC8VDYceRb5wn X-Received: by 10.58.134.36 with SMTP id ph4mr297147veb.27.1402657429844; Fri, 13 Jun 2014 04:03:49 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.82.37 with SMTP id g34ls3391030qgd.64.gmail; Fri, 13 Jun 2014 04:03:49 -0700 (PDT) X-Received: by 10.220.95.2 with SMTP id b2mr379104vcn.61.1402657429731; Fri, 13 Jun 2014 04:03:49 -0700 (PDT) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id sb3si1285518vdc.24.2014.06.13.04.03.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Jun 2014 04:03:49 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.173 as permitted sender) client-ip=209.85.128.173; Received: by mail-ve0-f173.google.com with SMTP id db11so3147406veb.18 for ; Fri, 13 Jun 2014 04:03:49 -0700 (PDT) X-Received: by 10.52.135.208 with SMTP id pu16mr1081538vdb.8.1402657429628; Fri, 13 Jun 2014 04:03:49 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp477671vcb; Fri, 13 Jun 2014 04:03:48 -0700 (PDT) X-Received: by 10.68.129.42 with SMTP id nt10mr2370347pbb.134.1402657427898; Fri, 13 Jun 2014 04:03:47 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gq7si4322964pac.237.2014.06.13.04.03.47 for ; Fri, 13 Jun 2014 04:03:47 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753334AbaFMLDk (ORCPT + 26 others); Fri, 13 Jun 2014 07:03:40 -0400 Received: from mail-wg0-f49.google.com ([74.125.82.49]:49803 "EHLO mail-wg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753230AbaFMLDa (ORCPT ); Fri, 13 Jun 2014 07:03:30 -0400 Received: by mail-wg0-f49.google.com with SMTP id y10so2565694wgg.20 for ; Fri, 13 Jun 2014 04:03:29 -0700 (PDT) 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-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: tomasz.nowicki@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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