lib subcmd: Avoid memory leak in exclude_cmds
Subsystems (2)
Ian Rogers
reviewerPATCH 1/5 lib subcmd: Avoid memory leak in exclude_cmds
exclude_cmds will shorten the cmds names array, before doing so free the removed entry.
--- tools/lib/subcmd/help.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
tools/lib/subcmd/help.c +6 -2
@@ -66,6 +66,7 @@ void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes)while (ci < cmds->cnt && ei < excludes->cnt) { cmp =strcmp (cmds->names[ci]->name, excludes->names[ei]->name);if (cmp <0 ) { +zfree (&cmds->names[cj]); cmds->names[cj++] = cmds->names[ci++]; }else if (cmp ==0 ) { ci++;
@@ -75,9 +76,12 @@ void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes) } } -while (ci < cmds->cnt) +while (ci < cmds->cnt) { +zfree (&cmds->names[cj]); cmds->names[cj++] = cmds->names[ci++]; - + } +for (ci = cj; ci < cmds->cnt; ci++) +zfree (&cmds->names[ci]); cmds->cnt = cj; }
Signature · 1 line
2.41.0.162.gfafddb0af9-goog
Ian Rogers
reviewerPATCH 2/5 perf help: Ensure clean_cmds is called on all paths
Avoid potential memory leaks.
--- tools/perf/util/help-unknown-cmd.c | 3 +++ 1 file changed, 3 insertions(+)
tools/perf/util/help-unknown-cmd.c +3 -0
@@ -92,6 +92,7 @@ const char *help_unknown_cmd(const char *cmd) main_cmds.names[0 ] =NULL ;clean_cmdnames (&main_cmds); +clean_cmdnames (&other_cmds); fprintf(stderr, "WARNING: You called a perf program named '%s', " "which does not exist.\n" "Continuing under the assumption that you meant '%s'\n",
@@ -114,5 +115,7 @@ const char *help_unknown_cmd(const char *cmd)fprintf (stderr,"\t%s\n" , main_cmds.names[i]->name); } end: +clean_cmdnames (&main_cmds); +clean_cmdnames (&other_cmds);exit (1 ); }
Signature · 1 line
2.41.0.162.gfafddb0af9-goog
Ian Rogers
reviewerPATCH 3/5 perf bench epoll: Fix missing frees/puts
In reply to Ian RogersIssues detected by leak sanitizer.
--- tools/perf/bench/epoll-ctl.c | 5 +++++ tools/perf/bench/epoll-wait.c | 5 +++++ 2 files changed, 10 insertions(+)
tools/perf/bench/epoll-ctl.c +5 -0
@@ -421,6 +421,11 @@ int bench_epoll_ctl(int argc, const char **argv)print_summary ();close (epollfd); +perf_cpu_map__put (cpu); +for (i =0 ; i < nthreads; i++) +free (worker[i].fdmap); + +free (worker);return ret; errmem:err (EXIT_FAILURE ,"calloc" );
tools/perf/bench/epoll-wait.c +5 -0
@@ -549,6 +549,11 @@ int bench_epoll_wait(int argc, const char **argv)print_summary ();close (epollfd); +perf_cpu_map__put (cpu); +for (i =0 ; i < nthreads; i++) +free (worker[i].fdmap); + +free (worker);return ret; errmem:err (EXIT_FAILURE ,"calloc" );
Signature · 1 line
2.41.0.162.gfafddb0af9-goog
Ian Rogers
reviewerPATCH 4/5 perf bench futex: Avoid memory leaks from pthread_attr
In reply to Ian RogersRemove code sharing the pthread_attr_t and initialize/destroy pthread_attr_t when needed. This avoids the same attribute being set that leak sanitizer reports as a memory leak.
--- tools/perf/bench/futex-lock-pi.c | 12 ++++++------ tools/perf/bench/futex-requeue.c | 12 ++++++------ tools/perf/bench/futex-wake-parallel.c | 19 +++++++++++-------- tools/perf/bench/futex-wake.c | 12 ++++++------ 4 files changed, 29 insertions(+), 26 deletions(-)
tools/perf/bench/futex-lock-pi.c +6 -6
@@ -118,8 +118,7 @@ static void *workerfn(void *arg)return NULL ; } -static void create_threads (struct worker *w,pthread_attr_t thread_attr, -struct perf_cpu_map *cpu) +static void create_threads (struct worker *w,struct perf_cpu_map *cpu) {cpu_set_t *cpuset;unsigned int i;
@@ -133,6 +132,9 @@ static void create_threads(struct worker *w, pthread_attr_t thread_attr, size =CPU_ALLOC_SIZE (nrcpus);for (i =0 ; i < params.nthreads; i++) { +pthread_attr_t thread_attr; + +pthread_attr_init (&thread_attr); worker[i].tid = i;if (params.multi) {
@@ -154,6 +156,7 @@ static void create_threads(struct worker *w, pthread_attr_t thread_attr,CPU_FREE (cpuset);err (EXIT_FAILURE ,"pthread_create" ); } +pthread_attr_destroy (&thread_attr); }CPU_FREE (cpuset); }
@@ -163,7 +166,6 @@ int bench_futex_lock_pi(int argc, const char **argv)int ret =0 ;unsigned int i;struct sigaction act; -pthread_attr_t thread_attr;struct perf_cpu_map *cpu; argc =parse_options (argc, argv, options, bench_futex_lock_pi_usage,0 );
@@ -203,11 +205,9 @@ int bench_futex_lock_pi(int argc, const char **argv)cond_init (&thread_worker); threads_starting = params.nthreads; -pthread_attr_init (&thread_attr);gettimeofday (&bench__start,NULL ); -create_threads (worker, thread_attr, cpu); -pthread_attr_destroy (&thread_attr); +create_threads (worker, cpu);mutex_lock (&thread_lock);while (threads_starting)
tools/perf/bench/futex-requeue.c +6 -6
@@ -121,8 +121,7 @@ static void *workerfn(void *arg __maybe_unused)return NULL ; } -static void block_threads (pthread_t *w, -pthread_attr_t thread_attr,struct perf_cpu_map *cpu) +static void block_threads (pthread_t *w,struct perf_cpu_map *cpu) {cpu_set_t *cpuset;unsigned int i;
@@ -137,6 +136,9 @@ static void block_threads(pthread_t *w,/* create and block all threads */ for (i =0 ; i < params.nthreads; i++) { +pthread_attr_t thread_attr; + +pthread_attr_init (&thread_attr);CPU_ZERO_S (size, cpuset);CPU_SET_S (perf_cpu_map__cpu (cpu, i %perf_cpu_map__nr (cpu)).cpu, size, cpuset);
@@ -149,6 +151,7 @@ static void block_threads(pthread_t *w,CPU_FREE (cpuset);err (EXIT_FAILURE ,"pthread_create" ); } +pthread_attr_destroy (&thread_attr); }CPU_FREE (cpuset); }
@@ -165,7 +168,6 @@ int bench_futex_requeue(int argc, const char **argv)int ret =0 ;unsigned int i, j;struct sigaction act; -pthread_attr_t thread_attr;struct perf_cpu_map *cpu; argc =parse_options (argc, argv, options, bench_futex_requeue_usage,0 );
@@ -209,7 +211,6 @@ int bench_futex_requeue(int argc, const char **argv)init_stats (&requeued_stats);init_stats (&requeuetime_stats); -pthread_attr_init (&thread_attr);mutex_init (&thread_lock);cond_init (&thread_parent);cond_init (&thread_worker);
@@ -219,7 +220,7 @@ int bench_futex_requeue(int argc, const char **argv)struct timeval start, end, runtime;/* create, launch & block all threads */ -block_threads (worker, thread_attr, cpu); +block_threads (worker, cpu);/* make sure all threads are already blocked */ mutex_lock (&thread_lock);
@@ -301,7 +302,6 @@ int bench_futex_requeue(int argc, const char **argv)cond_destroy (&thread_parent);cond_destroy (&thread_worker);mutex_destroy (&thread_lock); -pthread_attr_destroy (&thread_attr);print_summary ();
tools/perf/bench/futex-wake-parallel.c +11 -8
@@ -95,10 +95,12 @@ static void *waking_workerfn(void *arg)return NULL ; } -static void wakeup_threads (struct thread_data *td,pthread_attr_t thread_attr) +static void wakeup_threads (struct thread_data *td) {unsigned int i; +pthread_attr_t thread_attr; +pthread_attr_init (&thread_attr);pthread_attr_setdetachstate (&thread_attr,PTHREAD_CREATE_JOINABLE );pthread_barrier_init (&barrier,NULL , params.nwakes +1 );
@@ -122,6 +124,7 @@ static void wakeup_threads(struct thread_data *td, pthread_attr_t thread_attr)err (EXIT_FAILURE ,"pthread_join" );pthread_barrier_destroy (&barrier); +pthread_attr_destroy (&thread_attr); }static void *blocked_workerfn (void *arg__maybe_unused )
@@ -142,8 +145,7 @@ static void *blocked_workerfn(void *arg __maybe_unused)return NULL ; } -static void block_threads (pthread_t *w,pthread_attr_t thread_attr, -struct perf_cpu_map *cpu) +static void block_threads (pthread_t *w,struct perf_cpu_map *cpu) {cpu_set_t *cpuset;unsigned int i;
@@ -158,6 +160,9 @@ static void block_threads(pthread_t *w, pthread_attr_t thread_attr,/* create and block all threads */ for (i =0 ; i < params.nthreads; i++) { +pthread_attr_t thread_attr; + +pthread_attr_init (&thread_attr);CPU_ZERO_S (size, cpuset);CPU_SET_S (perf_cpu_map__cpu (cpu, i %perf_cpu_map__nr (cpu)).cpu, size, cpuset);
@@ -170,6 +175,7 @@ static void block_threads(pthread_t *w, pthread_attr_t thread_attr,CPU_FREE (cpuset);err (EXIT_FAILURE ,"pthread_create" ); } +pthread_attr_destroy (&thread_attr); }CPU_FREE (cpuset); }
@@ -238,7 +244,6 @@ int bench_futex_wake_parallel(int argc, const char **argv)int ret =0 ;unsigned int i, j;struct sigaction act; -pthread_attr_t thread_attr;struct thread_data *waking_worker;struct perf_cpu_map *cpu;
@@ -294,7 +299,6 @@ int bench_futex_wake_parallel(int argc, const char **argv)init_stats (&wakeup_stats);init_stats (&waketime_stats); -pthread_attr_init (&thread_attr);mutex_init (&thread_lock);cond_init (&thread_parent);cond_init (&thread_worker);
@@ -305,7 +309,7 @@ int bench_futex_wake_parallel(int argc, const char **argv)err (EXIT_FAILURE ,"calloc" );/* create, launch & block all threads */ -block_threads (blocked_worker, thread_attr, cpu); +block_threads (blocked_worker, cpu);/* make sure all threads are already blocked */ mutex_lock (&thread_lock);
@@ -317,7 +321,7 @@ int bench_futex_wake_parallel(int argc, const char **argv)usleep (100000 );/* Ok, all threads are patiently blocked, start waking folks up */ -wakeup_threads (waking_worker, thread_attr); +wakeup_threads (waking_worker);for (i =0 ; i < params.nthreads; i++) { ret =pthread_join (blocked_worker[i],NULL );
@@ -336,7 +340,6 @@ int bench_futex_wake_parallel(int argc, const char **argv)cond_destroy (&thread_parent);cond_destroy (&thread_worker);mutex_destroy (&thread_lock); -pthread_attr_destroy (&thread_attr);print_summary ();
tools/perf/bench/futex-wake.c +6 -6
@@ -95,8 +95,7 @@ static void print_summary(void) rel_stddev_stats(waketime_stddev, waketime_avg)); } -static void block_threads (pthread_t *w, -pthread_attr_t thread_attr,struct perf_cpu_map *cpu) +static void block_threads (pthread_t *w,struct perf_cpu_map *cpu) {cpu_set_t *cpuset;unsigned int i;
@@ -110,6 +109,9 @@ static void block_threads(pthread_t *w,/* create and block all threads */ for (i =0 ; i < params.nthreads; i++) { +pthread_attr_t thread_attr; + +pthread_attr_init (&thread_attr);CPU_ZERO_S (size, cpuset);CPU_SET_S (perf_cpu_map__cpu (cpu, i %perf_cpu_map__nr (cpu)).cpu, size, cpuset);
@@ -122,6 +124,7 @@ static void block_threads(pthread_t *w,CPU_FREE (cpuset);err (EXIT_FAILURE ,"pthread_create" ); } +pthread_attr_destroy (&thread_attr); }CPU_FREE (cpuset); }
@@ -138,7 +141,6 @@ int bench_futex_wake(int argc, const char **argv)int ret =0 ;unsigned int i, j;struct sigaction act; -pthread_attr_t thread_attr;struct perf_cpu_map *cpu; argc =parse_options (argc, argv, options, bench_futex_wake_usage,0 );
@@ -178,7 +180,6 @@ int bench_futex_wake(int argc, const char **argv)init_stats (&wakeup_stats);init_stats (&waketime_stats); -pthread_attr_init (&thread_attr);mutex_init (&thread_lock);cond_init (&thread_parent);cond_init (&thread_worker);
@@ -188,7 +189,7 @@ int bench_futex_wake(int argc, const char **argv)struct timeval start, end, runtime;/* create, launch & block all threads */ -block_threads (worker, thread_attr, cpu); +block_threads (worker, cpu);/* make sure all threads are already blocked */ mutex_lock (&thread_lock);
@@ -228,7 +229,6 @@ int bench_futex_wake(int argc, const char **argv)cond_destroy (&thread_parent);cond_destroy (&thread_worker);mutex_destroy (&thread_lock); -pthread_attr_destroy (&thread_attr);print_summary ();
Signature · 1 line
2.41.0.162.gfafddb0af9-goog
Ian Rogers
reviewerPATCH 5/5 perf bench sched messaging: Free contexts on exit
In reply to Ian RogersPlace sender and receiver contexts onto lists so that they may be freed on exit. Add missing pthread_attr_destroy. Fixes memory leaks reported by leak sanitizer.
--- tools/perf/bench/sched-messaging.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
tools/perf/bench/sched-messaging.c +17 -1
@@ -27,6 +27,7 @@#include <poll.h> #include <limits.h> #include <err.h> +#include <linux/list.h> #include <linux/time64.h> #define DATASIZE 100
@@ -35,8 +36,11 @@ static bool use_pipes = false;static unsigned int nr_loops =100 ;static bool thread_mode = false;static unsigned int num_groups =10 ; +static struct list_head sender_contexts =LIST_HEAD_INIT (sender_contexts); +static struct list_head receiver_contexts =LIST_HEAD_INIT (receiver_contexts);struct sender_context { +struct list_head list;unsigned int num_fds;int ready_out;int wakefd;
@@ -44,6 +48,7 @@ struct sender_context { };struct receiver_context { +struct list_head list;unsigned int num_packets;int in_fds[2 ];int ready_out;
@@ -170,6 +175,7 @@ static pthread_t create_worker(void *ctx, void *(*func)(void *))if (ret !=0 )err (EXIT_FAILURE ,"pthread_create failed" ); +pthread_attr_destroy (&attr);return childid; }
@@ -201,6 +207,7 @@ static unsigned int group(pthread_t *pth,if (!snd_ctx)err (EXIT_FAILURE ,"malloc()" ); +list_add (&snd_ctx->list, &sender_contexts);for (i =0 ; i < num_fds; i++) {int fds[2 ];struct receiver_context *ctx =malloc (sizeof (*ctx));
@@ -208,6 +215,7 @@ static unsigned int group(pthread_t *pth,if (!ctx)err (EXIT_FAILURE ,"malloc()" ); +list_add (&ctx->list, &receiver_contexts);/* Create the pipe between client and server */ fdpair (fds);
@@ -266,6 +274,7 @@ int bench_sched_messaging(int argc, const char **argv)int readyfds[2 ], wakefds[2 ];char dummy;pthread_t *pth_tab; +struct sender_context *pos, *n; argc =parse_options (argc, argv, options, bench_sched_message_usage,0 );
@@ -324,6 +333,13 @@ int bench_sched_messaging(int argc, const char **argv) }free (pth_tab); - +list_for_each_entry_safe (pos, n, &sender_contexts, list) { +list_del_init (&pos->list); +free (pos); + } +list_for_each_entry_safe (pos, n, &receiver_contexts, list) { +list_del_init (&pos->list); +free (pos); + }return 0 ; }
Signature · 1 line
2.41.0.162.gfafddb0af9-goog
Em Sun, Jun 11, 2023 at 04:36:06PM -0700, Ian Rogers escreveu:
Quoted 2 lines
exclude_cmdswill shorten the cmds names array, before doing so free the removed entry.
Thanks, applied.
- Arnaldo
Quoted 35 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/lib/subcmd/help.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)tools/lib/subcmd/help.c +6
-2@@ -66,6 +66,7 @@ void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes)while (ci < cmds->cnt && ei < excludes->cnt) { cmp =strcmp (cmds->names[ci]->name, excludes->names[ei]->name);if (cmp <0 ) { +zfree (&cmds->names[cj]); cmds->names[cj++] = cmds->names[ci++]; }else if (cmp ==0 ) { ci++;@@ -75,9 +76,12 @@ void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes) } } -while (ci < cmds->cnt) +while (ci < cmds->cnt) { +zfree (&cmds->names[cj]); cmds->names[cj++] = cmds->names[ci++]; - + } +for (ci = cj; ci < cmds->cnt; ci++) +zfree (&cmds->names[ci]); cmds->cnt = cj; }Signature · 1 line
2.41.0.162.gfafddb0af9-goog
Signature · 1 line
- Arnaldo