From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Dan Williams <dan.j.williams@intel.com>,
Erik Kaneda <erik.kaneda@intel.com>
Cc: rafael.j.wysocki@intel.com, Len Brown <lenb@kernel.org>,
Borislav Petkov <bp@alien8.de>, Ira Weiny <ira.weiny@intel.com>,
James Morse <james.morse@arm.com>,
Myron Stowe <myron.stowe@redhat.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org,
linux-nvdimm@lists.01.org, Bob Moore <robert.moore@intel.com>
Subject: [RFT][PATCH v3 4/4] ACPI: OSL: Implement acpi_os_map_memory_fast_path()
Date: Fri, 26 Jun 2020 19:33:53 +0200 [thread overview]
Message-ID: <14649052.BMOpmyQVCI@kreacher> (raw)
In-Reply-To: <2788992.3K7huLjdjL@kreacher>
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Add acpi_os_map_memory_fast_path() and set ACPI_USE_FAST_PATH_MAPPING
to allow acpi_ex_system_memory_space_handler() to avoid unnecessary
memory mapping and unmapping overhead by retaining all memory
mappings created by it until the memory opregions associated with
them go away.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/acpi/osl.c | 65 +++++++++++++++++++++++--------
include/acpi/platform/aclinux.h | 4 ++
include/acpi/platform/aclinuxex.h | 3 ++
3 files changed, 56 insertions(+), 16 deletions(-)
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 749ae3e32193..b8537ce89ea2 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -306,21 +306,8 @@ static void acpi_unmap(acpi_physical_address pg_off, void __iomem *vaddr)
iounmap(vaddr);
}
-/**
- * acpi_os_map_iomem - Get a virtual address for a given physical address range.
- * @phys: Start of the physical address range to map.
- * @size: Size of the physical address range to map.
- *
- * Look up the given physical address range in the list of existing ACPI memory
- * mappings. If found, get a reference to it and return a pointer to it (its
- * virtual address). If not found, map it, add it to that list and return a
- * pointer to it.
- *
- * During early init (when acpi_permanent_mmap has not been set yet) this
- * routine simply calls __acpi_map_table() to get the job done.
- */
-void __iomem __ref
-*acpi_os_map_iomem(acpi_physical_address phys, acpi_size size)
+static void __iomem __ref *__acpi_os_map_iomem(acpi_physical_address phys,
+ acpi_size size, bool fast_path)
{
struct acpi_ioremap *map;
void __iomem *virt;
@@ -332,8 +319,12 @@ void __iomem __ref
return NULL;
}
- if (!acpi_permanent_mmap)
+ if (!acpi_permanent_mmap) {
+ if (WARN_ON(fast_path))
+ return NULL;
+
return __acpi_map_table((unsigned long)phys, size);
+ }
mutex_lock(&acpi_ioremap_lock);
/* Check if there's a suitable mapping already. */
@@ -343,6 +334,11 @@ void __iomem __ref
goto out;
}
+ if (fast_path) {
+ mutex_unlock(&acpi_ioremap_lock);
+ return NULL;
+ }
+
map = kzalloc(sizeof(*map), GFP_KERNEL);
if (!map) {
mutex_unlock(&acpi_ioremap_lock);
@@ -370,6 +366,25 @@ void __iomem __ref
mutex_unlock(&acpi_ioremap_lock);
return map->virt + (phys - map->phys);
}
+
+/**
+ * acpi_os_map_iomem - Get a virtual address for a given physical address range.
+ * @phys: Start of the physical address range to map.
+ * @size: Size of the physical address range to map.
+ *
+ * Look up the given physical address range in the list of existing ACPI memory
+ * mappings. If found, get a reference to it and return a pointer representing
+ * its virtual address. If not found, map it, add it to that list and return a
+ * pointer representing its virtual address.
+ *
+ * During early init (when acpi_permanent_mmap has not been set yet) call
+ * __acpi_map_table() to obtain the mapping.
+ */
+void __iomem __ref *acpi_os_map_iomem(acpi_physical_address phys,
+ acpi_size size)
+{
+ return __acpi_os_map_iomem(phys, size, false);
+}
EXPORT_SYMBOL_GPL(acpi_os_map_iomem);
void *__ref acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
@@ -378,6 +393,24 @@ void *__ref acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
}
EXPORT_SYMBOL_GPL(acpi_os_map_memory);
+/**
+ * acpi_os_map_memory_fast_path - Fast-path physical-to-virtual address mapping.
+ * @phys: Start of the physical address range to map.
+ * @size: Size of the physical address range to map.
+ *
+ * Look up the given physical address range in the list of existing ACPI memory
+ * mappings. If found, get a reference to it and return a pointer representing
+ * its virtual address. If not found, return NULL.
+ *
+ * During early init (when acpi_permanent_mmap has not been set yet) log a
+ * warning and return NULL.
+ */
+void __ref *acpi_os_map_memory_fast_path(acpi_physical_address phys,
+ acpi_size size)
+{
+ return __acpi_os_map_iomem(phys, size, true);
+}
+
/* Must be called with mutex_lock(&acpi_ioremap_lock) */
static bool acpi_os_drop_map_ref(struct acpi_ioremap *map, bool defer)
{
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 784e294dc74c..1a5f8037e3d5 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -118,6 +118,10 @@
#define USE_NATIVE_ALLOCATE_ZEROED
+/* Use fast-path memory mapping to optimize memory opregions handling */
+
+#define ACPI_USE_FAST_PATH_MAPPING
+
/*
* Overrides for in-kernel ACPICA
*/
diff --git a/include/acpi/platform/aclinuxex.h b/include/acpi/platform/aclinuxex.h
index ad6b905358c5..c64b836ba455 100644
--- a/include/acpi/platform/aclinuxex.h
+++ b/include/acpi/platform/aclinuxex.h
@@ -141,6 +141,9 @@ static inline void acpi_os_terminate_debugger(void)
* OSL interfaces added by Linux
*/
+void *acpi_os_map_memory_fast_path(acpi_physical_address where,
+ acpi_size length);
+
#endif /* __KERNEL__ */
#endif /* __ACLINUXEX_H__ */
--
2.26.2
next prev parent reply other threads:[~2020-06-26 17:34 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-07 23:39 [PATCH v2] ACPI: Drop rcu usage for MMIO mappings Dan Williams
2020-05-13 8:52 ` [ACPI] 5a91d41f89: BUG:sleeping_function_called_from_invalid_context_at_kernel/locking/mutex.c kernel test robot
2020-06-05 13:32 ` [PATCH v2] ACPI: Drop rcu usage for MMIO mappings Rafael J. Wysocki
2020-06-05 16:18 ` Dan Williams
2020-06-05 16:21 ` Rafael J. Wysocki
2020-06-05 16:39 ` Dan Williams
2020-06-05 17:02 ` Rafael J. Wysocki
2020-06-05 14:06 ` [RFT][PATCH] ACPI: OSL: Use rwlock instead of RCU for memory management Rafael J. Wysocki
2020-06-05 17:08 ` Dan Williams
2020-06-06 6:56 ` Rafael J. Wysocki
2020-06-08 15:33 ` Rafael J. Wysocki
2020-06-08 16:29 ` Rafael J. Wysocki
2020-06-05 19:40 ` Andy Shevchenko
2020-06-06 6:48 ` Rafael J. Wysocki
2020-06-10 12:17 ` [RFT][PATCH 0/3] ACPI: ACPICA / OSL: Avoid unmapping ACPI memory inside of the AML interpreter Rafael J. Wysocki
2020-06-10 12:20 ` [RFT][PATCH 1/3] ACPICA: Defer unmapping of memory used in memory opregions Rafael J. Wysocki
2020-06-10 12:21 ` [RFT][PATCH 2/3] ACPICA: Remove unused memory mappings on interpreter exit Rafael J. Wysocki
2020-06-12 0:12 ` Kaneda, Erik
2020-06-12 12:05 ` Rafael J. Wysocki
2020-06-13 19:28 ` Rafael J. Wysocki
2020-06-15 19:06 ` Dan Williams
2020-06-10 12:22 ` [RFT][PATCH 3/3] ACPI: OSL: Define ACPI_OS_MAP_MEMORY_FAST_PATH() Rafael J. Wysocki
2020-06-13 19:19 ` [RFT][PATCH 0/3] ACPI: ACPICA / OSL: Avoid unmapping ACPI memory inside of the AML interpreter Rafael J. Wysocki
2020-06-22 13:50 ` [RFT][PATCH v2 0/4] " Rafael J. Wysocki
2020-06-22 13:52 ` [RFT][PATCH v2 1/4] ACPICA: Defer unmapping of opregion memory if supported by OS Rafael J. Wysocki
2020-06-22 13:53 ` [RFT][PATCH v2 2/4] ACPI: OSL: Add support for deferred unmapping of ACPI memory Rafael J. Wysocki
2020-06-22 14:56 ` Andy Shevchenko
2020-06-22 15:27 ` Rafael J. Wysocki
2020-06-22 15:46 ` Andy Shevchenko
2020-06-22 14:01 ` [RFT][PATCH v2 3/4] ACPICA: Preserve memory opregion mappings if supported by OS Rafael J. Wysocki
2020-06-26 22:53 ` Kaneda, Erik
2020-06-29 13:02 ` Rafael J. Wysocki
2020-06-22 14:02 ` [RFT][PATCH v2 4/4] ACPI: OSL: Implement acpi_os_map_memory_fast_path() Rafael J. Wysocki
2020-06-26 17:28 ` [RFT][PATCH v3 0/4] ACPI: ACPICA / OSL: Avoid unmapping ACPI memory inside of the AML interpreter Rafael J. Wysocki
2020-06-26 17:31 ` [RFT][PATCH v3 1/4] ACPICA: Take deferred unmapping of memory into account Rafael J. Wysocki
2020-06-26 17:31 ` [RFT][PATCH v3 2/4] ACPI: OSL: Implement deferred unmapping of ACPI memory Rafael J. Wysocki
2020-06-26 17:32 ` [RFT][PATCH v3 3/4] ACPICA: Preserve memory opregion mappings if supported by OS Rafael J. Wysocki
2020-06-26 17:33 ` Rafael J. Wysocki [this message]
2020-06-26 18:41 ` [RFT][PATCH v3 0/4] ACPI: ACPICA / OSL: Avoid unmapping ACPI memory inside of the AML interpreter Dan Williams
2020-06-28 17:09 ` Rafael J. Wysocki
2020-06-29 20:46 ` Dan Williams
2020-06-30 11:04 ` Rafael J. Wysocki
2020-06-29 16:31 ` [PATCH v4 0/2] " Rafael J. Wysocki
2020-06-29 16:33 ` [PATCH v4 1/2] ACPI: OSL: Implement deferred unmapping of ACPI memory Rafael J. Wysocki
2020-06-29 16:33 ` [PATCH v4 2/2] ACPICA: Preserve memory opregion mappings Rafael J. Wysocki
2020-06-29 20:57 ` Al Stone
2020-06-30 11:44 ` Rafael J. Wysocki
2020-06-30 15:31 ` Al Stone
2020-06-30 15:52 ` Rafael J. Wysocki
2020-06-30 19:57 ` Al Stone
2020-07-16 19:22 ` Verma, Vishal L
2020-07-19 19:14 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=14649052.BMOpmyQVCI@kreacher \
--to=rjw@rjwysocki.net \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bp@alien8.de \
--cc=dan.j.williams@intel.com \
--cc=erik.kaneda@intel.com \
--cc=ira.weiny@intel.com \
--cc=james.morse@arm.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvdimm@lists.01.org \
--cc=myron.stowe@redhat.com \
--cc=rafael.j.wysocki@intel.com \
--cc=robert.moore@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).