/* * netsniff-ng - the packet sniffing beast * Copyright 2009, 2010, 2011, 2012 Daniel Borkmann. * Subject to the GPL, version 2. */ #define _GNU_SOURCE #include #include #include #include #include #include #include #include #include "xmalloc.h" #include "built_in.h" #include "die.h" #include "str.h" void *xmalloc(size_t size) { void *ptr; if (unlikely(size == 0)) panic("xmalloc: zero size\n"); ptr = malloc(size); if (unlikely(ptr == NULL)) panic("xmalloc: out of memory (allocating %zu bytes)\n", size); return ptr; } void *xzmalloc(size_t size) { void *ptr = xmalloc(size); memset(ptr, 0, size); return ptr; } void *xmalloc_aligned(size_t size, size_t alignment) { int ret; void *ptr; if (unlikely(size == 0)) panic("xmalloc_aligned: zero size\n"); ret = posix_memalign(&ptr, alignment, size); if (unlikely(ret != 0)) panic("xmalloc_aligned: out of memory (allocating %zu " "bytes)\n", size); return ptr; } void *xzmalloc_aligned(size_t size, size_t alignment) { void *ptr = xmalloc_aligned(size, alignment); memset(ptr, 0, size); return ptr; } void *xmallocz(size_t size) { void *ptr; if (unlikely(size + 1 < size)) panic("xmallocz: data too large to fit into virtual " "memory space\n"); ptr = xmalloc(size + 1); ((char*) ptr)[size] = 0; return ptr; } void *xmemdupz(const void *data, size_t len) { return memcpy(xmallocz(len), data, len); } void *xrealloc(void *ptr, size_t nmemb, size_t size) { void *new_ptr; size_t new_size = nmemb * size; if (unlikely(new_size == 0)) panic("xrealloc: zero size\n"); if (unlikely(((size_t) ~0) / nmemb < size)) panic("xrealloc: nmemb * size > SIZE_T_MAX\n"); if (ptr == NULL) new_ptr = malloc(new_size); else new_ptr = realloc(ptr, new_size); if (unlikely(new_ptr == NULL)) panic("xrealloc: out of memory (new_size %zu bytes)\n", new_size); return new_ptr; } void xfree_func(void *ptr) { if (unlikely(ptr == NULL)) panic("xfree: NULL pointer given as argument\n"); free(ptr); } char *xstrdup(const char *str) { size_t len; char *cp; len = strlen(str) + 1; cp = xmalloc(len); strlcpy(cp, str, len); return cp; } char *xstrndup(const char *str, size_t size) { size_t len; char *cp; len = strlen(str) + 1; if (size < len) len = size; cp = xmalloc(len); strlcpy(cp, str, len); return cp; } alue='grep'>log msg

diff options

author	Arnaldo Carvalho de Melo <acme@redhat.com>	2016-09-09 12:00:08 -0300
committer	Arnaldo Carvalho de Melo <acme@redhat.com>	2016-09-12 10:37:07 -0300
commit	7a023fd239498edd269838784f12888147d970da (patch)
tree	3c9b06f4960d4a89d31e01b6cbcc0465543393c1
parent	cd34cd97b7b4336aa2c623c37daffab264c7c6ce (diff)

perf probe: Fix dwarf regs table for x86_64

In 293d5b439483 ("perf probe: Support probing on offline cross-arch binary") DWARF register tables were introduced for many architectures, with the one for the "dx" register being broken for x86_64, which got noticed by the 'perf test bpf' testcase, that has this difference from a successful run to one that fails, with the aforementioned patch: -Writing event: p:perf_bpf_probe/func _text+5197232 f_mode=+68(%di):x32 offset=%si:s64 orig=dx:s32 -Failed to write event: Invalid argument -bpf_probe: failed to apply perf probe eventsFailed to add events selected by BPF +Writing event: p:perf_bpf_probe/func _text+5197232 f_mode=+68(%di):x32 offset=%si:s64 orig=%dx:s32 Add the missing '%' to '%dx' to fix this. Acked-by: Masami Hiramatsu <mhiramat@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Wang Nan <wangnan0@huawei.com> Fixes: 293d5b439483 ("perf probe: Support probing on offline cross-arch binary") Link: https://lkml.kernel.org/r/20160909145955.GC32585@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>