perf script: Fix CPU filtering of a script's switch events
authorAdrian Hunter <adrian.hunter@intel.com>
Wed, 15 Dec 2021 08:06:35 +0000 (10:06 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 5 Jan 2022 11:42:39 +0000 (12:42 +0100)
commit 5e0c325cdb714409a5b242c9e73a1b61157abb36 upstream.

CPU filtering was not being applied to a script's switch events.

Fixes: 5bf83c29a0ad2e78 ("perf script: Add scripting operation process_switch()")
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20211215080636.149562-3-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
tools/perf/builtin-script.c

index c32c2eb..18b5625 100644 (file)
@@ -2463,7 +2463,7 @@ static int process_switch_event(struct perf_tool *tool,
        if (perf_event__process_switch(tool, event, sample, machine) < 0)
                return -1;
 
-       if (scripting_ops && scripting_ops->process_switch)
+       if (scripting_ops && scripting_ops->process_switch && !filter_cpu(sample))
                scripting_ops->process_switch(event, sample, machine);
 
        if (!script->show_switch_events)