Re: [PATCH v7 00/10] perf record --off-cpu: Dump off-cpu samples directly

[Arnaldo Carvalho de Melo <acme@kernel.org>]

On Tue, Nov 12, 2024 at 04:18:45PM -0300, Arnaldo Carvalho de Melo wrote:
> On Tue, Nov 12, 2024 at 04:18:27PM -0300, Arnaldo Carvalho de Melo wrote:
> > On Tue, Nov 12, 2024 at 04:17:24PM -0300, Arnaldo Carvalho de Melo wrote:
> > > On Tue, Nov 12, 2024 at 03:39:25PM -0300, Arnaldo Carvalho de Melo wrote:
> > > make: *** [Makefile:119: install-bin] Error 2
> > > make: Leaving directory '/home/acme/git/perf-tools-next/tools/perf'
> > > ⬢ [acme@toolbox perf-tools-next]$
> > > 
> > > I squashed the patch below and I'm trying to apply the other patches to do some
> > > minimal testing on the feature itself, but the organization of the
> > > patches needs some work.
> > 
> > Fails a few patches later, trying to fix it.
> 
> Sorry, forgot to add it:
> 
> ⬢ [acme@toolbox perf-tools-next]$        git am ./v7_20241108_howardchu95_perf_record_off_cpu_dump_off_cpu_samples_directly.mbx
> Applying: perf evsel: Assemble offcpu samples
> Applying: perf record --off-cpu: Disable perf_event's callchain collection
> Applying: perf script: Display off-cpu samples correctly
> Applying: perf record --off-cpu: Dump the remaining samples in BPF's stack trace map
> error: patch failed: tools/perf/util/bpf_off_cpu.c:61
> error: tools/perf/util/bpf_off_cpu.c: patch does not apply
> Patch failed at 0004 perf record --off-cpu: Dump the remaining samples in BPF's stack trace map
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> hint: When you have resolved this problem, run "git am --continue".
> hint: If you prefer to skip this patch, run "git am --skip" instead.
> hint: To restore the original branch and stop patching, run "git am --abort".
> hint: Disable this message with "git config advice.mergeConflict false"
> ⬢ [acme@toolbox perf-tools-next]$

So now its just a fallout from the fix on a previous patch, I'm patching
it up:

⬢ [acme@toolbox perf-tools-next]$ vim ./v7_20241108_howardchu95_perf_record_off_cpu_dump_off_cpu_samples_directly.mbx
⬢ [acme@toolbox perf-tools-next]$ patch -p1 < ./v7_20241108_howardchu95_perf_record_off_cpu_dump_off_cpu_samples_directly.mbx
patching file tools/perf/util/bpf_off_cpu.c
Hunk #2 FAILED at 63.
Hunk #3 succeeded at 311 (offset 5 lines).
Hunk #4 succeeded at 351 (offset 5 lines).
1 out of 4 hunks FAILED -- saving rejects to file tools/perf/util/bpf_off_cpu.c.rej
⬢ [acme@toolbox perf-tools-next]$ 
⬢ [acme@toolbox perf-tools-next]$ vim tools/perf/util/bpf_off_cpu.c.rej
⬢ [acme@toolbox perf-tools-next]$ cat tools/perf/util/bpf_off_cpu.c.rej
--- tools/perf/util/bpf_off_cpu.c
+++ tools/perf/util/bpf_off_cpu.c
@@ -63,6 +65,9 @@ static int off_cpu_config(struct evlist *evlist)
 static void off_cpu_start(void *arg)
 {
 	struct evlist *evlist = arg;
+	struct evsel *evsel;
+	struct perf_cpu pcpu;
+	int i, err;
 
 	/* update task filter for the given workload */
 	if (skel->rodata->has_task && skel->rodata->uses_tgid &&
⬢ [acme@toolbox perf-tools-next]$