From patchwork Thu Oct 22 23:20:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kani, Toshi" X-Patchwork-Id: 7468361 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 1B01D9F37F for ; Thu, 22 Oct 2015 23:24:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2B04C20702 for ; Thu, 22 Oct 2015 23:24:39 +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 6397820712 for ; Thu, 22 Oct 2015 23:24:37 +0000 (UTC) Received: from ml01.vlan14.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id C3DA560960; Thu, 22 Oct 2015 16:24:36 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from g1t6213.austin.hp.com (g1t6213.austin.hp.com [15.73.96.121]) (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 7C60D608A0 for ; Thu, 22 Oct 2015 16:24:35 -0700 (PDT) Received: from g2t4689.austin.hpicorp.net (g2t4689.austin.hpicorp.net [15.94.10.175]) by g1t6213.austin.hp.com (Postfix) with ESMTP id D2236132; Thu, 22 Oct 2015 23:24:33 +0000 (UTC) Received: from misato.fc.hp.com (misato.fc.hp.com [16.78.168.61]) by g2t4689.austin.hpicorp.net (Postfix) with ESMTP id 339833A; Thu, 22 Oct 2015 23:24:33 +0000 (UTC) From: Toshi Kani To: akpm@linux-foundation.org, dan.j.williams@intel.com, rjw@rjwysocki.net Subject: [PATCH 1/3] resource: Add @flags to region_intersects() Date: Thu, 22 Oct 2015 17:20:42 -0600 Message-Id: <1445556044-30322-2-git-send-email-toshi.kani@hpe.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1445556044-30322-1-git-send-email-toshi.kani@hpe.com> References: <1445556044-30322-1-git-send-email-toshi.kani@hpe.com> Cc: linux-mm@kvack.org, Toshi Kani , linux-acpi@vger.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.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, 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 region_intersects() checks if a specified region partially overlaps or fully eclipses a resource identified by @name. It currently sets resource flags statically, which prevents the caller from specifying a non-RAM region, such as persistent memory. Add @flags so that any region can be specified to the function. A helper function, region_intersects_ram(), is added so that the callers that check a RAM region do not have to specify its iomem resource name and flags. Signed-off-by: Toshi Kani --- include/linux/mm.h | 4 +++- kernel/memremap.c | 5 ++--- kernel/resource.c | 22 +++++++++++++++------- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 80001de..699224e 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -358,7 +358,9 @@ enum { REGION_MIXED, }; -int region_intersects(resource_size_t offset, size_t size, const char *type); +int region_intersects(resource_size_t offset, size_t size, const char *type, + unsigned long flags); +int region_intersects_ram(resource_size_t offset, size_t size); /* Support for virtually mapped pages */ struct page *vmalloc_to_page(const void *addr); diff --git a/kernel/memremap.c b/kernel/memremap.c index 72b0c66..2157ea5 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -47,7 +47,7 @@ __weak void __iomem *ioremap_cache(resource_size_t offset, unsigned long size) */ void *memremap(resource_size_t offset, size_t size, unsigned long flags) { - int is_ram = region_intersects(offset, size, "System RAM"); + int is_ram = region_intersects_ram(offset, size); void *addr = NULL; if (is_ram == REGION_MIXED) { @@ -152,8 +152,7 @@ static void devm_memremap_pages_release(struct device *dev, void *res) void *devm_memremap_pages(struct device *dev, struct resource *res) { - int is_ram = region_intersects(res->start, resource_size(res), - "System RAM"); + int is_ram = region_intersects_ram(res->start, resource_size(res)); struct page_map *page_map; int error, nid; diff --git a/kernel/resource.c b/kernel/resource.c index f150dbb..8a77ed8 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -497,6 +497,7 @@ EXPORT_SYMBOL_GPL(page_is_ram); * @start: region start address * @size: size of region * @name: name of resource (in iomem_resource) + * @flags: flags of resource (in iomem_resource) * * Check if the specified region partially overlaps or fully eclipses a * resource identified by @name. Return REGION_DISJOINT if the region @@ -504,15 +505,11 @@ EXPORT_SYMBOL_GPL(page_is_ram); * @type and another resource, and return REGION_INTERSECTS if the * region overlaps @type and no other defined resource. Note, that * REGION_INTERSECTS is also returned in the case when the specified - * region overlaps RAM and undefined memory holes. - * - * region_intersect() is used by memory remapping functions to ensure - * the user is not remapping RAM and is a vast speed up over walking - * through the resource table page by page. + * region overlaps with undefined memory holes. */ -int region_intersects(resource_size_t start, size_t size, const char *name) +int region_intersects(resource_size_t start, size_t size, const char *name, + unsigned long flags) { - unsigned long flags = IORESOURCE_MEM | IORESOURCE_BUSY; resource_size_t end = start + size - 1; int type = 0; int other = 0; struct resource *p; @@ -539,6 +536,17 @@ int region_intersects(resource_size_t start, size_t size, const char *name) return REGION_DISJOINT; } +/* + * region_intersect_ram() is used by memory remapping functions to ensure + * the user is not remapping RAM and is a vast speed up over walking + * through the resource table page by page. + */ +int region_intersects_ram(resource_size_t start, size_t size) +{ + return region_intersects(start, size, "System RAM", + IORESOURCE_MEM | IORESOURCE_BUSY); +} + void __weak arch_remove_reservations(struct resource *avail) { }