Re: [PATCH v6 1/8] perf/core: Allow multiple AUX PMU events with the same module

From: Leo Yan
Date: Fri Aug 23 2024 - 07:41:08 EST


Hi Peter, Adrian,

On 8/23/2024 12:32 PM, Leo Yan wrote:
>
> This commit changes the condition from checking the same PMU instance to
> checking the same .setup_aux() callback pointer. If PMU events have the
> same callback pointer, it means they share the same PMU driver module.
> This allows support for multiple PMU events with the same driver module.
>
> As a result, more than one AUX event (e.g. arm_spe_0 and arm_spe_1)
> can record trace into the AUX ring buffer.

This patch is the only change in the kernel, so it is crucial for this
series. Can I get your opinion? Thanks a lot!

Leo

> Signed-off-by: Leo Yan <leo.yan@xxxxxxx>
> ---
> kernel/events/core.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/events/core.c b/kernel/events/core.c
> index c973e3c11e03..883c457911a3 100644
> --- a/kernel/events/core.c
> +++ b/kernel/events/core.c
> @@ -12345,9 +12345,16 @@ perf_event_set_output(struct perf_event *event, struct perf_event *output_event)
>
> /*
> * If both events generate aux data, they must be on the same PMU
> + * module but can be with different PMU instances.
> + *
> + * For a built-in PMU module, the 'pmu->module' pointer is NULL,
> + * thus it is not feasible to compare the module pointers when
> + * AUX PMU drivers are built into the kernel image. Instead,
> + * comparing the .setup_aux() callback pointer can determine if
> + * the two PMU events come from the same PMU driver.
> */
> if (has_aux(event) && has_aux(output_event) &&
> - event->pmu != output_event->pmu)
> + event->pmu->setup_aux != output_event->pmu->setup_aux)
> goto out;
>
> /*
> --
> 2.34.1
>