]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop perf-report-fix-task-and-stat-with-pipe-input.patch from everywhere
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 06:22:29 +0000 (08:22 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 06:22:29 +0000 (08:22 +0200)
queue-4.19/perf-report-fix-task-and-stat-with-pipe-input.patch [deleted file]
queue-4.19/series
queue-5.10/perf-report-fix-task-and-stat-with-pipe-input.patch [deleted file]
queue-5.10/series
queue-5.12/perf-report-fix-task-and-stat-with-pipe-input.patch [deleted file]
queue-5.12/series
queue-5.13/perf-report-fix-task-and-stat-with-pipe-input.patch [deleted file]
queue-5.13/series
queue-5.4/perf-report-fix-task-and-stat-with-pipe-input.patch [deleted file]
queue-5.4/series

diff --git a/queue-4.19/perf-report-fix-task-and-stat-with-pipe-input.patch b/queue-4.19/perf-report-fix-task-and-stat-with-pipe-input.patch
deleted file mode 100644 (file)
index 0e694c5..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-From 2cb07609c8da3a223f308779ebad3072d825dce1 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 29 Jun 2021 21:30:58 -0700
-Subject: perf report: Fix --task and --stat with pipe input
-
-From: Namhyung Kim <namhyung@kernel.org>
-
-[ Upstream commit 892ba7f18621a02af4428c58d97451f64685dba4 ]
-
-Current 'perf report' fails to process a pipe input when --task or
---stat options are used.  This is because they reset all the tool
-callbacks and fails to find a matching event for a sample.
-
-When pipe input is used, the event info is passed via ATTR records so it
-needs to handle that operation.  Otherwise the following error occurs.
-Note, -14 (= -EFAULT) comes from evlist__parse_sample():
-
-  # perf record -a -o- sleep 1 | perf report -i- --stat
-  Can't parse sample, err = -14
-  0x271044 [0x38]: failed to process type: 9
-  Error:
-  failed to process sample
-  #
-
-Committer testing:
-
-Before:
-
-  $ perf record -o- sleep 1 | perf report -i- --stat
-  Can't parse sample, err = -14
-  [ perf record: Woken up 1 times to write data ]
-  0x1350 [0x30]: failed to process type: 9
-  Error:
-  failed to process sample
-  [ perf record: Captured and wrote 0.000 MB - ]
-  $
-
-After:
-
-  $ perf record -o- sleep 1 | perf report -i- --stat
-  [ perf record: Woken up 1 times to write data ]
-  [ perf record: Captured and wrote 0.000 MB - ]
-
-  Aggregated stats:
-             TOTAL events:         41
-              COMM events:          2  ( 4.9%)
-              EXIT events:          1  ( 2.4%)
-            SAMPLE events:          9  (22.0%)
-             MMAP2 events:          4  ( 9.8%)
-              ATTR events:          1  ( 2.4%)
-    FINISHED_ROUND events:          1  ( 2.4%)
-        THREAD_MAP events:          1  ( 2.4%)
-           CPU_MAP events:          1  ( 2.4%)
-      EVENT_UPDATE events:          1  ( 2.4%)
-         TIME_CONV events:          1  ( 2.4%)
-           FEATURE events:         19  (46.3%)
-  cycles:uhH stats:
-            SAMPLE events:          9
-  $
-
-Fixes: a4a4d0a7a2b20f78 ("perf report: Add --stats option to display quick data statistics")
-Signed-off-by: Namhyung Kim <namhyung@kernel.org>
-Acked-by: Jiri Olsa <jolsa@redhat.com>
-Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Cc: Andi Kleen <ak@linux.intel.com>
-Cc: Ian Rogers <irogers@google.com>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Link: http://lore.kernel.org/lkml/20210630043058.1131295-1-namhyung@kernel.org
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/builtin-report.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
-index 05eae94d09cb..dea7ed3fb0a4 100644
---- a/tools/perf/builtin-report.c
-+++ b/tools/perf/builtin-report.c
-@@ -634,9 +634,14 @@ static void report__output_resort(struct report *rep)
-       ui_progress__finish();
- }
-+static int process_attr(struct perf_tool *tool __maybe_unused,
-+                      union perf_event *event,
-+                      struct evlist **pevlist);
-+
- static void stats_setup(struct report *rep)
- {
-       memset(&rep->tool, 0, sizeof(rep->tool));
-+      rep->tool.attr = process_attr;
-       rep->tool.no_warn = true;
- }
-@@ -656,6 +661,7 @@ static void tasks_setup(struct report *rep)
-               rep->tool.mmap = perf_event__process_mmap;
-               rep->tool.mmap2 = perf_event__process_mmap2;
-       }
-+      rep->tool.attr = process_attr;
-       rep->tool.comm = perf_event__process_comm;
-       rep->tool.exit = perf_event__process_exit;
-       rep->tool.fork = perf_event__process_fork;
--- 
-2.30.2
-
index 43ba6ebcf85288e13f782160e0e2c88268977349..68bbfe0e2e647ecd67d39896cae091c97ff0c395 100644 (file)
@@ -414,7 +414,6 @@ arm-dts-imx6q-dhcom-add-gpios-pinctrl-for-i2c-bus-re.patch
 scsi-be2iscsi-fix-an-error-handling-path-in-beiscsi_.patch
 mips-always-link-byteswap-helpers-into-decompressor.patch
 mips-disable-branch-profiling-in-boot-decompress.o.patch
-perf-report-fix-task-and-stat-with-pipe-input.patch
 mips-vdso-invalid-gic-access-through-vdso.patch
 net-bridge-multicast-fix-pim-hello-router-port-marking-race.patch
 scsi-scsi_dh_alua-fix-signedness-bug-in-alua_rtpg.patch
diff --git a/queue-5.10/perf-report-fix-task-and-stat-with-pipe-input.patch b/queue-5.10/perf-report-fix-task-and-stat-with-pipe-input.patch
deleted file mode 100644 (file)
index ced1b49..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-From 70373f9472caa2a02f3b1629c7fbfda0968a93a2 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 29 Jun 2021 21:30:58 -0700
-Subject: perf report: Fix --task and --stat with pipe input
-
-From: Namhyung Kim <namhyung@kernel.org>
-
-[ Upstream commit 892ba7f18621a02af4428c58d97451f64685dba4 ]
-
-Current 'perf report' fails to process a pipe input when --task or
---stat options are used.  This is because they reset all the tool
-callbacks and fails to find a matching event for a sample.
-
-When pipe input is used, the event info is passed via ATTR records so it
-needs to handle that operation.  Otherwise the following error occurs.
-Note, -14 (= -EFAULT) comes from evlist__parse_sample():
-
-  # perf record -a -o- sleep 1 | perf report -i- --stat
-  Can't parse sample, err = -14
-  0x271044 [0x38]: failed to process type: 9
-  Error:
-  failed to process sample
-  #
-
-Committer testing:
-
-Before:
-
-  $ perf record -o- sleep 1 | perf report -i- --stat
-  Can't parse sample, err = -14
-  [ perf record: Woken up 1 times to write data ]
-  0x1350 [0x30]: failed to process type: 9
-  Error:
-  failed to process sample
-  [ perf record: Captured and wrote 0.000 MB - ]
-  $
-
-After:
-
-  $ perf record -o- sleep 1 | perf report -i- --stat
-  [ perf record: Woken up 1 times to write data ]
-  [ perf record: Captured and wrote 0.000 MB - ]
-
-  Aggregated stats:
-             TOTAL events:         41
-              COMM events:          2  ( 4.9%)
-              EXIT events:          1  ( 2.4%)
-            SAMPLE events:          9  (22.0%)
-             MMAP2 events:          4  ( 9.8%)
-              ATTR events:          1  ( 2.4%)
-    FINISHED_ROUND events:          1  ( 2.4%)
-        THREAD_MAP events:          1  ( 2.4%)
-           CPU_MAP events:          1  ( 2.4%)
-      EVENT_UPDATE events:          1  ( 2.4%)
-         TIME_CONV events:          1  ( 2.4%)
-           FEATURE events:         19  (46.3%)
-  cycles:uhH stats:
-            SAMPLE events:          9
-  $
-
-Fixes: a4a4d0a7a2b20f78 ("perf report: Add --stats option to display quick data statistics")
-Signed-off-by: Namhyung Kim <namhyung@kernel.org>
-Acked-by: Jiri Olsa <jolsa@redhat.com>
-Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Cc: Andi Kleen <ak@linux.intel.com>
-Cc: Ian Rogers <irogers@google.com>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Link: http://lore.kernel.org/lkml/20210630043058.1131295-1-namhyung@kernel.org
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/builtin-report.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
-index 3c74c9c0f3c3..f61558123099 100644
---- a/tools/perf/builtin-report.c
-+++ b/tools/perf/builtin-report.c
-@@ -710,9 +710,14 @@ static void report__output_resort(struct report *rep)
-       ui_progress__finish();
- }
-+static int process_attr(struct perf_tool *tool __maybe_unused,
-+                      union perf_event *event,
-+                      struct evlist **pevlist);
-+
- static void stats_setup(struct report *rep)
- {
-       memset(&rep->tool, 0, sizeof(rep->tool));
-+      rep->tool.attr = process_attr;
-       rep->tool.no_warn = true;
- }
-@@ -732,6 +737,7 @@ static void tasks_setup(struct report *rep)
-               rep->tool.mmap = perf_event__process_mmap;
-               rep->tool.mmap2 = perf_event__process_mmap2;
-       }
-+      rep->tool.attr = process_attr;
-       rep->tool.comm = perf_event__process_comm;
-       rep->tool.exit = perf_event__process_exit;
-       rep->tool.fork = perf_event__process_fork;
--- 
-2.30.2
-
index 5b7b8fd51eb3231f924084f24a40e9fe1fa58f74..0153bf7612bcc7244cf540d068105fc2e4f62e72 100644 (file)
@@ -234,6 +234,5 @@ jump_label-fix-jump_label_text_reserved-vs-__init.patch
 static_call-fix-static_call_text_reserved-vs-__init.patch
 mips-always-link-byteswap-helpers-into-decompressor.patch
 mips-disable-branch-profiling-in-boot-decompress.o.patch
-perf-report-fix-task-and-stat-with-pipe-input.patch
 mips-vdso-invalid-gic-access-through-vdso.patch
 scsi-scsi_dh_alua-fix-signedness-bug-in-alua_rtpg.patch
diff --git a/queue-5.12/perf-report-fix-task-and-stat-with-pipe-input.patch b/queue-5.12/perf-report-fix-task-and-stat-with-pipe-input.patch
deleted file mode 100644 (file)
index 6943b12..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-From f3fc05b17e95abdc25b56fda5aa0f221f41dc23d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 29 Jun 2021 21:30:58 -0700
-Subject: perf report: Fix --task and --stat with pipe input
-
-From: Namhyung Kim <namhyung@kernel.org>
-
-[ Upstream commit 892ba7f18621a02af4428c58d97451f64685dba4 ]
-
-Current 'perf report' fails to process a pipe input when --task or
---stat options are used.  This is because they reset all the tool
-callbacks and fails to find a matching event for a sample.
-
-When pipe input is used, the event info is passed via ATTR records so it
-needs to handle that operation.  Otherwise the following error occurs.
-Note, -14 (= -EFAULT) comes from evlist__parse_sample():
-
-  # perf record -a -o- sleep 1 | perf report -i- --stat
-  Can't parse sample, err = -14
-  0x271044 [0x38]: failed to process type: 9
-  Error:
-  failed to process sample
-  #
-
-Committer testing:
-
-Before:
-
-  $ perf record -o- sleep 1 | perf report -i- --stat
-  Can't parse sample, err = -14
-  [ perf record: Woken up 1 times to write data ]
-  0x1350 [0x30]: failed to process type: 9
-  Error:
-  failed to process sample
-  [ perf record: Captured and wrote 0.000 MB - ]
-  $
-
-After:
-
-  $ perf record -o- sleep 1 | perf report -i- --stat
-  [ perf record: Woken up 1 times to write data ]
-  [ perf record: Captured and wrote 0.000 MB - ]
-
-  Aggregated stats:
-             TOTAL events:         41
-              COMM events:          2  ( 4.9%)
-              EXIT events:          1  ( 2.4%)
-            SAMPLE events:          9  (22.0%)
-             MMAP2 events:          4  ( 9.8%)
-              ATTR events:          1  ( 2.4%)
-    FINISHED_ROUND events:          1  ( 2.4%)
-        THREAD_MAP events:          1  ( 2.4%)
-           CPU_MAP events:          1  ( 2.4%)
-      EVENT_UPDATE events:          1  ( 2.4%)
-         TIME_CONV events:          1  ( 2.4%)
-           FEATURE events:         19  (46.3%)
-  cycles:uhH stats:
-            SAMPLE events:          9
-  $
-
-Fixes: a4a4d0a7a2b20f78 ("perf report: Add --stats option to display quick data statistics")
-Signed-off-by: Namhyung Kim <namhyung@kernel.org>
-Acked-by: Jiri Olsa <jolsa@redhat.com>
-Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Cc: Andi Kleen <ak@linux.intel.com>
-Cc: Ian Rogers <irogers@google.com>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Link: http://lore.kernel.org/lkml/20210630043058.1131295-1-namhyung@kernel.org
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/builtin-report.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
-index 2a845d6cac09..71a31b8ac3f1 100644
---- a/tools/perf/builtin-report.c
-+++ b/tools/perf/builtin-report.c
-@@ -707,9 +707,14 @@ static void report__output_resort(struct report *rep)
-       ui_progress__finish();
- }
-+static int process_attr(struct perf_tool *tool __maybe_unused,
-+                      union perf_event *event,
-+                      struct evlist **pevlist);
-+
- static void stats_setup(struct report *rep)
- {
-       memset(&rep->tool, 0, sizeof(rep->tool));
-+      rep->tool.attr = process_attr;
-       rep->tool.no_warn = true;
- }
-@@ -729,6 +734,7 @@ static void tasks_setup(struct report *rep)
-               rep->tool.mmap = perf_event__process_mmap;
-               rep->tool.mmap2 = perf_event__process_mmap2;
-       }
-+      rep->tool.attr = process_attr;
-       rep->tool.comm = perf_event__process_comm;
-       rep->tool.exit = perf_event__process_exit;
-       rep->tool.fork = perf_event__process_fork;
--- 
-2.30.2
-
index e470448599bf2d487fbc88b651fcbf35cc148015..7dd76aceae732efa88a5ceaa781bbf7322553805 100644 (file)
@@ -278,7 +278,6 @@ static_call-fix-static_call_text_reserved-vs-__init.patch
 kprobe-static_call-restore-missing-static_call_text_.patch
 mips-always-link-byteswap-helpers-into-decompressor.patch
 mips-disable-branch-profiling-in-boot-decompress.o.patch
-perf-report-fix-task-and-stat-with-pipe-input.patch
 perf-script-python-fix-buffer-size-to-report-iregs-i.patch
 s390-irq-remove-have_irq_exit_on_irq_stack.patch
 mips-vdso-invalid-gic-access-through-vdso.patch
diff --git a/queue-5.13/perf-report-fix-task-and-stat-with-pipe-input.patch b/queue-5.13/perf-report-fix-task-and-stat-with-pipe-input.patch
deleted file mode 100644 (file)
index 10e9cbf..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-From 25f6a201c0155943aa3e1d097e55967a06f4d387 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 29 Jun 2021 21:30:58 -0700
-Subject: perf report: Fix --task and --stat with pipe input
-
-From: Namhyung Kim <namhyung@kernel.org>
-
-[ Upstream commit 892ba7f18621a02af4428c58d97451f64685dba4 ]
-
-Current 'perf report' fails to process a pipe input when --task or
---stat options are used.  This is because they reset all the tool
-callbacks and fails to find a matching event for a sample.
-
-When pipe input is used, the event info is passed via ATTR records so it
-needs to handle that operation.  Otherwise the following error occurs.
-Note, -14 (= -EFAULT) comes from evlist__parse_sample():
-
-  # perf record -a -o- sleep 1 | perf report -i- --stat
-  Can't parse sample, err = -14
-  0x271044 [0x38]: failed to process type: 9
-  Error:
-  failed to process sample
-  #
-
-Committer testing:
-
-Before:
-
-  $ perf record -o- sleep 1 | perf report -i- --stat
-  Can't parse sample, err = -14
-  [ perf record: Woken up 1 times to write data ]
-  0x1350 [0x30]: failed to process type: 9
-  Error:
-  failed to process sample
-  [ perf record: Captured and wrote 0.000 MB - ]
-  $
-
-After:
-
-  $ perf record -o- sleep 1 | perf report -i- --stat
-  [ perf record: Woken up 1 times to write data ]
-  [ perf record: Captured and wrote 0.000 MB - ]
-
-  Aggregated stats:
-             TOTAL events:         41
-              COMM events:          2  ( 4.9%)
-              EXIT events:          1  ( 2.4%)
-            SAMPLE events:          9  (22.0%)
-             MMAP2 events:          4  ( 9.8%)
-              ATTR events:          1  ( 2.4%)
-    FINISHED_ROUND events:          1  ( 2.4%)
-        THREAD_MAP events:          1  ( 2.4%)
-           CPU_MAP events:          1  ( 2.4%)
-      EVENT_UPDATE events:          1  ( 2.4%)
-         TIME_CONV events:          1  ( 2.4%)
-           FEATURE events:         19  (46.3%)
-  cycles:uhH stats:
-            SAMPLE events:          9
-  $
-
-Fixes: a4a4d0a7a2b20f78 ("perf report: Add --stats option to display quick data statistics")
-Signed-off-by: Namhyung Kim <namhyung@kernel.org>
-Acked-by: Jiri Olsa <jolsa@redhat.com>
-Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Cc: Andi Kleen <ak@linux.intel.com>
-Cc: Ian Rogers <irogers@google.com>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Link: http://lore.kernel.org/lkml/20210630043058.1131295-1-namhyung@kernel.org
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/builtin-report.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
-index 36f9ccfeb38a..2eb40cf5ef0c 100644
---- a/tools/perf/builtin-report.c
-+++ b/tools/perf/builtin-report.c
-@@ -729,9 +729,14 @@ static int count_sample_event(struct perf_tool *tool __maybe_unused,
-       return 0;
- }
-+static int process_attr(struct perf_tool *tool __maybe_unused,
-+                      union perf_event *event,
-+                      struct evlist **pevlist);
-+
- static void stats_setup(struct report *rep)
- {
-       memset(&rep->tool, 0, sizeof(rep->tool));
-+      rep->tool.attr = process_attr;
-       rep->tool.sample = count_sample_event;
-       rep->tool.no_warn = true;
- }
-@@ -753,6 +758,7 @@ static void tasks_setup(struct report *rep)
-               rep->tool.mmap = perf_event__process_mmap;
-               rep->tool.mmap2 = perf_event__process_mmap2;
-       }
-+      rep->tool.attr = process_attr;
-       rep->tool.comm = perf_event__process_comm;
-       rep->tool.exit = perf_event__process_exit;
-       rep->tool.fork = perf_event__process_fork;
--- 
-2.30.2
-
index 1e5e981cdc456c6d36ce9aafb4847591808668ab..c839ae5ed35e3327a6fd05951394640cc82bc37d 100644 (file)
@@ -339,7 +339,6 @@ static_call-fix-static_call_text_reserved-vs-__init.patch
 kprobe-static_call-restore-missing-static_call_text_.patch
 mips-always-link-byteswap-helpers-into-decompressor.patch
 mips-disable-branch-profiling-in-boot-decompress.o.patch
-perf-report-fix-task-and-stat-with-pipe-input.patch
 perf-script-python-fix-buffer-size-to-report-iregs-i.patch
 s390-irq-remove-have_irq_exit_on_irq_stack.patch
 mips-vdso-invalid-gic-access-through-vdso.patch
diff --git a/queue-5.4/perf-report-fix-task-and-stat-with-pipe-input.patch b/queue-5.4/perf-report-fix-task-and-stat-with-pipe-input.patch
deleted file mode 100644 (file)
index a5f0e11..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-From a044fe34a5c7ef2fe5298261b9297f88e75849a2 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 29 Jun 2021 21:30:58 -0700
-Subject: perf report: Fix --task and --stat with pipe input
-
-From: Namhyung Kim <namhyung@kernel.org>
-
-[ Upstream commit 892ba7f18621a02af4428c58d97451f64685dba4 ]
-
-Current 'perf report' fails to process a pipe input when --task or
---stat options are used.  This is because they reset all the tool
-callbacks and fails to find a matching event for a sample.
-
-When pipe input is used, the event info is passed via ATTR records so it
-needs to handle that operation.  Otherwise the following error occurs.
-Note, -14 (= -EFAULT) comes from evlist__parse_sample():
-
-  # perf record -a -o- sleep 1 | perf report -i- --stat
-  Can't parse sample, err = -14
-  0x271044 [0x38]: failed to process type: 9
-  Error:
-  failed to process sample
-  #
-
-Committer testing:
-
-Before:
-
-  $ perf record -o- sleep 1 | perf report -i- --stat
-  Can't parse sample, err = -14
-  [ perf record: Woken up 1 times to write data ]
-  0x1350 [0x30]: failed to process type: 9
-  Error:
-  failed to process sample
-  [ perf record: Captured and wrote 0.000 MB - ]
-  $
-
-After:
-
-  $ perf record -o- sleep 1 | perf report -i- --stat
-  [ perf record: Woken up 1 times to write data ]
-  [ perf record: Captured and wrote 0.000 MB - ]
-
-  Aggregated stats:
-             TOTAL events:         41
-              COMM events:          2  ( 4.9%)
-              EXIT events:          1  ( 2.4%)
-            SAMPLE events:          9  (22.0%)
-             MMAP2 events:          4  ( 9.8%)
-              ATTR events:          1  ( 2.4%)
-    FINISHED_ROUND events:          1  ( 2.4%)
-        THREAD_MAP events:          1  ( 2.4%)
-           CPU_MAP events:          1  ( 2.4%)
-      EVENT_UPDATE events:          1  ( 2.4%)
-         TIME_CONV events:          1  ( 2.4%)
-           FEATURE events:         19  (46.3%)
-  cycles:uhH stats:
-            SAMPLE events:          9
-  $
-
-Fixes: a4a4d0a7a2b20f78 ("perf report: Add --stats option to display quick data statistics")
-Signed-off-by: Namhyung Kim <namhyung@kernel.org>
-Acked-by: Jiri Olsa <jolsa@redhat.com>
-Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Cc: Andi Kleen <ak@linux.intel.com>
-Cc: Ian Rogers <irogers@google.com>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Link: http://lore.kernel.org/lkml/20210630043058.1131295-1-namhyung@kernel.org
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/builtin-report.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
-index d3c0b04e2e22..60beb2d5b164 100644
---- a/tools/perf/builtin-report.c
-+++ b/tools/perf/builtin-report.c
-@@ -666,9 +666,14 @@ static void report__output_resort(struct report *rep)
-       ui_progress__finish();
- }
-+static int process_attr(struct perf_tool *tool __maybe_unused,
-+                      union perf_event *event,
-+                      struct evlist **pevlist);
-+
- static void stats_setup(struct report *rep)
- {
-       memset(&rep->tool, 0, sizeof(rep->tool));
-+      rep->tool.attr = process_attr;
-       rep->tool.no_warn = true;
- }
-@@ -688,6 +693,7 @@ static void tasks_setup(struct report *rep)
-               rep->tool.mmap = perf_event__process_mmap;
-               rep->tool.mmap2 = perf_event__process_mmap2;
-       }
-+      rep->tool.attr = process_attr;
-       rep->tool.comm = perf_event__process_comm;
-       rep->tool.exit = perf_event__process_exit;
-       rep->tool.fork = perf_event__process_fork;
--- 
-2.30.2
-
index d163bdce11ccf2fc707fbf0d71eb9c918724f733..64350697c711f948982c5d0fe1e77bf734736650 100644 (file)
@@ -142,7 +142,6 @@ firmware-turris-mox-rwtm-fail-probing-when-firmware-.patch
 scsi-be2iscsi-fix-an-error-handling-path-in-beiscsi_.patch
 mips-always-link-byteswap-helpers-into-decompressor.patch
 mips-disable-branch-profiling-in-boot-decompress.o.patch
-perf-report-fix-task-and-stat-with-pipe-input.patch
 mips-vdso-invalid-gic-access-through-vdso.patch
 scsi-scsi_dh_alua-fix-signedness-bug-in-alua_rtpg.patch
 misc-alcor_pci-fix-inverted-branch-condition.patch