Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6ac1f0a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

* 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: Fix preemption counter leak in kvm_timer_init()
  KVM: enlarge number of possible CPUID leaves
  KVM: SVM: Do not report xsave in supported cpuid
  KVM: Fix OSXSAVE after migration
parents 508817e7 3e26f230

arch/x86/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ 
#define KVM_NUM_MMU_PAGES (1 << KVM_MMU_HASH_SHIFT)

#define KVM_MIN_FREE_MMU_PAGES 5

#define KVM_REFILL_PAGES 25

#define KVM_MAX_CPUID_ENTRIES 40

#define KVM_MAX_CPUID_ENTRIES 80

#define KVM_NR_FIXED_MTRR_REGION 88

#define KVM_NR_VAR_MTRR 8

arch/x86/kvm/svm.c

+4 −0
Original line number Diff line number Diff line
@@ -3494,6 +3494,10 @@ static void svm_cpuid_update(struct kvm_vcpu *vcpu) 
static void svm_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry)

{

	switch (func) {

	case 0x00000001:

		/* Mask out xsave bit as long as it is not supported by SVM */

		entry->ecx &= ~(bit(X86_FEATURE_XSAVE));

		break;

	case 0x80000001:

		if (nested)

			entry->ecx |= (1 << 2); /* Set SVM bit */

arch/x86/kvm/vmx.c

+0 −5
Original line number Diff line number Diff line
@@ -4227,11 +4227,6 @@ static int vmx_get_lpage_level(void) 
		return PT_PDPE_LEVEL;

}



static inline u32 bit(int bitno)

{

	return 1 << (bitno & 31);

}



static void vmx_cpuid_update(struct kvm_vcpu *vcpu)

{

	struct kvm_cpuid_entry2 *best;

arch/x86/kvm/x86.c

+5 −6
Original line number Diff line number Diff line
@@ -155,11 +155,6 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { 


u64 __read_mostly host_xcr0;



static inline u32 bit(int bitno)

{

	return 1 << (bitno & 31);

}



static void kvm_on_user_return(struct user_return_notifier *urn)

{

	unsigned slot;
@@ -4569,9 +4564,11 @@ static void kvm_timer_init(void) 
#ifdef CONFIG_CPU_FREQ

		struct cpufreq_policy policy;

		memset(&policy, 0, sizeof(policy));

		cpufreq_get_policy(&policy, get_cpu());

		cpu = get_cpu();

		cpufreq_get_policy(&policy, cpu);

		if (policy.cpuinfo.max_freq)

			max_tsc_khz = policy.cpuinfo.max_freq;

		put_cpu();

#endif

		cpufreq_register_notifier(&kvmclock_cpufreq_notifier_block,

					  CPUFREQ_TRANSITION_NOTIFIER);
@@ -5522,6 +5519,8 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, 


	mmu_reset_needed |= kvm_read_cr4(vcpu) != sregs->cr4;

	kvm_x86_ops->set_cr4(vcpu, sregs->cr4);

	if (sregs->cr4 & X86_CR4_OSXSAVE)

		update_cpuid(vcpu);

	if (!is_long_mode(vcpu) && is_pae(vcpu)) {

		load_pdptrs(vcpu, vcpu->arch.walk_mmu, vcpu->arch.cr3);

		mmu_reset_needed = 1;

arch/x86/kvm/x86.h

+5 −0
Original line number Diff line number Diff line
@@ -70,6 +70,11 @@ static inline int is_paging(struct kvm_vcpu *vcpu) 
	return kvm_read_cr0_bits(vcpu, X86_CR0_PG);

}



static inline u32 bit(int bitno)

{

	return 1 << (bitno & 31);

}



void kvm_before_handle_nmi(struct kvm_vcpu *vcpu);

void kvm_after_handle_nmi(struct kvm_vcpu *vcpu);

int kvm_inject_realmode_interrupt(struct kvm_vcpu *vcpu, int irq);