Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f3b1a46 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo' of... 

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

User visible changes:

  - Add 'vmlinux.debug' to the vmlinux search path (Ekaterina Tumanova)

  - Do not show sample_(type|period) in the perf_event_attr dump when using
    -v with 'perf stat' (Jiri Olsa)

  - Display the WEIGHT sample bit, when set, in 'perf evlist -v' (Jiri Olsa)

  - Honour --hide-unresolved in 'report', will honour it as well in 'top'
    when --hide-unresolved gets supported in that tool (Namhyung Kim)

  - Fix freeze wit h--call-graph 'flat/folded' due to not properly
    reinitializing the callchain rb_tree (Namhyumg Kim)

  - Set dso->long_name when a module name is passed as a parameter
    to tools like 'perf probe' but the 'struct dso' associated to that module
    still doesn't have the full path for the module, just the '[name]' one
    obtained from /proc/modules (Wang Nan)

  - Fix anon_hugepage mmaps detection using scanf on /proc/PID/smaps (Yannick Brosseau)

Infrastructure changes:

  - Add helper function for updating bpf maps elements (He Kuang)

  - Fix traceevents plugins build race (Jiri Olsa)

  - Add the $OUTPUT path prefix with 'fixdep' (Jiri Olsa)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents a95a49fa 43798bf3

tools/build/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ export Q srctree CC LD 
MAKEFLAGS := --no-print-directory

build     := -f $(srctree)/tools/build/Makefile.build dir=. obj



all: fixdep

all: $(OUTPUT)fixdep



clean:

	$(call QUIET_CLEAN, fixdep)

tools/build/Makefile.include

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ ifdef CROSS_COMPILE 
fixdep:

else

fixdep:

	$(Q)$(MAKE) -C $(srctree)/tools/build CFLAGS= LDFLAGS= fixdep

	$(Q)$(MAKE) -C $(srctree)/tools/build CFLAGS= LDFLAGS= $(OUTPUT)fixdep

endif



.PHONY: fixdep

tools/lib/bpf/bpf.c

+14 −0
Original line number Diff line number Diff line
@@ -83,3 +83,17 @@ int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns, 
	log_buf[0] = 0;

	return sys_bpf(BPF_PROG_LOAD, &attr, sizeof(attr));

}



int bpf_map_update_elem(int fd, void *key, void *value,

			u64 flags)

{

	union bpf_attr attr;



	bzero(&attr, sizeof(attr));

	attr.map_fd = fd;

	attr.key = ptr_to_u64(key);

	attr.value = ptr_to_u64(value);

	attr.flags = flags;



	return sys_bpf(BPF_MAP_UPDATE_ELEM, &attr, sizeof(attr));

}

tools/lib/bpf/bpf.h

+2 −0
Original line number Diff line number Diff line
@@ -20,4 +20,6 @@ int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns, 
		     u32 kern_version, char *log_buf,

		     size_t log_buf_sz);



int bpf_map_update_elem(int fd, void *key, void *value,

			u64 flags);

#endif

tools/perf/Makefile.perf

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ $(LIBTRACEEVENT)-clean: 
	$(call QUIET_CLEAN, libtraceevent)

	$(Q)$(MAKE) -C $(TRACE_EVENT_DIR) O=$(OUTPUT) clean >/dev/null



install-traceevent-plugins: $(LIBTRACEEVENT)

install-traceevent-plugins: libtraceevent_plugins

	$(Q)$(MAKE) -C $(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) O=$(OUTPUT) install_plugins



$(LIBAPI): fixdep FORCE