lkml.org 
[lkml]   [2020]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 01/28] x86/hyperv: use vmalloc_exec for the hypercall page
    Date
    Use the designated helper for allocating executable kernel memory, and
    remove the now unused PAGE_KERNEL_RX define.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    arch/x86/hyperv/hv_init.c | 2 +-
    arch/x86/include/asm/pgtable_types.h | 2 --
    2 files changed, 1 insertion(+), 3 deletions(-)

    diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c
    index b0da5320bcff..5a4b363ba67b 100644
    --- a/arch/x86/hyperv/hv_init.c
    +++ b/arch/x86/hyperv/hv_init.c
    @@ -355,7 +355,7 @@ void __init hyperv_init(void)
    guest_id = generate_guest_id(0, LINUX_VERSION_CODE, 0);
    wrmsrl(HV_X64_MSR_GUEST_OS_ID, guest_id);

    - hv_hypercall_pg = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
    + hv_hypercall_pg = vmalloc_exec(PAGE_SIZE);
    if (hv_hypercall_pg == NULL) {
    wrmsrl(HV_X64_MSR_GUEST_OS_ID, 0);
    goto remove_cpuhp_state;
    diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
    index b6606fe6cfdf..947867f112ea 100644
    --- a/arch/x86/include/asm/pgtable_types.h
    +++ b/arch/x86/include/asm/pgtable_types.h
    @@ -194,7 +194,6 @@ enum page_cache_mode {
    #define _PAGE_TABLE_NOENC (__PP|__RW|_USR|___A| 0|___D| 0| 0)
    #define _PAGE_TABLE (__PP|__RW|_USR|___A| 0|___D| 0| 0| _ENC)
    #define __PAGE_KERNEL_RO (__PP| 0| 0|___A|__NX|___D| 0|___G)
    -#define __PAGE_KERNEL_RX (__PP| 0| 0|___A| 0|___D| 0|___G)
    #define __PAGE_KERNEL_NOCACHE (__PP|__RW| 0|___A|__NX|___D| 0|___G| __NC)
    #define __PAGE_KERNEL_VVAR (__PP| 0|_USR|___A|__NX|___D| 0|___G)
    #define __PAGE_KERNEL_LARGE (__PP|__RW| 0|___A|__NX|___D|_PSE|___G)
    @@ -220,7 +219,6 @@ enum page_cache_mode {
    #define PAGE_KERNEL_RO __pgprot_mask(__PAGE_KERNEL_RO | _ENC)
    #define PAGE_KERNEL_EXEC __pgprot_mask(__PAGE_KERNEL_EXEC | _ENC)
    #define PAGE_KERNEL_EXEC_NOENC __pgprot_mask(__PAGE_KERNEL_EXEC | 0)
    -#define PAGE_KERNEL_RX __pgprot_mask(__PAGE_KERNEL_RX | _ENC)
    #define PAGE_KERNEL_NOCACHE __pgprot_mask(__PAGE_KERNEL_NOCACHE | _ENC)
    #define PAGE_KERNEL_LARGE __pgprot_mask(__PAGE_KERNEL_LARGE | _ENC)
    #define PAGE_KERNEL_LARGE_EXEC __pgprot_mask(__PAGE_KERNEL_LARGE_EXEC | _ENC)
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-04-08 14:00    [W:4.487 / U:0.604 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site