lkml.org 
[lkml]   [2018]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 15/39] x86/pgtable: Rename pti_set_user_pgd to pti_set_user_pgtbl
    Date
    From: Joerg Roedel <jroedel@suse.de>

    With the way page-table folding is implemented on 32 bit, we
    are not only setting PGDs with this functions, but also PUDs
    and even PMDs. Give the function a more generic name to
    reflect that.

    Signed-off-by: Joerg Roedel <jroedel@suse.de>
    ---
    arch/x86/include/asm/pgtable_64.h | 12 ++++++------
    arch/x86/mm/pti.c | 2 +-
    2 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
    index 3c5385f..9406c4f 100644
    --- a/arch/x86/include/asm/pgtable_64.h
    +++ b/arch/x86/include/asm/pgtable_64.h
    @@ -196,21 +196,21 @@ static inline bool pgdp_maps_userspace(void *__ptr)
    }

    #ifdef CONFIG_PAGE_TABLE_ISOLATION
    -pgd_t __pti_set_user_pgd(pgd_t *pgdp, pgd_t pgd);
    +pgd_t __pti_set_user_pgtbl(pgd_t *pgdp, pgd_t pgd);

    /*
    * Take a PGD location (pgdp) and a pgd value that needs to be set there.
    * Populates the user and returns the resulting PGD that must be set in
    * the kernel copy of the page tables.
    */
    -static inline pgd_t pti_set_user_pgd(pgd_t *pgdp, pgd_t pgd)
    +static inline pgd_t pti_set_user_pgtbl(pgd_t *pgdp, pgd_t pgd)
    {
    if (!static_cpu_has(X86_FEATURE_PTI))
    return pgd;
    - return __pti_set_user_pgd(pgdp, pgd);
    + return __pti_set_user_pgtbl(pgdp, pgd);
    }
    #else
    -static inline pgd_t pti_set_user_pgd(pgd_t *pgdp, pgd_t pgd)
    +static inline pgd_t pti_set_user_pgtbl(pgd_t *pgdp, pgd_t pgd)
    {
    return pgd;
    }
    @@ -226,7 +226,7 @@ static inline void native_set_p4d(p4d_t *p4dp, p4d_t p4d)
    }

    pgd = native_make_pgd(native_p4d_val(p4d));
    - pgd = pti_set_user_pgd((pgd_t *)p4dp, pgd);
    + pgd = pti_set_user_pgtbl((pgd_t *)p4dp, pgd);
    *p4dp = native_make_p4d(native_pgd_val(pgd));
    }

    @@ -237,7 +237,7 @@ static inline void native_p4d_clear(p4d_t *p4d)

    static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
    {
    - *pgdp = pti_set_user_pgd(pgdp, pgd);
    + *pgdp = pti_set_user_pgtbl(pgdp, pgd);
    }

    static inline void native_pgd_clear(pgd_t *pgd)
    diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c
    index 4d418e7..f512222 100644
    --- a/arch/x86/mm/pti.c
    +++ b/arch/x86/mm/pti.c
    @@ -117,7 +117,7 @@ void __init pti_check_boottime_disable(void)
    setup_force_cpu_cap(X86_FEATURE_PTI);
    }

    -pgd_t __pti_set_user_pgd(pgd_t *pgdp, pgd_t pgd)
    +pgd_t __pti_set_user_pgtbl(pgd_t *pgdp, pgd_t pgd)
    {
    /*
    * Changes to the high (kernel) portion of the kernelmode page
    --
    2.7.4
    \
     
     \ /
      Last update: 2018-07-18 11:45    [W:4.135 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site