lkml.org 
[lkml]   [2010]   [Sep]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 18/27] KVM: MMU: Propagate the right fault back to the guest after gva_to_gpa
    Date
    This patch implements logic to make sure that either a
    page-fault/page-fault-vmexit or a nested-page-fault-vmexit
    is propagated back to the guest.

    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    ---
    arch/x86/include/asm/kvm_host.h | 1 +
    arch/x86/kvm/x86.c | 19 +++++++++++++++++--
    2 files changed, 18 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
    index e5eb57c..173834b 100644
    --- a/arch/x86/include/asm/kvm_host.h
    +++ b/arch/x86/include/asm/kvm_host.h
    @@ -663,6 +663,7 @@ void kvm_inject_page_fault(struct kvm_vcpu *vcpu, unsigned long cr2,
    int kvm_read_guest_page_mmu(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,
    gfn_t gfn, void *data, int offset, int len,
    u32 *error);
    +void kvm_propagate_fault(struct kvm_vcpu *vcpu);
    bool kvm_require_cpl(struct kvm_vcpu *vcpu, int required_cpl);

    int kvm_pic_set_irq(void *opaque, int irq, int level);
    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index 38d482d..65b00f0 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -337,6 +337,22 @@ void kvm_inject_page_fault(struct kvm_vcpu *vcpu, unsigned long addr,
    kvm_queue_exception_e(vcpu, PF_VECTOR, error_code);
    }

    +void kvm_propagate_fault(struct kvm_vcpu *vcpu)
    +{
    + unsigned long address;
    + u32 nested, error;
    +
    + address = vcpu->arch.fault.address;
    + error = vcpu->arch.fault.error_code;
    + nested = error & PFERR_NESTED_MASK;
    + error = error & ~PFERR_NESTED_MASK;
    +
    + if (mmu_is_nested(vcpu) && !nested)
    + vcpu->arch.nested_mmu.inject_page_fault(vcpu, address, error);
    + else
    + vcpu->arch.mmu.inject_page_fault(vcpu, address, error);
    +}
    +
    void kvm_inject_nmi(struct kvm_vcpu *vcpu)
    {
    vcpu->arch.nmi_pending = 1;
    @@ -4130,8 +4146,7 @@ static void inject_emulated_exception(struct kvm_vcpu *vcpu)
    {
    struct x86_emulate_ctxt *ctxt = &vcpu->arch.emulate_ctxt;
    if (ctxt->exception == PF_VECTOR)
    - kvm_inject_page_fault(vcpu, vcpu->arch.fault.address,
    - vcpu->arch.fault.error_code);
    + kvm_propagate_fault(vcpu);
    else if (ctxt->error_code_valid)
    kvm_queue_exception_e(vcpu, ctxt->exception, ctxt->error_code);
    else
    --
    1.7.0.4



    \
     
     \ /
      Last update: 2010-09-06 17:09    [W:0.026 / U:32.512 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site