Skip to contentSkip to conversation

perf/x86/vlbr: Add c->flags to vlbr event constraints

PATCH Applied Like Xu 3 participants 3 messages Nov 3, 2021 – Nov 11, 2021

Subsystems (2)
lore
Share & tools
lore

Like Xu

author
#0 lore raw

PATCH 1/1 perf/x86/vlbr: Add c->flags to vlbr event constraints

From: Like Xu <[email protected]>

Just like what we do in the x86_get_event_constraints(), the PERF_X86_EVENT_LBR_SELECT flag should also be propagated to event->hw.flags so that the host lbr driver can save/restore MSR_LBR_SELECT for the special vlbr event created by KVM or BPF.

Fixes 097e4311cda9 ("perf/x86: Add constraint to create guest LBR event without hw counter")
---
 arch/x86/events/intel/core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/events/intel/core.c +3 -1
index 7011e87be6d0..30b5d1b3cb03 100644
@@ -2997,8 +2997,10 @@ intel_vlbr_constraints(struct perf_event *event)
 {
 	struct event_constraint *c = &vlbr_constraint;
 
-	if (unlikely(constraint_match(c, event->hw.config)))
+	if (unlikely(constraint_match(c, event->hw.config))) {
+		event->hw.flags |= c->flags;
 		return c;
+	}
 
 	return NULL;
 }
Signature · 1 line
2.33.0
Tested-by on v1 1/1
#1 lore raw
Quoted 11 lines · Like Xu

From: Like Xu <[email protected]>

Just like what we do in the x86_get_event_constraints(), the PERF_X86_EVENT_LBR_SELECT flag should also be propagated to event->hw.flags so that the host lbr driver can save/restore MSR_LBR_SELECT for the special vlbr event created by KVM or BPF.

Fixes 097e4311cda9 ("perf/x86: Add constraint to create guest LBR event without hw counter")
merge bot Applied
#2 lore raw
In reply to Like Xu
The following commit has been merged into the perf/urgent branch of tip:

The following commit has been merged into the perf/urgent branch of tip:

Commit-ID:     5863702561e625903ec678551cb056a4b19e0b8a
Gitweb:        https://git.kernel.org/tip/5863702561e625903ec678551cb056a4b19e0b8a
Author:        Like Xu <[email protected]>
AuthorDate:    Wed, 03 Nov 2021 17:17:16 +08:00
Committer:     Peter Zijlstra <[email protected]>
CommitterDate: Thu, 11 Nov 2021 13:09:34 +01:00

perf/x86/vlbr: Add c->flags to vlbr event constraints

Just like what we do in the x86_get_event_constraints(), the PERF_X86_EVENT_LBR_SELECT flag should also be propagated to event->hw.flags so that the host lbr driver can save/restore MSR_LBR_SELECT for the special vlbr event created by KVM or BPF.

Fixes 097e4311cda9 ("perf/x86: Add constraint to create guest LBR event without hw counter")
---
 arch/x86/events/intel/core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/events/intel/core.c +3 -1
index 6039644..42cf01e 100644
@@ -3048,8 +3048,10 @@ intel_vlbr_constraints(struct perf_event *event)
 {
 	struct event_constraint *c = &vlbr_constraint;
 
-	if (unlikely(constraint_match(c, event->hw.config)))
+	if (unlikely(constraint_match(c, event->hw.config))) {
+		event->hw.flags |= c->flags;
 		return c;
+	}
 
 	return NULL;
 }