lkml.org 
[lkml]   [2020]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 13/75] x86/boot/compressed/64: Rename kaslr_64.c to ident_map_64.c
    Date
    From: Joerg Roedel <jroedel@suse.de>

    The file contains only code related to identity mapped page-tables.
    Rename the file and compile it always in.

    Signed-off-by: Joerg Roedel <jroedel@suse.de>
    Reviewed-by: Kees Cook <keescook@chromium.org>
    ---
    arch/x86/boot/compressed/Makefile | 2 +-
    arch/x86/boot/compressed/{kaslr_64.c => ident_map_64.c} | 9 +++++++++
    arch/x86/boot/compressed/kaslr.c | 9 ---------
    arch/x86/boot/compressed/misc.h | 8 ++++++++
    4 files changed, 18 insertions(+), 10 deletions(-)
    rename arch/x86/boot/compressed/{kaslr_64.c => ident_map_64.c} (95%)

    diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
    index e6d1af3bae86..75bddf282f4c 100644
    --- a/arch/x86/boot/compressed/Makefile
    +++ b/arch/x86/boot/compressed/Makefile
    @@ -83,7 +83,7 @@ vmlinux-objs-y := $(obj)/vmlinux.lds $(obj)/kernel_info.o $(obj)/head_$(BITS).o
    vmlinux-objs-$(CONFIG_EARLY_PRINTK) += $(obj)/early_serial_console.o
    vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/kaslr.o
    ifdef CONFIG_X86_64
    - vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/kaslr_64.o
    + vmlinux-objs-y += $(obj)/ident_map_64.o
    vmlinux-objs-y += $(obj)/idt_64.o $(obj)/idt_handlers_64.o
    vmlinux-objs-y += $(obj)/mem_encrypt.o
    vmlinux-objs-y += $(obj)/pgtable_64.o
    diff --git a/arch/x86/boot/compressed/kaslr_64.c b/arch/x86/boot/compressed/ident_map_64.c
    similarity index 95%
    rename from arch/x86/boot/compressed/kaslr_64.c
    rename to arch/x86/boot/compressed/ident_map_64.c
    index f9c5c13d979b..d9932a133ac9 100644
    --- a/arch/x86/boot/compressed/kaslr_64.c
    +++ b/arch/x86/boot/compressed/ident_map_64.c
    @@ -29,6 +29,15 @@
    #define __PAGE_OFFSET __PAGE_OFFSET_BASE
    #include "../../mm/ident_map.c"

    +#ifdef CONFIG_X86_5LEVEL
    +unsigned int __pgtable_l5_enabled;
    +unsigned int pgdir_shift = 39;
    +unsigned int ptrs_per_p4d = 1;
    +#endif
    +
    +/* Used by PAGE_KERN* macros: */
    +pteval_t __default_kernel_pte_mask __read_mostly = ~0;
    +
    /* Used to track our page table allocation area. */
    struct alloc_pgt_data {
    unsigned char *pgt_buf;
    diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c
    index d7408af55738..7c61a8c5b9cf 100644
    --- a/arch/x86/boot/compressed/kaslr.c
    +++ b/arch/x86/boot/compressed/kaslr.c
    @@ -43,17 +43,8 @@
    #define STATIC
    #include <linux/decompress/mm.h>

    -#ifdef CONFIG_X86_5LEVEL
    -unsigned int __pgtable_l5_enabled;
    -unsigned int pgdir_shift __ro_after_init = 39;
    -unsigned int ptrs_per_p4d __ro_after_init = 1;
    -#endif
    -
    extern unsigned long get_cmd_line_ptr(void);

    -/* Used by PAGE_KERN* macros: */
    -pteval_t __default_kernel_pte_mask __read_mostly = ~0;
    -
    /* Simplified build-specific string for starting entropy. */
    static const char build_str[] = UTS_RELEASE " (" LINUX_COMPILE_BY "@"
    LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION;
    diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h
    index 062ae3ae6930..3a030a878d53 100644
    --- a/arch/x86/boot/compressed/misc.h
    +++ b/arch/x86/boot/compressed/misc.h
    @@ -134,6 +134,14 @@ int count_immovable_mem_regions(void);
    static inline int count_immovable_mem_regions(void) { return 0; }
    #endif

    +/* ident_map_64.c */
    +#ifdef CONFIG_X86_5LEVEL
    +extern unsigned int __pgtable_l5_enabled, pgdir_shift, ptrs_per_p4d;
    +#endif
    +
    +/* Used by PAGE_KERN* macros: */
    +extern pteval_t __default_kernel_pte_mask;
    +
    /* idt_64.c */
    extern gate_desc boot_idt[BOOT_IDT_ENTRIES];
    extern struct desc_ptr boot_idt_desc;
    --
    2.27.0
    \
     
     \ /
      Last update: 2020-07-24 18:11    [W:4.658 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site