public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Stephane Eranian <eranian@google.com>
To: linux-kernel@vger.kernel.org
Cc: peterz@infradead.org, kim.phillips@amd.com, acme@redhat.com,
	jolsa@redhat.com, songliubraving@fb.com
Subject: [PATCH v5 05/13] perf/x86/amd: enable branch sampling priv level filtering
Date: Wed, 26 Jan 2022 15:34:46 -0800	[thread overview]
Message-ID: <20220126233454.3362047-6-eranian@google.com> (raw)
In-Reply-To: <20220126233454.3362047-1-eranian@google.com>

The AMD Branch Sampling features does not provide hardware filtering by
privilege level. The associated PMU counter does but not the branch sampling
by itself. Given how BRS operates there is a possibility that BRS captures
kernel level branches even though the event is programmed to count only at
the user level. This patch implements a workaround in software by removing
the branches which belong to the wrong privilege level. The privilege level
is evaluated on the target of the branch and not the source so as to be
compatible with other architectures. As a consequence of this patch, the
number of entries in the PERF_RECORD_BRANCH_STACK buffer may be less than
the maximum (16).  It could even be zero. Another consequence is that
consecutive entries in the branch stack may not reflect actual code path and
may have discontinuities, in case kernel branches were suppressed. But this
is no different than what happens on other architectures.

Signed-off-by: Stephane Eranian <eranian@google.com>
---
 arch/x86/events/amd/brs.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/arch/x86/events/amd/brs.c b/arch/x86/events/amd/brs.c
index 3c13c484c637..40461c3ce714 100644
--- a/arch/x86/events/amd/brs.c
+++ b/arch/x86/events/amd/brs.c
@@ -92,10 +92,6 @@ int amd_brs_setup_filter(struct perf_event *event)
 	if ((type & ~PERF_SAMPLE_BRANCH_PLM_ALL) != PERF_SAMPLE_BRANCH_ANY)
 		return -EINVAL;
 
-	/* can only capture at all priv levels due to the way BRS works */
-	if ((type & PERF_SAMPLE_BRANCH_PLM_ALL) != PERF_SAMPLE_BRANCH_PLM_ALL)
-		return -EINVAL;
-
 	return 0;
 }
 
@@ -195,6 +191,21 @@ void amd_brs_disable_all(void)
 		amd_brs_disable();
 }
 
+static bool amd_brs_match_plm(struct perf_event *event, u64 to)
+{
+	int type = event->attr.branch_sample_type;
+	int plm_k = PERF_SAMPLE_BRANCH_KERNEL | PERF_SAMPLE_BRANCH_HV;
+	int plm_u = PERF_SAMPLE_BRANCH_USER;
+
+	if (!(type & plm_k) && kernel_ip(to))
+		return 0;
+
+	if (!(type & plm_u) && !kernel_ip(to))
+		return 0;
+
+	return 1;
+}
+
 /*
  * Caller must ensure amd_brs_inuse() is true before calling
  * return:
@@ -252,8 +263,6 @@ void amd_brs_drain(void)
 		if (to == BRS_POISON)
 			break;
 
-		rdmsrl(brs_from(brs_idx), from);
-
 		/*
 		 * Sign-extend SAMP_BR_TO to 64 bits, bits 61-63 are reserved.
 		 * Necessary to generate proper virtual addresses suitable for
@@ -261,6 +270,11 @@ void amd_brs_drain(void)
 		 */
 		to = (u64)(((s64)to << shift) >> shift);
 
+		if (!amd_brs_match_plm(event, to))
+			continue;
+
+		rdmsrl(brs_from(brs_idx), from);
+
 		perf_clear_branch_entry_bitfields(br+nr);
 
 		br[nr].from = from;
-- 
2.35.0.rc0.227.g00780c9af4-goog


  parent reply	other threads:[~2022-01-26 23:35 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-26 23:34 [PATCH v5 00/14] perf/x86/amd: Add AMD Fam19h Branch Sampling support Stephane Eranian
2022-01-26 23:34 ` [PATCH v5 01/13] perf/core: add perf_clear_branch_entry_bitfields() helper Stephane Eranian
2022-01-26 23:34 ` [PATCH v5 02/13] x86/cpufeatures: add AMD Fam19h Branch Sampling feature Stephane Eranian
2022-01-26 23:34 ` [PATCH v5 03/13] perf/x86/amd: add AMD Fam19h Branch Sampling support Stephane Eranian
2022-01-26 23:34 ` [PATCH v5 04/13] perf/x86/amd: add branch-brs helper event for Fam19h BRS Stephane Eranian
2022-01-26 23:34 ` Stephane Eranian [this message]
2022-01-26 23:34 ` [PATCH v5 06/13] perf/x86/amd: add AMD branch sampling period adjustment Stephane Eranian
2022-01-26 23:34 ` [PATCH v5 07/13] perf/x86/amd: make Zen3 branch sampling opt-in Stephane Eranian
2022-01-27 12:51   ` Peter Zijlstra
2022-02-01  7:28     ` Stephane Eranian
2022-01-26 23:34 ` [PATCH v5 08/13] ACPI: add perf low power callback Stephane Eranian
2022-01-27 13:06   ` Peter Zijlstra
2022-02-01  7:33     ` Stephane Eranian
2022-02-01 10:20       ` Peter Zijlstra
2022-01-26 23:34 ` [PATCH v5 09/13] perf/x86/amd: add idle hooks for branch sampling Stephane Eranian
2022-01-27 13:07   ` Peter Zijlstra
2022-02-01  7:34     ` Stephane Eranian
2022-01-26 23:34 ` [PATCH v5 10/13] perf evsel: Make evsel__env always return a valid env Stephane Eranian
2022-01-26 23:34 ` [PATCH v5 11/13] perf tools: Improve IBS error handling Stephane Eranian
2022-01-26 23:34 ` [PATCH v5 12/13] perf tools: Improve error handling of AMD Branch Sampling Stephane Eranian
2022-01-26 23:34 ` [PATCH v5 13/13] perf report: add addr_from/addr_to sort dimensions Stephane Eranian

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=20220126233454.3362047-6-eranian@google.com \
    --to=eranian@google.com \
    --cc=acme@redhat.com \
    --cc=jolsa@redhat.com \
    --cc=kim.phillips@amd.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=peterz@infradead.org \
    --cc=songliubraving@fb.com \
    /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