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,
Jonathan Cameron <Jonathan.Cameron@Huawei.com>,
Christoph Hellwig <hch@infradead.org>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
Rick Edgecombe <rick.p.edgecombe@intel.com>,
Ding Tianhong <dingtianhong@huawei.com>,
Miaohe Lin <linmiaohe@huawei.com>, Christoph Hellwig <hch@lst.de>
Subject: [PATCH v13 04/14] mm/vmalloc: rename vmap_*_range vmap_pages_*_range
Date: Wed, 17 Mar 2021 16:23:52 +1000 [thread overview]
Message-ID: <20210317062402.533919-5-npiggin@gmail.com> (raw)
In-Reply-To: <20210317062402.533919-1-npiggin@gmail.com>
The vmalloc mapper operates on a struct page * array rather than a
linear physical address, re-name it to make this distinction clear.
Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
mm/vmalloc.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 98e697ac764c..4693fab4f42a 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -189,7 +189,7 @@ void unmap_kernel_range_noflush(unsigned long start, unsigned long size)
arch_sync_kernel_mappings(start, end);
}
-static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
+static int vmap_pages_pte_range(pmd_t *pmd, unsigned long addr,
unsigned long end, pgprot_t prot, struct page **pages, int *nr,
pgtbl_mod_mask *mask)
{
@@ -217,7 +217,7 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
return 0;
}
-static int vmap_pmd_range(pud_t *pud, unsigned long addr,
+static int vmap_pages_pmd_range(pud_t *pud, unsigned long addr,
unsigned long end, pgprot_t prot, struct page **pages, int *nr,
pgtbl_mod_mask *mask)
{
@@ -229,13 +229,13 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
return -ENOMEM;
do {
next = pmd_addr_end(addr, end);
- if (vmap_pte_range(pmd, addr, next, prot, pages, nr, mask))
+ if (vmap_pages_pte_range(pmd, addr, next, prot, pages, nr, mask))
return -ENOMEM;
} while (pmd++, addr = next, addr != end);
return 0;
}
-static int vmap_pud_range(p4d_t *p4d, unsigned long addr,
+static int vmap_pages_pud_range(p4d_t *p4d, unsigned long addr,
unsigned long end, pgprot_t prot, struct page **pages, int *nr,
pgtbl_mod_mask *mask)
{
@@ -247,13 +247,13 @@ static int vmap_pud_range(p4d_t *p4d, unsigned long addr,
return -ENOMEM;
do {
next = pud_addr_end(addr, end);
- if (vmap_pmd_range(pud, addr, next, prot, pages, nr, mask))
+ if (vmap_pages_pmd_range(pud, addr, next, prot, pages, nr, mask))
return -ENOMEM;
} while (pud++, addr = next, addr != end);
return 0;
}
-static int vmap_p4d_range(pgd_t *pgd, unsigned long addr,
+static int vmap_pages_p4d_range(pgd_t *pgd, unsigned long addr,
unsigned long end, pgprot_t prot, struct page **pages, int *nr,
pgtbl_mod_mask *mask)
{
@@ -265,7 +265,7 @@ static int vmap_p4d_range(pgd_t *pgd, unsigned long addr,
return -ENOMEM;
do {
next = p4d_addr_end(addr, end);
- if (vmap_pud_range(p4d, addr, next, prot, pages, nr, mask))
+ if (vmap_pages_pud_range(p4d, addr, next, prot, pages, nr, mask))
return -ENOMEM;
} while (p4d++, addr = next, addr != end);
return 0;
@@ -306,7 +306,7 @@ int map_kernel_range_noflush(unsigned long addr, unsigned long size,
next = pgd_addr_end(addr, end);
if (pgd_bad(*pgd))
mask |= PGTBL_PGD_MODIFIED;
- err = vmap_p4d_range(pgd, addr, next, prot, pages, &nr, &mask);
+ err = vmap_pages_p4d_range(pgd, addr, next, prot, pages, &nr, &mask);
if (err)
return err;
} while (pgd++, addr = next, addr != end);
--
2.23.0
next prev parent reply other threads:[~2021-03-17 6:26 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-17 6:23 [PATCH v13 00/14] huge vmalloc mappings Nicholas Piggin
2021-03-17 6:23 ` [PATCH v13 01/14] ARM: mm: add missing pud_page define to 2-level page tables Nicholas Piggin
2021-03-17 6:23 ` [PATCH v13 02/14] mm/vmalloc: fix HUGE_VMAP regression by enabling huge pages in vmalloc_to_page Nicholas Piggin
2021-03-17 6:23 ` [PATCH v13 03/14] mm: apply_to_pte_range warn and fail if a large pte is encountered Nicholas Piggin
2021-03-17 6:23 ` Nicholas Piggin [this message]
2021-03-17 6:23 ` [PATCH v13 05/14] mm/ioremap: rename ioremap_*_range to vmap_*_range Nicholas Piggin
2021-03-17 6:23 ` [PATCH v13 06/14] mm: HUGE_VMAP arch support cleanup Nicholas Piggin
2021-04-28 8:32 ` Christophe Leroy
2021-04-28 8:34 ` Christophe Leroy
2021-03-17 6:23 ` [PATCH v13 07/14] powerpc: inline huge vmap supported functions Nicholas Piggin
2021-03-17 6:23 ` [PATCH v13 08/14] arm64: " Nicholas Piggin
2021-03-17 6:23 ` [PATCH v13 09/14] x86: " Nicholas Piggin
2021-03-17 6:23 ` [PATCH v13 10/14] mm/vmalloc: provide fallback arch huge vmap support functions Nicholas Piggin
2021-03-17 6:23 ` [PATCH v13 11/14] mm: Move vmap_range from mm/ioremap.c to mm/vmalloc.c Nicholas Piggin
2021-03-17 6:24 ` [PATCH v13 12/14] mm/vmalloc: add vmap_range_noflush variant Nicholas Piggin
2021-03-17 6:24 ` [PATCH v13 13/14] mm/vmalloc: Hugepage vmalloc mappings Nicholas Piggin
2021-03-17 6:24 ` [PATCH v13 14/14] powerpc/64s/radix: Enable huge " Nicholas Piggin
2021-04-15 10:23 ` Christophe Leroy
2021-04-15 18:55 ` Andrew Morton
2021-04-15 23:04 ` Stephen Rothwell
2021-04-17 2:39 ` Nicholas Piggin
2021-03-17 22:58 ` [PATCH v13 00/14] " Andrew Morton
2021-03-18 3:50 ` 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=20210317062402.533919-5-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=Jonathan.Cameron@Huawei.com \
--cc=akpm@linux-foundation.org \
--cc=christophe.leroy@csgroup.eu \
--cc=dingtianhong@huawei.com \
--cc=hch@infradead.org \
--cc=hch@lst.de \
--cc=linmiaohe@huawei.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--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 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).