perf events fixes
Linus,
Please pull the latest perf-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf-fixes-for-linus
Thanks,
Ingo
------------------>
Marti Raudsepp (1):
perf tools: Fix compatibility with libelf 0.8 and autodetect
Paul Mundt (1):
perf tools: Remove -Wcast-align
Soeren Sandmann (2):
perf events: Fix swevent hrtimer sampling by keeping track of remaining time when enabling/disabling swevent hrtimers perf events: Don't generate events for the idle task when exclude_idle is set
include/linux/perf_event.h | 4 +- kernel/perf_event.c | 66 +++++++++++++++++++++++++++++-------------- tools/perf/Makefile | 9 ++++-- tools/perf/util/symbol.c | 6 ++-- tools/perf/util/symbol.h | 10 ++++++ 5 files changed, 65 insertions(+), 30 deletions(-)
include/linux/perf_event.h +2 -2
@@ -471,8 +471,8 @@ struct hw_perf_event {unsigned long event_base;int idx; }; -union {/* software */ -atomic64_t count; +struct {/* software */ +s64 remaining;struct hrtimer hrtimer; }; };
kernel/perf_event.c +44 -22
102 lines not on this page · raw message
tools/perf/Makefile +6 -3
@@ -177,8 +177,7 @@ endif # Include saner warnings here, which can catch bugs: # -EXTRA_WARNINGS := -Wcast-align -EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wformat +EXTRA_WARNINGS := -Wformat EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wformat-security EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wformat-y2k EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wshadow
@@ -422,7 +421,11 @@ ifeq ($(uname_S),Darwin) PTHREAD_LIBS = endif -ifneq ($(shell sh -c "(echo '\#include <libelf.h>'; echo 'int main(void) { Elf * elf = elf_begin(0, ELF_C_READ_MMAP, 0); return (long)elf; }') | $(CC) -x c - $(ALL_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o /dev/null $(ALL_LDFLAGS) > /dev/null 2>&1 && echo y"), y) +ifeq ($(shell sh -c "(echo '\#include <libelf.h>'; echo 'int main(void) { Elf * elf = elf_begin(0, ELF_C_READ, 0); return (long)elf; }') | $(CC) -x c - $(ALL_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o /dev/null $(ALL_LDFLAGS) > /dev/null 2>&1 && echo y"), y) + ifneq ($(shell sh -c "(echo '\#include <libelf.h>'; echo 'int main(void) { Elf * elf = elf_begin(0, ELF_C_READ_MMAP, 0); return (long)elf; }') | $(CC) -x c - $(ALL_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o /dev/null $(ALL_LDFLAGS) > /dev/null 2>&1 && echo y"), y) + BASIC_CFLAGS += -DLIBELF_NO_MMAP + endif +else msg := $(error No libelf.h/libelf found, please install libelf-dev/elfutils-libelf-devel and glibc-dev[el]); endif
tools/perf/util/symbol.c +3 -3
@@ -413,7 +413,7 @@ static int dso__synthesize_plt_symbols(struct dso *self, int v)if (fd <0 ) goto out; - elf =elf_begin (fd,ELF_C_READ_MMAP ,NULL ); + elf =elf_begin (fd,PERF_ELF_C_READ_MMAP ,NULL );if (elf ==NULL ) goto out_close;
@@ -533,7 +533,7 @@ static int dso__load_sym(struct dso *self, int fd, const char *name,Elf *elf;int nr =0 , kernel = !strcmp ("[kernel]" , self->name); - elf =elf_begin (fd,ELF_C_READ_MMAP ,NULL ); + elf =elf_begin (fd,PERF_ELF_C_READ_MMAP ,NULL );if (elf ==NULL ) {if (v) fprintf(stderr, "%s: cannot read %s ELF file.\n",
@@ -675,7 +675,7 @@ static char *dso__read_build_id(struct dso *self, int v)if (fd <0 ) goto out; - elf =elf_begin (fd,ELF_C_READ_MMAP ,NULL ); + elf =elf_begin (fd,PERF_ELF_C_READ_MMAP ,NULL );if (elf ==NULL ) {if (v) fprintf(stderr, "%s: cannot read %s ELF file.\n",
tools/perf/util/symbol.h +10 -0
@@ -27,6 +27,16 @@ static inline char *bfd_demangle(void __used *v, const char __used *c,#endif #endif +/* +* libelf 0.8.x and earlier do not support ELF_C_READ_MMAP; +* for newer versions we can use mmap to reduce memory usage: +*/ +#ifdef LIBELF_NO_MMAP +# define PERF_ELF_C_READ_MMAP ELF_C_READ +#else +# define PERF_ELF_C_READ_MMAP ELF_C_READ_MMAP +#endif +#ifndef DMGL_PARAMS #define DMGL_PARAMS (1 << 0)/* Include function args */ #define DMGL_ANSI (1 << 1)/* Include const, volatile, etc */