From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-mm@kvack.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
Uladzislau Rezki <urezki@gmail.com>,
David Howells <dhowells@redhat.com>,
Dave Chinner <david@fromorbit.com>,
linux-fsdevel@vger.kernel.org,
Thomas Gleixner <tglx@linutronix.de>,
Ira Weiny <ira.weiny@intel.com>,
"Fabio M. De Francesco" <fmdefrancesco@gmail.com>,
Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH v2 2/2] mm: Add folio_map_local()
Date: Tue, 1 Nov 2022 20:18:28 +0000 [thread overview]
Message-ID: <20221101201828.1170455-3-willy@infradead.org> (raw)
In-Reply-To: <20221101201828.1170455-1-willy@infradead.org>
Some filesystems benefit from being able to map the entire folio.
On 32-bit platforms with HIGHMEM, we fall back to using vmap, which
will be slow. If it proves to be a performance problem, we can look at
optimising it in a number of ways.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
include/linux/highmem.h | 40 ++++++++++++++++++++++++++++++++++++++++
include/linux/vmalloc.h | 6 ++++--
mm/vmalloc.c | 32 ++++++++++++++++++++++++++++++++
3 files changed, 76 insertions(+), 2 deletions(-)
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index e9912da5441b..d56ae62db252 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -10,6 +10,7 @@
#include <linux/mm.h>
#include <linux/uaccess.h>
#include <linux/hardirq.h>
+#include <linux/vmalloc.h>
#include "highmem-internal.h"
@@ -132,6 +133,45 @@ static inline void *kmap_local_page(struct page *page);
*/
static inline void *kmap_local_folio(struct folio *folio, size_t offset);
+/**
+ * folio_map_local - Map an entire folio.
+ * @folio: The folio to map.
+ *
+ * Unlike kmap_local_folio(), map an entire folio. This should be undone
+ * with folio_unmap_local(). The address returned should be treated as
+ * stack-based, and local to this CPU, like kmap_local_folio().
+ *
+ * Context: May allocate memory using GFP_KERNEL if it takes the vmap path.
+ * Return: A kernel virtual address which can be used to access the folio,
+ * or NULL if the mapping fails.
+ */
+static inline __must_check void *folio_map_local(struct folio *folio)
+{
+ might_alloc(GFP_KERNEL);
+
+ if (!IS_ENABLED(CONFIG_HIGHMEM))
+ return folio_address(folio);
+ if (folio_test_large(folio))
+ return vm_map_folio(folio);
+ return kmap_local_page(&folio->page);
+}
+
+/**
+ * folio_unmap_local - Unmap an entire folio.
+ * @addr: Address returned from folio_map_local()
+ *
+ * Undo the result of a previous call to folio_map_local().
+ */
+static inline void folio_unmap_local(const void *addr, unsigned long nr_pages)
+{
+ if (!IS_ENABLED(CONFIG_HIGHMEM))
+ return;
+ if (is_vmalloc_addr(addr))
+ vm_unmap_ram(addr, nr_pages);
+ else
+ kunmap_local(addr);
+}
+
/**
* kmap_atomic - Atomically map a page for temporary usage - Deprecated!
* @page: Pointer to the page to be mapped
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index 096d48aa3437..4bb34c939c01 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -13,6 +13,7 @@
#include <asm/vmalloc.h>
struct vm_area_struct; /* vma defining user mapping in mm_types.h */
+struct folio; /* also mm_types.h */
struct notifier_block; /* in notifier.h */
/* bits in flags of vmalloc's vm_struct below */
@@ -163,8 +164,9 @@ extern void *vcalloc(size_t n, size_t size) __alloc_size(1, 2);
extern void vfree(const void *addr);
extern void vfree_atomic(const void *addr);
-extern void *vmap(struct page **pages, unsigned int count,
- unsigned long flags, pgprot_t prot);
+void *vmap(struct page **pages, unsigned int count, unsigned long flags,
+ pgprot_t prot);
+void *vm_map_folio(struct folio *folio);
void *vmap_pfn(unsigned long *pfns, unsigned int count, pgprot_t prot);
extern void vunmap(const void *addr);
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index dcab1d3cf185..c101b09d15d3 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -2288,6 +2288,38 @@ void *vm_map_ram(struct page **pages, unsigned int count, int node)
}
EXPORT_SYMBOL(vm_map_ram);
+#ifdef CONFIG_HIGHMEM
+/**
+ * vm_map_folio() - Map an entire folio into virtually contiguous space.
+ * @folio: The folio to map.
+ *
+ * Maps all pages in @folio into contiguous kernel virtual space. This
+ * function is only available in HIGHMEM builds; for !HIGHMEM, use
+ * folio_address(). The pages are mapped with PAGE_KERNEL permissions.
+ *
+ * Return: The address of the area or %NULL on failure
+ */
+void *vm_map_folio(struct folio *folio)
+{
+ size_t size = folio_size(folio);
+ void *mem = vmap_alloc(size, NUMA_NO_NODE);
+ unsigned long addr = (unsigned long)mem;
+
+ if (vmap_range_noflush(addr, addr + size,
+ folio_pfn(folio) << PAGE_SHIFT,
+ PAGE_KERNEL, folio_shift(folio))) {
+ vm_unmap_ram(mem, folio_nr_pages(folio));
+ return NULL;
+ }
+ flush_cache_vmap(addr, addr + size);
+
+ mem = kasan_unpoison_vmalloc(mem, size, KASAN_VMALLOC_PROT_NORMAL);
+
+ return mem;
+}
+EXPORT_SYMBOL(vm_map_folio);
+#endif
+
static struct vm_struct *vmlist __initdata;
static inline unsigned int vm_area_page_order(struct vm_struct *vm)
--
2.35.1
next prev parent reply other threads:[~2022-11-01 20:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-01 20:18 [PATCH v2 0/2] Mapping an entire folio Matthew Wilcox (Oracle)
2022-11-01 20:18 ` [PATCH v2 1/2] vmalloc: Factor vmap_alloc() out of vm_map_ram() Matthew Wilcox (Oracle)
2022-11-02 3:46 ` Hyeonggon Yoo
2022-11-02 3:59 ` Hyeonggon Yoo
2022-11-02 9:10 ` Christoph Hellwig
2022-11-01 20:18 ` Matthew Wilcox (Oracle) [this message]
2022-11-02 9:13 ` [PATCH v2 2/2] mm: Add folio_map_local() Christoph Hellwig
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=20221101201828.1170455-3-willy@infradead.org \
--to=willy@infradead.org \
--cc=david@fromorbit.com \
--cc=dhowells@redhat.com \
--cc=fmdefrancesco@gmail.com \
--cc=ira.weiny@intel.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mcgrof@kernel.org \
--cc=tglx@linutronix.de \
--cc=urezki@gmail.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).