drop perf-bench-fix-two-memory-leaks-detected-with-asan.patch from everywhere

diff --git a/queue-4.14/perf-bench-fix-two-memory-leaks-detected-with-asan.patch b/queue-4.14/perf-bench-fix-two-memory-leaks-detected-with-asan.patch
deleted file mode 100644 (file)
index 459d050..0000000
--- a/queue-4.14/perf-bench-fix-two-memory-leaks-detected-with-asan.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From f510919b2ba9323773c981acabfa99d85b66eb09 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 10 Nov 2021 04:20:11 +0200
-Subject: perf bench: Fix two memory leaks detected with ASan
-
-From: Sohaib Mohamed <sohaib.amhmd@gmail.com>
-
-[ Upstream commit 92723ea0f11d92496687db8c9725248e9d1e5e1d ]
-
-ASan reports memory leaks while running:
-
-  $ perf bench sched all
-
-Fixes: e27454cc6352c422 ("perf bench: Add sched-messaging.c: Benchmark for scheduler and IPC mechanisms based on hackbench")
-Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>
-Acked-by: Ian Rogers <irogers@google.com>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Hitoshi Mitake <h.mitake@gmail.com>
-Cc: Jiri Olsa <jolsa@redhat.com>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Paul Russel <rusty@rustcorp.com.au>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Pierre Gondois <pierre.gondois@arm.com>
-Link: http://lore.kernel.org/lkml/20211110022012.16620-1-sohaib.amhmd@gmail.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/bench/sched-messaging.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tools/perf/bench/sched-messaging.c b/tools/perf/bench/sched-messaging.c
-index f9d7641ae8338..b4e13db991e9e 100644
---- a/tools/perf/bench/sched-messaging.c
-+++ b/tools/perf/bench/sched-messaging.c
-@@ -226,6 +226,8 @@ static unsigned int group(pthread_t *pth,
-               snd_ctx->out_fds[i] = fds[1];
-               if (!thread_mode)
-                       close(fds[0]);
-+
-+              free(ctx);
-       }
- 
-       /* Now we have all the fds, fork the senders */
-@@ -242,6 +244,8 @@ static unsigned int group(pthread_t *pth,
-               for (i = 0; i < num_fds; i++)
-                       close(snd_ctx->out_fds[i]);
- 
-+      free(snd_ctx);
-+
-       /* Return number of children to reap */
-       return num_fds * 2;
- }
--- 
-2.33.0
-

diff --git a/queue-4.14/series b/queue-4.14/series
index d9773cd94e7acc95d9f65a21b2accbf415138299..23542fb1baeb5ba6df868a6adef2483fa4f262ea 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -228,7 +228,6 @@ net-virtio_net_hdr_to_skb-count-transport-header-in-.patch
 i40e-fix-null-ptr-dereference-on-vsi-filter-sync.patch
 nfc-reorganize-the-functions-in-nci_request.patch
 nfc-reorder-the-logic-in-nfc_-un-register_device.patch
-perf-bench-fix-two-memory-leaks-detected-with-asan.patch
 perf-x86-intel-uncore-fix-filter_tid-mask-for-cha-ev.patch
 perf-x86-intel-uncore-fix-iio-event-constraints-for-.patch
 tun-fix-bonding-active-backup-with-arp-monitoring.patch

diff --git a/queue-4.19/perf-bench-fix-two-memory-leaks-detected-with-asan.patch b/queue-4.19/perf-bench-fix-two-memory-leaks-detected-with-asan.patch
deleted file mode 100644 (file)
index 01bf99e..0000000
--- a/queue-4.19/perf-bench-fix-two-memory-leaks-detected-with-asan.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 74a09e87169ebb10c3fd0a8252c276a23d9e8c76 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 10 Nov 2021 04:20:11 +0200
-Subject: perf bench: Fix two memory leaks detected with ASan
-
-From: Sohaib Mohamed <sohaib.amhmd@gmail.com>
-
-[ Upstream commit 92723ea0f11d92496687db8c9725248e9d1e5e1d ]
-
-ASan reports memory leaks while running:
-
-  $ perf bench sched all
-
-Fixes: e27454cc6352c422 ("perf bench: Add sched-messaging.c: Benchmark for scheduler and IPC mechanisms based on hackbench")
-Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>
-Acked-by: Ian Rogers <irogers@google.com>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Hitoshi Mitake <h.mitake@gmail.com>
-Cc: Jiri Olsa <jolsa@redhat.com>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Paul Russel <rusty@rustcorp.com.au>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Pierre Gondois <pierre.gondois@arm.com>
-Link: http://lore.kernel.org/lkml/20211110022012.16620-1-sohaib.amhmd@gmail.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/bench/sched-messaging.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tools/perf/bench/sched-messaging.c b/tools/perf/bench/sched-messaging.c
-index f9d7641ae8338..b4e13db991e9e 100644
---- a/tools/perf/bench/sched-messaging.c
-+++ b/tools/perf/bench/sched-messaging.c
-@@ -226,6 +226,8 @@ static unsigned int group(pthread_t *pth,
-               snd_ctx->out_fds[i] = fds[1];
-               if (!thread_mode)
-                       close(fds[0]);
-+
-+              free(ctx);
-       }
- 
-       /* Now we have all the fds, fork the senders */
-@@ -242,6 +244,8 @@ static unsigned int group(pthread_t *pth,
-               for (i = 0; i < num_fds; i++)
-                       close(snd_ctx->out_fds[i]);
- 
-+      free(snd_ctx);
-+
-       /* Return number of children to reap */
-       return num_fds * 2;
- }
--- 
-2.33.0
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 957d88e4f1839334012930db06adf09ff2516cc9..d18df90175499cd5c457b0bd0fcf56588d195db2 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -298,7 +298,6 @@ i40e-fix-changing-previously-set-num_queue_pairs-for.patch
 i40e-fix-display-error-code-in-dmesg.patch
 nfc-reorganize-the-functions-in-nci_request.patch
 nfc-reorder-the-logic-in-nfc_-un-register_device.patch
-perf-bench-fix-two-memory-leaks-detected-with-asan.patch
 perf-x86-intel-uncore-fix-filter_tid-mask-for-cha-ev.patch
 perf-x86-intel-uncore-fix-iio-event-constraints-for-.patch
 tun-fix-bonding-active-backup-with-arp-monitoring.patch

diff --git a/queue-4.4/perf-bench-fix-two-memory-leaks-detected-with-asan.patch b/queue-4.4/perf-bench-fix-two-memory-leaks-detected-with-asan.patch
deleted file mode 100644 (file)
index a335442..0000000
--- a/queue-4.4/perf-bench-fix-two-memory-leaks-detected-with-asan.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 69505b7b0117db791fc23f8408b0c40c9b8961dc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 10 Nov 2021 04:20:11 +0200
-Subject: perf bench: Fix two memory leaks detected with ASan
-
-From: Sohaib Mohamed <sohaib.amhmd@gmail.com>
-
-[ Upstream commit 92723ea0f11d92496687db8c9725248e9d1e5e1d ]
-
-ASan reports memory leaks while running:
-
-  $ perf bench sched all
-
-Fixes: e27454cc6352c422 ("perf bench: Add sched-messaging.c: Benchmark for scheduler and IPC mechanisms based on hackbench")
-Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>
-Acked-by: Ian Rogers <irogers@google.com>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Hitoshi Mitake <h.mitake@gmail.com>
-Cc: Jiri Olsa <jolsa@redhat.com>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Paul Russel <rusty@rustcorp.com.au>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Pierre Gondois <pierre.gondois@arm.com>
-Link: http://lore.kernel.org/lkml/20211110022012.16620-1-sohaib.amhmd@gmail.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/bench/sched-messaging.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tools/perf/bench/sched-messaging.c b/tools/perf/bench/sched-messaging.c
-index d4ff1b539cfd2..1841e10fdb964 100644
---- a/tools/perf/bench/sched-messaging.c
-+++ b/tools/perf/bench/sched-messaging.c
-@@ -224,6 +224,8 @@ static unsigned int group(pthread_t *pth,
-               snd_ctx->out_fds[i] = fds[1];
-               if (!thread_mode)
-                       close(fds[0]);
-+
-+              free(ctx);
-       }
- 
-       /* Now we have all the fds, fork the senders */
-@@ -240,6 +242,8 @@ static unsigned int group(pthread_t *pth,
-               for (i = 0; i < num_fds; i++)
-                       close(snd_ctx->out_fds[i]);
- 
-+      free(snd_ctx);
-+
-       /* Return number of children to reap */
-       return num_fds * 2;
- }
--- 
-2.33.0
-

diff --git a/queue-4.4/series b/queue-4.4/series
index bfa75ffc36ec2ceed0e2e284545231d6f8930657..4167e0d4d6ad2ad4ca35499bd25d155a645fedfa 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -137,7 +137,6 @@ mips-bcm63xx-add-support-for-clk_get_parent.patch
 platform-x86-hp_accel-fix-an-error-handling-path-in-.patch
 nfc-reorganize-the-functions-in-nci_request.patch
 nfc-reorder-the-logic-in-nfc_-un-register_device.patch
-perf-bench-fix-two-memory-leaks-detected-with-asan.patch
 tun-fix-bonding-active-backup-with-arp-monitoring.patch
 hexagon-export-raw-i-o-routines-for-modules.patch
 mm-kmemleak-slob-respect-slab_noleaktrace-flag.patch

diff --git a/queue-4.9/perf-bench-fix-two-memory-leaks-detected-with-asan.patch b/queue-4.9/perf-bench-fix-two-memory-leaks-detected-with-asan.patch
deleted file mode 100644 (file)
index a064751..0000000
--- a/queue-4.9/perf-bench-fix-two-memory-leaks-detected-with-asan.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From b1c29e2248629770cee7ac88cb9dfea91e07146b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 10 Nov 2021 04:20:11 +0200
-Subject: perf bench: Fix two memory leaks detected with ASan
-
-From: Sohaib Mohamed <sohaib.amhmd@gmail.com>
-
-[ Upstream commit 92723ea0f11d92496687db8c9725248e9d1e5e1d ]
-
-ASan reports memory leaks while running:
-
-  $ perf bench sched all
-
-Fixes: e27454cc6352c422 ("perf bench: Add sched-messaging.c: Benchmark for scheduler and IPC mechanisms based on hackbench")
-Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>
-Acked-by: Ian Rogers <irogers@google.com>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Hitoshi Mitake <h.mitake@gmail.com>
-Cc: Jiri Olsa <jolsa@redhat.com>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Paul Russel <rusty@rustcorp.com.au>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Pierre Gondois <pierre.gondois@arm.com>
-Link: http://lore.kernel.org/lkml/20211110022012.16620-1-sohaib.amhmd@gmail.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/bench/sched-messaging.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tools/perf/bench/sched-messaging.c b/tools/perf/bench/sched-messaging.c
-index 6a111e775210f..9322fd166bdaf 100644
---- a/tools/perf/bench/sched-messaging.c
-+++ b/tools/perf/bench/sched-messaging.c
-@@ -225,6 +225,8 @@ static unsigned int group(pthread_t *pth,
-               snd_ctx->out_fds[i] = fds[1];
-               if (!thread_mode)
-                       close(fds[0]);
-+
-+              free(ctx);
-       }
- 
-       /* Now we have all the fds, fork the senders */
-@@ -241,6 +243,8 @@ static unsigned int group(pthread_t *pth,
-               for (i = 0; i < num_fds; i++)
-                       close(snd_ctx->out_fds[i]);
- 
-+      free(snd_ctx);
-+
-       /* Return number of children to reap */
-       return num_fds * 2;
- }
--- 
-2.33.0
-

diff --git a/queue-4.9/series b/queue-4.9/series
index 6c09daa2260f31fa2d95dfa96e2eb42f4257d726..dc3a0c7b2163356560f30d88139edaa33fbbc0a0 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -184,7 +184,6 @@ mips-bcm63xx-add-support-for-clk_get_parent.patch
 platform-x86-hp_accel-fix-an-error-handling-path-in-.patch
 nfc-reorganize-the-functions-in-nci_request.patch
 nfc-reorder-the-logic-in-nfc_-un-register_device.patch
-perf-bench-fix-two-memory-leaks-detected-with-asan.patch
 perf-x86-intel-uncore-fix-filter_tid-mask-for-cha-ev.patch
 perf-x86-intel-uncore-fix-iio-event-constraints-for-.patch
 tun-fix-bonding-active-backup-with-arp-monitoring.patch

diff --git a/queue-5.10/perf-bench-fix-two-memory-leaks-detected-with-asan.patch b/queue-5.10/perf-bench-fix-two-memory-leaks-detected-with-asan.patch
deleted file mode 100644 (file)
index c6391c1..0000000
--- a/queue-5.10/perf-bench-fix-two-memory-leaks-detected-with-asan.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From e492a415127093857d11f286a55c51c43ab525d3 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 10 Nov 2021 04:20:11 +0200
-Subject: perf bench: Fix two memory leaks detected with ASan
-
-From: Sohaib Mohamed <sohaib.amhmd@gmail.com>
-
-[ Upstream commit 92723ea0f11d92496687db8c9725248e9d1e5e1d ]
-
-ASan reports memory leaks while running:
-
-  $ perf bench sched all
-
-Fixes: e27454cc6352c422 ("perf bench: Add sched-messaging.c: Benchmark for scheduler and IPC mechanisms based on hackbench")
-Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>
-Acked-by: Ian Rogers <irogers@google.com>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Hitoshi Mitake <h.mitake@gmail.com>
-Cc: Jiri Olsa <jolsa@redhat.com>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Paul Russel <rusty@rustcorp.com.au>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Pierre Gondois <pierre.gondois@arm.com>
-Link: http://lore.kernel.org/lkml/20211110022012.16620-1-sohaib.amhmd@gmail.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/bench/sched-messaging.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tools/perf/bench/sched-messaging.c b/tools/perf/bench/sched-messaging.c
-index cecce93ccc636..9ce72fa873768 100644
---- a/tools/perf/bench/sched-messaging.c
-+++ b/tools/perf/bench/sched-messaging.c
-@@ -223,6 +223,8 @@ static unsigned int group(pthread_t *pth,
-               snd_ctx->out_fds[i] = fds[1];
-               if (!thread_mode)
-                       close(fds[0]);
-+
-+              free(ctx);
-       }
- 
-       /* Now we have all the fds, fork the senders */
-@@ -239,6 +241,8 @@ static unsigned int group(pthread_t *pth,
-               for (i = 0; i < num_fds; i++)
-                       close(snd_ctx->out_fds[i]);
- 
-+      free(snd_ctx);
-+
-       /* Return number of children to reap */
-       return num_fds * 2;
- }
--- 
-2.33.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 26590d71a84b6b19c06d670f441410a7f10582dd..17c3a530e8409d1700558c6229a9184f2a5a4e38 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -109,7 +109,6 @@ nfc-reorder-the-logic-in-nfc_-un-register_device.patch
 net-nfc-nci-change-the-nci-close-sequence.patch
 nfc-add-nci_unreg-flag-to-eliminate-the-race.patch
 e100-fix-device-suspend-resume.patch
-perf-bench-fix-two-memory-leaks-detected-with-asan.patch
 kvm-ppc-book3s-hv-use-global_toc-for-kvmppc_h_set_da.patch
 pinctrl-qcom-sdm845-enable-dual-edge-errata.patch
 perf-x86-intel-uncore-fix-filter_tid-mask-for-cha-ev.patch

diff --git a/queue-5.15/perf-bench-fix-two-memory-leaks-detected-with-asan.patch b/queue-5.15/perf-bench-fix-two-memory-leaks-detected-with-asan.patch
deleted file mode 100644 (file)
index 84ef14d..0000000
--- a/queue-5.15/perf-bench-fix-two-memory-leaks-detected-with-asan.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From e1dcd3f6713534890290c505165c237c0453962b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 10 Nov 2021 04:20:11 +0200
-Subject: perf bench: Fix two memory leaks detected with ASan
-
-From: Sohaib Mohamed <sohaib.amhmd@gmail.com>
-
-[ Upstream commit 92723ea0f11d92496687db8c9725248e9d1e5e1d ]
-
-ASan reports memory leaks while running:
-
-  $ perf bench sched all
-
-Fixes: e27454cc6352c422 ("perf bench: Add sched-messaging.c: Benchmark for scheduler and IPC mechanisms based on hackbench")
-Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>
-Acked-by: Ian Rogers <irogers@google.com>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Hitoshi Mitake <h.mitake@gmail.com>
-Cc: Jiri Olsa <jolsa@redhat.com>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Paul Russel <rusty@rustcorp.com.au>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Pierre Gondois <pierre.gondois@arm.com>
-Link: http://lore.kernel.org/lkml/20211110022012.16620-1-sohaib.amhmd@gmail.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/bench/sched-messaging.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tools/perf/bench/sched-messaging.c b/tools/perf/bench/sched-messaging.c
-index 488f6e6ba1a55..fa0ff4ce2b749 100644
---- a/tools/perf/bench/sched-messaging.c
-+++ b/tools/perf/bench/sched-messaging.c
-@@ -223,6 +223,8 @@ static unsigned int group(pthread_t *pth,
-               snd_ctx->out_fds[i] = fds[1];
-               if (!thread_mode)
-                       close(fds[0]);
-+
-+              free(ctx);
-       }
- 
-       /* Now we have all the fds, fork the senders */
-@@ -239,6 +241,8 @@ static unsigned int group(pthread_t *pth,
-               for (i = 0; i < num_fds; i++)
-                       close(snd_ctx->out_fds[i]);
- 
-+      free(snd_ctx);
-+
-       /* Return number of children to reap */
-       return num_fds * 2;
- }
--- 
-2.33.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 06ac0bb04dd5650a6259b6c87b2e118b9e3d07d9..a96cf3d6407006829eb165334e359d0e6085c112 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -170,7 +170,6 @@ nfc-reorder-the-logic-in-nfc_-un-register_device.patch
 nfc-add-nci_unreg-flag-to-eliminate-the-race.patch
 e100-fix-device-suspend-resume.patch
 ptp-ocp-fix-a-couple-null-vs-is_err-checks.patch
-perf-bench-fix-two-memory-leaks-detected-with-asan.patch
 tools-build-fix-removal-of-feature-sync-compare-and-.patch
 riscv-fix-building-external-modules.patch
 kvm-ppc-book3s-hv-use-global_toc-for-kvmppc_h_set_da.patch

diff --git a/queue-5.4/perf-bench-fix-two-memory-leaks-detected-with-asan.patch b/queue-5.4/perf-bench-fix-two-memory-leaks-detected-with-asan.patch
deleted file mode 100644 (file)
index f730538..0000000
--- a/queue-5.4/perf-bench-fix-two-memory-leaks-detected-with-asan.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 95b40d75fc9d87bb9719208e6a6c87ff59c9afd9 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 10 Nov 2021 04:20:11 +0200
-Subject: perf bench: Fix two memory leaks detected with ASan
-
-From: Sohaib Mohamed <sohaib.amhmd@gmail.com>
-
-[ Upstream commit 92723ea0f11d92496687db8c9725248e9d1e5e1d ]
-
-ASan reports memory leaks while running:
-
-  $ perf bench sched all
-
-Fixes: e27454cc6352c422 ("perf bench: Add sched-messaging.c: Benchmark for scheduler and IPC mechanisms based on hackbench")
-Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>
-Acked-by: Ian Rogers <irogers@google.com>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Hitoshi Mitake <h.mitake@gmail.com>
-Cc: Jiri Olsa <jolsa@redhat.com>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Paul Russel <rusty@rustcorp.com.au>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Pierre Gondois <pierre.gondois@arm.com>
-Link: http://lore.kernel.org/lkml/20211110022012.16620-1-sohaib.amhmd@gmail.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/bench/sched-messaging.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tools/perf/bench/sched-messaging.c b/tools/perf/bench/sched-messaging.c
-index b142d87337be8..9e6e0ca6a2002 100644
---- a/tools/perf/bench/sched-messaging.c
-+++ b/tools/perf/bench/sched-messaging.c
-@@ -223,6 +223,8 @@ static unsigned int group(pthread_t *pth,
-               snd_ctx->out_fds[i] = fds[1];
-               if (!thread_mode)
-                       close(fds[0]);
-+
-+              free(ctx);
-       }
- 
-       /* Now we have all the fds, fork the senders */
-@@ -239,6 +241,8 @@ static unsigned int group(pthread_t *pth,
-               for (i = 0; i < num_fds; i++)
-                       close(snd_ctx->out_fds[i]);
- 
-+      free(snd_ctx);
-+
-       /* Return number of children to reap */
-       return num_fds * 2;
- }
--- 
-2.33.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index d7f010d92ffdf51bbaca3fd0d0bb6e31a7d722da..f76c7e0b2c172a118604bffd726abfafa752387c 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -68,7 +68,6 @@ i40e-fix-display-error-code-in-dmesg.patch
 nfc-reorganize-the-functions-in-nci_request.patch
 drm-nouveau-hdmigv100.c-fix-corrupted-hdmi-vendor-in.patch
 nfc-reorder-the-logic-in-nfc_-un-register_device.patch
-perf-bench-fix-two-memory-leaks-detected-with-asan.patch
 kvm-ppc-book3s-hv-use-global_toc-for-kvmppc_h_set_da.patch
 perf-x86-intel-uncore-fix-filter_tid-mask-for-cha-ev.patch
 perf-x86-intel-uncore-fix-iio-event-constraints-for-.patch