lkml.org 
[lkml]   [2020]   [Aug]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 7/8] mm/vmalloc: add vmap_range_noflush variant
    Date
    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 | 17 +++++++++++++----
    1 file changed, 13 insertions(+), 4 deletions(-)

    diff --git a/mm/vmalloc.c b/mm/vmalloc.c
    index 129f10545bb1..4e5cb7c7f780 100644
    --- a/mm/vmalloc.c
    +++ b/mm/vmalloc.c
    @@ -234,8 +234,8 @@ 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, phys_addr_t phys_addr, pgprot_t prot,
    - unsigned int max_page_shift)
    +static int vmap_range_noflush(unsigned long addr, unsigned long end, phys_addr_t phys_addr,
    + pgprot_t prot, unsigned int max_page_shift)
    {
    pgd_t *pgd;
    unsigned long start;
    @@ -255,14 +255,23 @@ int vmap_range(unsigned long addr, unsigned long end, phys_addr_t phys_addr, pgp
    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
    \
     
     \ /
      Last update: 2020-08-10 04:28    [W:3.225 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site