correctly mask pmc index bits in RDPMC instruction emulation

PATCH Applied Gleb Natapov 2 participants 2 messages Feb 16, 2012

Subsystems (3)

x86 KVM KVM x86

lore

Share & tools

lore

Gleb Natapov

author

2012-02-16 12:44 UTC #0 lore raw

PATCH 1/1 correctly mask pmc index bits in RDPMC instruction emulation

Signed-off-by Gleb Natapov <[email protected]>

arch/x86/kvm/pmu.c +1 -1

index 7aad544..3e48c1d 100644
@@ -413,7 +413,7 @@ int kvm_pmu_read_pmc(struct kvm_vcpu *vcpu, unsigned pmc, u64 *data)
 	struct kvm_pmc *counters;
 	u64 ctr;
 
-	pmc &= (3u << 30) - 1;
+	pmc &= ~(3u << 30);
 	if (!fixed && pmc >= pmu->nr_arch_gp_counters)
 		return 1;
 	if (fixed && pmc >= pmu->nr_arch_fixed_counters)

--
Gleb.

Avi Kivity

Applied

2012-02-16 16:10 UTC #1 lore raw

Quoted 2 lines · Gleb Natapov

Signed-off-by Gleb Natapov <[email protected]>

Thanks, applied and queued for 3.3

Signature · 1 line

error compiling committee.c: too many arguments to function