On Mon, 4 May 2020 09:27:11 +0300
"Tzvetomir Stoyanov (VMware)" <tz.stoyanov@xxxxxxxxx> wrote:
> When trace-cmd runs a command, specified with the "-F" flag, it forks a
> child process and executes the command in its context. This child process
> receives a full copy of the parents memory at the moment of fork(). When
> it modifies this copy, the parent memory is not affected. Calling the
> function update_task_filter() in the child context will operate on a valid
> data, but will not update anything in the parent's databases.
>
> Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@xxxxxxxxx>
> ---
> tracecmd/trace-record.c | 64 +++++++++++++++++++++++++++++++++--------
> 1 file changed, 52 insertions(+), 12 deletions(-)
>
> diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
> index 1e4d38fa..ae8a5745 100644
> --- a/tracecmd/trace-record.c
> +++ b/tracecmd/trace-record.c
> @@ -11,6 +11,7 @@
> #include <stdarg.h>
> #include <getopt.h>
> #include <time.h>
> +#include <semaphore.h>
OK, first things first. Do not use semaphores. I think I mentioned this to
you before. Semaphores are a horrible interface, and should be avoided at
all costs! ;-)
Also, I don't think you are solving the bug you think you are ;-)
With today's code (without this patch), I can run:
# trace-cmd record -e exceptions -e sched -e irq --proc-map ls
And for that result I can do:
# trace-cmd dump --options
[..]
[Option PROCMAPS, 2383 bytes]
a10 30 /usr/bin/ls
556850495000 556850499000 /usr/bin/ls
556850499000 5568504ad000 /usr/bin/ls
5568504ad000 5568504b6000 /usr/bin/ls
5568504b6000 5568504b8000 /usr/bin/ls
5568504b8000 5568504b9000 /usr/bin/ls
556850c60000 556850c81000 [heap]
7efce4a9b000 7efcf1a45000 /usr/lib/locale/locale-archive
7efcf1a49000 7efcf1a4f000 /usr/lib64/libpthread-2.28.so
7efcf1a4f000 7efcf1a5f000 /usr/lib64/libpthread-2.28.so
7efcf1a5f000 7efcf1a65000 /usr/lib64/libpthread-2.28.so
7efcf1a65000 7efcf1a66000 /usr/lib64/libpthread-2.28.so
7efcf1a66000 7efcf1a67000 /usr/lib64/libpthread-2.28.so
[..]
What is it that you are fixing? Remember, if we run --proc-map, we enable
ptrace. Which at the end of its execution we have:
case PTRACE_EVENT_EXIT:
if (get_procmap)
get_pid_addr_maps(pid);
Where the code records the proc_map of the -F process when it exits.
The only thing this patch is saving, is the wasted time of updating the
procmaps from the child. And to stop that, all you need is this:
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index 1e4d38fa..4d647887 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -1187,7 +1187,7 @@ static void get_filter_pid_maps(void)
}
}
-static void update_task_filter(void)
+static void update_task_filter(bool do_procmaps)
{
struct buffer_instance *instance;
int pid = getpid();
@@ -1195,7 +1195,7 @@ static void update_task_filter(void)
if (no_filter)
return;
- if (get_procmap && filter_pids)
+ if (do_procmaps && get_procmap && filter_pids)
get_filter_pid_maps();
if (filter_task)
@@ -1496,7 +1496,7 @@ static void run_cmd(enum trace_type type, const char *user, int argc, char **arg
die("failed to fork");
if (!pid) {
/* child */
- update_task_filter();
+ update_task_filter(false);
tracecmd_enable_tracing();
enable_ptrace();
/*
@@ -6285,7 +6285,7 @@ static void record_trace(int argc, char **argv,
if (!latency)
start_threads(type, ctx);
} else {
- update_task_filter();
+ update_task_filter(true);
tracecmd_enable_tracing();
exit(0);
}
@@ -6293,11 +6293,11 @@ static void record_trace(int argc, char **argv,
if (ctx->run_command) {
run_cmd(type, ctx->user, (argc - optind) - 1, &argv[optind + 1]);
} else if (ctx->instance && is_agent(ctx->instance)) {
- update_task_filter();
+ update_task_filter(true);
tracecmd_enable_tracing();
tracecmd_msg_wait_close(ctx->instance->msg_handle);
} else {
- update_task_filter();
+ update_task_filter(true);
tracecmd_enable_tracing();
/* We don't ptrace ourself */
if (do_ptrace && filter_pids) {
-- Steve
|