提交 67316912 编写于 作者: N Nicholas Piggin 提交者: Yang Yingliang

mm/vmalloc: rename vmap_*_range vmap_pages_*_range

ascend inclusion
category: feature
bugzilla: NA
CVE: NA

https://lwn.net/ml/linux-kernel/20200825145753.529284-4-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.
Signed-off-by: NNicholas Piggin <npiggin@gmail.com>
Signed-off-by: NRui Xiang <rui.xiang@huawei.com>
Reviewed-by: NDing Tianhong <dingtianhong@huawei.com>
Reviewed-by: NZefan Li <lizefan@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 c8141476
...@@ -148,7 +148,7 @@ void unmap_kernel_range_noflush(unsigned long addr, unsigned long size) ...@@ -148,7 +148,7 @@ void unmap_kernel_range_noflush(unsigned long addr, unsigned long size)
} while (pgd++, addr = next, addr != end); } while (pgd++, addr = next, addr != 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) unsigned long end, pgprot_t prot, struct page **pages, int *nr)
{ {
pte_t *pte; pte_t *pte;
...@@ -174,7 +174,7 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr, ...@@ -174,7 +174,7 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
return 0; 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) unsigned long end, pgprot_t prot, struct page **pages, int *nr)
{ {
pmd_t *pmd; pmd_t *pmd;
...@@ -185,13 +185,13 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr, ...@@ -185,13 +185,13 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
return -ENOMEM; return -ENOMEM;
do { do {
next = pmd_addr_end(addr, end); next = pmd_addr_end(addr, end);
if (vmap_pte_range(pmd, addr, next, prot, pages, nr)) if (vmap_pages_pte_range(pmd, addr, next, prot, pages, nr))
return -ENOMEM; return -ENOMEM;
} while (pmd++, addr = next, addr != end); } while (pmd++, addr = next, addr != end);
return 0; 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) unsigned long end, pgprot_t prot, struct page **pages, int *nr)
{ {
pud_t *pud; pud_t *pud;
...@@ -202,13 +202,13 @@ static int vmap_pud_range(p4d_t *p4d, unsigned long addr, ...@@ -202,13 +202,13 @@ static int vmap_pud_range(p4d_t *p4d, unsigned long addr,
return -ENOMEM; return -ENOMEM;
do { do {
next = pud_addr_end(addr, end); next = pud_addr_end(addr, end);
if (vmap_pmd_range(pud, addr, next, prot, pages, nr)) if (vmap_pages_pmd_range(pud, addr, next, prot, pages, nr))
return -ENOMEM; return -ENOMEM;
} while (pud++, addr = next, addr != end); } while (pud++, addr = next, addr != end);
return 0; 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) unsigned long end, pgprot_t prot, struct page **pages, int *nr)
{ {
p4d_t *p4d; p4d_t *p4d;
...@@ -219,7 +219,7 @@ static int vmap_p4d_range(pgd_t *pgd, unsigned long addr, ...@@ -219,7 +219,7 @@ static int vmap_p4d_range(pgd_t *pgd, unsigned long addr,
return -ENOMEM; return -ENOMEM;
do { do {
next = p4d_addr_end(addr, end); next = p4d_addr_end(addr, end);
if (vmap_pud_range(p4d, addr, next, prot, pages, nr)) if (vmap_pages_pud_range(p4d, addr, next, prot, pages, nr))
return -ENOMEM; return -ENOMEM;
} while (p4d++, addr = next, addr != end); } while (p4d++, addr = next, addr != end);
return 0; return 0;
...@@ -256,7 +256,7 @@ int map_kernel_range_noflush(unsigned long addr, unsigned long size, ...@@ -256,7 +256,7 @@ int map_kernel_range_noflush(unsigned long addr, unsigned long size,
pgd = pgd_offset_k(addr); pgd = pgd_offset_k(addr);
do { do {
next = pgd_addr_end(addr, end); next = pgd_addr_end(addr, end);
err = vmap_p4d_range(pgd, addr, next, prot, pages, &nr); err = vmap_pages_p4d_range(pgd, addr, next, prot, pages, &nr);
if (err) if (err)
return err; return err;
} while (pgd++, addr = next, addr != end); } while (pgd++, addr = next, addr != end);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册