Skip to content

Commit

Permalink
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/…
Browse files Browse the repository at this point in the history
…linux/kernel/git/tip/tip

Pull perf fixes from Thomas Gleixner:
 "This update contains:

   - a fix for the bpf tools to use the new EM_BPF code

   - a fix for the module parser of perf to retrieve the
     proper text start address

   - add str_error_c to libapi to avoid linking against
     tools/lib/str_error_r.o"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tools lib api: Add str_error_c to libapi
  perf s390: Fix 'start' address of module's map
  tools lib bpf: Use official ELF e_machine value
  • Loading branch information
Linus Torvalds committed Jul 30, 2016
2 parents 228ffba + 9ecabed commit 7f7d556
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 7 deletions.
5 changes: 5 additions & 0 deletions tools/lib/api/Build
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@ libapi-y += fd/
libapi-y += fs/
libapi-y += cpu.o
libapi-y += debug.o
libapi-y += str_error_r.o

$(OUTPUT)str_error_r.o: ../str_error_r.c FORCE
$(call rule_mkdir)
$(call if_changed_dep,cc_o_c)
7 changes: 6 additions & 1 deletion tools/lib/bpf/libbpf.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@
#include "libbpf.h"
#include "bpf.h"

#ifndef EM_BPF
#define EM_BPF 247
#endif

#define __printf(a, b) __attribute__((format(printf, a, b)))

__printf(1, 2)
Expand Down Expand Up @@ -439,7 +443,8 @@ static int bpf_object__elf_init(struct bpf_object *obj)
}
ep = &obj->efile.ehdr;

if ((ep->e_type != ET_REL) || (ep->e_machine != 0)) {
/* Old LLVM set e_machine to EM_NONE */
if ((ep->e_type != ET_REL) || (ep->e_machine && (ep->e_machine != EM_BPF))) {
pr_warning("%s is not an eBPF object file\n",
obj->path);
err = -LIBBPF_ERRNO__FORMAT;
Expand Down
2 changes: 2 additions & 0 deletions tools/perf/arch/s390/util/Build
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ libperf-y += header.o
libperf-y += kvm-stat.o

libperf-$(CONFIG_DWARF) += dwarf-regs.o

libperf-y += machine.o
19 changes: 19 additions & 0 deletions tools/perf/arch/s390/util/machine.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#include <unistd.h>
#include <stdio.h>
#include <string.h>
#include "util.h"
#include "machine.h"
#include "api/fs/fs.h"

int arch__fix_module_text_start(u64 *start, const char *name)
{
char path[PATH_MAX];

snprintf(path, PATH_MAX, "module/%.*s/sections/.text",
(int)strlen(name) - 2, name + 1);

if (sysfs__read_ull(path, (unsigned long long *)start) < 0)
return -1;

return 0;
}
5 changes: 0 additions & 5 deletions tools/perf/util/Build
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ libperf-y += stat.o
libperf-y += stat-shadow.o
libperf-y += record.o
libperf-y += srcline.o
libperf-y += str_error_r.o
libperf-y += data.o
libperf-y += tsc.o
libperf-y += cloexec.o
Expand Down Expand Up @@ -176,10 +175,6 @@ $(OUTPUT)util/libstring.o: ../lib/string.c FORCE
$(call rule_mkdir)
$(call if_changed_dep,cc_o_c)

$(OUTPUT)util/str_error_r.o: ../lib/str_error_r.c FORCE
$(call rule_mkdir)
$(call if_changed_dep,cc_o_c)

$(OUTPUT)util/hweight.o: ../lib/hweight.c FORCE
$(call rule_mkdir)
$(call if_changed_dep,cc_o_c)
Expand Down
8 changes: 8 additions & 0 deletions tools/perf/util/machine.c
Original file line number Diff line number Diff line change
Expand Up @@ -1093,12 +1093,20 @@ static int machine__set_modules_path(struct machine *machine)

return map_groups__set_modules_path_dir(&machine->kmaps, modules_path, 0);
}
int __weak arch__fix_module_text_start(u64 *start __maybe_unused,
const char *name __maybe_unused)
{
return 0;
}

static int machine__create_module(void *arg, const char *name, u64 start)
{
struct machine *machine = arg;
struct map *map;

if (arch__fix_module_text_start(&start, name) < 0)
return -1;

map = machine__findnew_module_map(machine, start, name);
if (map == NULL)
return -1;
Expand Down
1 change: 1 addition & 0 deletions tools/perf/util/machine.h
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ struct symbol *machine__find_kernel_function_by_name(struct machine *machine,

struct map *machine__findnew_module_map(struct machine *machine, u64 start,
const char *filename);
int arch__fix_module_text_start(u64 *start, const char *name);

int __machine__load_kallsyms(struct machine *machine, const char *filename,
enum map_type type, bool no_kcore, symbol_filter_t filter);
Expand Down
1 change: 0 additions & 1 deletion tools/perf/util/python-ext-sources
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ util/cpumap.c
../lib/bitmap.c
../lib/find_bit.c
../lib/hweight.c
../lib/str_error_r.c
../lib/vsprintf.c
util/thread_map.c
util/util.c
Expand Down

0 comments on commit 7f7d556

Please sign in to comment.