]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop some perf patches that broke the build
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 Jul 2021 06:13:01 +0000 (08:13 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 Jul 2021 06:13:01 +0000 (08:13 +0200)
queue-4.14/perf-test-session_topology-delete-session-evlist.patch [deleted file]
queue-4.14/series
queue-4.19/perf-script-fix-memory-threads-and-cpus-leaks-on-exi.patch [deleted file]
queue-4.19/perf-test-session_topology-delete-session-evlist.patch [deleted file]
queue-4.19/series
queue-4.4/perf-test-session_topology-delete-session-evlist.patch [deleted file]
queue-4.4/series
queue-4.9/perf-test-session_topology-delete-session-evlist.patch [deleted file]
queue-4.9/series

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 (file)
index 4afef02..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-From 33e76eefae501f236f1203058c3481f750a8bc12 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 15 Jul 2021 18:07:08 +0200
-Subject: perf test session_topology: Delete session->evlist
-
-From: Riccardo Mancini <rickyman7@gmail.com>
-
-[ 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 <rickyman7@gmail.com>
-Fixes: c84974ed9fb67293 ("perf test: Add entry to test cpu topology")
-Cc: Ian Rogers <irogers@google.com>
-Cc: Jiri Olsa <jolsa@redhat.com>
-Cc: Kan Liang <kan.liang@intel.com>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Link: http://lore.kernel.org/lkml/822f741f06eb25250fb60686cf30a35f447e9e91.1626343282.git.rickyman7@gmail.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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
-
index e1f1de078cc5322fed7086b553bfc1dc648b962a..a6e70efae8504c41509fd708241958afe6be8fe3 100644 (file)
@@ -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 (file)
index 2f40a9f..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From 7acf0058cce8d835d61faa2be62da52e43fed751 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 15 Jul 2021 18:07:18 +0200
-Subject: perf script: Fix memory 'threads' and 'cpus' leaks on exit
-
-From: Riccardo Mancini <rickyman7@gmail.com>
-
-[ 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 <rickyman7@gmail.com>
-Fixes: cfc8874a48599249 ("perf script: Process cpu/threads maps")
-Cc: Ian Rogers <irogers@google.com>
-Cc: Jiri Olsa <jolsa@redhat.com>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Link: http://lore.kernel.org/lkml/5ee73b19791c6fa9d24c4d57f4ac1a23609400d7.1626343282.git.rickyman7@gmail.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 (file)
index 35f36fa..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-From 6df97b58f5d003c3451f5531e650fb73dc11971a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 15 Jul 2021 18:07:08 +0200
-Subject: perf test session_topology: Delete session->evlist
-
-From: Riccardo Mancini <rickyman7@gmail.com>
-
-[ 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 <rickyman7@gmail.com>
-Fixes: c84974ed9fb67293 ("perf test: Add entry to test cpu topology")
-Cc: Ian Rogers <irogers@google.com>
-Cc: Jiri Olsa <jolsa@redhat.com>
-Cc: Kan Liang <kan.liang@intel.com>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Link: http://lore.kernel.org/lkml/822f741f06eb25250fb60686cf30a35f447e9e91.1626343282.git.rickyman7@gmail.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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
-
index 230130ac3dff21abb324eca7494765a273ed556e..db27258d0b46140c0fc08cc8684cd8c4c4204e09 100644 (file)
@@ -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 (file)
index fe639df..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-From 5828d07535ec935471ee4353ff1998355fe705bc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 15 Jul 2021 18:07:08 +0200
-Subject: perf test session_topology: Delete session->evlist
-
-From: Riccardo Mancini <rickyman7@gmail.com>
-
-[ 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 <rickyman7@gmail.com>
-Fixes: c84974ed9fb67293 ("perf test: Add entry to test cpu topology")
-Cc: Ian Rogers <irogers@google.com>
-Cc: Jiri Olsa <jolsa@redhat.com>
-Cc: Kan Liang <kan.liang@intel.com>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Link: http://lore.kernel.org/lkml/822f741f06eb25250fb60686cf30a35f447e9e91.1626343282.git.rickyman7@gmail.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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
-
index 54bcfd67c171ec6ed6e7190dba6a2923b72d914e..7e26a32eaee6d550bae81f0e94f0135742c6e75c 100644 (file)
@@ -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 (file)
index f31ba29..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-From 2c7215cfa6409a1e453d99bc6d036c87cd5f4213 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 15 Jul 2021 18:07:08 +0200
-Subject: perf test session_topology: Delete session->evlist
-
-From: Riccardo Mancini <rickyman7@gmail.com>
-
-[ 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 <rickyman7@gmail.com>
-Fixes: c84974ed9fb67293 ("perf test: Add entry to test cpu topology")
-Cc: Ian Rogers <irogers@google.com>
-Cc: Jiri Olsa <jolsa@redhat.com>
-Cc: Kan Liang <kan.liang@intel.com>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Link: http://lore.kernel.org/lkml/822f741f06eb25250fb60686cf30a35f447e9e91.1626343282.git.rickyman7@gmail.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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
-
index f1647ea1f7305d19f40ebd84abaf26b812c2e5b0..9ef40f3b6d905291fb61670c04d57654a0b27ef4 100644 (file)
@@ -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