All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nicholas Piggin <npiggin@gmail.com>
To: linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>
Cc: Nicholas Piggin <npiggin@gmail.com>,
	linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
	linuxppc-dev@lists.ozlabs.org, Zefan Li <lizefan@huawei.com>,
	Jonathan Cameron <Jonathan.Cameron@Huawei.com>,
	Christoph Hellwig <hch@infradead.org>,
	Christophe Leroy <christophe.leroy@csgroup.eu>,
	Rick Edgecombe <rick.p.edgecombe@intel.com>
Subject: [PATCH v9 10/12] mm/vmalloc: add vmap_range_noflush variant
Date: Sat,  5 Dec 2020 16:57:23 +1000	[thread overview]
Message-ID: <20201205065725.1286370-11-npiggin@gmail.com> (raw)
In-Reply-To: <20201205065725.1286370-1-npiggin@gmail.com>

As a side-effect, the order of flush_cache_vmap() and
arch_sync_kernel_mappings() calls are switched, but that now matches
the other callers in this file.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 mm/vmalloc.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 2f236aeeac24..ee9c3bee67f5 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -235,7 +235,7 @@ static int vmap_p4d_range(pgd_t *pgd, unsigned long addr, unsigned long end,
 	return 0;
 }
 
-int vmap_range(unsigned long addr, unsigned long end,
+static int vmap_range_noflush(unsigned long addr, unsigned long end,
 			phys_addr_t phys_addr, pgprot_t prot,
 			unsigned int max_page_shift)
 {
@@ -257,14 +257,24 @@ int vmap_range(unsigned long addr, unsigned long end,
 			break;
 	} while (pgd++, phys_addr += (next - addr), addr = next, addr != end);
 
-	flush_cache_vmap(start, end);
-
 	if (mask & ARCH_PAGE_TABLE_SYNC_MASK)
 		arch_sync_kernel_mappings(start, end);
 
 	return err;
 }
 
+int vmap_range(unsigned long addr, unsigned long end,
+			phys_addr_t phys_addr, pgprot_t prot,
+			unsigned int max_page_shift)
+{
+	int err;
+
+	err = vmap_range_noflush(addr, end, phys_addr, prot, max_page_shift);
+	flush_cache_vmap(addr, end);
+
+	return err;
+}
+
 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
 			     pgtbl_mod_mask *mask)
 {
-- 
2.23.0


WARNING: multiple messages have this Message-ID (diff)
From: Nicholas Piggin <npiggin@gmail.com>
To: linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>
Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
	Nicholas Piggin <npiggin@gmail.com>,
	Christoph Hellwig <hch@infradead.org>,
	Zefan Li <lizefan@huawei.com>,
	Jonathan Cameron <Jonathan.Cameron@Huawei.com>,
	Rick Edgecombe <rick.p.edgecombe@intel.com>,
	linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v9 10/12] mm/vmalloc: add vmap_range_noflush variant
Date: Sat,  5 Dec 2020 16:57:23 +1000	[thread overview]
Message-ID: <20201205065725.1286370-11-npiggin@gmail.com> (raw)
In-Reply-To: <20201205065725.1286370-1-npiggin@gmail.com>

As a side-effect, the order of flush_cache_vmap() and
arch_sync_kernel_mappings() calls are switched, but that now matches
the other callers in this file.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 mm/vmalloc.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 2f236aeeac24..ee9c3bee67f5 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -235,7 +235,7 @@ static int vmap_p4d_range(pgd_t *pgd, unsigned long addr, unsigned long end,
 	return 0;
 }
 
-int vmap_range(unsigned long addr, unsigned long end,
+static int vmap_range_noflush(unsigned long addr, unsigned long end,
 			phys_addr_t phys_addr, pgprot_t prot,
 			unsigned int max_page_shift)
 {
@@ -257,14 +257,24 @@ int vmap_range(unsigned long addr, unsigned long end,
 			break;
 	} while (pgd++, phys_addr += (next - addr), addr = next, addr != end);
 
-	flush_cache_vmap(start, end);
-
 	if (mask & ARCH_PAGE_TABLE_SYNC_MASK)
 		arch_sync_kernel_mappings(start, end);
 
 	return err;
 }
 
+int vmap_range(unsigned long addr, unsigned long end,
+			phys_addr_t phys_addr, pgprot_t prot,
+			unsigned int max_page_shift)
+{
+	int err;
+
+	err = vmap_range_noflush(addr, end, phys_addr, prot, max_page_shift);
+	flush_cache_vmap(addr, end);
+
+	return err;
+}
+
 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
 			     pgtbl_mod_mask *mask)
 {
-- 
2.23.0


  parent reply	other threads:[~2020-12-05  6:59 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-05  6:57 [PATCH v9 00/12] huge vmalloc mappings Nicholas Piggin
2020-12-05  6:57 ` Nicholas Piggin
2020-12-05  6:57 ` [PATCH v9 01/12] mm/vmalloc: fix vmalloc_to_page for huge vmap mappings Nicholas Piggin
2020-12-05  6:57   ` Nicholas Piggin
2020-12-05  6:57 ` [PATCH v9 02/12] mm: apply_to_pte_range warn and fail if a large pte is encountered Nicholas Piggin
2020-12-05  6:57   ` Nicholas Piggin
2020-12-05  6:57 ` [PATCH v9 03/12] mm/vmalloc: rename vmap_*_range vmap_pages_*_range Nicholas Piggin
2020-12-05  6:57   ` Nicholas Piggin
2020-12-05  6:57 ` [PATCH v9 04/12] mm/ioremap: rename ioremap_*_range to vmap_*_range Nicholas Piggin
2020-12-05  6:57   ` Nicholas Piggin
2020-12-05  6:57 ` [PATCH v9 05/12] mm: HUGE_VMAP arch support cleanup Nicholas Piggin
2020-12-05  6:57   ` Nicholas Piggin
2020-12-05  6:57   ` Nicholas Piggin
2021-01-04 12:33   ` Ding Tianhong
2021-01-04 12:33     ` Ding Tianhong
2021-01-04 12:33     ` Ding Tianhong
2021-01-24  7:43     ` Nicholas Piggin
2021-01-24  7:43       ` Nicholas Piggin
2021-01-24  7:43       ` Nicholas Piggin
2020-12-05  6:57 ` [PATCH v9 06/12] powerpc: inline huge vmap supported functions Nicholas Piggin
2020-12-05  6:57   ` Nicholas Piggin
2020-12-05  6:57 ` [PATCH v9 07/12] arm64: " Nicholas Piggin
2020-12-05  6:57   ` Nicholas Piggin
2020-12-05  6:57   ` Nicholas Piggin
2020-12-05  6:57 ` [PATCH v9 08/12] x86: " Nicholas Piggin
2020-12-05  6:57   ` Nicholas Piggin
2020-12-05  6:57 ` [PATCH v9 09/12] mm: Move vmap_range from mm/ioremap.c to mm/vmalloc.c Nicholas Piggin
2020-12-05  6:57   ` Nicholas Piggin
2020-12-05  6:57 ` Nicholas Piggin [this message]
2020-12-05  6:57   ` [PATCH v9 10/12] mm/vmalloc: add vmap_range_noflush variant Nicholas Piggin
2020-12-05  6:57 ` [PATCH v9 11/12] mm/vmalloc: Hugepage vmalloc mappings Nicholas Piggin
2020-12-05  6:57   ` Nicholas Piggin
2020-12-25  7:58   ` Ding Tianhong
2020-12-25  7:58     ` Ding Tianhong
2020-12-05  6:57 ` [PATCH v9 12/12] powerpc/64s/radix: Enable huge " Nicholas Piggin
2020-12-05  6:57   ` Nicholas Piggin

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=20201205065725.1286370-11-npiggin@gmail.com \
    --to=npiggin@gmail.com \
    --cc=Jonathan.Cameron@Huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=christophe.leroy@csgroup.eu \
    --cc=hch@infradead.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=lizefan@huawei.com \
    --cc=rick.p.edgecombe@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.