7 files changed, 253 insertions, 85 deletions

diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
index 4555304dc18e..83714ca1f22b 100644
--- a/tools/lib/bpf/Makefile
+++ b/tools/lib/bpf/Makefile
@@ -93,7 +93,6 @@ export prefix libdir src obj
 # Shell quotes
 libdir_SQ = $(subst ','\'',$(libdir))
 libdir_relative_SQ = $(subst ','\'',$(libdir_relative))
-plugin_dir_SQ = $(subst ','\'',$(plugin_dir))
 
 LIB_FILE = libbpf.a libbpf.so
 
@@ -150,7 +149,7 @@ CMD_TARGETS = $(LIB_FILE)
 
 TARGETS = $(CMD_TARGETS)
 
-all: fixdep $(VERSION_FILES) all_cmd
+all: fixdep all_cmd
 
 all_cmd: $(CMD_TARGETS)
 
@@ -169,21 +168,11 @@ $(OUTPUT)libbpf.so: $(BPF_IN)
 $(OUTPUT)libbpf.a: $(BPF_IN)
         $(QUIET_LINK)$(RM) $@; $(AR) rcs $@ $^
 
-define update_dir
-  (echo $1 > $@.tmp;                            \
-   if [ -r $@ ] && cmp -s $@ $@.tmp; then       \
-     rm -f $@.tmp;                              \
-   else                                         \
-     echo '  UPDATE                 $@';        \
-     mv -f $@.tmp $@;                           \
-   fi);
-endef
-
 define do_install
         if [ ! -d '$(DESTDIR_SQ)$2' ]; then             \
                 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \
         fi;                                             \
-        $(INSTALL) $1 '$(DESTDIR_SQ)$2'
+        $(INSTALL) $1 $(if $3,-m $3,) '$(DESTDIR_SQ)$2'
 endef
 
 install_lib: all_cmd
@@ -192,7 +181,8 @@ install_lib: all_cmd
 
 install_headers:
         $(call QUIET_INSTALL, headers) \
-                $(call do_install,bpf.h,$(prefix)/include/bpf,644)
+                $(call do_install,bpf.h,$(prefix)/include/bpf,644); \
+                $(call do_install,libbpf.h,$(prefix)/include/bpf,644);
 
 install: install_lib
 
@@ -203,7 +193,7 @@ config-clean:
         $(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null
 
 clean:
-        $(call QUIET_CLEAN, libbpf) $(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d .*.cmd \
+        $(call QUIET_CLEAN, libbpf) $(RM) *.o *~ $(TARGETS) *.a *.so .*.d .*.cmd \
                 $(RM) LIBBPF-CFLAGS
         $(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP.libbpf
 
@@ -213,10 +203,10 @@ PHONY += force elfdep bpfdep
 force:
 
 elfdep:
-        @if [ "$(feature-libelf)" != "1" ]; then echo "No libelf found"; exit -1 ; fi
+        @if [ "$(feature-libelf)" != "1" ]; then echo "No libelf found"; exit 1 ; fi
 
 bpfdep:
-        @if [ "$(feature-bpf)" != "1" ]; then echo "BPF API too old"; exit -1 ; fi
+        @if [ "$(feature-bpf)" != "1" ]; then echo "BPF API too old"; exit 1 ; fi
 
 # Declare the contents of the .PHONY variable as phony.  We keep that
 # information in a variable so we can use it in if_changed and friends.
diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h
index 6534889e2b2f..9f44c196931e 100644
--- a/tools/lib/bpf/bpf.h
+++ b/tools/lib/bpf/bpf.h
@@ -40,7 +40,7 @@ int bpf_create_map_in_map(enum bpf_map_type map_type, const char *name,
                           __u32 map_flags);
 
 /* Recommend log buffer size */
-#define BPF_LOG_BUF_SIZE 65536
+#define BPF_LOG_BUF_SIZE (256 * 1024)
 int bpf_load_program_name(enum bpf_prog_type type, const char *name,
                           const struct bpf_insn *insns,
                           size_t insns_cnt, const char *license,
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 5aa45f89da93..30c776375118 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -174,12 +174,19 @@ struct bpf_program {
         char *name;
         char *section_name;
         struct bpf_insn *insns;
-        size_t insns_cnt;
+        size_t insns_cnt, main_prog_cnt;
         enum bpf_prog_type type;
 
-        struct {
+        struct reloc_desc {
+                enum {
+                        RELO_LD64,
+                        RELO_CALL,
+                } type;
                 int insn_idx;
-                int map_idx;
+                union {
+                        int map_idx;
+                        int text_off;
+                };
         } *reloc_desc;
         int nr_reloc;
 
@@ -234,6 +241,7 @@ struct bpf_object {
                 } *reloc;
                 int nr_reloc;
                 int maps_shndx;
+                int text_shndx;
         } efile;
         /*
          * All loaded bpf_object is linked in a list, which is
@@ -375,9 +383,13 @@ bpf_object__init_prog_names(struct bpf_object *obj)
         size_t pi, si;
 
         for (pi = 0; pi < obj->nr_programs; pi++) {
-                char *name = NULL;
+                const char *name = NULL;
 
                 prog = &obj->programs[pi];
+                if (prog->idx == obj->efile.text_shndx) {
+                        name = ".text";
+                        goto skip_search;
+                }
 
                 for (si = 0; si < symbols->d_size / sizeof(GElf_Sym) && !name;
                      si++) {
@@ -387,6 +399,8 @@ bpf_object__init_prog_names(struct bpf_object *obj)
                                 continue;
                         if (sym.st_shndx != prog->idx)
                                 continue;
+                        if (GELF_ST_BIND(sym.st_info) != STB_GLOBAL)
+                                continue;
 
                         name = elf_strptr(obj->efile.elf,
                                           obj->efile.strtabidx,
@@ -403,7 +417,7 @@ bpf_object__init_prog_names(struct bpf_object *obj)
                                    prog->section_name);
                         return -EINVAL;
                 }
-
+skip_search:
                 prog->name = strdup(name);
                 if (!prog->name) {
                         pr_warning("failed to allocate memory for prog sym %s\n",
@@ -793,6 +807,8 @@ static int bpf_object__elf_collect(struct bpf_object *obj)
                 } else if ((sh.sh_type == SHT_PROGBITS) &&
                            (sh.sh_flags & SHF_EXECINSTR) &&
                            (data->d_size > 0)) {
+                        if (strcmp(name, ".text") == 0)
+                                obj->efile.text_shndx = idx;
                         err = bpf_object__add_program(obj, data->d_buf,
                                                       data->d_size, name, idx);
                         if (err) {
@@ -854,11 +870,14 @@ bpf_object__find_prog_by_idx(struct bpf_object *obj, int idx)
 }
 
 static int
-bpf_program__collect_reloc(struct bpf_program *prog,
-                           size_t nr_maps, GElf_Shdr *shdr,
-                           Elf_Data *data, Elf_Data *symbols,
-                           int maps_shndx, struct bpf_map *maps)
+bpf_program__collect_reloc(struct bpf_program *prog, GElf_Shdr *shdr,
+                           Elf_Data *data, struct bpf_object *obj)
 {
+        Elf_Data *symbols = obj->efile.symbols;
+        int text_shndx = obj->efile.text_shndx;
+        int maps_shndx = obj->efile.maps_shndx;
+        struct bpf_map *maps = obj->maps;
+        size_t nr_maps = obj->nr_maps;
         int i, nrels;
 
         pr_debug("collecting relocating info for: '%s'\n",
@@ -891,8 +910,11 @@ bpf_program__collect_reloc(struct bpf_program *prog,
                                    GELF_R_SYM(rel.r_info));
                         return -LIBBPF_ERRNO__FORMAT;
                 }
+                pr_debug("relo for %lld value %lld name %d\n",
+                         (long long) (rel.r_info >> 32),
+                         (long long) sym.st_value, sym.st_name);
 
-                if (sym.st_shndx != maps_shndx) {
+                if (sym.st_shndx != maps_shndx && sym.st_shndx != text_shndx) {
                         pr_warning("Program '%s' contains non-map related relo data pointing to section %u\n",
                                    prog->section_name, sym.st_shndx);
                         return -LIBBPF_ERRNO__RELOC;
@@ -901,6 +923,17 @@ bpf_program__collect_reloc(struct bpf_program *prog,
                 insn_idx = rel.r_offset / sizeof(struct bpf_insn);
                 pr_debug("relocation: insn_idx=%u\n", insn_idx);
 
+                if (insns[insn_idx].code == (BPF_JMP | BPF_CALL)) {
+                        if (insns[insn_idx].src_reg != BPF_PSEUDO_CALL) {
+                                pr_warning("incorrect bpf_call opcode\n");
+                                return -LIBBPF_ERRNO__RELOC;
+                        }
+                        prog->reloc_desc[i].type = RELO_CALL;
+                        prog->reloc_desc[i].insn_idx = insn_idx;
+                        prog->reloc_desc[i].text_off = sym.st_value;
+                        continue;
+                }
+
                 if (insns[insn_idx].code != (BPF_LD | BPF_IMM | BPF_DW)) {
                         pr_warning("bpf: relocation: invalid relo for insns[%d].code 0x%x\n",
                                    insn_idx, insns[insn_idx].code);
@@ -922,6 +955,7 @@ bpf_program__collect_reloc(struct bpf_program *prog,
                         return -LIBBPF_ERRNO__RELOC;
                 }
 
+                prog->reloc_desc[i].type = RELO_LD64;
                 prog->reloc_desc[i].insn_idx = insn_idx;
                 prog->reloc_desc[i].map_idx = map_idx;
         }
@@ -961,27 +995,76 @@ bpf_object__create_maps(struct bpf_object *obj)
 }
 
 static int
+bpf_program__reloc_text(struct bpf_program *prog, struct bpf_object *obj,
+                        struct reloc_desc *relo)
+{
+        struct bpf_insn *insn, *new_insn;
+        struct bpf_program *text;
+        size_t new_cnt;
+
+        if (relo->type != RELO_CALL)
+                return -LIBBPF_ERRNO__RELOC;
+
+        if (prog->idx == obj->efile.text_shndx) {
+                pr_warning("relo in .text insn %d into off %d\n",
+                           relo->insn_idx, relo->text_off);
+                return -LIBBPF_ERRNO__RELOC;
+        }
+
+        if (prog->main_prog_cnt == 0) {
+                text = bpf_object__find_prog_by_idx(obj, obj->efile.text_shndx);
+                if (!text) {
+                        pr_warning("no .text section found yet relo into text exist\n");
+                        return -LIBBPF_ERRNO__RELOC;
+                }
+                new_cnt = prog->insns_cnt + text->insns_cnt;
+                new_insn = realloc(prog->insns, new_cnt * sizeof(*insn));
+                if (!new_insn) {
+                        pr_warning("oom in prog realloc\n");
+                        return -ENOMEM;
+                }
+                memcpy(new_insn + prog->insns_cnt, text->insns,
+                       text->insns_cnt * sizeof(*insn));
+                prog->insns = new_insn;
+                prog->main_prog_cnt = prog->insns_cnt;
+                prog->insns_cnt = new_cnt;
+        }
+        insn = &prog->insns[relo->insn_idx];
+        insn->imm += prog->main_prog_cnt - relo->insn_idx;
+        pr_debug("added %zd insn from %s to prog %s\n",
+                 text->insns_cnt, text->section_name, prog->section_name);
+        return 0;
+}
+
+static int
 bpf_program__relocate(struct bpf_program *prog, struct bpf_object *obj)
 {
-        int i;
+        int i, err;
 
         if (!prog || !prog->reloc_desc)
                 return 0;
 
         for (i = 0; i < prog->nr_reloc; i++) {
-                int insn_idx, map_idx;
-                struct bpf_insn *insns = prog->insns;
+                if (prog->reloc_desc[i].type == RELO_LD64) {
+                        struct bpf_insn *insns = prog->insns;
+                        int insn_idx, map_idx;
 
-                insn_idx = prog->reloc_desc[i].insn_idx;
-                map_idx = prog->reloc_desc[i].map_idx;
+                        insn_idx = prog->reloc_desc[i].insn_idx;
+                        map_idx = prog->reloc_desc[i].map_idx;
 
-                if (insn_idx >= (int)prog->insns_cnt) {
-                        pr_warning("relocation out of range: '%s'\n",
-                                   prog->section_name);
-                        return -LIBBPF_ERRNO__RELOC;
+                        if (insn_idx >= (int)prog->insns_cnt) {
+                                pr_warning("relocation out of range: '%s'\n",
+                                           prog->section_name);
+                                return -LIBBPF_ERRNO__RELOC;
+                        }
+                        insns[insn_idx].src_reg = BPF_PSEUDO_MAP_FD;
+                        insns[insn_idx].imm = obj->maps[map_idx].fd;
+                } else {
+                        err = bpf_program__reloc_text(prog, obj,
+                                                      &prog->reloc_desc[i]);
+                        if (err)
+                                return err;
                 }
-                insns[insn_idx].src_reg = BPF_PSEUDO_MAP_FD;
-                insns[insn_idx].imm = obj->maps[map_idx].fd;
         }
 
         zfree(&prog->reloc_desc);
@@ -1024,7 +1107,6 @@ static int bpf_object__collect_reloc(struct bpf_object *obj)
                 Elf_Data *data = obj->efile.reloc[i].data;
                 int idx = shdr->sh_info;
                 struct bpf_program *prog;
-                size_t nr_maps = obj->nr_maps;
 
                 if (shdr->sh_type != SHT_REL) {
                         pr_warning("internal error at %d\n", __LINE__);
@@ -1038,11 +1120,9 @@ static int bpf_object__collect_reloc(struct bpf_object *obj)
                         return -LIBBPF_ERRNO__RELOC;
                 }
 
-                err = bpf_program__collect_reloc(prog, nr_maps,
+                err = bpf_program__collect_reloc(prog,
                                                  shdr, data,
-                                                 obj->efile.symbols,
-                                                 obj->efile.maps_shndx,
-                                                 obj->maps);
+                                                 obj);
                 if (err)
                         return err;
         }
@@ -1195,6 +1275,8 @@ bpf_object__load_progs(struct bpf_object *obj)
         int err;
 
         for (i = 0; i < obj->nr_programs; i++) {
+                if (obj->programs[i].idx == obj->efile.text_shndx)
+                        continue;
                 err = bpf_program__load(&obj->programs[i],
                                         obj->license,
                                         obj->kern_version);
@@ -1721,6 +1803,45 @@ BPF_PROG_TYPE_FNS(tracepoint, BPF_PROG_TYPE_TRACEPOINT);
 BPF_PROG_TYPE_FNS(xdp, BPF_PROG_TYPE_XDP);
 BPF_PROG_TYPE_FNS(perf_event, BPF_PROG_TYPE_PERF_EVENT);
 
+#define BPF_PROG_SEC(string, type) { string, sizeof(string) - 1, type }
+static const struct {
+        const char *sec;
+        size_t len;
+        enum bpf_prog_type prog_type;
+} section_names[] = {
+        BPF_PROG_SEC("socket",          BPF_PROG_TYPE_SOCKET_FILTER),
+        BPF_PROG_SEC("kprobe/",         BPF_PROG_TYPE_KPROBE),
+        BPF_PROG_SEC("kretprobe/",      BPF_PROG_TYPE_KPROBE),
+        BPF_PROG_SEC("tracepoint/",     BPF_PROG_TYPE_TRACEPOINT),
+        BPF_PROG_SEC("xdp",             BPF_PROG_TYPE_XDP),
+        BPF_PROG_SEC("perf_event",      BPF_PROG_TYPE_PERF_EVENT),
+        BPF_PROG_SEC("cgroup/skb",      BPF_PROG_TYPE_CGROUP_SKB),
+        BPF_PROG_SEC("cgroup/sock",     BPF_PROG_TYPE_CGROUP_SOCK),
+        BPF_PROG_SEC("cgroup/dev",      BPF_PROG_TYPE_CGROUP_DEVICE),
+        BPF_PROG_SEC("sockops",         BPF_PROG_TYPE_SOCK_OPS),
+        BPF_PROG_SEC("sk_skb",          BPF_PROG_TYPE_SK_SKB),
+};
+#undef BPF_PROG_SEC
+
+static enum bpf_prog_type bpf_program__guess_type(struct bpf_program *prog)
+{
+        int i;
+
+        if (!prog->section_name)
+                goto err;
+
+        for (i = 0; i < ARRAY_SIZE(section_names); i++)
+                if (strncmp(prog->section_name, section_names[i].sec,
+                            section_names[i].len) == 0)
+                        return section_names[i].prog_type;
+
+err:
+        pr_warning("failed to guess program type based on section name %s\n",
+                   prog->section_name);
+
+        return BPF_PROG_TYPE_UNSPEC;
+}
+
 int bpf_map__fd(struct bpf_map *map)
 {
         return map ? map->fd : -EINVAL;
@@ -1818,7 +1939,7 @@ long libbpf_get_error(const void *ptr)
 int bpf_prog_load(const char *file, enum bpf_prog_type type,
                   struct bpf_object **pobj, int *prog_fd)
 {
-        struct bpf_program *prog;
+        struct bpf_program *prog, *first_prog = NULL;
         struct bpf_object *obj;
         int err;
 
@@ -1826,13 +1947,30 @@ int bpf_prog_load(const char *file, enum bpf_prog_type type,
         if (IS_ERR(obj))
                 return -ENOENT;
 
-        prog = bpf_program__next(NULL, obj);
-        if (!prog) {
+        bpf_object__for_each_program(prog, obj) {
+                /*
+                 * If type is not specified, try to guess it based on
+                 * section name.
+                 */
+                if (type == BPF_PROG_TYPE_UNSPEC) {
+                        type = bpf_program__guess_type(prog);
+                        if (type == BPF_PROG_TYPE_UNSPEC) {
+                                bpf_object__close(obj);
+                                return -EINVAL;
+                        }
+                }
+
+                bpf_program__set_type(prog, type);
+                if (prog->idx != obj->efile.text_shndx && !first_prog)
+                        first_prog = prog;
+        }
+
+        if (!first_prog) {
+                pr_warning("object file doesn't contain bpf program\n");
                 bpf_object__close(obj);
                 return -ENOENT;
         }
 
-        bpf_program__set_type(prog, type);
         err = bpf_object__load(obj);
         if (err) {
                 bpf_object__close(obj);
@@ -1840,6 +1978,6 @@ int bpf_prog_load(const char *file, enum bpf_prog_type type,
         }
 
         *pobj = obj;
-        *prog_fd = bpf_program__fd(prog);
+        *prog_fd = bpf_program__fd(first_prog);
         return 0;
 }
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 7ce724fc0544..e5f2acbb70cc 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -1094,7 +1094,7 @@ static enum event_type __read_token(char **tok)
                 if (strcmp(*tok, "LOCAL_PR_FMT") == 0) {
                         free(*tok);
                         *tok = NULL;
-                        return force_token("\"\%s\" ", tok);
+                        return force_token("\"%s\" ", tok);
                 } else if (strcmp(*tok, "STA_PR_FMT") == 0) {
                         free(*tok);
                         *tok = NULL;
@@ -3970,6 +3970,11 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,
                                 val &= ~fval;
                         }
                 }
+                if (val) {
+                        if (print && arg->flags.delim)
+                                trace_seq_puts(s, arg->flags.delim);
+                        trace_seq_printf(s, "0x%llx", val);
+                }
                 break;
         case PRINT_SYMBOL:
                 val = eval_num_arg(data, size, event, arg->symbol.field);
@@ -3980,6 +3985,8 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,
                                 break;
                         }
                 }
+                if (!flag)
+                        trace_seq_printf(s, "0x%llx", val);
                 break;
         case PRINT_HEX:
         case PRINT_HEX_STR:
@@ -4293,6 +4300,26 @@ static struct print_arg *make_bprint_args(char *fmt, void *data, int size, struc
                                 goto process_again;
                         case 'p':
                                 ls = 1;
+                                if (isalnum(ptr[1])) {
+                                        ptr++;
+                                        /* Check for special pointers */
+                                        switch (*ptr) {
+                                        case 's':
+                                        case 'S':
+                                        case 'f':
+                                        case 'F':
+                                                break;
+                                        default:
+                                                /*
+                                                 * Older kernels do not process
+                                                 * dereferenced pointers.
+                                                 * Only process if the pointer
+                                                 * value is a printable.
+                                                 */
+                                                if (isprint(*(char *)bptr))
+                                                        goto process_string;
+                                        }
+                                }
                                 /* fall through */
                         case 'd':
                         case 'u':
@@ -4345,6 +4372,7 @@ static struct print_arg *make_bprint_args(char *fmt, void *data, int size, struc
 
                                 break;
                         case 's':
+ process_string:
                                 arg = alloc_arg();
                                 if (!arg) {
                                         do_warning_event(event, "%s(%d): not enough memory!",
@@ -4949,21 +4977,27 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
                                 else
                                         ls = 2;
 
-                                if (*(ptr+1) == 'F' || *(ptr+1) == 'f' ||
-                                    *(ptr+1) == 'S' || *(ptr+1) == 's') {
+                                if (isalnum(ptr[1]))
                                         ptr++;
+
+                                if (arg->type == PRINT_BSTRING) {
+                                        trace_seq_puts(s, arg->string.string);
+                                        break;
+                                }
+
+                                if (*ptr == 'F' || *ptr == 'f' ||
+                                    *ptr == 'S' || *ptr == 's') {
                                         show_func = *ptr;
-                                } else if (*(ptr+1) == 'M' || *(ptr+1) == 'm') {
-                                        print_mac_arg(s, *(ptr+1), data, size, event, arg);
-                                        ptr++;
+                                } else if (*ptr == 'M' || *ptr == 'm') {
+                                        print_mac_arg(s, *ptr, data, size, event, arg);
                                         arg = arg->next;
                                         break;
-                                } else if (*(ptr+1) == 'I' || *(ptr+1) == 'i') {
+                                } else if (*ptr == 'I' || *ptr == 'i') {
                                         int n;
 
-                                        n = print_ip_arg(s, ptr+1, data, size, event, arg);
+                                        n = print_ip_arg(s, ptr, data, size, event, arg);
                                         if (n > 0) {
-                                                ptr += n;
+                                                ptr += n - 1;
                                                 arg = arg->next;
                                                 break;
                                         }
@@ -5532,8 +5566,14 @@ void pevent_print_event(struct pevent *pevent, struct trace_seq *s,
 
         event = pevent_find_event_by_record(pevent, record);
         if (!event) {
-                do_warning("ug! no event found for type %d",
-                           trace_parse_common_type(pevent, record->data));
+                int i;
+                int type = trace_parse_common_type(pevent, record->data);
+
+                do_warning("ug! no event found for type %d", type);
+                trace_seq_printf(s, "[UNKNOWN TYPE %d]", type);
+                for (i = 0; i < record->size; i++)
+                        trace_seq_printf(s, " %02x",
+                                         ((unsigned char *)record->data)[i]);
                 return;
         }
 
diff --git a/tools/lib/traceevent/event-plugin.c b/tools/lib/traceevent/event-plugin.c
index a16756ae3526..d542cb60ca1a 100644
--- a/tools/lib/traceevent/event-plugin.c
+++ b/tools/lib/traceevent/event-plugin.c
@@ -120,12 +120,12 @@ char **traceevent_plugin_list_options(void)
                 for (op = reg->options; op->name; op++) {
                         char *alias = op->plugin_alias ? op->plugin_alias : op->file;
                         char **temp = list;
+                        int ret;
 
-                        name = malloc(strlen(op->name) + strlen(alias) + 2);
-                        if (!name)
+                        ret = asprintf(&name, "%s:%s", alias, op->name);
+                        if (ret < 0)
                                 goto err;
 
-                        sprintf(name, "%s:%s", alias, op->name);
                         list = realloc(list, count + 2);
                         if (!list) {
                                 list = temp;
@@ -290,17 +290,14 @@ load_plugin(struct pevent *pevent, const char *path,
         const char *alias;
         char *plugin;
         void *handle;
+        int ret;
 
-        plugin = malloc(strlen(path) + strlen(file) + 2);
-        if (!plugin) {
+        ret = asprintf(&plugin, "%s/%s", path, file);
+        if (ret < 0) {
                 warning("could not allocate plugin memory\n");
                 return;
         }
 
-        strcpy(plugin, path);
-        strcat(plugin, "/");
-        strcat(plugin, file);
-
         handle = dlopen(plugin, RTLD_NOW | RTLD_GLOBAL);
         if (!handle) {
                 warning("could not load plugin '%s'\n%s\n",
@@ -391,6 +388,7 @@ load_plugins(struct pevent *pevent, const char *suffix,
         char *home;
         char *path;
         char *envdir;
+        int ret;
 
         if (pevent->flags & PEVENT_DISABLE_PLUGINS)
                 return;
@@ -421,16 +419,12 @@ load_plugins(struct pevent *pevent, const char *suffix,
         if (!home)
                 return;
 
-        path = malloc(strlen(home) + strlen(LOCAL_PLUGIN_DIR) + 2);
-        if (!path) {
+        ret = asprintf(&path, "%s/%s", home, LOCAL_PLUGIN_DIR);
+        if (ret < 0) {
                 warning("could not allocate plugin memory\n");
                 return;
         }
 
-        strcpy(path, home);
-        strcat(path, "/");
-        strcat(path, LOCAL_PLUGIN_DIR);
-
         load_plugins_dir(pevent, suffix, path, load_plugin, data);
 
         free(path);
diff --git a/tools/lib/traceevent/kbuffer-parse.c b/tools/lib/traceevent/kbuffer-parse.c
index c94e3641b046..ca424b157e46 100644
--- a/tools/lib/traceevent/kbuffer-parse.c
+++ b/tools/lib/traceevent/kbuffer-parse.c
@@ -24,8 +24,8 @@
 
 #include "kbuffer.h"
 
-#define MISSING_EVENTS (1 << 31)
-#define MISSING_STORED (1 << 30)
+#define MISSING_EVENTS (1UL << 31)
+#define MISSING_STORED (1UL << 30)
 
 #define COMMIT_MASK ((1 << 27) - 1)
 
diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
index 315df0a70265..431e8b309f6e 100644
--- a/tools/lib/traceevent/parse-filter.c
+++ b/tools/lib/traceevent/parse-filter.c
@@ -287,12 +287,10 @@ find_event(struct pevent *pevent, struct event_list **events,
                 sys_name = NULL;
         }
 
-        reg = malloc(strlen(event_name) + 3);
-        if (reg == NULL)
+        ret = asprintf(&reg, "^%s$", event_name);
+        if (ret < 0)
                 return PEVENT_ERRNO__MEM_ALLOC_FAILED;
 
-        sprintf(reg, "^%s$", event_name);
-
         ret = regcomp(&ereg, reg, REG_ICASE|REG_NOSUB);
         free(reg);
 
@@ -300,13 +298,12 @@ find_event(struct pevent *pevent, struct event_list **events,
                 return PEVENT_ERRNO__INVALID_EVENT_NAME;
 
         if (sys_name) {
-                reg = malloc(strlen(sys_name) + 3);
-                if (reg == NULL) {
+                ret = asprintf(&reg, "^%s$", sys_name);
+                if (ret < 0) {
                         regfree(&ereg);
                         return PEVENT_ERRNO__MEM_ALLOC_FAILED;
                 }
 
-                sprintf(reg, "^%s$", sys_name);
                 ret = regcomp(&sreg, reg, REG_ICASE|REG_NOSUB);
                 free(reg);
                 if (ret) {
@@ -1634,6 +1631,7 @@ int pevent_filter_clear_trivial(struct event_filter *filter,
                 case FILTER_TRIVIAL_FALSE:
                         if (filter_type->filter->boolean.value)
                                 continue;
+                        break;
                 case FILTER_TRIVIAL_TRUE:
                         if (!filter_type->filter->boolean.value)
                                 continue;
@@ -1879,17 +1877,25 @@ static const char *get_field_str(struct filter_arg *arg, struct pevent_record *r
         struct pevent *pevent;
         unsigned long long addr;
         const char *val = NULL;
+        unsigned int size;
         char hex[64];
 
         /* If the field is not a string convert it */
         if (arg->str.field->flags & FIELD_IS_STRING) {
                 val = record->data + arg->str.field->offset;
+                size = arg->str.field->size;
+
+                if (arg->str.field->flags & FIELD_IS_DYNAMIC) {
+                        addr = *(unsigned int *)val;
+                        val = record->data + (addr & 0xffff);
+                        size = addr >> 16;
+                }
 
                 /*
                  * We need to copy the data since we can't be sure the field
                  * is null terminated.
                  */
-                if (*(val + arg->str.field->size - 1)) {
+                if (*(val + size - 1)) {
                         /* copy it */
                         memcpy(arg->str.buffer, val, arg->str.field->size);
                         /* the buffer is already NULL terminated */