lkml.org 
[lkml]   [2018]   [Apr]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 29/37] x86/mm/dump_pagetables: Define INIT_PGD
    Date
    From: Joerg Roedel <jroedel@suse.de>

    Define INIT_PGD to point to the correct initial page-table
    for 32 and 64 bit and use it where needed. This fixes the
    build on 32 bit with CONFIG_PAGE_TABLE_ISOLATION enabled.

    Signed-off-by: Joerg Roedel <jroedel@suse.de>
    ---
    arch/x86/mm/dump_pagetables.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c
    index cc7ff59..23d24d1 100644
    --- a/arch/x86/mm/dump_pagetables.c
    +++ b/arch/x86/mm/dump_pagetables.c
    @@ -111,6 +111,8 @@ static struct addr_marker address_markers[] = {
    [END_OF_SPACE_NR] = { -1, NULL }
    };

    +#define INIT_PGD ((pgd_t *) &init_top_pgt)
    +
    #else /* CONFIG_X86_64 */

    enum address_markers_idx {
    @@ -139,6 +141,8 @@ static struct addr_marker address_markers[] = {
    [END_OF_SPACE_NR] = { -1, NULL }
    };

    +#define INIT_PGD (swapper_pg_dir)
    +
    #endif /* !CONFIG_X86_64 */

    /* Multipliers for offsets within the PTEs */
    @@ -496,11 +500,7 @@ static inline bool is_hypervisor_range(int idx)
    static void ptdump_walk_pgd_level_core(struct seq_file *m, pgd_t *pgd,
    bool checkwx, bool dmesg)
    {
    -#ifdef CONFIG_X86_64
    - pgd_t *start = (pgd_t *) &init_top_pgt;
    -#else
    - pgd_t *start = swapper_pg_dir;
    -#endif
    + pgd_t *start = INIT_PGD;
    pgprotval_t prot, eff;
    int i;
    struct pg_state st = {};
    @@ -566,7 +566,7 @@ EXPORT_SYMBOL_GPL(ptdump_walk_pgd_level_debugfs);
    static void ptdump_walk_user_pgd_level_checkwx(void)
    {
    #ifdef CONFIG_PAGE_TABLE_ISOLATION
    - pgd_t *pgd = (pgd_t *) &init_top_pgt;
    + pgd_t *pgd = INIT_PGD;

    if (!static_cpu_has(X86_FEATURE_PTI))
    return;
    --
    2.7.4
    \
     
     \ /
      Last update: 2018-04-23 17:51    [W:3.638 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site