From: Adrian Hunter <adrian.hunter@intel.com>

Date: Wed, 15 Dec 2021 10:06:35 +0200

Subject: perf script: Fix CPU filtering of a script's switch events

Git-commit: 5e0c325cdb714409a5b242c9e73a1b61157abb36

Patch-mainline: v5.16-rc8

References: git-fixes

​

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: Tony Jones <tonyj@suse.de>

---

 tools/perf/builtin-script.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

​

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c

index 9434367af166..c82b033e8942 100644

--- a/tools/perf/builtin-script.c

+++ b/tools/perf/builtin-script.c

@@ -2473,7 +2473,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)

​

​