Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Paolo Bonzini:
"Just two very small & simple patches"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: x86: Use adjustment in guest cycles when handling MSR_IA32_TSC_ADJUST
KVM: x86: zero IDT limit on entry to SMM
+6
-1
+6
-1
arch/x86/kvm/x86.c
+6
-1
arch/x86/kvm/x86.c
···
2105
2105
if (guest_cpuid_has_tsc_adjust(vcpu)) {
2106
2106
if (!msr_info->host_initiated) {
2107
2107
s64 adj = data - vcpu->arch.ia32_tsc_adjust_msr;
2108
-
kvm_x86_ops->adjust_tsc_offset(vcpu, adj, true);
2108
+
adjust_tsc_offset_guest(vcpu, adj);
2109
2109
}
2110
2110
vcpu->arch.ia32_tsc_adjust_msr = data;
2111
2111
}
···
6327
6327
static void process_smi(struct kvm_vcpu *vcpu)
6328
6328
{
6329
6329
struct kvm_segment cs, ds;
6330
+
struct desc_ptr dt;
6330
6331
char buf[512];
6331
6332
u32 cr0;
6332
6333
···
6359
6358
vcpu->arch.cr0 = cr0;
6360
6359
6361
6360
kvm_x86_ops->set_cr4(vcpu, 0);
6361
+
6362
+
/* Undocumented: IDT limit is set to zero on entry to SMM. */
6363
+
dt.address = dt.size = 0;
6364
+
kvm_x86_ops->set_idt(vcpu, &dt);
6362
6365
6363
6366
__kvm_set_dr(vcpu, 7, DR7_FIXED_1);
6364
6367