From: Song Liu <songliubraving@fb.com>
To: Peter Zijlstra <peterz@infradead.org>
Cc: "bpf@vger.kernel.org" <bpf@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"acme@kernel.org" <acme@kernel.org>,
"mingo@redhat.com" <mingo@redhat.com>,
"kjain@linux.ibm.com" <kjain@linux.ibm.com>,
Kernel Team <Kernel-team@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
"Andrii Nakryiko" <andrii@kernel.org>
Subject: Re: [PATCH v6 bpf-next 1/3] perf: enable branch record for software events
Date: Fri, 10 Sep 2021 18:27:36 +0000 [thread overview]
Message-ID: <96445733-055E-41E3-986B-5E1DC04ADEFA@fb.com> (raw)
In-Reply-To: <YTtjeyfJXXiDielu@hirez.programming.kicks-ass.net>
> On Sep 10, 2021, at 6:54 AM, Peter Zijlstra <peterz@infradead.org> wrote:
>
> On Fri, Sep 10, 2021 at 12:40:51PM +0200, Peter Zijlstra wrote:
>
>> The below seems to cure that.
>
> Seems I lost a hunk, fold below.
>
> diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c
> index 9e6d6eaeb4cb..6b72e9b55c69 100644
> --- a/arch/x86/events/intel/lbr.c
> +++ b/arch/x86/events/intel/lbr.c
> @@ -228,20 +228,6 @@ static void __intel_pmu_lbr_enable(bool pmi)
> wrmsrl(MSR_ARCH_LBR_CTL, lbr_select | ARCH_LBR_CTL_LBREN);
> }
>
> -static void __intel_pmu_lbr_disable(void)
> -{
> - u64 debugctl;
> -
> - if (static_cpu_has(X86_FEATURE_ARCH_LBR)) {
> - wrmsrl(MSR_ARCH_LBR_CTL, 0);
> - return;
> - }
> -
> - rdmsrl(MSR_IA32_DEBUGCTLMSR, debugctl);
> - debugctl &= ~(DEBUGCTLMSR_LBR | DEBUGCTLMSR_FREEZE_LBRS_ON_PMI);
> - wrmsrl(MSR_IA32_DEBUGCTLMSR, debugctl);
> -}
> -
> void intel_pmu_lbr_reset_32(void)
> {
> int i;
> @@ -779,8 +765,12 @@ void intel_pmu_lbr_disable_all(void)
> {
> struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);
>
> - if (cpuc->lbr_users && !vlbr_exclude_host())
> + if (cpuc->lbr_users && !vlbr_exclude_host()) {
> + if (static_cpu_has(X86_FEATURE_ARCH_LBR))
> + return __intel_pmu_arch_lbr_disable();
> +
> __intel_pmu_lbr_disable();
> + }
> }
>
> void intel_pmu_lbr_read_32(struct cpu_hw_events *cpuc)
This works great and saves 3 entries! We have the following now:
ID: 0 from bpf_get_branch_snapshot+18 to intel_pmu_snapshot_branch_stack+0
ID: 1 from __brk_limit+477143934 to bpf_get_branch_snapshot+0
ID: 2 from __brk_limit+477192263 to __brk_limit+477143880 # trampoline
ID: 3 from __bpf_prog_enter+34 to __brk_limit+477192251
ID: 4 from migrate_disable+60 to __bpf_prog_enter+9
ID: 5 from __bpf_prog_enter+4 to migrate_disable+0
ID: 6 from bpf_testmod_loop_test+20 to __bpf_prog_enter+0
ID: 7 from bpf_testmod_loop_test+20 to bpf_testmod_loop_test+13
ID: 8 from bpf_testmod_loop_test+20 to bpf_testmod_loop_test+13
I will fold this in and send v7.
Thanks,
Song
next prev parent reply other threads:[~2021-09-10 18:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-07 20:27 [PATCH v6 bpf-next 0/3] bpf: introduce bpf_get_branch_snapshot Song Liu
2021-09-07 20:28 ` [PATCH v6 bpf-next 1/3] perf: enable branch record for software events Song Liu
2021-09-10 10:40 ` Peter Zijlstra
2021-09-10 13:54 ` Peter Zijlstra
2021-09-10 18:27 ` Song Liu [this message]
2021-09-10 18:40 ` Peter Zijlstra
2021-09-10 18:50 ` Peter Zijlstra
2021-09-10 19:00 ` Song Liu
2021-09-10 19:08 ` Peter Zijlstra
2021-09-10 19:11 ` Song Liu
2021-09-10 18:51 ` Song Liu
2021-09-07 20:28 ` [PATCH v6 bpf-next 2/3] bpf: introduce helper bpf_get_branch_snapshot Song Liu
2021-09-07 20:28 ` [PATCH v6 bpf-next 3/3] selftests/bpf: add test for bpf_get_branch_snapshot Song Liu
2021-09-07 20:29 ` [PATCH v6 bpf-next 0/3] bpf: introduce bpf_get_branch_snapshot Song Liu
2021-09-07 20:58 ` Andrii Nakryiko
2021-09-09 21:53 ` Song Liu
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=96445733-055E-41E3-986B-5E1DC04ADEFA@fb.com \
--to=songliubraving@fb.com \
--cc=Kernel-team@fb.com \
--cc=acme@kernel.org \
--cc=andrii@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=john.fastabend@gmail.com \
--cc=kjain@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).