Skip to content

Commit 3cb3c2f

Browse files
author
Peter Zijlstra
committed
perf: Clean up mediated vPMU accounting
The mediated_pmu_account_event() and perf_create_mediated_pmu() functions implement the exclusion between '!exclude_guest' counters and mediated vPMUs. Their implementation is basically identical, except mirrored in what they count/check. Make sure the actual implementations reflect this similarity. Notably: - while perf_release_mediated_pmu() has an underflow check; mediated_pmu_unaccount_event() did not. - while perf_create_mediated_pmu() has an inc_not_zero() path; mediated_pmu_account_event() did not. Also, the inc_not_zero() path can be outsite of perf_mediated_pmu_mutex. The mutex must guard the 0->1 (of either nr_include_guest_events or nr_mediated_pmu_vms) transition, but once a counter is already non-zero, it can safely be incremented further. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://patch.msgid.link/20251208115156.GE3707891@noisy.programming.kicks-ass.net
1 parent 3006911 commit 3cb3c2f

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

kernel/events/core.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6344,8 +6344,10 @@ static int mediated_pmu_account_event(struct perf_event *event)
63446344
if (!is_include_guest_event(event))
63456345
return 0;
63466346

6347-
guard(mutex)(&perf_mediated_pmu_mutex);
6347+
if (atomic_inc_not_zero(&nr_include_guest_events))
6348+
return 0;
63486349

6350+
guard(mutex)(&perf_mediated_pmu_mutex);
63496351
if (atomic_read(&nr_mediated_pmu_vms))
63506352
return -EOPNOTSUPP;
63516353

@@ -6358,6 +6360,9 @@ static void mediated_pmu_unaccount_event(struct perf_event *event)
63586360
if (!is_include_guest_event(event))
63596361
return;
63606362

6363+
if (WARN_ON_ONCE(!atomic_read(&nr_include_guest_events)))
6364+
return;
6365+
63616366
atomic_dec(&nr_include_guest_events);
63626367
}
63636368

@@ -6373,10 +6378,10 @@ static void mediated_pmu_unaccount_event(struct perf_event *event)
63736378
*/
63746379
int perf_create_mediated_pmu(void)
63756380
{
6376-
guard(mutex)(&perf_mediated_pmu_mutex);
63776381
if (atomic_inc_not_zero(&nr_mediated_pmu_vms))
63786382
return 0;
63796383

6384+
guard(mutex)(&perf_mediated_pmu_mutex);
63806385
if (atomic_read(&nr_include_guest_events))
63816386
return -EBUSY;
63826387

0 commit comments

Comments
 (0)