Re: [PATCH 18/29] KVM: MMU: Propagate the right fault back to the guest after gva_to_gpa

[Avi Kivity]

 On 09/10/2010 06:30 PM, Joerg Roedel wrote:

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.

@@ -338,6 +338,22 @@ void kvm_inject_page_fault(struct kvm_vcpu *vcpu)
kvm_queue_exception_e(vcpu, PF_VECTOR, error_code);
  }

+void kvm_propagate_fault(struct kvm_vcpu *vcpu)
+{
+   u32 nested, error;
+
+   error   = vcpu->arch.fault.error_code;
+   nested  = error&   PFERR_NESTED_MASK;
+   error   = error&  ~PFERR_NESTED_MASK;
+
+   vcpu->arch.fault.error_code = error;
+
+   if (mmu_is_nested(vcpu)&&  !nested)
+   vcpu->arch.nested_mmu.inject_page_fault(vcpu);
+   else
+   vcpu->arch.mmu.inject_page_fault(vcpu);
+}
+


Tacking a non-architectural bit on top of the error code is not very 
nice.  Can you move it to a separate vcpu->arch.fault.nested?


--
error compiling committee.c: too many arguments to function

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 18/29] KVM: MMU: Propagate the right fault back to the guest after gva_to_gpa

[Joerg Roedel]

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 
---
 arch/x86/include/asm/kvm_host.h |1 +
 arch/x86/kvm/x86.c  |   18 +-
 2 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 87734cc..7d3adb8 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -660,6 +660,7 @@ void kvm_inject_page_fault(struct kvm_vcpu *vcpu);
 int kvm_read_guest_page_mmu(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,
gfn_t gfn, void *data, int offset, int len,
u32 access);
+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 307599d..2816e5a 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -338,6 +338,22 @@ void kvm_inject_page_fault(struct kvm_vcpu *vcpu)
kvm_queue_exception_e(vcpu, PF_VECTOR, error_code);
 }
 
+void kvm_propagate_fault(struct kvm_vcpu *vcpu)
+{
+   u32 nested, error;
+
+   error   = vcpu->arch.fault.error_code;
+   nested  = error &  PFERR_NESTED_MASK;
+   error   = error & ~PFERR_NESTED_MASK;
+
+   vcpu->arch.fault.error_code = error;
+
+   if (mmu_is_nested(vcpu) && !nested)
+   vcpu->arch.nested_mmu.inject_page_fault(vcpu);
+   else
+   vcpu->arch.mmu.inject_page_fault(vcpu);
+}
+
 void kvm_inject_nmi(struct kvm_vcpu *vcpu)
 {
vcpu->arch.nmi_pending = 1;
@@ -4126,7 +4142,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);
+   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


--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html