lkml.org 
[lkml]   [2006]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 36/38] KVM: Move vmcs accessors to vmx.c
    From
    Date
    Signed-off-by: Avi Kivity <avi@qumranet.com>

    Index: linux-2.6/drivers/kvm/kvm.h
    ===================================================================
    --- linux-2.6.orig/drivers/kvm/kvm.h
    +++ linux-2.6/drivers/kvm/kvm.h
    @@ -377,9 +377,6 @@ int kvm_write_guest(struct kvm_vcpu *vcp
    unsigned long size,
    void *data);

    -void vmcs_writel(unsigned long field, unsigned long value);
    -unsigned long vmcs_readl(unsigned long field);
    -
    unsigned long segment_base(u16 selector);

    static inline struct page *_gfn_to_page(struct kvm *kvm, gfn_t gfn)
    @@ -388,30 +385,6 @@ static inline struct page *_gfn_to_page(
    return (slot) ? slot->phys_mem[gfn - slot->base_gfn] : 0;
    }

    -static inline u16 vmcs_read16(unsigned long field)
    -{
    - return vmcs_readl(field);
    -}
    -
    -static inline u32 vmcs_read32(unsigned long field)
    -{
    - return vmcs_readl(field);
    -}
    -
    -static inline u64 vmcs_read64(unsigned long field)
    -{
    -#ifdef __x86_64__
    - return vmcs_readl(field);
    -#else
    - return vmcs_readl(field) | ((u64)vmcs_readl(field+1) << 32);
    -#endif
    -}
    -
    -static inline void vmcs_write32(unsigned long field, u32 value)
    -{
    - vmcs_writel(field, value);
    -}
    -
    static inline int is_pae(struct kvm_vcpu *vcpu)
    {
    return vcpu->cr4 & CR4_PAE_MASK;
    Index: linux-2.6/drivers/kvm/kvm_main.c
    ===================================================================
    --- linux-2.6.orig/drivers/kvm/kvm_main.c
    +++ linux-2.6/drivers/kvm/kvm_main.c
    @@ -310,28 +310,6 @@ static int kvm_dev_release(struct inode
    return 0;
    }

    -unsigned long vmcs_readl(unsigned long field)
    -{
    - unsigned long value;
    -
    - asm volatile (ASM_VMX_VMREAD_RDX_RAX
    - : "=a"(value) : "d"(field) : "cc");
    - return value;
    -}
    -EXPORT_SYMBOL_GPL(vmcs_readl);
    -
    -void vmcs_writel(unsigned long field, unsigned long value)
    -{
    - u8 error;
    -
    - asm volatile (ASM_VMX_VMWRITE_RAX_RDX "; setna %0"
    - : "=q"(error) : "a"(value), "d"(field) : "cc" );
    - if (error)
    - printk(KERN_ERR "vmwrite error: reg %lx value %lx (err %d)\n",
    - field, value, vmcs_read32(VM_INSTRUCTION_ERROR));
    -}
    -EXPORT_SYMBOL_GPL(vmcs_writel);
    -
    static void inject_gp(struct kvm_vcpu *vcpu)
    {
    kvm_arch_ops->inject_gp(vcpu, 0);
    Index: linux-2.6/drivers/kvm/kvm_vmx.h
    ===================================================================
    --- linux-2.6.orig/drivers/kvm/kvm_vmx.h
    +++ linux-2.6/drivers/kvm/kvm_vmx.h
    @@ -1,22 +1,6 @@
    #ifndef __KVM_VMX_H
    #define __KVM_VMX_H

    -static inline void vmcs_write16(unsigned long field, u16 value)
    -{
    - vmcs_writel(field, value);
    -}
    -
    -static inline void vmcs_write64(unsigned long field, u64 value)
    -{
    -#ifdef __x86_64__
    - vmcs_writel(field, value);
    -#else
    - vmcs_writel(field, value);
    - asm volatile ("");
    - vmcs_writel(field+1, value >> 32);
    -#endif
    -}
    -
    #ifdef __x86_64__
    /*
    * avoid save/load MSR_SYSCALL_MASK and MSR_LSTAR by std vt
    Index: linux-2.6/drivers/kvm/vmx.c
    ===================================================================
    --- linux-2.6.orig/drivers/kvm/vmx.c
    +++ linux-2.6/drivers/kvm/vmx.c
    @@ -101,6 +101,66 @@ static void __vcpu_clear(void *arg)
    per_cpu(current_vmcs, cpu) = 0;
    }

    +static unsigned long vmcs_readl(unsigned long field)
    +{
    + unsigned long value;
    +
    + asm volatile (ASM_VMX_VMREAD_RDX_RAX
    + : "=a"(value) : "d"(field) : "cc");
    + return value;
    +}
    +
    +static u16 vmcs_read16(unsigned long field)
    +{
    + return vmcs_readl(field);
    +}
    +
    +static u32 vmcs_read32(unsigned long field)
    +{
    + return vmcs_readl(field);
    +}
    +
    +static u64 vmcs_read64(unsigned long field)
    +{
    +#ifdef __x86_64__
    + return vmcs_readl(field);
    +#else
    + return vmcs_readl(field) | ((u64)vmcs_readl(field+1) << 32);
    +#endif
    +}
    +
    +static void vmcs_writel(unsigned long field, unsigned long value)
    +{
    + u8 error;
    +
    + asm volatile (ASM_VMX_VMWRITE_RAX_RDX "; setna %0"
    + : "=q"(error) : "a"(value), "d"(field) : "cc" );
    + if (error)
    + printk(KERN_ERR "vmwrite error: reg %lx value %lx (err %d)\n",
    + field, value, vmcs_read32(VM_INSTRUCTION_ERROR));
    +}
    +
    +static void vmcs_write16(unsigned long field, u16 value)
    +{
    + vmcs_writel(field, value);
    +}
    +
    +static void vmcs_write32(unsigned long field, u32 value)
    +{
    + vmcs_writel(field, value);
    +}
    +
    +static void vmcs_write64(unsigned long field, u64 value)
    +{
    +#ifdef __x86_64__
    + vmcs_writel(field, value);
    +#else
    + vmcs_writel(field, value);
    + asm volatile ("");
    + vmcs_writel(field+1, value >> 32);
    +#endif
    +}
    +
    /*
    * Switches to specified vcpu, until a matching vcpu_put(), but assumes
    * vcpu mutex is already taken.
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-11-27 13:49    [W:0.026 / U:92.788 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site