From: Andi Kleen <andi@firstfloor.org> To: peterz@infradead.org Cc: linux-kernel@vger.kernel.org, Andi Kleen <ak@linux.intel.com>, alexander.shishkin@intel.com, kan.liang@intel.com, stable@vger.kernel.org Subject: [PATCH] perf/x86: Fix exclusion of BTS and LBR for Goldmont Date: Thu, 8 Dec 2016 16:14:17 -0800 Message-ID: <20161209001417.4713-1-andi@firstfloor.org> (raw) From: Andi Kleen <ak@linux.intel.com> An earlier patch allowed enabling PT and LBR at the same time on Goldmont. However it also allowed enabling BTS and LBR at the same time, which is still not supported. Fix this by bypassing the check only for PT. Marking for stable because this allows crashing kernels. Also should be merged for 4.9. Fixes: ccbebba4c6bf ("erf/x86/intel/pt: Bypass PT vs. LBR exclusivity if the core supports it") Cc: alexander.shishkin@intel.com Cc: kan.liang@intel.com Cc: <stable@vger.kernel.org> v2: Paint bike shed differently. Signed-off-by: Andi Kleen <ak@linux.intel.com> --- arch/x86/events/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c index d0efb5cb1b00..baa1eed55e88 100644 --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c @@ -364,7 +364,7 @@ int x86_add_exclusive(unsigned int what) { int i; - if (x86_pmu.lbr_pt_coexist) + if (what == x86_lbr_exclusive_pt && x86_pmu.lbr_pt_coexist) return 0; if (!atomic_inc_not_zero(&x86_pmu.lbr_exclusive[what])) { @@ -387,7 +387,7 @@ fail_unlock: void x86_del_exclusive(unsigned int what) { - if (x86_pmu.lbr_pt_coexist) + if (what == x86_lbr_exclusive_pt && x86_pmu.lbr_pt_coexist) return; atomic_dec(&x86_pmu.lbr_exclusive[what]); -- 2.9.3
next reply index Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-12-09 0:14 Andi Kleen [this message] 2016-12-09 15:49 ` Peter Zijlstra 2016-12-12 6:49 ` [tip:perf/core] " tip-bot for Andi Kleen -- strict thread matches above, loose matches on Subject: below -- 2016-12-02 23:17 [PATCH] " Andi Kleen 2016-12-06 12:38 ` Peter Zijlstra 2016-12-06 14:53 ` Andi Kleen
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20161209001417.4713-1-andi@firstfloor.org \ --to=andi@firstfloor.org \ --cc=ak@linux.intel.com \ --cc=alexander.shishkin@intel.com \ --cc=kan.liang@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=peterz@infradead.org \ --cc=stable@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
LKML Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git git clone --mirror https://lore.kernel.org/lkml/7 lkml/git/7.git git clone --mirror https://lore.kernel.org/lkml/8 lkml/git/8.git git clone --mirror https://lore.kernel.org/lkml/9 lkml/git/9.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 lkml lkml/ https://lore.kernel.org/lkml \ linux-kernel@vger.kernel.org public-inbox-index lkml Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kernel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git