fix some bugs in kvm-sch patch.
1. vmcs_readl/vmcs_writel are called with preempt enabled
2. preempt_count check doesn't make sense with preempt disabled
3. vmx_cpu_run doesn't handle error correctly and kvm_mmu_reload might
sleep with mutex changes, so I move it above.
Signed-off-by: Shaohua Li <[EMAIL PROTECTED]>
---
drivers/kvm/vmx.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
Index: linux/drivers/kvm/vmx.c
===================================================================
--- linux.orig/drivers/kvm/vmx.c 2007-07-18 16:11:22.000000000 +0800
+++ linux/drivers/kvm/vmx.c 2007-07-20 14:56:45.000000000 +0800
@@ -179,7 +179,6 @@ static unsigned long vmcs_readl(unsigned
{
unsigned long value;
- WARN_ON(raw_smp_processor_id() != current->kvm_vcpu->cpu);
asm volatile (ASM_VMX_VMREAD_RDX_RAX
: "=a"(value) : "d"(field) : "cc");
return value;
@@ -215,7 +214,6 @@ static void vmcs_writel(unsigned long fi
{
u8 error;
- WARN_ON(raw_smp_processor_id() != current->kvm_vcpu->cpu);
asm volatile (ASM_VMX_VMWRITE_RAX_RDX "; setna %0"
: "=q"(error) : "a"(value), "d"(field) : "cc" );
if (unlikely(error))
@@ -384,7 +382,6 @@ static void vmx_vcpu_load(struct kvm_vcp
u64 phys_addr = __pa(vcpu->vmcs);
u64 tsc_this, delta;
- WARN_ON(!preempt_count());
if (vcpu->cpu != cpu)
vcpu_clear(vcpu);
@@ -427,7 +424,6 @@ static void vmx_vcpu_load(struct kvm_vcp
static void vmx_vcpu_put(struct kvm_vcpu *vcpu)
{
- WARN_ON(!preempt_count());
vmx_load_host_state(vcpu);
kvm_put_guest_fpu(vcpu);
}
@@ -2001,6 +1997,10 @@ preempted:
kvm_guest_debug_pre(vcpu);
again:
+ r = kvm_mmu_reload(vcpu);
+ if (unlikely(r))
+ goto out;
+
preempt_disable();
if (!vcpu->mmio_read_completed)
@@ -2009,10 +2009,6 @@ again:
vmx_save_host_state(vcpu);
kvm_load_guest_fpu(vcpu);
- r = kvm_mmu_reload(vcpu);
- if (unlikely(r))
- goto out;
-
/*
* Loading guest fpu may have cleared host cr0.ts
*/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
