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

Commit 36e674a0 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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

Merge tag 'perf-core-for-mingo-20160823' 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:

. Allow configuring the default 'perf report -s' sort order in ~/.perfconfig,
  for instance, "sym,dso" may be more fitting for kernel developers. (Arnaldo Carvalho de Melo)

- Support x8/x16/x32/x64 hexadecimal "types" in ftrace and 'perf probe' (Masami Hiramatsu)

Infrastructure changes:

- Skip running the feature tests for 'make install-doc' (Rui Teng)

- Introduce tools/include/linux/time64.h with *SEC_PER_*SEC macros
  to use in all of tools/ (Arnaldo Carvalho de Melo)

- Break down symbol__disassemble() into multiple functions, to ease
  future work on better reporting the errors that may take place in
  the various steps it performs (possibly decompressing kernel module
  files, getting build-id keyed files, calling objdump, parsing its
  output, etc) (Arnaldo Carvalho de Melo)

- Typo fixes in various places (Colin Ian King)

- Remove superfluous NULL check in the TUI code (Colin Ian King)

- Allow displaying multiple header lines in the TUI browser, prep
  work for the 'perf c2c' browser (Jiri Olsa)

- Copy coresight-pmu.h header file needed by perf tools (Mathieu Poirier)

- Use __weak definition from linux/compiler.h (Rui Teng)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents b6a32f02 5e30d55c

Documentation/trace/kprobetrace.txt

+6 −3
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ Synopsis of kprobe_events 
  +|-offs(FETCHARG) : Fetch memory at FETCHARG +|- offs address.(**)

  NAME=FETCHARG : Set NAME as the argument name of FETCHARG.

  FETCHARG:TYPE : Set TYPE as the type of FETCHARG. Currently, basic types

		  (u8/u16/u32/u64/s8/s16/s32/s64), "string" and bitfield

		  are supported.

		  (u8/u16/u32/u64/s8/s16/s32/s64), hexadecimal types

		  (x8/x16/x32/x64), "string" and bitfield are supported.



  (*) only for return probe.

  (**) this is useful for fetching a field of data structures.
@@ -54,7 +54,10 @@ Types 
-----

Several types are supported for fetch-args. Kprobe tracer will access memory

by given type. Prefix 's' and 'u' means those types are signed and unsigned

respectively. Traced arguments are shown in decimal (signed) or hex (unsigned).

respectively. 'x' prefix implies it is unsigned. Traced arguments are shown

in decimal ('s' and 'u') or hexadecimal ('x'). Without type casting, 'x32'

or 'x64' is used depends on the architecture (e.g. x86-32 uses x32, and

x86-64 uses x64).

String type is a special type, which fetches a "null-terminated" string from

kernel space. This means it will fail and store NULL if the string container

has been paged out.

Documentation/trace/uprobetracer.txt

+6 −3
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ Synopsis of uprobe_tracer 
   +|-offs(FETCHARG) : Fetch memory at FETCHARG +|- offs address.(**)

   NAME=FETCHARG     : Set NAME as the argument name of FETCHARG.

   FETCHARG:TYPE     : Set TYPE as the type of FETCHARG. Currently, basic types

		       (u8/u16/u32/u64/s8/s16/s32/s64), "string" and bitfield

		       are supported.

		       (u8/u16/u32/u64/s8/s16/s32/s64), hexadecimal types

		       (x8/x16/x32/x64), "string" and bitfield are supported.



  (*) only for return probe.

  (**) this is useful for fetching a field of data structures.
@@ -50,7 +50,10 @@ Types 
-----

Several types are supported for fetch-args. Uprobe tracer will access memory

by given type. Prefix 's' and 'u' means those types are signed and unsigned

respectively. Traced arguments are shown in decimal (signed) or hex (unsigned).

respectively. 'x' prefix implies it is unsigned. Traced arguments are shown

in decimal ('s' and 'u') or hexadecimal ('x'). Without type casting, 'x32'

or 'x64' is used depends on the architecture (e.g. x86-32 uses x32, and

x86-64 uses x64).

String type is a special type, which fetches a "null-terminated" string from

user space.

Bitfield is another special type, which takes 3 parameters, bit-width, bit-

kernel/trace/trace.c

+24 −0
Original line number Diff line number Diff line
@@ -4123,6 +4123,30 @@ static const char readme_msg[] = 
	"\t\t\t  traces\n"

#endif

#endif /* CONFIG_STACK_TRACER */

#ifdef CONFIG_KPROBE_EVENT

	"  kprobe_events\t\t- Add/remove/show the kernel dynamic events\n"

	"\t\t\t  Write into this file to define/undefine new trace events.\n"

#endif

#ifdef CONFIG_UPROBE_EVENT

	"  uprobe_events\t\t- Add/remove/show the userspace dynamic events\n"

	"\t\t\t  Write into this file to define/undefine new trace events.\n"

#endif

#if defined(CONFIG_KPROBE_EVENT) || defined(CONFIG_UPROBE_EVENT)

	"\t  accepts: event-definitions (one definition per line)\n"

	"\t   Format: p|r[:[<group>/]<event>] <place> [<args>]\n"

	"\t           -:[<group>/]<event>\n"

#ifdef CONFIG_KPROBE_EVENT

	"\t    place: [<module>:]<symbol>[+<offset>]|<memaddr>\n"

#endif

#ifdef CONFIG_UPROBE_EVENT

	"\t    place: <path>:<offset>\n"

#endif

	"\t     args: <name>=fetcharg[:type]\n"

	"\t fetcharg: %<register>, @<address>, @<symbol>[+|-<offset>],\n"

	"\t           $stack<index>, $stack, $retval, $comm\n"

	"\t     type: s8/16/32/64, u8/16/32/64, x8/16/32/64, string,\n"

	"\t           b<bit-width>@<bit-offset>/<container-size>\n"

#endif

	"  events/\t\t- Directory containing all trace event subsystems:\n"

	"      enable\t\t- Write 0/1 to enable/disable tracing of all events\n"

	"  events/<system>/\t- Directory containing all trace events for <system>:\n"

kernel/trace/trace_kprobe.c

+4 −0
Original line number Diff line number Diff line
@@ -253,6 +253,10 @@ static const struct fetch_type kprobes_fetch_type_table[] = { 
	ASSIGN_FETCH_TYPE(s16, u16, 1),

	ASSIGN_FETCH_TYPE(s32, u32, 1),

	ASSIGN_FETCH_TYPE(s64, u64, 1),

	ASSIGN_FETCH_TYPE_ALIAS(x8,  u8,  u8,  0),

	ASSIGN_FETCH_TYPE_ALIAS(x16, u16, u16, 0),

	ASSIGN_FETCH_TYPE_ALIAS(x32, u32, u32, 0),

	ASSIGN_FETCH_TYPE_ALIAS(x64, u64, u64, 0),



	ASSIGN_FETCH_TYPE_END

};

kernel/trace/trace_probe.c

+17 −13
Original line number Diff line number Diff line
@@ -36,24 +36,28 @@ const char *reserved_field_names[] = { 
};



/* Printing  in basic type function template */

#define DEFINE_BASIC_PRINT_TYPE_FUNC(type, fmt)				\

int PRINT_TYPE_FUNC_NAME(type)(struct trace_seq *s, const char *name,	\

#define DEFINE_BASIC_PRINT_TYPE_FUNC(tname, type, fmt)			\

int PRINT_TYPE_FUNC_NAME(tname)(struct trace_seq *s, const char *name,	\

				void *data, void *ent)			\

{									\

	trace_seq_printf(s, " %s=" fmt, name, *(type *)data);		\

	return !trace_seq_has_overflowed(s);				\

}									\

const char PRINT_TYPE_FMT_NAME(type)[] = fmt;				\

NOKPROBE_SYMBOL(PRINT_TYPE_FUNC_NAME(type));



DEFINE_BASIC_PRINT_TYPE_FUNC(u8 , "0x%x")

DEFINE_BASIC_PRINT_TYPE_FUNC(u16, "0x%x")

DEFINE_BASIC_PRINT_TYPE_FUNC(u32, "0x%x")

DEFINE_BASIC_PRINT_TYPE_FUNC(u64, "0x%Lx")

DEFINE_BASIC_PRINT_TYPE_FUNC(s8,  "%d")

DEFINE_BASIC_PRINT_TYPE_FUNC(s16, "%d")

DEFINE_BASIC_PRINT_TYPE_FUNC(s32, "%d")

DEFINE_BASIC_PRINT_TYPE_FUNC(s64, "%Ld")

const char PRINT_TYPE_FMT_NAME(tname)[] = fmt;				\

NOKPROBE_SYMBOL(PRINT_TYPE_FUNC_NAME(tname));



DEFINE_BASIC_PRINT_TYPE_FUNC(u8,  u8,  "%u")

DEFINE_BASIC_PRINT_TYPE_FUNC(u16, u16, "%u")

DEFINE_BASIC_PRINT_TYPE_FUNC(u32, u32, "%u")

DEFINE_BASIC_PRINT_TYPE_FUNC(u64, u64, "%Lu")

DEFINE_BASIC_PRINT_TYPE_FUNC(s8,  s8,  "%d")

DEFINE_BASIC_PRINT_TYPE_FUNC(s16, s16, "%d")

DEFINE_BASIC_PRINT_TYPE_FUNC(s32, s32, "%d")

DEFINE_BASIC_PRINT_TYPE_FUNC(s64, s64, "%Ld")

DEFINE_BASIC_PRINT_TYPE_FUNC(x8,  u8,  "0x%x")

DEFINE_BASIC_PRINT_TYPE_FUNC(x16, u16, "0x%x")

DEFINE_BASIC_PRINT_TYPE_FUNC(x32, u32, "0x%x")

DEFINE_BASIC_PRINT_TYPE_FUNC(x64, u64, "0x%Lx")



/* Print type function for string type */

int PRINT_TYPE_FUNC_NAME(string)(struct trace_seq *s, const char *name,