Commit f19a0c2c authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: PMU emulation: GLOBAL_CTRL MSR should be enabled on reset 



On reset all MPU counters should be enabled in GLOBAL_CTRL MSR.

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 00341028

arch/x86/kvm/pmu.c

+9 −9
Original line number Original line Diff line number Diff line
@@ -459,17 +459,17 @@ void kvm_pmu_cpuid_update(struct kvm_vcpu *vcpu) 
	pmu->available_event_types = ~entry->ebx & ((1ull << bitmap_len) - 1);

	pmu->available_event_types = ~entry->ebx & ((1ull << bitmap_len) - 1);





	if (pmu->version == 1) {

	if (pmu->version == 1) {

		pmu->global_ctrl = (1 << pmu->nr_arch_gp_counters) - 1;

		pmu->nr_arch_fixed_counters = 0;

		return;

	} else {

	}



		pmu->nr_arch_fixed_counters = min((int)(entry->edx & 0x1f),

		pmu->nr_arch_fixed_counters = min((int)(entry->edx & 0x1f),

				X86_PMC_MAX_FIXED);

				X86_PMC_MAX_FIXED);

		pmu->counter_bitmask[KVM_PMC_FIXED] =

		pmu->counter_bitmask[KVM_PMC_FIXED] =

			((u64)1 << ((entry->edx >> 5) & 0xff)) - 1;

			((u64)1 << ((entry->edx >> 5) & 0xff)) - 1;

	pmu->global_ctrl_mask = ~(((1 << pmu->nr_arch_gp_counters) - 1)

	}

			| (((1ull << pmu->nr_arch_fixed_counters) - 1)



				<< X86_PMC_IDX_FIXED));

	pmu->global_ctrl = ((1 << pmu->nr_arch_gp_counters) - 1) |

		(((1ull << pmu->nr_arch_fixed_counters) - 1) << X86_PMC_IDX_FIXED);

	pmu->global_ctrl_mask = ~pmu->global_ctrl;

}

}





void kvm_pmu_init(struct kvm_vcpu *vcpu)

void kvm_pmu_init(struct kvm_vcpu *vcpu)