Skip to contentSkip to conversation

Update cr8 intercept when APIC/CR8 is changed by userspace.

PATCH Applied Gleb Natapov 2 participants 2 messages Aug 9, 2009

Subsystems (3)
x86 KVM KVM x86
lore
Share & tools
lore

Gleb Natapov

author
#0 lore raw

PATCH 1/1 Update cr8 intercept when APIC/CR8 is changed by userspace.

Since on vcpu entry we do it only if apic is enabled we should do it when TPR is changed while apic is disabled. This happens when windows resets HW without setting TPR to zero.

Signed-off-by Gleb Natapov <[email protected]>
arch/x86/kvm/x86.c +3 -0
index 44777a6..5a69ad1 100644
@@ -77,6 +77,7 @@ static u64 __read_mostly efer_reserved_bits = 0xfffffffffffffffeULL;
 #define VM_STAT(x) offsetof(struct kvm, stat.x), KVM_STAT_VM
 #define VCPU_STAT(x) offsetof(struct kvm_vcpu, stat.x), KVM_STAT_VCPU
 
+static void update_cr8_intercept(struct kvm_vcpu *vcpu);
 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
 				    struct kvm_cpuid_entry2 __user *entries);
 

@@ -1629,6 +1630,7 @@ static int kvm_vcpu_ioctl_set_lapic(struct kvm_vcpu *vcpu,
 	vcpu_load(vcpu);
 	memcpy(vcpu->arch.apic->regs, s->regs, sizeof *s);
 	kvm_apic_post_state_restore(vcpu);
+	update_cr8_intercept(vcpu);
 	vcpu_put(vcpu);
 
 	return 0;

@@ -4412,6 +4414,7 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,
 	vcpu->arch.cr3 = sregs->cr3;
 
 	kvm_set_cr8(vcpu, sregs->cr8);
+	update_cr8_intercept(vcpu);
 
 	mmu_reset_needed |= vcpu->arch.shadow_efer != sregs->efer;
 	kvm_x86_ops->set_efer(vcpu, sregs->efer);

--
Gleb.

Applied
#1 lore raw
Quoted 5 lines · Gleb Natapov

Since on vcpu entry we do it only if apic is enabled we should do it when TPR is changed while apic is disabled. This happens when windows resets HW without setting TPR to zero.

Applied, thanks.

arch/x86/kvm/x86.c int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, · line 4420

Quoted 9 lines
arch/x86/kvm/x86.c +1 -0
@@ -4412,6 +4414,7 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,
  	vcpu->arch.cr3 = sregs->cr3;
 
  	kvm_set_cr8(vcpu, sregs->cr8);
+	update_cr8_intercept(vcpu);
 
  	mmu_reset_needed |= vcpu->arch.shadow_efer != sregs->efer;
  	kvm_x86_ops->set_efer(vcpu, sregs->efer);

Already had this bit, so dropped it.

Signature · 1 line
error compiling committee.c: too many arguments to function