Please take dependent commit cbd7bfc7fd99 first, then ca76d7d2812b.
On 23/09/22 20:55, gregkh@xxxxxxxxxxxxxxxxxxx wrote:
>
> The patch below does not apply to the 5.19-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@xxxxxxxxxxxxxxx>.
>
> Possible dependencies:
>
> ca76d7d2812b ("perf record: Fix cpu mask bit setting for mixed mmaps")
> cbd7bfc7fd99 ("tools/perf: Fix out of bound access to cpu mask array")
>
> thanks,
>
> greg k-h
>
> ------------------ original commit in Linus's tree ------------------
>
> From ca76d7d2812b46124291f99c9b50aaf63a936f23 Mon Sep 17 00:00:00 2001
> From: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> Date: Thu, 15 Sep 2022 15:26:11 +0300
> Subject: [PATCH] perf record: Fix cpu mask bit setting for mixed mmaps
>
> With mixed per-thread and (system-wide) per-cpu maps, the "any cpu" value
> -1 must be skipped when setting CPU mask bits.
>
> Prior to commit cbd7bfc7fd99acdd ("tools/perf: Fix out of bound access
> to cpu mask array") the invalid setting went unnoticed, but since then
> it causes perf record to fail with an error.
>
> Example:
>
> Before:
>
> $ perf record -e intel_pt// --per-thread uname
> Failed to initialize parallel data streaming masks
>
> After:
>
> $ perf record -e intel_pt// --per-thread uname
> Linux
> [ perf record: Woken up 1 times to write data ]
> [ perf record: Captured and wrote 0.068 MB perf.data ]
>
> Fixes: ae4f8ae16a078964 ("libperf evlist: Allow mixing per-thread and per-cpu mmaps")
> Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> Acked-by: Namhyung Kim <namhyung@xxxxxxxxxx>
> Cc: Athira Rajeev <atrajeev@xxxxxxxxxxxxxxxxxx>
> Cc: Ian Rogers <irogers@xxxxxxxxxx>
> Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
> Cc: stable@xxxxxxxxxxxxxxx
> Link: https://lore.kernel.org/r/20220915122612.81738-2-adrian.hunter@xxxxxxxxx
> Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
>
> diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
> index f87ef43eb820..0f711f88894c 100644
> --- a/tools/perf/builtin-record.c
> +++ b/tools/perf/builtin-record.c
> @@ -3371,6 +3371,8 @@ static int record__mmap_cpu_mask_init(struct mmap_cpu_mask *mask, struct perf_cp
> return 0;
>
> perf_cpu_map__for_each_cpu(cpu, idx, cpus) {
> + if (cpu.cpu == -1)
> + continue;
> /* Return ENODEV is input cpu is greater than max cpu */
> if ((unsigned long)cpu.cpu > mask->nbits)
> return -ENODEV;
>
