From patchwork Wed Feb 10 02:06:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kani, Toshi" X-Patchwork-Id: 8267501 Return-Path: X-Original-To: patchwork-linux-nvdimm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1AC779F1C1 for ; Wed, 10 Feb 2016 01:13:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 119D8202E6 for ; Wed, 10 Feb 2016 01:13:17 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E68AA202E9 for ; Wed, 10 Feb 2016 01:13:15 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id A8FA21A1DE9; Tue, 9 Feb 2016 17:13:15 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from g4t3428.houston.hp.com (g4t3428.houston.hp.com [15.201.208.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 900311A1DE9 for ; Tue, 9 Feb 2016 17:13:13 -0800 (PST) Received: from g4t3433.houston.hp.com (g4t3433.houston.hp.com [16.210.25.219]) by g4t3428.houston.hp.com (Postfix) with ESMTP id 4AC8856; Wed, 10 Feb 2016 01:13:12 +0000 (UTC) Received: from misato.fc.hp.com (misato.fc.hp.com [16.78.168.61]) by g4t3433.houston.hp.com (Postfix) with ESMTP id 21A8D47; Wed, 10 Feb 2016 01:13:11 +0000 (UTC) From: Toshi Kani To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, bp@suse.de Subject: [PATCH] x86/mm: Add x86 valid_phys_addr_range() for /dev/mem Date: Tue, 9 Feb 2016 19:06:15 -0700 Message-Id: <1455069975-14291-1-git-send-email-toshi.kani@hpe.com> X-Mailer: git-send-email 2.5.0 Cc: x86@kernel.org, linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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 x86 does not define ARCH_HAS_VALID_PHYS_ADDR_RANGE, which leads /dev/mem to use the default valid_phys_addr_range() and valid_mmap_phys_addr_range() in drivers/char/mem.c. The default valid_phys_addr_range() allows any range lower than __pa(high_memory), which is the end of system RAM, and disallows any range higher than it. Persistent memory may be located at lower and/or higher address of __pa(high_memory) depending on their memory slots. When using crash(8) via /dev/mem for analyzing data in persistent memory, it can only access to the one lower than __pa(high_memory). Add x86 valid_phys_addr_range() and valid_mmap_phys_addr_range() to provide better checking: - Physical address range is valid when it is fully backed by IORESOURCE_MEM, regardless of __pa(high_memory). - Other ranges, including holes, are invalid. This also allows crash(8) to access persistent memory ranges via /dev/mem (with a minor change to remove high_memory check from crash itself). Note, /dev/mem makes additional check with devmem_is_allowed() for read/write when CONFIG_STRICT_DEVMEM is set, and does always for mmap. CONFIG_IO_STRICT_DEVMEM provides further restriction. Signed-off-by: Toshi Kani Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Borislav Petkov Cc: Dan Williams --- This patch applies on top of the patch-set below, and is based on the tip tree. https://lkml.org/lkml/2016/1/26/886 --- arch/x86/include/asm/io.h | 3 +++ arch/x86/mm/init.c | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index de25aad..189901a 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h @@ -36,6 +36,7 @@ #define ARCH_HAS_IOREMAP_WC #define ARCH_HAS_IOREMAP_WT +#define ARCH_HAS_VALID_PHYS_ADDR_RANGE #include #include @@ -326,6 +327,8 @@ extern void __iomem *ioremap_wc(resource_size_t offset, unsigned long size); extern void __iomem *ioremap_wt(resource_size_t offset, unsigned long size); extern bool is_early_ioremap_ptep(pte_t *ptep); +extern int valid_phys_addr_range(phys_addr_t addr, size_t size); +extern int valid_mmap_phys_addr_range(unsigned long pfn, size_t size); #ifdef CONFIG_XEN #include diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 493f541..35cf96f 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -624,6 +624,30 @@ void __init init_mem_mapping(void) early_memtest(0, max_pfn_mapped << PAGE_SHIFT); } +/** + * valid_phys_addr_range - check phys addr for /dev/mem read and write + * + * Return true if a target physical address is marked as IORESOURCE_MEM. + */ +int valid_phys_addr_range(phys_addr_t addr, size_t size) +{ + return (region_intersects(addr, size, IORESOURCE_MEM, + IORES_DESC_NONE) == REGION_INTERSECTS); +} + +/** + * valid_mmap_phys_addr_range - check phys addr for /dev/mem mmap + * + * Return true if a target physical address is marked as IORESOURCE_MEM. + */ +int valid_mmap_phys_addr_range(unsigned long pfn, size_t size) +{ + resource_size_t addr = pfn << PAGE_SHIFT; + + return (region_intersects(addr, size, IORESOURCE_MEM, + IORES_DESC_NONE) == REGION_INTERSECTS); +} + /* * devmem_is_allowed() checks to see if /dev/mem access to a certain address * is valid. The argument is a physical page number.