lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 15 Dec 2010 14:19:52 -0800 From: Jeremy Fitzhardinge <jeremy@...p.org> To: Andrew Morton <akpm@...ux-foundation.org> Cc: Haavard Skinnemoen <hskinnemoen@...el.com>, Linux-MM <linux-mm@...ck.org>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Nick Piggin <npiggin@...nel.dk>, Xen-devel <xen-devel@...ts.xensource.com>, Jeremy Fitzhardinge <jeremy.fitzhardinge@...rix.com> Subject: [PATCH 6/9] vmalloc: use apply_to_page_range_batch() for vmap_page_range_noflush() From: Jeremy Fitzhardinge <jeremy.fitzhardinge@...rix.com> There's no need to open-code it when there's a helpful utility function. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@...rix.com> Cc: Nick Piggin <npiggin@...nel.dk> --- mm/vmalloc.c | 92 ++++++++++++++++++--------------------------------------- 1 files changed, 29 insertions(+), 63 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 5c5ad6a..0e845bb 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -53,63 +53,34 @@ static void vunmap_page_range(unsigned long addr, unsigned long end) apply_to_page_range_batch(&init_mm, addr, end - addr, vunmap_pte, NULL); } -static int vmap_pte_range(pmd_t *pmd, unsigned long addr, - unsigned long end, pgprot_t prot, struct page **pages, int *nr) +struct vmap_data { - pte_t *pte; + struct page **pages; + unsigned index; + pgprot_t prot; +}; - /* - * nr is a running index into the array which helps higher level - * callers keep track of where we're up to. - */ +static int vmap_pte(pte_t *pte, unsigned count, + unsigned long addr, void *data) +{ + struct vmap_data *vmap = data; - pte = pte_alloc_kernel(pmd, addr); - if (!pte) - return -ENOMEM; - do { - struct page *page = pages[*nr]; + while (count--) { + struct page *page = vmap->pages[vmap->index]; if (WARN_ON(!pte_none(*pte))) return -EBUSY; + if (WARN_ON(!page)) return -ENOMEM; - set_pte_at(&init_mm, addr, pte, mk_pte(page, prot)); - (*nr)++; - } while (pte++, addr += PAGE_SIZE, addr != end); - return 0; -} -static int vmap_pmd_range(pud_t *pud, unsigned long addr, - unsigned long end, pgprot_t prot, struct page **pages, int *nr) -{ - pmd_t *pmd; - unsigned long next; - - pmd = pmd_alloc(&init_mm, pud, addr); - if (!pmd) - return -ENOMEM; - do { - next = pmd_addr_end(addr, end); - if (vmap_pte_range(pmd, addr, next, prot, pages, nr)) - return -ENOMEM; - } while (pmd++, addr = next, addr != end); - return 0; -} + set_pte_at(&init_mm, addr, pte, mk_pte(page, vmap->prot)); -static int vmap_pud_range(pgd_t *pgd, unsigned long addr, - unsigned long end, pgprot_t prot, struct page **pages, int *nr) -{ - pud_t *pud; - unsigned long next; + pte++; + addr += PAGE_SIZE; + vmap->index++; + } - pud = pud_alloc(&init_mm, pgd, addr); - if (!pud) - return -ENOMEM; - do { - next = pud_addr_end(addr, end); - if (vmap_pmd_range(pud, addr, next, prot, pages, nr)) - return -ENOMEM; - } while (pud++, addr = next, addr != end); return 0; } @@ -122,22 +93,17 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr, static int vmap_page_range_noflush(unsigned long start, unsigned long end, pgprot_t prot, struct page **pages) { - pgd_t *pgd; - unsigned long next; - unsigned long addr = start; - int err = 0; - int nr = 0; - - BUG_ON(addr >= end); - pgd = pgd_offset_k(addr); - do { - next = pgd_addr_end(addr, end); - err = vmap_pud_range(pgd, addr, next, prot, pages, &nr); - if (err) - return err; - } while (pgd++, addr = next, addr != end); - - return nr; + int err; + struct vmap_data vmap = { + .pages = pages, + .index = 0, + .prot = prot + }; + + err = apply_to_page_range_batch(&init_mm, start, end - start, + vmap_pte, &vmap); + + return err ? err : vmap.index; } static int vmap_page_range(unsigned long start, unsigned long end, -- 1.7.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists