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 21/38] KVM: Make inject_page_fault() an arch operation
    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
    @@ -281,6 +281,8 @@ struct kvm_arch_ops {
    void (*decache_regs)(struct kvm_vcpu *vcpu);

    void (*flush_tlb)(struct kvm_vcpu *vcpu);
    + void (*inject_page_fault)(struct kvm_vcpu *vcpu,
    + unsigned long addr, u32 err_code);

    int (*run)(struct kvm_vcpu *vcpu, struct kvm_run *run);
    int (*vcpu_setup)(struct kvm_vcpu *vcpu);
    Index: linux-2.6/drivers/kvm/mmu.c
    ===================================================================
    --- linux-2.6.orig/drivers/kvm/mmu.c
    +++ linux-2.6/drivers/kvm/mmu.c
    @@ -455,32 +455,7 @@ static void inject_page_fault(struct kvm
    u64 addr,
    u32 err_code)
    {
    - u32 vect_info = vmcs_read32(IDT_VECTORING_INFO_FIELD);
    -
    - pgprintk("inject_page_fault: 0x%llx err 0x%x\n", addr, err_code);
    -
    - ++kvm_stat.pf_guest;
    -
    - if (is_page_fault(vect_info)) {
    - printk(KERN_DEBUG "inject_page_fault: "
    - "double fault 0x%llx @ 0x%lx\n",
    - addr, vmcs_readl(GUEST_RIP));
    - vmcs_write32(VM_ENTRY_EXCEPTION_ERROR_CODE, 0);
    - vmcs_write32(VM_ENTRY_INTR_INFO_FIELD,
    - DF_VECTOR |
    - INTR_TYPE_EXCEPTION |
    - INTR_INFO_DELIEVER_CODE_MASK |
    - INTR_INFO_VALID_MASK);
    - return;
    - }
    - vcpu->cr2 = addr;
    - vmcs_write32(VM_ENTRY_EXCEPTION_ERROR_CODE, err_code);
    - vmcs_write32(VM_ENTRY_INTR_INFO_FIELD,
    - PF_VECTOR |
    - INTR_TYPE_EXCEPTION |
    - INTR_INFO_DELIEVER_CODE_MASK |
    - INTR_INFO_VALID_MASK);
    -
    + kvm_arch_ops->inject_page_fault(vcpu, addr, err_code);
    }

    static inline int fix_read_pf(u64 *shadow_ent)
    Index: linux-2.6/drivers/kvm/vmx.c
    ===================================================================
    --- linux-2.6.orig/drivers/kvm/vmx.c
    +++ linux-2.6/drivers/kvm/vmx.c
    @@ -1624,6 +1624,36 @@ static void vmx_flush_tlb(struct kvm_vcp
    vmcs_writel(GUEST_CR3, vmcs_readl(GUEST_CR3));
    }

    +static void vmx_inject_page_fault(struct kvm_vcpu *vcpu,
    + unsigned long addr,
    + u32 err_code)
    +{
    + u32 vect_info = vmcs_read32(IDT_VECTORING_INFO_FIELD);
    +
    + ++kvm_stat.pf_guest;
    +
    + if (is_page_fault(vect_info)) {
    + printk(KERN_DEBUG "inject_page_fault: "
    + "double fault 0x%lx @ 0x%lx\n",
    + addr, vmcs_readl(GUEST_RIP));
    + vmcs_write32(VM_ENTRY_EXCEPTION_ERROR_CODE, 0);
    + vmcs_write32(VM_ENTRY_INTR_INFO_FIELD,
    + DF_VECTOR |
    + INTR_TYPE_EXCEPTION |
    + INTR_INFO_DELIEVER_CODE_MASK |
    + INTR_INFO_VALID_MASK);
    + return;
    + }
    + vcpu->cr2 = addr;
    + vmcs_write32(VM_ENTRY_EXCEPTION_ERROR_CODE, err_code);
    + vmcs_write32(VM_ENTRY_INTR_INFO_FIELD,
    + PF_VECTOR |
    + INTR_TYPE_EXCEPTION |
    + INTR_INFO_DELIEVER_CODE_MASK |
    + INTR_INFO_VALID_MASK);
    +
    +}
    +
    static struct kvm_arch_ops vmx_arch_ops = {
    .cpu_has_kvm_support = cpu_has_kvm_support,
    .disabled_by_bios = vmx_disabled_by_bios,
    @@ -1650,6 +1680,7 @@ static struct kvm_arch_ops vmx_arch_ops
    .decache_regs = vcpu_put_rsp_rip,

    .flush_tlb = vmx_flush_tlb,
    + .inject_page_fault = vmx_inject_page_fault,

    .run = vmx_vcpu_run,
    .skip_emulated_instruction = skip_emulated_instruction,
    -
    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:35    [W:4.062 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site