Re: [PATCH] perf trace: Fix wrong size to bpf_map__update_elem call

[Howard Chu <howardchu95@gmail.com>]

On Mon, Mar 24, 2025 at 04:27:56PM +0100, Thomas Richter wrote:
> In linux-next
> commit c760174401f6 ("perf cpumap: Reduce cpu size from int to int16_t")
> causes the perf tests 100 126 to fail on s390:
>
> Output before:
>  # ./perf test 100
>  100: perf trace BTF general tests         : FAILED!

Arnaldo encountered similar failure, but I couldn't reproduce it, so the
fix was stalled.

>  #
>
> The root cause is the change from int to int16_t for the
> cpu maps. The size of the CPU key value pair changes from
> four bytes to two bytes. However a two byte key size is
> not supported for bpf_map__update_elem().
> Note: validate_map_op() in libbpf.c emits warning
>  libbpf: map '__augmented_syscalls__': \
>        unexpected key size 2 provided, expected 4
> when key size is set to int16_t.
>
> Therefore change to variable size back to 4 bytes for
> invocation of bpf_map__update_elem().

Makes sense, thank you so much for digging into this and fixing it.

>
> Output after:
>  # ./perf test 100
>  100: perf trace BTF general tests         : Ok
>  #
>
> Fixes: c760174401f6 ("perf cpumap: Reduce cpu size from int to int16_t")
> Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
> Cc: Ian Rogers <irogers@google.com>
> Cc: James Clark <james.clark@linaro.org>
> ---
>  tools/perf/builtin-trace.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
> index 092c5f6404ba..464c97a11852 100644
> --- a/tools/perf/builtin-trace.c
> +++ b/tools/perf/builtin-trace.c
> @@ -4375,10 +4375,12 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
>                * CPU the bpf-output event's file descriptor.
>                */
>               perf_cpu_map__for_each_cpu(cpu, i, trace->syscalls.events.bpf_output->core.cpus) {
> +                     int mycpu = cpu.cpu;
> +
>                       bpf_map__update_elem(trace->skel->maps.__augmented_syscalls__,
> -                                     &cpu.cpu, sizeof(int),
> +                                     &mycpu, sizeof(int),
>                                       xyarray__entry(trace->syscalls.events.bpf_output->core.fd,
> -                                                    cpu.cpu, 0),
> +                                                    mycpu, 0),
>                                       sizeof(__u32), BPF_ANY);
>               }
>       }
> --
> 2.48.1
>
>

Acked-by: Howard Chu <howardchu95@gmail.com>

Thanks,
Howard