* [PATCH v2 1/3] trace-cmd: Internal refactoring of pid address map logic
2020-09-16 11:47 [PATCH v2 0/3] Initial trace-cmd support for ftrace uprobes Tzvetomir Stoyanov (VMware)
@ 2020-09-16 11:47 ` Tzvetomir Stoyanov (VMware)
2020-09-16 11:47 ` [PATCH v2 2/3] trace-cmd: New internal APIs for reading ELF header Tzvetomir Stoyanov (VMware)
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Tzvetomir Stoyanov (VMware) @ 2020-09-16 11:47 UTC (permalink / raw)
To: rostedt; +Cc: linux-trace-devel
Make functions for collecting file to memory map of a PID non static,
so they can be reused in the trace-cmd application context. Created new
file trace-obj-debug.c with these functions.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
tracecmd/Makefile | 1 +
tracecmd/include/trace-local.h | 19 +++--
tracecmd/trace-obj-debug.c | 138 +++++++++++++++++++++++++++++++++
tracecmd/trace-record.c | 107 +------------------------
4 files changed, 152 insertions(+), 113 deletions(-)
create mode 100644 tracecmd/trace-obj-debug.c
diff --git a/tracecmd/Makefile b/tracecmd/Makefile
index 5e59adf8..f9435558 100644
--- a/tracecmd/Makefile
+++ b/tracecmd/Makefile
@@ -31,6 +31,7 @@ TRACE_CMD_OBJS += trace-show.o
TRACE_CMD_OBJS += trace-list.o
TRACE_CMD_OBJS += trace-usage.o
TRACE_CMD_OBJS += trace-dump.o
+TRACE_CMD_OBJS += trace-obj-debug.o
ifeq ($(VSOCK_DEFINED), 1)
TRACE_CMD_OBJS += trace-tsync.o
endif
diff --git a/tracecmd/include/trace-local.h b/tracecmd/include/trace-local.h
index d148aa16..c5c225e0 100644
--- a/tracecmd/include/trace-local.h
+++ b/tracecmd/include/trace-local.h
@@ -178,14 +178,6 @@ struct func_list {
const char *mod;
};
-struct pid_addr_maps {
- struct pid_addr_maps *next;
- struct tracecmd_proc_addr_map *lib_maps;
- unsigned int nr_lib_maps;
- char *proc_name;
- int pid;
-};
-
struct opt_list {
struct opt_list *next;
const char *option;
@@ -314,4 +306,15 @@ void *malloc_or_die(unsigned int size); /* Can be overridden */
void __noreturn __die(const char *fmt, ...);
void __noreturn _vdie(const char *fmt, va_list ap);
+/* --- Debug symbols--- */
+struct pid_addr_maps {
+ struct pid_addr_maps *next;
+ struct tracecmd_proc_addr_map *lib_maps;
+ unsigned int nr_lib_maps;
+ char *proc_name;
+ int pid;
+};
+int trace_debug_get_filemap(struct pid_addr_maps **file_maps, int pid);
+void trace_debug_free_filemap(struct pid_addr_maps *maps);
+
#endif /* __TRACE_LOCAL_H */
diff --git a/tracecmd/trace-obj-debug.c b/tracecmd/trace-obj-debug.c
new file mode 100644
index 00000000..9aa9baae
--- /dev/null
+++ b/tracecmd/trace-obj-debug.c
@@ -0,0 +1,138 @@
+// SPDX-License-Identifier: LGPL-2.1
+/*
+ * Copyright (C) 2020, VMware, Tzvetomir Stoyanov <tz.stoyanov@gmail.com>
+ *
+ */
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include "trace-local.h"
+
+#define _STRINGIFY(x) #x
+#define STRINGIFY(x) _STRINGIFY(x)
+int trace_debug_get_filemap(struct pid_addr_maps **pid_maps, int pid)
+{
+ struct pid_addr_maps *maps = *pid_maps;
+ struct tracecmd_proc_addr_map *map;
+ unsigned long long begin, end;
+ struct pid_addr_maps *m;
+ char mapname[PATH_MAX+1];
+ char fname[PATH_MAX+1];
+ char buf[PATH_MAX+100];
+ FILE *f;
+ int ret;
+ int res;
+ int i;
+
+ sprintf(fname, "/proc/%d/exe", pid);
+ ret = readlink(fname, mapname, PATH_MAX);
+ if (ret >= PATH_MAX || ret < 0)
+ return -ENOENT;
+ mapname[ret] = 0;
+
+ sprintf(fname, "/proc/%d/maps", pid);
+ f = fopen(fname, "r");
+ if (!f)
+ return -ENOENT;
+
+ while (maps) {
+ if (pid == maps->pid)
+ break;
+ maps = maps->next;
+ }
+
+ ret = -ENOMEM;
+ if (!maps) {
+ maps = calloc(1, sizeof(*maps));
+ if (!maps)
+ goto out_fail;
+ maps->pid = pid;
+ maps->next = *pid_maps;
+ *pid_maps = maps;
+ } else {
+ for (i = 0; i < maps->nr_lib_maps; i++)
+ free(maps->lib_maps[i].lib_name);
+ free(maps->lib_maps);
+ maps->lib_maps = NULL;
+ maps->nr_lib_maps = 0;
+ free(maps->proc_name);
+ }
+
+ maps->proc_name = strdup(mapname);
+ if (!maps->proc_name)
+ goto out;
+
+ while (fgets(buf, sizeof(buf), f)) {
+ mapname[0] = '\0';
+ res = sscanf(buf, "%llx-%llx %*s %*x %*s %*d %"STRINGIFY(PATH_MAX)"s",
+ &begin, &end, mapname);
+ if (res == 3 && mapname[0] != '\0') {
+ map = realloc(maps->lib_maps,
+ (maps->nr_lib_maps + 1) * sizeof(*map));
+ if (!map)
+ goto out_fail;
+ map[maps->nr_lib_maps].end = end;
+ map[maps->nr_lib_maps].start = begin;
+ map[maps->nr_lib_maps].lib_name = strdup(mapname);
+ if (!map[maps->nr_lib_maps].lib_name)
+ goto out_fail;
+ maps->lib_maps = map;
+ maps->nr_lib_maps++;
+ }
+ }
+out:
+ fclose(f);
+ return 0;
+
+out_fail:
+ fclose(f);
+ if (maps) {
+ for (i = 0; i < maps->nr_lib_maps; i++)
+ free(maps->lib_maps[i].lib_name);
+ if (*pid_maps != maps) {
+ m = *pid_maps;
+ while (m) {
+ if (m->next == maps) {
+ m->next = maps->next;
+ break;
+ }
+ m = m->next;
+ }
+ } else
+ *pid_maps = maps->next;
+ free(maps->lib_maps);
+ maps->lib_maps = NULL;
+ maps->nr_lib_maps = 0;
+ free(maps->proc_name);
+ maps->proc_name = NULL;
+ free(maps);
+ }
+ return ret;
+}
+
+static void procmap_free(struct pid_addr_maps *maps)
+{
+ int i;
+
+ if (!maps)
+ return;
+ if (maps->lib_maps) {
+ for (i = 0; i < maps->nr_lib_maps; i++)
+ free(maps->lib_maps[i].lib_name);
+ free(maps->lib_maps);
+ }
+ free(maps->proc_name);
+ free(maps);
+}
+
+void trace_debug_free_filemap(struct pid_addr_maps *maps)
+{
+ struct pid_addr_maps *del;
+
+ while (maps) {
+ del = maps;
+ maps = maps->next;
+ procmap_free(del);
+ }
+}
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index bd004574..a48475b3 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -1080,109 +1080,6 @@ static char *make_pid_filter(struct buffer_instance *instance,
return filter;
}
-#define _STRINGIFY(x) #x
-#define STRINGIFY(x) _STRINGIFY(x)
-
-static int get_pid_addr_maps(struct buffer_instance *instance, int pid)
-{
- struct pid_addr_maps *maps = instance->pid_maps;
- struct tracecmd_proc_addr_map *map;
- unsigned long long begin, end;
- struct pid_addr_maps *m;
- char mapname[PATH_MAX+1];
- char fname[PATH_MAX+1];
- char buf[PATH_MAX+100];
- FILE *f;
- int ret;
- int res;
- int i;
-
- sprintf(fname, "/proc/%d/exe", pid);
- ret = readlink(fname, mapname, PATH_MAX);
- if (ret >= PATH_MAX || ret < 0)
- return -ENOENT;
- mapname[ret] = 0;
-
- sprintf(fname, "/proc/%d/maps", pid);
- f = fopen(fname, "r");
- if (!f)
- return -ENOENT;
-
- while (maps) {
- if (pid == maps->pid)
- break;
- maps = maps->next;
- }
-
- ret = -ENOMEM;
- if (!maps) {
- maps = calloc(1, sizeof(*maps));
- if (!maps)
- goto out_fail;
- maps->pid = pid;
- maps->next = instance->pid_maps;
- instance->pid_maps = maps;
- } else {
- for (i = 0; i < maps->nr_lib_maps; i++)
- free(maps->lib_maps[i].lib_name);
- free(maps->lib_maps);
- maps->lib_maps = NULL;
- maps->nr_lib_maps = 0;
- free(maps->proc_name);
- }
-
- maps->proc_name = strdup(mapname);
- if (!maps->proc_name)
- goto out;
-
- while (fgets(buf, sizeof(buf), f)) {
- mapname[0] = '\0';
- res = sscanf(buf, "%llx-%llx %*s %*x %*s %*d %"STRINGIFY(PATH_MAX)"s",
- &begin, &end, mapname);
- if (res == 3 && mapname[0] != '\0') {
- map = realloc(maps->lib_maps,
- (maps->nr_lib_maps + 1) * sizeof(*map));
- if (!map)
- goto out_fail;
- map[maps->nr_lib_maps].end = end;
- map[maps->nr_lib_maps].start = begin;
- map[maps->nr_lib_maps].lib_name = strdup(mapname);
- if (!map[maps->nr_lib_maps].lib_name)
- goto out_fail;
- maps->lib_maps = map;
- maps->nr_lib_maps++;
- }
- }
-out:
- fclose(f);
- return 0;
-
-out_fail:
- fclose(f);
- if (maps) {
- for (i = 0; i < maps->nr_lib_maps; i++)
- free(maps->lib_maps[i].lib_name);
- if (instance->pid_maps != maps) {
- m = instance->pid_maps;
- while (m) {
- if (m->next == maps) {
- m->next = maps->next;
- break;
- }
- m = m->next;
- }
- } else
- instance->pid_maps = maps->next;
- free(maps->lib_maps);
- maps->lib_maps = NULL;
- maps->nr_lib_maps = 0;
- free(maps->proc_name);
- maps->proc_name = NULL;
- free(maps);
- }
- return ret;
-}
-
static void get_filter_pid_maps(void)
{
struct buffer_instance *instance;
@@ -1194,7 +1091,7 @@ static void get_filter_pid_maps(void)
for (p = instance->filter_pids; p; p = p->next) {
if (p->exclude)
continue;
- get_pid_addr_maps(instance, p->pid);
+ trace_debug_get_filemap(&instance->pid_maps, p->pid);
}
}
}
@@ -1524,7 +1421,7 @@ static void ptrace_wait(enum trace_type type)
case PTRACE_EVENT_EXIT:
instance = get_intance_fpid(pid);
if (instance && instance->get_procmap)
- get_pid_addr_maps(instance, pid);
+ trace_debug_get_filemap(&instance->pid_maps, pid);
ptrace(PTRACE_GETEVENTMSG, pid, NULL, &cstatus);
ptrace(PTRACE_DETACH, pid, NULL, NULL);
break;
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2 2/3] trace-cmd: New internal APIs for reading ELF header
2020-09-16 11:47 [PATCH v2 0/3] Initial trace-cmd support for ftrace uprobes Tzvetomir Stoyanov (VMware)
2020-09-16 11:47 ` [PATCH v2 1/3] trace-cmd: Internal refactoring of pid address map logic Tzvetomir Stoyanov (VMware)
@ 2020-09-16 11:47 ` Tzvetomir Stoyanov (VMware)
2020-09-17 13:42 ` Steven Rostedt
2020-09-16 11:47 ` [PATCH v2 3/3] trace-cmd: [POC] Add support for uprobes Tzvetomir Stoyanov (VMware)
` (2 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Tzvetomir Stoyanov (VMware) @ 2020-09-16 11:47 UTC (permalink / raw)
To: rostedt; +Cc: linux-trace-devel
Implemented new trace-cmd internal APIs for parsing ELF header and
resolving VMA to function name and function name to VMA and file offset.
The bfd library is used to read and parse the binary file. The new APIs
are part of trace-cmd application and are visible only inside its
context.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
Makefile | 10 +
include/trace-cmd/trace-cmd.h | 8 +
tracecmd/include/trace-local.h | 12 +
tracecmd/trace-obj-debug.c | 685 +++++++++++++++++++++++++++++++++
4 files changed, 715 insertions(+)
diff --git a/Makefile b/Makefile
index b0340427..0d657969 100644
--- a/Makefile
+++ b/Makefile
@@ -245,6 +245,16 @@ endif
CUNIT_INSTALLED := $(shell if (printf "$(pound)include <CUnit/Basic.h>\n void main(){CU_initialize_registry();}" | $(CC) -x c - -lcunit >/dev/null 2>&1) ; then echo 1; else echo 0 ; fi)
export CUNIT_INSTALLED
+BFD_INSTALLED := $(shell if (echo -e "\#include <bfd.h>\n void main(){bfd_init();}" | $(CC) -xc - -lbfd >/dev/null 2>&1) ; then echo 1; else echo 0 ; fi)
+
+export BFD_INSTALLED
+ifeq ($(BFD_INSTALLED), 1)
+CFLAGS += -DBFD_INSTALLED
+LIBS += -lbfd
+else
+$(warning libbfd is not installed)
+endif
+
export CFLAGS
export INCLUDES
diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h
index f3c95f30..5ebd076e 100644
--- a/include/trace-cmd/trace-cmd.h
+++ b/include/trace-cmd/trace-cmd.h
@@ -135,6 +135,14 @@ struct tracecmd_proc_addr_map {
char *lib_name;
};
+struct tracecmd_debug_symbols {
+ char *name; /* symbol's name */
+ char *fname; /* symbol's file */
+ unsigned long long vma_start; /* symbol's start VMA */
+ unsigned long long vma_near; /* symbol's requested VMA */
+ unsigned long long foffset; /* symbol's offset in the binary file*/
+};
+
typedef void (*tracecmd_show_data_func)(struct tracecmd_input *handle,
struct tep_record *record);
typedef void (*tracecmd_handle_init_func)(struct tracecmd_input *handle,
diff --git a/tracecmd/include/trace-local.h b/tracecmd/include/trace-local.h
index c5c225e0..ccae61d4 100644
--- a/tracecmd/include/trace-local.h
+++ b/tracecmd/include/trace-local.h
@@ -317,4 +317,16 @@ struct pid_addr_maps {
int trace_debug_get_filemap(struct pid_addr_maps **file_maps, int pid);
void trace_debug_free_filemap(struct pid_addr_maps *maps);
+struct trace_debug_object;
+struct trace_debug_object *trace_debug_obj_create_file(char *file);
+struct trace_debug_object *trace_debug_obj_create_pid(int pid);
+void trace_debug_obj_destroy(struct trace_debug_object *debug);
+
+int trace_debug_resolve_symbols(struct trace_debug_object *obj);
+int trace_debug_add_resolve_symbol(struct trace_debug_object *obj,
+ unsigned long long vma, char *name);
+
+void trace_debug_walk_resolved_symbols(struct trace_debug_object *obj,
+ int (*callback)(struct tracecmd_debug_symbols *, void *),
+ void *context);
#endif /* __TRACE_LOCAL_H */
diff --git a/tracecmd/trace-obj-debug.c b/tracecmd/trace-obj-debug.c
index 9aa9baae..93b0dfee 100644
--- a/tracecmd/trace-obj-debug.c
+++ b/tracecmd/trace-obj-debug.c
@@ -4,10 +4,695 @@
*
*/
#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <limits.h>
#include <errno.h>
+#include <bfd.h>
#include <unistd.h>
#include "trace-local.h"
+#include "trace-cmd.h"
+
+#ifdef BFD_INSTALLED
+
+struct trace_debug_handle {
+ bfd *bfd;
+ unsigned long long addr_offset;
+};
+
+struct trace_debug_vmem_range {
+ struct trace_debug_vmem_range *next;
+ unsigned long long start;
+ unsigned long long end;
+};
+
+struct debug_symbols {
+ struct debug_symbols *next;
+ regex_t *regex;
+ struct tracecmd_debug_symbols symbol;
+};
+
+struct trace_debug_file {
+ struct trace_debug_file *next;
+ char *file_name;
+ struct trace_debug_vmem_range *vmem;
+ struct trace_debug_handle *dbg;
+ int sym_count;
+ struct debug_symbols *sym; /* symbols to resolve,
+ * look in this file only
+ */
+};
+
+struct trace_debug_object {
+ int pid;
+ char *fname;
+ struct pid_addr_maps *fmaps;
+ int sym_count;
+ struct debug_symbols *sym; /* symbols to resolve,
+ * look into all files
+ */
+ struct trace_debug_file *files;
+};
+
+#define RESOLVE_NAME (1 << 0)
+#define RESOLVE_VMA (1 << 1)
+#define RESOLVE_FOFFSET (1 << 2)
+struct trace_obj_job {
+ unsigned int flags;
+ unsigned long long addr_offset;
+ struct debug_symbols *symbols;
+};
+
+struct dwarf_bfd_context {
+ asymbol **table;
+ struct trace_obj_job *job;
+};
+
+static void bfd_dwarf_section(bfd *abfd, asection *section, void *param)
+{
+ struct dwarf_bfd_context *context = (struct dwarf_bfd_context *)param;
+ unsigned int discriminator;
+ const char *functionname;
+ struct debug_symbols *s;
+ unsigned long long vma;
+ const char *filename;
+ unsigned int line;
+ bfd_boolean found;
+
+ if (!(section->flags & SEC_CODE))
+ return;
+
+ for (s = context->job->symbols; s; s = s->next) {
+ if (s->symbol.vma_near)
+ vma = s->symbol.vma_near;
+ else if (s->symbol.vma_start)
+ vma = s->symbol.vma_start;
+ else
+ continue;
+
+ if (abfd->flags & DYNAMIC)
+ vma -= context->job->addr_offset;
+ if (vma && section->vma <= vma &&
+ (section->vma + section->size) > vma) {
+ if (!s->symbol.fname)
+ s->symbol.fname = strdup(abfd->filename);
+ if (context->job->flags & RESOLVE_FOFFSET)
+ s->symbol.foffset = section->filepos + (vma - section->vma);
+ if (!s->symbol.name && (context->job->flags & RESOLVE_NAME)) {
+ found = bfd_find_nearest_line_discriminator(abfd, section, context->table,
+ vma - section->vma, &filename,
+ &functionname, &line, &discriminator);
+ if (found)
+ s->symbol.name = strdup(functionname);
+ }
+ }
+ }
+}
+
+static asymbol **get_sym_table(bfd *handle)
+{
+ bfd_boolean dyn = FALSE;
+ asymbol **symtable;
+ long count;
+ long size;
+
+ if ((bfd_get_file_flags(handle) & HAS_SYMS) == 0)
+ return NULL;
+ size = bfd_get_symtab_upper_bound(handle);
+ if (size == 0) {
+ size = bfd_get_dynamic_symtab_upper_bound(handle);
+ dyn = TRUE;
+ }
+ if (size <= 0)
+ return NULL;
+
+ symtable = (asymbol **) calloc(1, size);
+ if (!symtable)
+ return NULL;
+ if (dyn)
+ count = bfd_canonicalize_dynamic_symtab(handle, symtable);
+ else
+ count = bfd_canonicalize_symtab(handle, symtable);
+ if (count <= 0) {
+ free(symtable);
+ return NULL;
+ }
+/*
+ * alloc = bfd_demangle(cur_bfd, name, demangle_flags);
+ */
+
+ return symtable;
+}
+
+static int sym_match(char *pattern, regex_t *regex, const char *symbol)
+{
+ if (strlen(pattern) == strlen(symbol) &&
+ !strcmp(pattern, symbol))
+ return 0;
+ if (regex && !regexec(regex, symbol, 0, NULL, 0))
+ return 1;
+
+ return -1;
+}
+
+static int bfd_symlookup(struct dwarf_bfd_context *context)
+{
+ struct debug_symbols *s, *last = NULL;
+ struct debug_symbols *new, *new_list = NULL;
+ unsigned long long vma;
+ asymbol **sp;
+ int res = 0;
+ int ret;
+
+ for (sp = context->table; *sp != NULL; sp++) {
+ if (!((*sp)->flags & BSF_FUNCTION))
+ continue;
+ for (s = context->job->symbols; s; s = s->next) {
+ last = s;
+ ret = sym_match(s->symbol.name, s->regex, (*sp)->name);
+ if (ret < 0)
+ continue;
+ vma = (*sp)->value + (*sp)->section->vma;
+ if ((*sp)->the_bfd->flags & DYNAMIC)
+ vma += context->job->addr_offset;
+ if (ret == 0) { /* exact match */
+ s->symbol.vma_start = vma;
+ } else { /* regex pattern match */
+ new = calloc(1, sizeof(struct debug_symbols));
+ if (!new)
+ break;
+ new->symbol.name = strdup((*sp)->name);
+ new->symbol.vma_start = vma;
+ new->symbol.vma_near = s->symbol.vma_near;
+ new->symbol.foffset = s->symbol.foffset;
+ if (s->symbol.fname)
+ new->symbol.fname = strdup(s->symbol.fname);
+ new->next = new_list;
+ new_list = new;
+ }
+ res++;
+ }
+ }
+ if (last && !last->next)
+ last->next = new_list;
+
+ return res;
+}
+
+static int bfd_process_object(bfd *abfd, struct trace_obj_job *job)
+{
+ struct dwarf_bfd_context context;
+ int ret = 0;
+
+ memset(&context, 0, sizeof(context));
+ context.job = job;
+
+ if (bfd_check_format_matches(abfd, bfd_object, NULL) ||
+ bfd_check_format_matches(abfd, bfd_core, NULL)) {
+ context.table = get_sym_table(abfd);
+ if (job->flags & RESOLVE_VMA)
+ bfd_symlookup(&context);
+ if ((job->flags & RESOLVE_NAME) || (job->flags & RESOLVE_FOFFSET))
+ bfd_map_over_sections(abfd, bfd_dwarf_section, &context);
+ free(context.table);
+ } else {
+ ret = -1;
+ }
+
+ return ret;
+}
+
+static int bfd_read_all(bfd *abfd, struct trace_obj_job *job)
+{
+ bfd *last_arfile = NULL;
+ bfd *arfile = NULL;
+ int ret = 0;
+
+ if (bfd_check_format(abfd, bfd_archive)) {
+ for (;;) {
+ bfd_set_error(bfd_error_no_error);
+ arfile = bfd_openr_next_archived_file(abfd, arfile);
+ if (!arfile) {
+ if (bfd_get_error() != bfd_error_no_more_archived_files)
+ break;
+ }
+ ret = bfd_read_all(arfile, job);
+ if (last_arfile)
+ bfd_close(last_arfile);
+ last_arfile = arfile;
+ }
+ if (last_arfile)
+ bfd_close(last_arfile);
+ } else
+ ret = bfd_process_object(abfd, job);
+
+ return ret;
+}
+
+/**
+ * resolve_symbol_vma - name -> (vma, file offset) resolving
+ * @obj - pointer to object, returned by trace_obj_debug_create()
+ * @symbols - link list with desired symbols, with given name
+ *
+ * Get VMA and file offset of the symbols with given name
+ * Return 0 on success, -1 on error
+ */
+static int resolve_symbol_vma(struct trace_debug_handle *obj,
+ struct debug_symbols *symbols)
+{
+ struct trace_obj_job job;
+ int ret;
+
+ memset(&job, 0, sizeof(job));
+ job.flags |= RESOLVE_VMA;
+ job.flags |= RESOLVE_FOFFSET;
+ job.symbols = symbols;
+ job.addr_offset = obj->addr_offset;
+ ret = bfd_read_all(obj->bfd, &job);
+
+ return ret;
+}
+
+/**
+ * resolve_symbol_name - vma -> name resolving
+ * @obj - pointer to object, returned by trace_obj_debug_create()
+ * @symbols - link list with desired symbols, with given VMA
+ *
+ * Get names of the symbols with given VMA, look for nearest symbol to that VMA
+ * Return 0 on success, -1 on error
+ */
+static int resolve_symbol_name(struct trace_debug_handle *obj,
+ struct debug_symbols *symbols)
+{
+ struct trace_obj_job job;
+
+ if (!obj || !obj->bfd)
+ return -1;
+ memset(&job, 0, sizeof(job));
+ job.flags |= RESOLVE_NAME;
+ job.addr_offset = obj->addr_offset;
+ job.symbols = symbols;
+ return bfd_read_all(obj->bfd, &job);
+}
+
+/**
+ * debug_handle_destroy - Close file opened with trace_obj_debug_create()
+ * @obj - pointer to object, returned by trace_obj_debug_create()
+ *
+ * Close the file and free any allocated resources, related to file's debug
+ * information
+ */
+static void debug_handle_destroy(struct trace_debug_handle *obj)
+{
+ if (obj && obj->bfd)
+ bfd_close(obj->bfd);
+ free(obj);
+}
+
+/**
+ * debug_handle_create - Open binary file for parsing ELF and DWARF information
+ * @name: Name of the binary ELF file.
+ *
+ * Return pointer to trace_obj_debug structure, that can be passed to other APIs
+ * for extracting debug information from the file. NULL in case of an error.
+ */
+static struct trace_debug_handle *debug_handle_create(char *file)
+{
+ struct trace_debug_handle *obj = NULL;
+
+ obj = calloc(1, sizeof(*obj));
+ if (!obj)
+ return NULL;
+
+ bfd_init();
+ obj->bfd = bfd_openr(file, NULL);
+ if (!obj->bfd)
+ goto error;
+ obj->bfd->flags |= BFD_DECOMPRESS;
+
+ return obj;
+
+error:
+ debug_handle_destroy(obj);
+ return NULL;
+}
+
+static void set_vma_offset(struct trace_debug_handle *obj,
+ unsigned long long addr_offset)
+{
+ if (obj)
+ obj->addr_offset = addr_offset;
+}
+
+static char *get_full_name(int pid)
+{
+ char mapname[PATH_MAX+1];
+ char fname[PATH_MAX+1];
+ int ret;
+
+ sprintf(fname, "/proc/%d/exe", pid);
+ ret = readlink(fname, mapname, PATH_MAX);
+ if (ret >= PATH_MAX || ret < 0)
+ return NULL;
+ mapname[ret] = 0;
+
+ return strdup(mapname);
+}
+
+static struct trace_debug_file *get_mapped_file(struct trace_debug_object *dbg, char *fname)
+{
+ struct trace_debug_file *file = dbg->files;
+
+ while (file) {
+ if (!strcmp(fname, file->file_name))
+ break;
+ file = file->next;
+ }
+ if (file)
+ return file;
+
+ file = calloc(1, sizeof(*file));
+ if (!file)
+ return NULL;
+ file->file_name = strdup(fname);
+ file->dbg = debug_handle_create(fname);
+ file->next = dbg->files;
+ dbg->files = file;
+ return file;
+}
+
+void trace_debug_obj_destroy(struct trace_debug_object *dbg)
+{
+ struct trace_debug_vmem_range *mdel;
+ struct trace_debug_file *fdel;
+ struct debug_symbols *sdel;
+
+ while (dbg->sym) {
+ sdel = dbg->sym;
+ dbg->sym = dbg->sym->next;
+ if (sdel->regex) {
+ regfree(sdel->regex);
+ free(sdel->regex);
+ }
+ free(sdel->symbol.name);
+ free(sdel->symbol.fname);
+ free(sdel);
+ }
+ while (dbg->files) {
+ fdel = dbg->files;
+ dbg->files = dbg->files->next;
+ debug_handle_destroy(fdel->dbg);
+ while (fdel->sym) {
+ sdel = fdel->sym;
+ fdel->sym = fdel->sym->next;
+ free(sdel->symbol.name);
+ free(sdel->symbol.fname);
+ free(sdel);
+ }
+ while (fdel->vmem) {
+ mdel = fdel->vmem;
+ fdel->vmem = fdel->vmem->next;
+ free(mdel);
+ }
+ free(fdel);
+ }
+
+ free(dbg->fname);
+ trace_debug_free_filemap(dbg->fmaps);
+ free(dbg);
+}
+
+struct trace_debug_object *trace_debug_obj_create_pid(int pid)
+{
+ struct trace_debug_vmem_range *mem;
+ struct trace_debug_object *dbg;
+ struct trace_debug_file *file;
+ int i;
+
+ dbg = calloc(1, sizeof(*dbg));
+ if (!dbg)
+ return NULL;
+
+ dbg->pid = pid;
+ dbg->fname = get_full_name(pid);
+ trace_debug_get_filemap(&dbg->fmaps, pid);
+
+ for (i = 0; i < dbg->fmaps->nr_lib_maps; i++) {
+ file = get_mapped_file(dbg, dbg->fmaps->lib_maps[i].lib_name);
+ if (!file)
+ goto error;
+ if (file->vmem && file->vmem->end == dbg->fmaps->lib_maps[i].start) {
+ file->vmem->end = dbg->fmaps->lib_maps[i].end;
+ } else {
+ mem = calloc(1, sizeof(*mem));
+ if (!mem)
+ goto error;
+ mem->start = dbg->fmaps->lib_maps[i].start;
+ mem->end = dbg->fmaps->lib_maps[i].end;
+ mem->next = file->vmem;
+ file->vmem = mem;
+ set_vma_offset(file->dbg, mem->start);
+ }
+ }
+ return dbg;
+
+error:
+ trace_debug_obj_destroy(dbg);
+ return NULL;
+}
+
+struct trace_debug_object *trace_debug_obj_create_file(char *fname)
+{
+ struct trace_debug_object *dbg;
+ struct trace_debug_file *file;
+
+ dbg = calloc(1, sizeof(*dbg));
+ if (!dbg)
+ return NULL;
+
+ dbg->fname = strdup(fname);
+ file = get_mapped_file(dbg, fname);
+ if (!file)
+ goto error;
+
+ return dbg;
+
+error:
+ trace_debug_obj_destroy(dbg);
+ return NULL;
+}
+
+static void set_unknown(struct debug_symbols *sym, char *file)
+{
+ while (sym) {
+ if (!sym->symbol.fname)
+ sym->symbol.fname = strdup(file);
+ sym = sym->next;
+ }
+}
+
+int trace_debug_resolve_symbols(struct trace_debug_object *obj)
+{
+ struct trace_debug_file *file;
+
+ for (file = obj->files; file; file = file->next) {
+ if (!file->dbg) {
+ set_unknown(file->sym, file->file_name);
+ continue;
+ }
+ /* near VMA -> name resolving */
+ resolve_symbol_name(file->dbg, file->sym);
+ /* name -> exact VMA resolving */
+ resolve_symbol_vma(file->dbg, file->sym);
+ resolve_symbol_vma(file->dbg, obj->sym);
+ }
+
+ return 0;
+}
+
+static int add_resolve_vma2name(struct trace_debug_object *obj,
+ unsigned long long vma)
+{
+ struct trace_debug_vmem_range *vmem;
+ struct debug_symbols *s = NULL;
+ struct trace_debug_file *file;
+
+ file = obj->files;
+ while (file) {
+ if (!file->vmem)
+ break;
+ vmem = file->vmem;
+ while (vmem) {
+ if (vma >= vmem->start && vma <= vmem->end)
+ break;
+ vmem = vmem->next;
+ }
+ if (vmem)
+ break;
+ file = file->next;
+ }
+ if (file) {
+ s = file->sym;
+ while (s) {
+ if (s->symbol.vma_near == vma)
+ break;
+ s = s->next;
+ }
+ if (!s) {
+ s = calloc(1, sizeof(*s));
+ if (!s)
+ return -1;
+ s->symbol.vma_near = vma;
+ s->next = file->sym;
+ file->sym = s;
+ file->sym_count++;
+ }
+ }
+
+ if (s)
+ return 0;
+ return -1;
+}
+
+static int add_resolve_name2vma(struct trace_debug_object *obj, char *name)
+{
+ struct debug_symbols *s = NULL;
+
+ s = obj->sym;
+ while (s) {
+ if (s->symbol.name && !strcmp(name, s->symbol.name))
+ break;
+ s = s->next;
+ }
+ if (!s) {
+ s = calloc(1, sizeof(*s));
+ if (!s)
+ return -1;
+ s->symbol.name = strdup(name);
+ if (!s->symbol.name)
+ goto error;
+ s->regex = calloc(1, sizeof(regex_t));
+ if (!s->regex)
+ goto error;
+ if (regcomp(s->regex, name, REG_NOSUB) < 0)
+ goto error;
+ s->next = obj->sym;
+ obj->sym = s;
+ obj->sym_count++;
+ }
+
+ return 0;
+
+error:
+ if (s) {
+ if (s->regex) {
+ regfree(s->regex);
+ free(s->regex);
+ }
+ free(s->symbol.name);
+ free(s);
+ }
+ return -1;
+}
+
+int trace_debug_add_resolve_symbol(struct trace_debug_object *obj,
+ unsigned long long vma, char *name)
+{
+ int ret = -1;
+
+ if (!obj)
+ return -1;
+
+ if (!name && vma) /* vma -> name resolving */
+ ret = add_resolve_vma2name(obj, vma);
+ else if (name) /* name -> vma resolving */
+ ret = add_resolve_name2vma(obj, name);
+
+ return ret;
+}
+
+static int walk_symbols(struct debug_symbols *sym,
+ int (*callback)(struct tracecmd_debug_symbols *, void *),
+ void *context)
+{
+ while (sym) {
+ if (callback(&sym->symbol, context))
+ return -1;
+ sym = sym->next;
+ }
+
+ return 0;
+}
+
+void trace_debug_walk_resolved_symbols(struct trace_debug_object *obj,
+ int (*callback)(struct tracecmd_debug_symbols *, void *),
+ void *context)
+{
+ struct trace_debug_file *file;
+
+ walk_symbols(obj->sym, callback, context);
+ file = obj->files;
+ while (file) {
+ walk_symbols(file->sym, callback, context);
+ file = file->next;
+ }
+}
+
+
+void trace_debug_free_symbols(struct tracecmd_debug_symbols *symbols, int count)
+{
+ int i;
+
+ if (!symbols)
+ return;
+
+ for (i = 0; i < count; i++) {
+ free(symbols[i].name);
+ free(symbols[i].fname);
+ }
+ free(symbols);
+
+}
+#else
+int trace_debug_resolve_symbols(struct trace_debug_object *obj)
+{
+ return -1;
+}
+
+int trace_debug_add_resolve_symbol(struct trace_debug_object *obj,
+ unsigned long long vma, char *name)
+{
+ return -1;
+}
+
+void trace_debug_walk_resolved_symbols(struct trace_debug_object *obj,
+ int (*callback)(struct tracecmd_debug_symbols *, void *),
+ void *context)
+{
+
+}
+
+void trace_debug_free_symbols(struct tracecmd_debug_symbols *symbols, int count)
+{
+
+}
+
+void trace_debug_obj_destroy(struct trace_debug_object *debug)
+{
+
+}
+
+struct trace_debug_object *trace_debug_obj_create_file(char *file)
+{
+ return NULL;
+}
+struct trace_debug_object *trace_debug_obj_create_pid(int pid)
+{
+ return NULL;
+}
+
+#endif
#define _STRINGIFY(x) #x
#define STRINGIFY(x) _STRINGIFY(x)
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v2 2/3] trace-cmd: New internal APIs for reading ELF header
2020-09-16 11:47 ` [PATCH v2 2/3] trace-cmd: New internal APIs for reading ELF header Tzvetomir Stoyanov (VMware)
@ 2020-09-17 13:42 ` Steven Rostedt
0 siblings, 0 replies; 8+ messages in thread
From: Steven Rostedt @ 2020-09-17 13:42 UTC (permalink / raw)
To: Tzvetomir Stoyanov (VMware); +Cc: linux-trace-devel
On Wed, 16 Sep 2020 14:47:08 +0300
"Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com> wrote:
> +#define RESOLVE_NAME (1 << 0)
> +#define RESOLVE_VMA (1 << 1)
> +#define RESOLVE_FOFFSET (1 << 2)
> +struct trace_obj_job {
> + unsigned int flags;
> + unsigned long long addr_offset;
> + struct debug_symbols *symbols;
> +};
> +
> +struct dwarf_bfd_context {
> + asymbol **table;
> + struct trace_obj_job *job;
> +};
> +
> +static void bfd_dwarf_section(bfd *abfd, asection *section, void *param)
Another small comment. Do not name any function that starts with "bfd_" as
that makes it hard to know the difference between these functions and
functions from the bfd library. The only functions that should have bfd_ as
the start are those in the library.
Could call this: dwarf_bfd_section()?
> +{
> + struct dwarf_bfd_context *context = (struct dwarf_bfd_context *)param;
> + unsigned int discriminator;
> + const char *functionname;
> + struct debug_symbols *s;
> + unsigned long long vma;
> + const char *filename;
> + unsigned int line;
> + bfd_boolean found;
> +
> + if (!(section->flags & SEC_CODE))
> + return;
> +
> + for (s = context->job->symbols; s; s = s->next) {
> + if (s->symbol.vma_near)
> + vma = s->symbol.vma_near;
> + else if (s->symbol.vma_start)
> + vma = s->symbol.vma_start;
> + else
> + continue;
> +
> + if (abfd->flags & DYNAMIC)
> + vma -= context->job->addr_offset;
> + if (vma && section->vma <= vma &&
> + (section->vma + section->size) > vma) {
> + if (!s->symbol.fname)
> + s->symbol.fname = strdup(abfd->filename);
> + if (context->job->flags & RESOLVE_FOFFSET)
> + s->symbol.foffset = section->filepos + (vma - section->vma);
> + if (!s->symbol.name && (context->job->flags & RESOLVE_NAME)) {
> + found = bfd_find_nearest_line_discriminator(abfd, section, context->table,
> + vma - section->vma, &filename,
> + &functionname, &line, &discriminator);
> + if (found)
> + s->symbol.name = strdup(functionname);
> + }
> + }
> + }
> +}
> +
> +static asymbol **get_sym_table(bfd *handle)
> +{
> + bfd_boolean dyn = FALSE;
> + asymbol **symtable;
> + long count;
> + long size;
> +
> + if ((bfd_get_file_flags(handle) & HAS_SYMS) == 0)
> + return NULL;
> + size = bfd_get_symtab_upper_bound(handle);
> + if (size == 0) {
> + size = bfd_get_dynamic_symtab_upper_bound(handle);
> + dyn = TRUE;
> + }
> + if (size <= 0)
> + return NULL;
> +
> + symtable = (asymbol **) calloc(1, size);
> + if (!symtable)
> + return NULL;
> + if (dyn)
> + count = bfd_canonicalize_dynamic_symtab(handle, symtable);
> + else
> + count = bfd_canonicalize_symtab(handle, symtable);
> + if (count <= 0) {
> + free(symtable);
> + return NULL;
> + }
> +/*
> + * alloc = bfd_demangle(cur_bfd, name, demangle_flags);
> + */
> +
> + return symtable;
> +}
> +
> +static int sym_match(char *pattern, regex_t *regex, const char *symbol)
> +{
> + if (strlen(pattern) == strlen(symbol) &&
> + !strcmp(pattern, symbol))
> + return 0;
> + if (regex && !regexec(regex, symbol, 0, NULL, 0))
> + return 1;
> +
> + return -1;
> +}
> +
> +static int bfd_symlookup(struct dwarf_bfd_context *context)
Same here: lookup_bfd_sym()?
> +{
> + struct debug_symbols *s, *last = NULL;
> + struct debug_symbols *new, *new_list = NULL;
> + unsigned long long vma;
> + asymbol **sp;
> + int res = 0;
> + int ret;
> +
> + for (sp = context->table; *sp != NULL; sp++) {
> + if (!((*sp)->flags & BSF_FUNCTION))
> + continue;
> + for (s = context->job->symbols; s; s = s->next) {
> + last = s;
> + ret = sym_match(s->symbol.name, s->regex, (*sp)->name);
> + if (ret < 0)
> + continue;
> + vma = (*sp)->value + (*sp)->section->vma;
> + if ((*sp)->the_bfd->flags & DYNAMIC)
> + vma += context->job->addr_offset;
> + if (ret == 0) { /* exact match */
> + s->symbol.vma_start = vma;
> + } else { /* regex pattern match */
> + new = calloc(1, sizeof(struct debug_symbols));
> + if (!new)
> + break;
> + new->symbol.name = strdup((*sp)->name);
> + new->symbol.vma_start = vma;
> + new->symbol.vma_near = s->symbol.vma_near;
> + new->symbol.foffset = s->symbol.foffset;
> + if (s->symbol.fname)
> + new->symbol.fname = strdup(s->symbol.fname);
> + new->next = new_list;
> + new_list = new;
> + }
> + res++;
> + }
> + }
> + if (last && !last->next)
> + last->next = new_list;
> +
> + return res;
> +}
> +
> +static int bfd_process_object(bfd *abfd, struct trace_obj_job *job)
find_bfd_process_object()?
> +{
> + struct dwarf_bfd_context context;
> + int ret = 0;
> +
> + memset(&context, 0, sizeof(context));
> + context.job = job;
> +
> + if (bfd_check_format_matches(abfd, bfd_object, NULL) ||
> + bfd_check_format_matches(abfd, bfd_core, NULL)) {
> + context.table = get_sym_table(abfd);
> + if (job->flags & RESOLVE_VMA)
> + bfd_symlookup(&context);
> + if ((job->flags & RESOLVE_NAME) || (job->flags & RESOLVE_FOFFSET))
> + bfd_map_over_sections(abfd, bfd_dwarf_section, &context);
> + free(context.table);
> + } else {
> + ret = -1;
> + }
> +
> + return ret;
> +}
> +
> +static int bfd_read_all(bfd *abfd, struct trace_obj_job *job)
read_all_bfd()?
-- Steve
> +{
> + bfd *last_arfile = NULL;
> + bfd *arfile = NULL;
> + int ret = 0;
> +
> + if (bfd_check_format(abfd, bfd_archive)) {
> + for (;;) {
> + bfd_set_error(bfd_error_no_error);
> + arfile = bfd_openr_next_archived_file(abfd, arfile);
> + if (!arfile) {
> + if (bfd_get_error() != bfd_error_no_more_archived_files)
> + break;
> + }
> + ret = bfd_read_all(arfile, job);
> + if (last_arfile)
> + bfd_close(last_arfile);
> + last_arfile = arfile;
> + }
> + if (last_arfile)
> + bfd_close(last_arfile);
> + } else
> + ret = bfd_process_object(abfd, job);
> +
> + return ret;
> +}
> +
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 3/3] trace-cmd: [POC] Add support for uprobes
2020-09-16 11:47 [PATCH v2 0/3] Initial trace-cmd support for ftrace uprobes Tzvetomir Stoyanov (VMware)
2020-09-16 11:47 ` [PATCH v2 1/3] trace-cmd: Internal refactoring of pid address map logic Tzvetomir Stoyanov (VMware)
2020-09-16 11:47 ` [PATCH v2 2/3] trace-cmd: New internal APIs for reading ELF header Tzvetomir Stoyanov (VMware)
@ 2020-09-16 11:47 ` Tzvetomir Stoyanov (VMware)
2020-09-16 13:26 ` [PATCH v2 0/3] Initial trace-cmd support for ftrace uprobes Steven Rostedt
2020-09-17 1:07 ` Steven Rostedt
4 siblings, 0 replies; 8+ messages in thread
From: Tzvetomir Stoyanov (VMware) @ 2020-09-16 11:47 UTC (permalink / raw)
To: rostedt; +Cc: linux-trace-devel
Initial implementaton of trace-cmd support for ftrace uprobes.
Two new trace-cmd record / set argumemnts are introduced:
--uprobe file:function
--uprobe-ret file:function
The ftrace (return) probe is set on given function from the file.
Wildcards are supported in the function name:
--uprobe file:*
will set uprobes on all functions from the given file.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
include/trace-cmd/trace-cmd.h | 1 +
tracecmd/Makefile | 1 +
tracecmd/include/trace-local.h | 18 +++
tracecmd/trace-record.c | 86 ++++++++++++-
tracecmd/trace-uprobes.c | 221 +++++++++++++++++++++++++++++++++
tracecmd/trace-usage.c | 4 +
6 files changed, 330 insertions(+), 1 deletion(-)
create mode 100644 tracecmd/trace-uprobes.c
diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h
index 5ebd076e..47dc4c4e 100644
--- a/include/trace-cmd/trace-cmd.h
+++ b/include/trace-cmd/trace-cmd.h
@@ -7,6 +7,7 @@
#define _TRACE_CMD_H
#include "traceevent/event-parse.h"
+#include "tracefs.h"
#define TRACECMD_MAGIC { 23, 8, 68 }
diff --git a/tracecmd/Makefile b/tracecmd/Makefile
index f9435558..37a5c42b 100644
--- a/tracecmd/Makefile
+++ b/tracecmd/Makefile
@@ -32,6 +32,7 @@ TRACE_CMD_OBJS += trace-list.o
TRACE_CMD_OBJS += trace-usage.o
TRACE_CMD_OBJS += trace-dump.o
TRACE_CMD_OBJS += trace-obj-debug.o
+TRACE_CMD_OBJS += trace-uprobes.o
ifeq ($(VSOCK_DEFINED), 1)
TRACE_CMD_OBJS += trace-tsync.o
endif
diff --git a/tracecmd/include/trace-local.h b/tracecmd/include/trace-local.h
index ccae61d4..8fc9f48c 100644
--- a/tracecmd/include/trace-local.h
+++ b/tracecmd/include/trace-local.h
@@ -189,6 +189,21 @@ struct filter_pids {
int exclude;
};
+struct tracecmd_uprobe {
+ struct tracecmd_uprobe *next;
+
+ char *file;
+ int pcount;
+ struct trace_debug_object *debug;
+ char **events;
+ int ecount;
+ int esize;
+};
+int tracecmd_uprobe_new(struct tracecmd_uprobe **list, char *file, char *func);
+int tracecmd_uprobe_remove(struct tracecmd_uprobe *probes);
+void tracecmd_uprobe_free(struct tracecmd_uprobe *probes);
+int tracecmd_uprobe_create(struct tracecmd_uprobe *probes, bool uret);
+
struct buffer_instance {
struct buffer_instance *next;
struct tracefs_instance *tracefs;
@@ -208,6 +223,9 @@ struct buffer_instance {
struct func_list *filter_funcs;
struct func_list *notrace_funcs;
+ struct tracecmd_uprobe *uprobes;
+ struct tracecmd_uprobe *uretprobes;
+
struct opt_list *options;
struct filter_pids *filter_pids;
struct filter_pids *process_pids;
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index a48475b3..0fbc25e0 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -5023,7 +5023,8 @@ static void check_function_plugin(void)
static int __check_doing_something(struct buffer_instance *instance)
{
return is_guest(instance) || (instance->flags & BUFFER_FL_PROFILE) ||
- instance->plugin || instance->events || instance->get_procmap;
+ instance->plugin || instance->events || instance->get_procmap ||
+ instance->uprobes || instance->uretprobes;
}
static void check_doing_something(void)
@@ -5438,6 +5439,8 @@ void init_top_instance(void)
}
enum {
+ OPT_retuprobe = 239,
+ OPT_uprobe = 240,
OPT_fork = 241,
OPT_tsyncinterval = 242,
OPT_user = 243,
@@ -5627,6 +5630,25 @@ void trace_reset(int argc, char **argv)
exit(0);
}
+static int
+uprobe_param(struct buffer_instance *instance, char *param, bool pret)
+{
+ char *str, *file, *func;
+
+ if (!param)
+ return -1;
+
+ file = strtok_r(param, ":", &str);
+ func = strtok_r(NULL, ":", &str);
+
+ if (!file || !func)
+ return -1;
+ if (pret)
+ return tracecmd_uprobe_new(&instance->uretprobes, file, func);
+ else
+ return tracecmd_uprobe_new(&instance->uprobes, file, func);
+}
+
static void init_common_record_context(struct common_record_context *ctx,
enum trace_cmd curr_cmd)
{
@@ -5781,6 +5803,8 @@ static void parse_record_options(int argc,
{"module", required_argument, NULL, OPT_module},
{"tsync-interval", required_argument, NULL, OPT_tsyncinterval},
{"fork", no_argument, NULL, OPT_fork},
+ {"uprobe", required_argument, NULL, OPT_uprobe},
+ {"uprobe-ret", required_argument, NULL, OPT_retuprobe},
{NULL, 0, NULL, 0}
};
@@ -6180,6 +6204,14 @@ static void parse_record_options(int argc,
die("--fork option used for 'start' command only");
fork_process = true;
break;
+ case OPT_uprobe:
+ check_instance_die(ctx->instance, "--uprobe");
+ uprobe_param(ctx->instance, optarg, false);
+ break;
+ case OPT_retuprobe:
+ check_instance_die(ctx->instance, "--uprobe-ret");
+ uprobe_param(ctx->instance, optarg, true);
+ break;
case OPT_quiet:
case 'q':
quiet = true;
@@ -6291,6 +6323,17 @@ static void finalize_record_trace(struct common_record_context *ctx)
set_plugin("nop");
+ for_all_instances(instance) {
+ if (instance->uprobes) {
+ tracecmd_uprobe_remove(instance->uprobes);
+ tracecmd_uprobe_free(instance->uprobes);
+ }
+ if (instance->uretprobes) {
+ tracecmd_uprobe_remove(instance->uretprobes);
+ tracecmd_uprobe_free(instance->uretprobes);
+ }
+ }
+
tracecmd_remove_instances();
/* If tracing_on was enabled before we started, set it on now */
@@ -6322,6 +6365,37 @@ static bool has_local_instances(void)
return false;
}
+static int uprobes_set(struct buffer_instance *instance, bool ret_probe)
+{
+ struct tracecmd_uprobe *list;
+ struct event_list *event;
+ int i, ret;
+
+ if (ret_probe)
+ list = instance->uretprobes;
+ else
+ list = instance->uprobes;
+
+ ret = tracecmd_uprobe_create(list, ret_probe);
+ if (ret < 0)
+ return ret;
+ for (i = 0; i < list->ecount; i++) {
+ event = calloc(1, sizeof(*event));
+ if (!event)
+ break;
+
+ event->event = strdup(list->events[i]);
+ add_event(instance, event);
+
+ if (!recording_all_events())
+ list_event(event->event);
+ }
+
+ if (i < list->ecount)
+ return -1;
+ return 0;
+}
+
/*
* This function contains common code for the following commands:
* record, start, stream, profile.
@@ -6365,6 +6439,16 @@ static void record_trace(int argc, char **argv,
/* Some instances may not be created yet */
if (instance->tracing_on_init_val < 0)
instance->tracing_on_init_val = 1;
+ if (instance->uprobes) {
+ ctx->events = 1;
+ if (uprobes_set(instance, false) < 0)
+ die("Failed to set uprobes");
+ }
+ if (instance->uretprobes) {
+ ctx->events = 1;
+ if (uprobes_set(instance, true) < 0)
+ die("Failed to set return uprobes");
+ }
}
if (ctx->events)
diff --git a/tracecmd/trace-uprobes.c b/tracecmd/trace-uprobes.c
new file mode 100644
index 00000000..87f8c148
--- /dev/null
+++ b/tracecmd/trace-uprobes.c
@@ -0,0 +1,221 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2020, VMware, Tzvetomir Stoyanov <tz.stoyanov@gmail.com>
+ *
+ */
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <linux/limits.h>
+#include <ctype.h>
+
+#include "tracefs.h"
+#include "trace-local.h"
+#include "trace-cmd.h"
+
+#define UPROBE_FILE "uprobe_events"
+
+static char *uprobe_event_name(char *file, char *func, bool pret)
+{
+ char *event = NULL;
+ char *fname;
+ int i;
+
+ fname = strrchr(file, '/');
+ if (fname)
+ fname++;
+ if (!fname || *fname == '\0')
+ fname = file;
+
+ asprintf(&event, "%c_%.*s_%.10s", pret ? 'r':'p', 10, fname, func);
+ if (event) {
+ for (i = 0; event[i]; i++) {
+ if (!isalpha(event[i]))
+ event[i] = '_';
+ }
+ }
+ return event;
+}
+
+/**
+ * tracecmd_uprobe_new - Add new uprobe in the uprobe list
+ * @list - list with uprobes, the new one will be added in this list
+ * @file - executable file that will be traced
+ * @func - function from @file
+ * @pret - indicate if this is return probe (true for return uprobe)
+ *
+ * Returns 0 on success or -1 on failure
+ */
+int tracecmd_uprobe_new(struct tracecmd_uprobe **list, char *file, char *func)
+{
+ struct tracecmd_uprobe *probe = *list;
+ bool new_file = false;
+
+ while (probe) {
+ if (!strcmp(probe->file, file))
+ break;
+ probe = probe->next;
+ }
+
+ if (!probe) {
+ probe = calloc(1, sizeof(*probe));
+ if (!probe)
+ return -1;
+
+ probe->file = strdup(file);
+ probe->next = *list;
+ probe->debug = trace_debug_obj_create_file(file);
+ if (!probe->debug)
+ goto error;
+ new_file = true;
+ }
+
+ if (trace_debug_add_resolve_symbol(probe->debug, 0, func) < 0)
+ goto error;
+ probe->pcount++;
+ if (new_file)
+ *list = probe;
+
+ return 0;
+
+error:
+ if (new_file) {
+ if (probe && probe->debug)
+ trace_debug_obj_destroy(probe->debug);
+ free(probe);
+ }
+
+ return -1;
+}
+
+/**
+ * tracecmd_uprobe_free - Free uprobe list
+ * @list - list with uprobes, that wil be freed
+ *
+ */
+void tracecmd_uprobe_free(struct tracecmd_uprobe *probes)
+{
+ struct tracecmd_uprobe *del;
+
+ while (probes) {
+ del = probes;
+ probes = probes->next;
+ trace_debug_obj_destroy(del->debug);
+ free(del->events);
+ free(del->file);
+ free(del);
+ }
+}
+
+struct uprobe_walk {
+ struct tracecmd_uprobe *probe;
+ bool uret;
+ int fd;
+};
+
+static int uprobe_write(struct tracecmd_debug_symbols *symbol, void *data)
+{
+ struct uprobe_walk *context = (struct uprobe_walk *)data;
+ char **events;
+ char probe_str[BUFSIZ];
+
+ if (!symbol->foffset || !symbol->name)
+ return 0;
+
+ if (context->probe->ecount == context->probe->esize) {
+ events = realloc(context->probe->events,
+ (context->probe->esize + 1) * sizeof(char *));
+ if (events) {
+ context->probe->esize++;
+ context->probe->events = events;
+ }
+ }
+ if (!context->probe->events)
+ return -1;
+
+ context->probe->events[context->probe->ecount] = uprobe_event_name(symbol->fname, symbol->name, context->uret);
+ if (!context->probe->events[context->probe->ecount])
+ return -1;
+ snprintf(probe_str, BUFSIZ,
+ "%c:%s %s:0x%llx", context->uret?'r':'p',
+ context->probe->events[context->probe->ecount],
+ symbol->fname, symbol->foffset);
+ write(context->fd, probe_str, strlen(probe_str));
+ context->probe->ecount++;
+
+ return 0;
+}
+
+/**
+ * tracecmd_uprobe_create - Create uprobes in ftrace
+ * @list - list with uprobes, that will be created
+ *
+ * Returns 0 on success or -1 on failure
+ */
+int tracecmd_uprobe_create(struct tracecmd_uprobe *probes, bool uret)
+{
+ char *ufile = tracefs_instance_get_file(NULL, UPROBE_FILE);
+ struct tracecmd_uprobe *probe = probes;
+ struct uprobe_walk context;
+
+ if (!ufile)
+ return -1;
+ context.uret = uret;
+ context.fd = open(ufile, O_WRONLY | O_APPEND);
+ tracefs_put_tracing_file(ufile);
+
+ while (probe) {
+ context.probe = probe;
+ if (trace_debug_resolve_symbols(probe->debug) == 0) {
+ if (!probe->events) {
+ probe->esize = probe->pcount;
+ probe->events = calloc(probe->esize, sizeof(char *));
+ }
+ trace_debug_walk_resolved_symbols(probe->debug,
+ uprobe_write,
+ (void *)&context);
+ }
+ probe = probe->next;
+ }
+ close(context.fd);
+
+ return 0;
+}
+
+/**
+ * tracecmd_uprobe_remove - Remove uprobes from ftrace
+ * @list - list with uprobes, that will be removed
+ *
+ * Returns 0 on success or -1 on failure
+ */
+int tracecmd_uprobe_remove(struct tracecmd_uprobe *probes)
+{
+ char *ufile = tracefs_instance_get_file(NULL, UPROBE_FILE);
+ struct tracecmd_uprobe *probe = probes;
+ char probe_str[BUFSIZ];
+ int fd;
+ int i;
+
+ if (!ufile)
+ return -1;
+ fd = open(ufile, O_WRONLY | O_APPEND);
+ tracefs_put_tracing_file(ufile);
+ if (fd < 0)
+ return -1;
+
+ while (probe) {
+ if (probe->events) {
+ for (i = 0; i < probe->ecount; i++) {
+ snprintf(probe_str, BUFSIZ,
+ "-:%s", probe->events[i]);
+ write(fd, probe_str, strlen(probe_str));
+ }
+ }
+
+ probe = probe->next;
+ }
+
+ close(fd);
+ return 0;
+}
diff --git a/tracecmd/trace-usage.c b/tracecmd/trace-usage.c
index 3f0b2d07..59708070 100644
--- a/tracecmd/trace-usage.c
+++ b/tracecmd/trace-usage.c
@@ -65,6 +65,8 @@ static struct usage_help usage_help[] = {
" If a negative number is specified, timestamps synchronization is disabled"
" If 0 is specified, no loop is performed - timestamps offset is calculated only twice,"
" at the beginnig and at the end of the trace\n"
+ " --uprobe set the specified [file:function] as uprobe\n"
+ " --uprobe-ret set the specified [file:function] as return uprobe\n"
},
{
"set",
@@ -101,6 +103,8 @@ static struct usage_help usage_help[] = {
" --cmdlines-size change kernel saved_cmdlines_size\n"
" --user execute the specified [command ...] as given user\n"
" --fork return immediately if a command is specified\n"
+ " --uprobe set the specified [file:function] as uprobe\n"
+ " --uprobe-ret set the specified [file:function] as return uprobe\n"
},
{
"start",
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v2 0/3] Initial trace-cmd support for ftrace uprobes
2020-09-16 11:47 [PATCH v2 0/3] Initial trace-cmd support for ftrace uprobes Tzvetomir Stoyanov (VMware)
` (2 preceding siblings ...)
2020-09-16 11:47 ` [PATCH v2 3/3] trace-cmd: [POC] Add support for uprobes Tzvetomir Stoyanov (VMware)
@ 2020-09-16 13:26 ` Steven Rostedt
2020-09-17 1:07 ` Steven Rostedt
4 siblings, 0 replies; 8+ messages in thread
From: Steven Rostedt @ 2020-09-16 13:26 UTC (permalink / raw)
To: Tzvetomir Stoyanov (VMware); +Cc: linux-trace-devel
On Wed, 16 Sep 2020 14:47:06 +0300
"Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com> wrote:
> Ftrace supports uprobes - trace events on user space applications.
> Trace-cmd cannot configure uprobes, in order to support it this new
> functionality is introduced:
> - Function name to file offset mapping, this information is extracted
> from the dwarf and ELF headers in the binary file.
> - New options are added to "trace-cmd record" for setting a uprobe:
> --uprobe file:function
> --uprobe-ret file:function
Thanks Tzvetomir,
I'll take a look at this.
-- Steve
>
> Tzvetomir Stoyanov (VMware) (3):
> trace-cmd: Internal refactoring of pid address map logic
> trace-cmd: New internal APIs for reading ELF header
> trace-cmd: [POC] Add support for uprobes
>
> Makefile | 10 +
> include/trace-cmd/trace-cmd.h | 9 +
> tracecmd/Makefile | 2 +
> tracecmd/include/trace-local.h | 49 +-
> tracecmd/trace-obj-debug.c | 823 +++++++++++++++++++++++++++++++++
> tracecmd/trace-record.c | 193 ++++----
> tracecmd/trace-uprobes.c | 221 +++++++++
> tracecmd/trace-usage.c | 4 +
> 8 files changed, 1197 insertions(+), 114 deletions(-)
> create mode 100644 tracecmd/trace-obj-debug.c
> create mode 100644 tracecmd/trace-uprobes.c
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v2 0/3] Initial trace-cmd support for ftrace uprobes
2020-09-16 11:47 [PATCH v2 0/3] Initial trace-cmd support for ftrace uprobes Tzvetomir Stoyanov (VMware)
` (3 preceding siblings ...)
2020-09-16 13:26 ` [PATCH v2 0/3] Initial trace-cmd support for ftrace uprobes Steven Rostedt
@ 2020-09-17 1:07 ` Steven Rostedt
4 siblings, 0 replies; 8+ messages in thread
From: Steven Rostedt @ 2020-09-17 1:07 UTC (permalink / raw)
To: Tzvetomir Stoyanov (VMware); +Cc: linux-trace-devel
Hi Tzvetomir,
I really like this patch set. Great job!
To get it working on my laptop, I had to make the following changes. I
ran this on a new VM which didn't have libbfd and it failed to build.
Then the check wasn't quite working, and it was saying that libbfd
wasn't installed even though it was. Finally, I tested it against a
small program that had numbers in the function name, and I had to
change your sanitizer to not convert numbers into underscores.
Also, all strdup()s need to be tested. But other than that, it looks
great!
Below is the changes I made.
-- Steve
diff --git a/Makefile b/Makefile
index 0d657969..240043e1 100644
--- a/Makefile
+++ b/Makefile
@@ -245,7 +245,7 @@ endif
CUNIT_INSTALLED := $(shell if (printf "$(pound)include <CUnit/Basic.h>\n void main(){CU_initialize_registry();}" | $(CC) -x c - -lcunit >/dev/null 2>&1) ; then echo 1; else echo 0 ; fi)
export CUNIT_INSTALLED
-BFD_INSTALLED := $(shell if (echo -e "\#include <bfd.h>\n void main(){bfd_init();}" | $(CC) -xc - -lbfd >/dev/null 2>&1) ; then echo 1; else echo 0 ; fi)
+BFD_INSTALLED := $(shell if (printf "$(pound)include <bfd.h>\n void main(){bfd_init();}" | $(CC) -x c - -lbfd >/dev/null 2>&1) ; then echo 1; else echo 0 ; fi)
export BFD_INSTALLED
ifeq ($(BFD_INSTALLED), 1)
diff --git a/tracecmd/trace-obj-debug.c b/tracecmd/trace-obj-debug.c
index 93b0dfee..254bfb38 100644
--- a/tracecmd/trace-obj-debug.c
+++ b/tracecmd/trace-obj-debug.c
@@ -8,13 +8,13 @@
#include <string.h>
#include <limits.h>
#include <errno.h>
-#include <bfd.h>
#include <unistd.h>
#include "trace-local.h"
#include "trace-cmd.h"
#ifdef BFD_INSTALLED
+#include <bfd.h>
struct trace_debug_handle {
bfd *bfd;
diff --git a/tracecmd/trace-uprobes.c b/tracecmd/trace-uprobes.c
index 87f8c148..75bebd6f 100644
--- a/tracecmd/trace-uprobes.c
+++ b/tracecmd/trace-uprobes.c
@@ -31,7 +31,7 @@ static char *uprobe_event_name(char *file, char *func, bool pret)
asprintf(&event, "%c_%.*s_%.10s", pret ? 'r':'p', 10, fname, func);
if (event) {
for (i = 0; event[i]; i++) {
- if (!isalpha(event[i]))
+ if (!isalnum(event[i]))
event[i] = '_';
}
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 3/3] trace-cmd: [POC] Add support for uprobes
2020-09-24 7:14 Tzvetomir Stoyanov (VMware)
@ 2020-09-24 7:14 ` Tzvetomir Stoyanov (VMware)
0 siblings, 0 replies; 8+ messages in thread
From: Tzvetomir Stoyanov (VMware) @ 2020-09-24 7:14 UTC (permalink / raw)
To: rostedt; +Cc: linux-trace-devel
Initial implementaton of trace-cmd support for ftrace uprobes.
Two new trace-cmd record / set argumemnts are introduced:
--uprobe file:function
--uprobe-ret file:function
The ftrace (return) probe is set on given function from the file.
Wildcards are supported in the function name:
--uprobe file:*
will set uprobes on all functions from the given file.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
tracecmd/Makefile | 1 +
tracecmd/include/trace-local.h | 18 +++
tracecmd/trace-record.c | 86 ++++++++++++-
tracecmd/trace-uprobes.c | 221 +++++++++++++++++++++++++++++++++
tracecmd/trace-usage.c | 4 +
5 files changed, 329 insertions(+), 1 deletion(-)
create mode 100644 tracecmd/trace-uprobes.c
diff --git a/tracecmd/Makefile b/tracecmd/Makefile
index f9435558..37a5c42b 100644
--- a/tracecmd/Makefile
+++ b/tracecmd/Makefile
@@ -32,6 +32,7 @@ TRACE_CMD_OBJS += trace-list.o
TRACE_CMD_OBJS += trace-usage.o
TRACE_CMD_OBJS += trace-dump.o
TRACE_CMD_OBJS += trace-obj-debug.o
+TRACE_CMD_OBJS += trace-uprobes.o
ifeq ($(VSOCK_DEFINED), 1)
TRACE_CMD_OBJS += trace-tsync.o
endif
diff --git a/tracecmd/include/trace-local.h b/tracecmd/include/trace-local.h
index 16adaac5..64626395 100644
--- a/tracecmd/include/trace-local.h
+++ b/tracecmd/include/trace-local.h
@@ -189,6 +189,21 @@ struct filter_pids {
int exclude;
};
+struct tracecmd_uprobe {
+ struct tracecmd_uprobe *next;
+
+ char *file;
+ int pcount;
+ struct trace_debug_object *debug;
+ char **events;
+ int ecount;
+ int esize;
+};
+int tracecmd_uprobe_new(struct tracecmd_uprobe **list, char *file, char *func);
+int tracecmd_uprobe_remove(struct tracecmd_uprobe *probes);
+void tracecmd_uprobe_free(struct tracecmd_uprobe *probes);
+int tracecmd_uprobe_create(struct tracecmd_uprobe *probes, bool uret);
+
struct buffer_instance {
struct buffer_instance *next;
struct tracefs_instance *tracefs;
@@ -208,6 +223,9 @@ struct buffer_instance {
struct func_list *filter_funcs;
struct func_list *notrace_funcs;
+ struct tracecmd_uprobe *uprobes;
+ struct tracecmd_uprobe *uretprobes;
+
struct opt_list *options;
struct filter_pids *filter_pids;
struct filter_pids *process_pids;
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index a48475b3..0fbc25e0 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -5023,7 +5023,8 @@ static void check_function_plugin(void)
static int __check_doing_something(struct buffer_instance *instance)
{
return is_guest(instance) || (instance->flags & BUFFER_FL_PROFILE) ||
- instance->plugin || instance->events || instance->get_procmap;
+ instance->plugin || instance->events || instance->get_procmap ||
+ instance->uprobes || instance->uretprobes;
}
static void check_doing_something(void)
@@ -5438,6 +5439,8 @@ void init_top_instance(void)
}
enum {
+ OPT_retuprobe = 239,
+ OPT_uprobe = 240,
OPT_fork = 241,
OPT_tsyncinterval = 242,
OPT_user = 243,
@@ -5627,6 +5630,25 @@ void trace_reset(int argc, char **argv)
exit(0);
}
+static int
+uprobe_param(struct buffer_instance *instance, char *param, bool pret)
+{
+ char *str, *file, *func;
+
+ if (!param)
+ return -1;
+
+ file = strtok_r(param, ":", &str);
+ func = strtok_r(NULL, ":", &str);
+
+ if (!file || !func)
+ return -1;
+ if (pret)
+ return tracecmd_uprobe_new(&instance->uretprobes, file, func);
+ else
+ return tracecmd_uprobe_new(&instance->uprobes, file, func);
+}
+
static void init_common_record_context(struct common_record_context *ctx,
enum trace_cmd curr_cmd)
{
@@ -5781,6 +5803,8 @@ static void parse_record_options(int argc,
{"module", required_argument, NULL, OPT_module},
{"tsync-interval", required_argument, NULL, OPT_tsyncinterval},
{"fork", no_argument, NULL, OPT_fork},
+ {"uprobe", required_argument, NULL, OPT_uprobe},
+ {"uprobe-ret", required_argument, NULL, OPT_retuprobe},
{NULL, 0, NULL, 0}
};
@@ -6180,6 +6204,14 @@ static void parse_record_options(int argc,
die("--fork option used for 'start' command only");
fork_process = true;
break;
+ case OPT_uprobe:
+ check_instance_die(ctx->instance, "--uprobe");
+ uprobe_param(ctx->instance, optarg, false);
+ break;
+ case OPT_retuprobe:
+ check_instance_die(ctx->instance, "--uprobe-ret");
+ uprobe_param(ctx->instance, optarg, true);
+ break;
case OPT_quiet:
case 'q':
quiet = true;
@@ -6291,6 +6323,17 @@ static void finalize_record_trace(struct common_record_context *ctx)
set_plugin("nop");
+ for_all_instances(instance) {
+ if (instance->uprobes) {
+ tracecmd_uprobe_remove(instance->uprobes);
+ tracecmd_uprobe_free(instance->uprobes);
+ }
+ if (instance->uretprobes) {
+ tracecmd_uprobe_remove(instance->uretprobes);
+ tracecmd_uprobe_free(instance->uretprobes);
+ }
+ }
+
tracecmd_remove_instances();
/* If tracing_on was enabled before we started, set it on now */
@@ -6322,6 +6365,37 @@ static bool has_local_instances(void)
return false;
}
+static int uprobes_set(struct buffer_instance *instance, bool ret_probe)
+{
+ struct tracecmd_uprobe *list;
+ struct event_list *event;
+ int i, ret;
+
+ if (ret_probe)
+ list = instance->uretprobes;
+ else
+ list = instance->uprobes;
+
+ ret = tracecmd_uprobe_create(list, ret_probe);
+ if (ret < 0)
+ return ret;
+ for (i = 0; i < list->ecount; i++) {
+ event = calloc(1, sizeof(*event));
+ if (!event)
+ break;
+
+ event->event = strdup(list->events[i]);
+ add_event(instance, event);
+
+ if (!recording_all_events())
+ list_event(event->event);
+ }
+
+ if (i < list->ecount)
+ return -1;
+ return 0;
+}
+
/*
* This function contains common code for the following commands:
* record, start, stream, profile.
@@ -6365,6 +6439,16 @@ static void record_trace(int argc, char **argv,
/* Some instances may not be created yet */
if (instance->tracing_on_init_val < 0)
instance->tracing_on_init_val = 1;
+ if (instance->uprobes) {
+ ctx->events = 1;
+ if (uprobes_set(instance, false) < 0)
+ die("Failed to set uprobes");
+ }
+ if (instance->uretprobes) {
+ ctx->events = 1;
+ if (uprobes_set(instance, true) < 0)
+ die("Failed to set return uprobes");
+ }
}
if (ctx->events)
diff --git a/tracecmd/trace-uprobes.c b/tracecmd/trace-uprobes.c
new file mode 100644
index 00000000..87f8c148
--- /dev/null
+++ b/tracecmd/trace-uprobes.c
@@ -0,0 +1,221 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2020, VMware, Tzvetomir Stoyanov <tz.stoyanov@gmail.com>
+ *
+ */
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <linux/limits.h>
+#include <ctype.h>
+
+#include "tracefs.h"
+#include "trace-local.h"
+#include "trace-cmd.h"
+
+#define UPROBE_FILE "uprobe_events"
+
+static char *uprobe_event_name(char *file, char *func, bool pret)
+{
+ char *event = NULL;
+ char *fname;
+ int i;
+
+ fname = strrchr(file, '/');
+ if (fname)
+ fname++;
+ if (!fname || *fname == '\0')
+ fname = file;
+
+ asprintf(&event, "%c_%.*s_%.10s", pret ? 'r':'p', 10, fname, func);
+ if (event) {
+ for (i = 0; event[i]; i++) {
+ if (!isalpha(event[i]))
+ event[i] = '_';
+ }
+ }
+ return event;
+}
+
+/**
+ * tracecmd_uprobe_new - Add new uprobe in the uprobe list
+ * @list - list with uprobes, the new one will be added in this list
+ * @file - executable file that will be traced
+ * @func - function from @file
+ * @pret - indicate if this is return probe (true for return uprobe)
+ *
+ * Returns 0 on success or -1 on failure
+ */
+int tracecmd_uprobe_new(struct tracecmd_uprobe **list, char *file, char *func)
+{
+ struct tracecmd_uprobe *probe = *list;
+ bool new_file = false;
+
+ while (probe) {
+ if (!strcmp(probe->file, file))
+ break;
+ probe = probe->next;
+ }
+
+ if (!probe) {
+ probe = calloc(1, sizeof(*probe));
+ if (!probe)
+ return -1;
+
+ probe->file = strdup(file);
+ probe->next = *list;
+ probe->debug = trace_debug_obj_create_file(file);
+ if (!probe->debug)
+ goto error;
+ new_file = true;
+ }
+
+ if (trace_debug_add_resolve_symbol(probe->debug, 0, func) < 0)
+ goto error;
+ probe->pcount++;
+ if (new_file)
+ *list = probe;
+
+ return 0;
+
+error:
+ if (new_file) {
+ if (probe && probe->debug)
+ trace_debug_obj_destroy(probe->debug);
+ free(probe);
+ }
+
+ return -1;
+}
+
+/**
+ * tracecmd_uprobe_free - Free uprobe list
+ * @list - list with uprobes, that wil be freed
+ *
+ */
+void tracecmd_uprobe_free(struct tracecmd_uprobe *probes)
+{
+ struct tracecmd_uprobe *del;
+
+ while (probes) {
+ del = probes;
+ probes = probes->next;
+ trace_debug_obj_destroy(del->debug);
+ free(del->events);
+ free(del->file);
+ free(del);
+ }
+}
+
+struct uprobe_walk {
+ struct tracecmd_uprobe *probe;
+ bool uret;
+ int fd;
+};
+
+static int uprobe_write(struct tracecmd_debug_symbols *symbol, void *data)
+{
+ struct uprobe_walk *context = (struct uprobe_walk *)data;
+ char **events;
+ char probe_str[BUFSIZ];
+
+ if (!symbol->foffset || !symbol->name)
+ return 0;
+
+ if (context->probe->ecount == context->probe->esize) {
+ events = realloc(context->probe->events,
+ (context->probe->esize + 1) * sizeof(char *));
+ if (events) {
+ context->probe->esize++;
+ context->probe->events = events;
+ }
+ }
+ if (!context->probe->events)
+ return -1;
+
+ context->probe->events[context->probe->ecount] = uprobe_event_name(symbol->fname, symbol->name, context->uret);
+ if (!context->probe->events[context->probe->ecount])
+ return -1;
+ snprintf(probe_str, BUFSIZ,
+ "%c:%s %s:0x%llx", context->uret?'r':'p',
+ context->probe->events[context->probe->ecount],
+ symbol->fname, symbol->foffset);
+ write(context->fd, probe_str, strlen(probe_str));
+ context->probe->ecount++;
+
+ return 0;
+}
+
+/**
+ * tracecmd_uprobe_create - Create uprobes in ftrace
+ * @list - list with uprobes, that will be created
+ *
+ * Returns 0 on success or -1 on failure
+ */
+int tracecmd_uprobe_create(struct tracecmd_uprobe *probes, bool uret)
+{
+ char *ufile = tracefs_instance_get_file(NULL, UPROBE_FILE);
+ struct tracecmd_uprobe *probe = probes;
+ struct uprobe_walk context;
+
+ if (!ufile)
+ return -1;
+ context.uret = uret;
+ context.fd = open(ufile, O_WRONLY | O_APPEND);
+ tracefs_put_tracing_file(ufile);
+
+ while (probe) {
+ context.probe = probe;
+ if (trace_debug_resolve_symbols(probe->debug) == 0) {
+ if (!probe->events) {
+ probe->esize = probe->pcount;
+ probe->events = calloc(probe->esize, sizeof(char *));
+ }
+ trace_debug_walk_resolved_symbols(probe->debug,
+ uprobe_write,
+ (void *)&context);
+ }
+ probe = probe->next;
+ }
+ close(context.fd);
+
+ return 0;
+}
+
+/**
+ * tracecmd_uprobe_remove - Remove uprobes from ftrace
+ * @list - list with uprobes, that will be removed
+ *
+ * Returns 0 on success or -1 on failure
+ */
+int tracecmd_uprobe_remove(struct tracecmd_uprobe *probes)
+{
+ char *ufile = tracefs_instance_get_file(NULL, UPROBE_FILE);
+ struct tracecmd_uprobe *probe = probes;
+ char probe_str[BUFSIZ];
+ int fd;
+ int i;
+
+ if (!ufile)
+ return -1;
+ fd = open(ufile, O_WRONLY | O_APPEND);
+ tracefs_put_tracing_file(ufile);
+ if (fd < 0)
+ return -1;
+
+ while (probe) {
+ if (probe->events) {
+ for (i = 0; i < probe->ecount; i++) {
+ snprintf(probe_str, BUFSIZ,
+ "-:%s", probe->events[i]);
+ write(fd, probe_str, strlen(probe_str));
+ }
+ }
+
+ probe = probe->next;
+ }
+
+ close(fd);
+ return 0;
+}
diff --git a/tracecmd/trace-usage.c b/tracecmd/trace-usage.c
index 3f0b2d07..59708070 100644
--- a/tracecmd/trace-usage.c
+++ b/tracecmd/trace-usage.c
@@ -65,6 +65,8 @@ static struct usage_help usage_help[] = {
" If a negative number is specified, timestamps synchronization is disabled"
" If 0 is specified, no loop is performed - timestamps offset is calculated only twice,"
" at the beginnig and at the end of the trace\n"
+ " --uprobe set the specified [file:function] as uprobe\n"
+ " --uprobe-ret set the specified [file:function] as return uprobe\n"
},
{
"set",
@@ -101,6 +103,8 @@ static struct usage_help usage_help[] = {
" --cmdlines-size change kernel saved_cmdlines_size\n"
" --user execute the specified [command ...] as given user\n"
" --fork return immediately if a command is specified\n"
+ " --uprobe set the specified [file:function] as uprobe\n"
+ " --uprobe-ret set the specified [file:function] as return uprobe\n"
},
{
"start",
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread