From patchwork Thu Oct 21 20:24:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Myron Stowe X-Patchwork-Id: 272151 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9LKO6kA005766 for ; Thu, 21 Oct 2010 20:24:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756020Ab0JUUYQ (ORCPT ); Thu, 21 Oct 2010 16:24:16 -0400 Received: from g1t0026.austin.hp.com ([15.216.28.33]:24623 "EHLO g1t0026.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755287Ab0JUUYP (ORCPT ); Thu, 21 Oct 2010 16:24:15 -0400 Received: from g1t0038.austin.hp.com (g1t0038.austin.hp.com [16.236.32.44]) by g1t0026.austin.hp.com (Postfix) with ESMTP id 2B29DC8CC; Thu, 21 Oct 2010 20:24:15 +0000 (UTC) Received: from ldl (ldl.usa.hp.com [16.125.112.222]) by g1t0038.austin.hp.com (Postfix) with ESMTP id 05C3630018; Thu, 21 Oct 2010 20:24:15 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id E927ECF0022; Thu, 21 Oct 2010 14:24:14 -0600 (MDT) Received: from ldl ([127.0.0.1]) by localhost (ldl.fc.hp.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iV5nLqnSNKOx; Thu, 21 Oct 2010 14:24:14 -0600 (MDT) Received: from eh.fc.hp.com (bob.lnx.usa.hp.com [16.125.112.218]) by ldl (Postfix) with ESMTP id C6C70CF0020; Thu, 21 Oct 2010 14:24:14 -0600 (MDT) Received: from bob.kio (localhost [127.0.0.1]) by eh.fc.hp.com (Postfix) with ESMTP id AD86D26151; Thu, 21 Oct 2010 14:24:14 -0600 (MDT) Subject: [PATCH 6/7] ACPI: Page based coalescing of I/O remappings optimization To: lenb@kernel.org From: Myron Stowe Cc: linux-acpi@vger.kernel.org, ak@linux.intel.com, ying.huang@intel.com Date: Thu, 21 Oct 2010 14:24:14 -0600 Message-ID: <20101021202414.9220.71053.stgit@bob.kio> In-Reply-To: <20101021201916.9220.5711.stgit@bob.kio> References: <20101021201916.9220.5711.stgit@bob.kio> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 21 Oct 2010 20:24:16 +0000 (UTC) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 3282689..885e222 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -104,6 +104,7 @@ struct acpi_ioremap { void __iomem *virt; acpi_physical_address phys; acpi_size size; + struct kref ref; }; static LIST_HEAD(acpi_ioremaps); @@ -245,15 +246,28 @@ acpi_physical_address __init acpi_os_get_root_pointer(void) } /* Must be called with 'acpi_ioremap_lock' or RCU read lock held. */ -static void __iomem * -acpi_map_vaddr_lookup(acpi_physical_address phys, acpi_size size) +static struct acpi_ioremap * +acpi_map_lookup(acpi_physical_address phys, acpi_size size) { struct acpi_ioremap *map; list_for_each_entry_rcu(map, &acpi_ioremaps, list) if (map->phys <= phys && phys + size <= map->phys + map->size) - return map->virt + (phys - map->phys); + return map; + + return NULL; +} + +/* Must be called with 'acpi_ioremap_lock' or RCU read lock held. */ +static void __iomem * +acpi_map_vaddr_lookup(acpi_physical_address phys, unsigned int size) +{ + struct acpi_ioremap *map; + + map = acpi_map_lookup(phys, size); + if (map) + return map->virt + (phys - map->phys); return NULL; } @@ -265,7 +279,8 @@ acpi_map_lookup_virt(void __iomem *virt, acpi_size size) struct acpi_ioremap *map; list_for_each_entry_rcu(map, &acpi_ioremaps, list) - if (map->virt == virt && map->size == size) + if (map->virt <= virt && + virt + size <= map->virt + map->size) return map; return NULL; @@ -274,9 +289,10 @@ acpi_map_lookup_virt(void __iomem *virt, acpi_size size) void __iomem *__init_refok acpi_os_map_memory(acpi_physical_address phys, acpi_size size) { - struct acpi_ioremap *map; - unsigned long flags; + struct acpi_ioremap *map, *tmp_map; + unsigned long flags, pg_sz; void __iomem *virt; + phys_addr_t pg_off; if (phys > ULONG_MAX) { printk(KERN_ERR PREFIX "Cannot map memory that high\n"); @@ -290,7 +306,9 @@ acpi_os_map_memory(acpi_physical_address phys, acpi_size size) if (!map) return NULL; - virt = ioremap(phys, size); + pg_off = round_down(phys, PAGE_SIZE); + pg_sz = round_up(phys + size, PAGE_SIZE) - pg_off; + virt = ioremap(pg_off, pg_sz); if (!virt) { kfree(map); return NULL; @@ -298,21 +316,40 @@ acpi_os_map_memory(acpi_physical_address phys, acpi_size size) INIT_LIST_HEAD(&map->list); map->virt = virt; - map->phys = phys; - map->size = size; + map->phys = pg_off; + map->size = pg_sz; + kref_init(&map->ref); spin_lock_irqsave(&acpi_ioremap_lock, flags); + /* Check if page has already been mapped. */ + tmp_map = acpi_map_lookup(phys, size); + if (tmp_map) { + kref_get(&tmp_map->ref); + spin_unlock_irqrestore(&acpi_ioremap_lock, flags); + iounmap(map->virt); + kfree(map); + return tmp_map->virt + (phys - tmp_map->phys); + } list_add_tail_rcu(&map->list, &acpi_ioremaps); spin_unlock_irqrestore(&acpi_ioremap_lock, flags); - return virt; + return map->virt + (phys - map->phys); } EXPORT_SYMBOL_GPL(acpi_os_map_memory); +static void acpi_kref_del_iomap(struct kref *ref) +{ + struct acpi_ioremap *map; + + map = container_of(ref, struct acpi_ioremap, ref); + list_del_rcu(&map->list); +} + void __ref acpi_os_unmap_memory(void __iomem *virt, acpi_size size) { struct acpi_ioremap *map; unsigned long flags; + int del; if (!acpi_gbl_permanent_mmap) { __acpi_unmap_table(virt, size); @@ -328,9 +365,12 @@ void __ref acpi_os_unmap_memory(void __iomem *virt, acpi_size size) return; } - list_del_rcu(&map->list); + del = kref_put(&map->ref, acpi_kref_del_iomap); spin_unlock_irqrestore(&acpi_ioremap_lock, flags); + if (!del) + return; + synchronize_rcu(); iounmap(map->virt); kfree(map);