lkml.org 
[lkml]   [2013]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/4] x86/xen/store_gdt: Remove the pvops variant of store_gdt.
    Date
    The two use-cases where we needed to store the GDT were during ACPI S3 suspend
    and resume. As the patches:
    x86/gdt/i386: store/load GDT for ACPI S3 or hibernation/resume path is not needed
    x86/gdt/64-bit: store/load GDT for ACPI S3 or hibernate/resume path is not needed.

    have demonstrated - there are other mechanism by which the GDT is
    saved and reloaded during early resume path.

    Hence we do not need to worry about the pvops call-chain for saving the
    GDT and can and can eliminate it. The other areas where the store_gdt is
    used are never going to be hit when running under the pvops platforms.

    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    ---
    arch/x86/include/asm/paravirt.h | 4 ----
    arch/x86/include/asm/paravirt_types.h | 2 +-
    arch/x86/kernel/acpi/sleep.c | 2 +-
    arch/x86/kernel/doublefault_32.c | 2 +-
    arch/x86/kernel/paravirt.c | 1 -
    arch/x86/kvm/vmx.c | 2 +-
    arch/x86/xen/enlighten.c | 1 -
    7 files changed, 4 insertions(+), 10 deletions(-)

    diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
    index 5edd174..7365128 100644
    --- a/arch/x86/include/asm/paravirt.h
    +++ b/arch/x86/include/asm/paravirt.h
    @@ -262,10 +262,6 @@ static inline void set_ldt(const void *addr, unsigned entries)
    {
    PVOP_VCALL2(pv_cpu_ops.set_ldt, addr, entries);
    }
    -static inline void store_gdt(struct desc_ptr *dtr)
    -{
    - PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr);
    -}
    static inline void store_idt(struct desc_ptr *dtr)
    {
    PVOP_VCALL1(pv_cpu_ops.store_idt, dtr);
    diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
    index 142236e..b6c69a6 100644
    --- a/arch/x86/include/asm/paravirt_types.h
    +++ b/arch/x86/include/asm/paravirt_types.h
    @@ -122,7 +122,7 @@ struct pv_cpu_ops {
    void (*load_tr_desc)(void);
    void (*load_gdt)(const struct desc_ptr *);
    void (*load_idt)(const struct desc_ptr *);
    - void (*store_gdt)(struct desc_ptr *);
    + /* store_gdt has been removed. */
    void (*store_idt)(struct desc_ptr *);
    void (*set_ldt)(const void *desc, unsigned entries);
    unsigned long (*store_tr)(void);
    diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
    index 0532f5d..b44577b 100644
    --- a/arch/x86/kernel/acpi/sleep.c
    +++ b/arch/x86/kernel/acpi/sleep.c
    @@ -46,7 +46,7 @@ int acpi_suspend_lowlevel(void)
    header->pmode_behavior = 0;

    #ifndef CONFIG_64BIT
    - store_gdt((struct desc_ptr *)&header->pmode_gdt);
    + native_store_gdt((struct desc_ptr *)&header->pmode_gdt);

    if (!rdmsr_safe(MSR_EFER,
    &header->pmode_efer_low,
    diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c
    index 37250fe..155a13f 100644
    --- a/arch/x86/kernel/doublefault_32.c
    +++ b/arch/x86/kernel/doublefault_32.c
    @@ -20,7 +20,7 @@ static void doublefault_fn(void)
    struct desc_ptr gdt_desc = {0, 0};
    unsigned long gdt, tss;

    - store_gdt(&gdt_desc);
    + native_store_gdt(&gdt_desc);
    gdt = gdt_desc.address;

    printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
    diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
    index 17fff18..4ae3d23 100644
    --- a/arch/x86/kernel/paravirt.c
    +++ b/arch/x86/kernel/paravirt.c
    @@ -360,7 +360,6 @@ struct pv_cpu_ops pv_cpu_ops = {
    .set_ldt = native_set_ldt,
    .load_gdt = native_load_gdt,
    .load_idt = native_load_idt,
    - .store_gdt = native_store_gdt,
    .store_idt = native_store_idt,
    .store_tr = native_store_tr,
    .load_tls = native_load_tls,
    diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
    index 6667042..867b810 100644
    --- a/arch/x86/kvm/vmx.c
    +++ b/arch/x86/kvm/vmx.c
    @@ -2459,7 +2459,7 @@ static int hardware_enable(void *garbage)
    ept_sync_global();
    }

    - store_gdt(&__get_cpu_var(host_gdt));
    + native_store_gdt(&__get_cpu_var(host_gdt));

    return 0;
    }
    diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
    index c8e1c7b..ddab539 100644
    --- a/arch/x86/xen/enlighten.c
    +++ b/arch/x86/xen/enlighten.c
    @@ -1220,7 +1220,6 @@ static const struct pv_cpu_ops xen_cpu_ops __initconst = {
    .alloc_ldt = xen_alloc_ldt,
    .free_ldt = xen_free_ldt,

    - .store_gdt = native_store_gdt,
    .store_idt = native_store_idt,
    .store_tr = xen_store_tr,

    --
    1.8.1.4


    \
     
     \ /
      Last update: 2013-04-05 23:43    [W:2.710 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site