From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Zijlstra Subject: Re: [PATCHv2 6/9] perf: expose perf capability to other modules. Date: Mon, 07 Nov 2011 15:07:50 +0100 Message-ID: <1320674870.18053.37.camel@twins> References: <1320323618-10375-1-git-send-email-gleb@redhat.com> <1320323618-10375-7-git-send-email-gleb@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Cc: kvm@vger.kernel.org, avi@redhat.com, mtosatti@redhat.com, linux-kernel@vger.kernel.org, mingo@elte.hu, acme@ghostprotocols.net To: Gleb Natapov Return-path: In-Reply-To: <1320323618-10375-7-git-send-email-gleb@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org On Thu, 2011-11-03 at 14:33 +0200, Gleb Natapov wrote: > @@ -1580,6 +1580,8 @@ __init int intel_pmu_init(void) > x86_pmu.num_counters = eax.split.num_counters; > x86_pmu.cntval_bits = eax.split.bit_width; > x86_pmu.cntval_mask = (1ULL << eax.split.bit_width) - 1; > + x86_pmu.events_mask = ebx; > + x86_pmu.events_mask_len = eax.split.mask_length; > > /* > * Quirk: v2 perfmon does not report fixed-purpose events, so > @@ -1651,6 +1653,7 @@ __init int intel_pmu_init(void) > * architectural event which is often completely bogus: > */ > intel_perfmon_event_map[PERF_COUNT_HW_BRANCH_MISSES] = 0x7f89; > + x86_pmu.events_mask &= ~0x40; > > pr_cont("erratum AAJ80 worked around, "); > } It might make sense to introduce cpuid10_ebx or so, also I think the removal of the branch-miss-retired event is either unwanted or incomplete. As seen software already expects that bit to be set, even though its known broken. At the very least add a full ebx iteration to disable unsupported events in the intel-v1 case.