Merge tag 'perf-core-for-mingo' of... (7e74efcf) · Commits · 戴 / test

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: * Allow setting preferred callchain method in .perfconfig (Jiri Olsa) * Show in what binaries/modules 'perf probe's are set (Masami Hiramatsu) * Support distro-style debuginfo for uprobe in 'perf probe' (Masami Hiramatsu) Developer stuff: * Move some hashing and fs related code from tools/perf/util/ to tools/lib/ so that it can be used by more tools/ living utilities (Borislav Petkov) * Prepare DWARF unwinding code for using an elfutils alternative unwinding library (Jiri Olsa) * Fix DWARF unwind max_stack processing (Jiri Olsa) * Add dwarf unwind 'perf test' entry (Jiri Olsa) * 'perf probe' improvements including memory leak fixes, sharing the intlist class with other tools, uprobes/kprobes code sharing and use of ref_reloc_sym (Masami Hiramatsu) * Shorten sample symbol resolving by adding cpumode to struct addr_location (Arnaldo Carvalho de Melo) Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by:

Ingo Molnar <mingo@kernel.org>

tools/include/linux/hash.h

0 → 100644

+5 −0

Original line number	Diff line number	Diff line
		#include "../../../include/linux/hash.h"

		#ifndef _TOOLS_LINUX_HASH_H
		#define _TOOLS_LINUX_HASH_H
		#endif

tools/lib/api/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -9,8 +9,10 @@ LIB_H=
		LIB_OBJS=

		LIB_H += fs/debugfs.h
		LIB_H += fs/fs.h

		LIB_OBJS += $(OUTPUT)fs/debugfs.o
		LIB_OBJS += $(OUTPUT)fs/fs.o

		LIBFILE = libapikfs.a

tools/perf/util/fs.c→tools/lib/api/fs/fs.c

+8 −3

Original line number	Diff line number	Diff line
		/* TODO merge/factor in debugfs.c here */

		/* TODO merge/factor into tools/lib/lk/debugfs.c */
		#include <errno.h>
		#include <stdbool.h>
		#include <stdio.h>
		#include <string.h>
		#include <sys/vfs.h>

		#include "util.h"
		#include "util/fs.h"
		#include "debugfs.h"
		#include "fs.h"

		static const char * const sysfs__fs_known_mountpoints[] = {
		"/sys",

tools/perf/util/include/linux/magic.h→tools/lib/api/fs/fs.h

+5 −7

Original line number	Diff line number	Diff line
		#ifndef _PERF_LINUX_MAGIC_H_
		#define _PERF_LINUX_MAGIC_H_

		#ifndef DEBUGFS_MAGIC
		#define DEBUGFS_MAGIC 0x64626720
		#endif
		#ifndef __API_FS__
		#define __API_FS__

		#ifndef SYSFS_MAGIC
		#define SYSFS_MAGIC 0x62656572
		@@ -13,4 +9,6 @@
		#define PROC_SUPER_MAGIC 0x9fa0
		#endif

		#endif
		const char *sysfs__mountpoint(void);
		const char *procfs__mountpoint(void);
		#endif /* __API_FS__ */

tools/perf/MANIFEST

+1 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ tools/lib/symbol/kallsyms.c
		tools/lib/symbol/kallsyms.h
		tools/include/asm/bug.h
		tools/include/linux/compiler.h
		tools/include/linux/hash.h
		include/linux/const.h
		include/linux/perf_event.h
		include/linux/rbtree.h

Admin message