From: Greg Kroah-Hartman Date: Tue, 27 Jul 2021 06:13:01 +0000 (+0200) Subject: drop some perf patches that broke the build X-Git-Tag: v4.4.277~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a187f24294936e217f4b4e1fb6695e6bf6ed96c2;p=thirdparty%2Fkernel%2Fstable-queue.git drop some perf patches that broke the build --- diff --git a/queue-4.14/perf-test-session_topology-delete-session-evlist.patch b/queue-4.14/perf-test-session_topology-delete-session-evlist.patch deleted file mode 100644 index 4afef022cc2..00000000000 --- a/queue-4.14/perf-test-session_topology-delete-session-evlist.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 33e76eefae501f236f1203058c3481f750a8bc12 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 15 Jul 2021 18:07:08 +0200 -Subject: perf test session_topology: Delete session->evlist - -From: Riccardo Mancini - -[ Upstream commit 233f2dc1c284337286f9a64c0152236779a42f6c ] - -ASan reports a memory leak related to session->evlist while running: - - # perf test "41: Session topology". - -When perf_data is in write mode, session->evlist is owned by the caller, -which should also take care of deleting it. - -This patch adds the missing evlist__delete(). - -Signed-off-by: Riccardo Mancini -Fixes: c84974ed9fb67293 ("perf test: Add entry to test cpu topology") -Cc: Ian Rogers -Cc: Jiri Olsa -Cc: Kan Liang -Cc: Mark Rutland -Cc: Namhyung Kim -Cc: Peter Zijlstra -Link: http://lore.kernel.org/lkml/822f741f06eb25250fb60686cf30a35f447e9e91.1626343282.git.rickyman7@gmail.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/tests/topology.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c -index 4e9dad8c9763..f03c26b369c7 100644 ---- a/tools/perf/tests/topology.c -+++ b/tools/perf/tests/topology.c -@@ -50,6 +50,7 @@ static int session_write_header(char *path) - TEST_ASSERT_VAL("failed to write header", - !perf_session__write_header(session, session->evlist, file.fd, true)); - -+ evlist__delete(session->evlist); - perf_session__delete(session); - - return 0; --- -2.30.2 - diff --git a/queue-4.14/series b/queue-4.14/series index e1f1de078cc..a6e70efae85 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -41,7 +41,6 @@ iavf-fix-an-error-handling-path-in-iavf_probe.patch igb-check-if-num-of-q_vectors-is-smaller-than-max-be.patch perf-map-fix-dso-nsinfo-refcounting.patch perf-probe-fix-dso-nsinfo-refcounting.patch -perf-test-session_topology-delete-session-evlist.patch perf-lzma-close-lzma-stream-on-exit.patch perf-test-bpf-free-obj_buf.patch perf-probe-file-delete-namelist-in-del_events-on-the.patch diff --git a/queue-4.19/perf-script-fix-memory-threads-and-cpus-leaks-on-exi.patch b/queue-4.19/perf-script-fix-memory-threads-and-cpus-leaks-on-exi.patch deleted file mode 100644 index 2f40a9ff13a..00000000000 --- a/queue-4.19/perf-script-fix-memory-threads-and-cpus-leaks-on-exi.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 7acf0058cce8d835d61faa2be62da52e43fed751 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 15 Jul 2021 18:07:18 +0200 -Subject: perf script: Fix memory 'threads' and 'cpus' leaks on exit - -From: Riccardo Mancini - -[ Upstream commit faf3ac305d61341c74e5cdd9e41daecce7f67bfe ] - -ASan reports several memory leaks while running: - - # perf test "82: Use vfs_getname probe to get syscall args filenames" - -Two of these are caused by some refcounts not being decreased on -perf-script exit, namely script.threads and script.cpus. - -This patch adds the missing __put calls in a new perf_script__exit -function, which is called at the end of cmd_script. - -This patch concludes the fixes of all remaining memory leaks in perf -test "82: Use vfs_getname probe to get syscall args filenames". - -Signed-off-by: Riccardo Mancini -Fixes: cfc8874a48599249 ("perf script: Process cpu/threads maps") -Cc: Ian Rogers -Cc: Jiri Olsa -Cc: Mark Rutland -Cc: Namhyung Kim -Cc: Peter Zijlstra -Link: http://lore.kernel.org/lkml/5ee73b19791c6fa9d24c4d57f4ac1a23609400d7.1626343282.git.rickyman7@gmail.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/builtin-script.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c -index 1200973c77cb..5f369d4b08f7 100644 ---- a/tools/perf/builtin-script.c -+++ b/tools/perf/builtin-script.c -@@ -2207,6 +2207,12 @@ static void perf_script__exit_per_event_dump_stats(struct perf_script *script) - } - } - -+static void perf_script__exit(struct perf_script *script) -+{ -+ perf_thread_map__put(script->threads); -+ perf_cpu_map__put(script->cpus); -+} -+ - static int __cmd_script(struct perf_script *script) - { - int ret; -@@ -3534,6 +3540,7 @@ out_delete: - - perf_evlist__free_stats(session->evlist); - perf_session__delete(session); -+ perf_script__exit(&script); - - if (script_started) - cleanup_scripting(); --- -2.30.2 - diff --git a/queue-4.19/perf-test-session_topology-delete-session-evlist.patch b/queue-4.19/perf-test-session_topology-delete-session-evlist.patch deleted file mode 100644 index 35f36fafce6..00000000000 --- a/queue-4.19/perf-test-session_topology-delete-session-evlist.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 6df97b58f5d003c3451f5531e650fb73dc11971a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 15 Jul 2021 18:07:08 +0200 -Subject: perf test session_topology: Delete session->evlist - -From: Riccardo Mancini - -[ Upstream commit 233f2dc1c284337286f9a64c0152236779a42f6c ] - -ASan reports a memory leak related to session->evlist while running: - - # perf test "41: Session topology". - -When perf_data is in write mode, session->evlist is owned by the caller, -which should also take care of deleting it. - -This patch adds the missing evlist__delete(). - -Signed-off-by: Riccardo Mancini -Fixes: c84974ed9fb67293 ("perf test: Add entry to test cpu topology") -Cc: Ian Rogers -Cc: Jiri Olsa -Cc: Kan Liang -Cc: Mark Rutland -Cc: Namhyung Kim -Cc: Peter Zijlstra -Link: http://lore.kernel.org/lkml/822f741f06eb25250fb60686cf30a35f447e9e91.1626343282.git.rickyman7@gmail.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/tests/topology.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c -index 9497d02f69e6..bed53ed82af7 100644 ---- a/tools/perf/tests/topology.c -+++ b/tools/perf/tests/topology.c -@@ -52,6 +52,7 @@ static int session_write_header(char *path) - TEST_ASSERT_VAL("failed to write header", - !perf_session__write_header(session, session->evlist, data.file.fd, true)); - -+ evlist__delete(session->evlist); - perf_session__delete(session); - - return 0; --- -2.30.2 - diff --git a/queue-4.19/series b/queue-4.19/series index 230130ac3df..db27258d0b4 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -62,9 +62,7 @@ ipv6-fix-disable_policy-for-fwd-packets.patch nvme-pci-do-not-call-nvme_dev_remove_admin-from-nvme.patch perf-map-fix-dso-nsinfo-refcounting.patch perf-probe-fix-dso-nsinfo-refcounting.patch -perf-test-session_topology-delete-session-evlist.patch perf-dso-fix-memory-leak-in-dso__new_map.patch -perf-script-fix-memory-threads-and-cpus-leaks-on-exi.patch perf-lzma-close-lzma-stream-on-exit.patch perf-test-bpf-free-obj_buf.patch perf-probe-file-delete-namelist-in-del_events-on-the.patch diff --git a/queue-4.4/perf-test-session_topology-delete-session-evlist.patch b/queue-4.4/perf-test-session_topology-delete-session-evlist.patch deleted file mode 100644 index fe639df45f4..00000000000 --- a/queue-4.4/perf-test-session_topology-delete-session-evlist.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 5828d07535ec935471ee4353ff1998355fe705bc Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 15 Jul 2021 18:07:08 +0200 -Subject: perf test session_topology: Delete session->evlist - -From: Riccardo Mancini - -[ Upstream commit 233f2dc1c284337286f9a64c0152236779a42f6c ] - -ASan reports a memory leak related to session->evlist while running: - - # perf test "41: Session topology". - -When perf_data is in write mode, session->evlist is owned by the caller, -which should also take care of deleting it. - -This patch adds the missing evlist__delete(). - -Signed-off-by: Riccardo Mancini -Fixes: c84974ed9fb67293 ("perf test: Add entry to test cpu topology") -Cc: Ian Rogers -Cc: Jiri Olsa -Cc: Kan Liang -Cc: Mark Rutland -Cc: Namhyung Kim -Cc: Peter Zijlstra -Link: http://lore.kernel.org/lkml/822f741f06eb25250fb60686cf30a35f447e9e91.1626343282.git.rickyman7@gmail.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/tests/topology.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c -index bf67343c7795..39cb6cb6f359 100644 ---- a/tools/perf/tests/topology.c -+++ b/tools/perf/tests/topology.c -@@ -49,6 +49,7 @@ static int session_write_header(char *path) - TEST_ASSERT_VAL("failed to write header", - !perf_session__write_header(session, session->evlist, file.fd, true)); - -+ evlist__delete(session->evlist); - perf_session__delete(session); - - return 0; --- -2.30.2 - diff --git a/queue-4.4/series b/queue-4.4/series index 54bcfd67c17..7e26a32eaee 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -17,7 +17,6 @@ tcp-annotate-data-races-around-tp-mtu_info.patch ipv6-tcp-drop-silly-icmpv6-packet-too-big-messages.patch iavf-fix-an-error-handling-path-in-iavf_probe.patch igb-check-if-num-of-q_vectors-is-smaller-than-max-be.patch -perf-test-session_topology-delete-session-evlist.patch perf-test-bpf-free-obj_buf.patch perf-probe-file-delete-namelist-in-del_events-on-the.patch s390-bpf-perform-r1-range-checking-before-accessing-.patch diff --git a/queue-4.9/perf-test-session_topology-delete-session-evlist.patch b/queue-4.9/perf-test-session_topology-delete-session-evlist.patch deleted file mode 100644 index f31ba29e0a5..00000000000 --- a/queue-4.9/perf-test-session_topology-delete-session-evlist.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 2c7215cfa6409a1e453d99bc6d036c87cd5f4213 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 15 Jul 2021 18:07:08 +0200 -Subject: perf test session_topology: Delete session->evlist - -From: Riccardo Mancini - -[ Upstream commit 233f2dc1c284337286f9a64c0152236779a42f6c ] - -ASan reports a memory leak related to session->evlist while running: - - # perf test "41: Session topology". - -When perf_data is in write mode, session->evlist is owned by the caller, -which should also take care of deleting it. - -This patch adds the missing evlist__delete(). - -Signed-off-by: Riccardo Mancini -Fixes: c84974ed9fb67293 ("perf test: Add entry to test cpu topology") -Cc: Ian Rogers -Cc: Jiri Olsa -Cc: Kan Liang -Cc: Mark Rutland -Cc: Namhyung Kim -Cc: Peter Zijlstra -Link: http://lore.kernel.org/lkml/822f741f06eb25250fb60686cf30a35f447e9e91.1626343282.git.rickyman7@gmail.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/tests/topology.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c -index 3e7cdefb0817..f06f00828ce7 100644 ---- a/tools/perf/tests/topology.c -+++ b/tools/perf/tests/topology.c -@@ -49,6 +49,7 @@ static int session_write_header(char *path) - TEST_ASSERT_VAL("failed to write header", - !perf_session__write_header(session, session->evlist, file.fd, true)); - -+ evlist__delete(session->evlist); - perf_session__delete(session); - - return 0; --- -2.30.2 - diff --git a/queue-4.9/series b/queue-4.9/series index f1647ea1f73..9ef40f3b6d9 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -27,7 +27,6 @@ fm10k-fix-an-error-handling-path-in-fm10k_probe.patch e1000e-fix-an-error-handling-path-in-e1000_probe.patch iavf-fix-an-error-handling-path-in-iavf_probe.patch igb-check-if-num-of-q_vectors-is-smaller-than-max-be.patch -perf-test-session_topology-delete-session-evlist.patch perf-lzma-close-lzma-stream-on-exit.patch perf-test-bpf-free-obj_buf.patch perf-probe-file-delete-namelist-in-del_events-on-the.patch