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

Commit 17ce3dc7 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Arnaldo Carvalho de Melo
Browse files

ftrace: kprobe: uprobe: Add x8/x16/x32/x64 for hexadecimal types 



Add x8/x16/x32/x64 for hexadecimal type casting to kprobe/uprobe event
tracer.

These type casts can be used for integer arguments for explicitly
showing them in hexadecimal digits in formatted text.

Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Hemant Kumar <hemant@linux.vnet.ibm.com>
Cc: Naohiro Aota <naohiro.aota@hgst.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/147151067029.12957.11591314629326414783.stgit@devbox


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 6637e6f1

Documentation/trace/kprobetrace.txt

+2 −2
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.

Documentation/trace/uprobetracer.txt

+2 −2
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.

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,  "0x%x")

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

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

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

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,

kernel/trace/trace_probe.h

+9 −0
Original line number Diff line number Diff line
@@ -149,6 +149,11 @@ DECLARE_BASIC_PRINT_TYPE_FUNC(s8); 
DECLARE_BASIC_PRINT_TYPE_FUNC(s16);

DECLARE_BASIC_PRINT_TYPE_FUNC(s32);

DECLARE_BASIC_PRINT_TYPE_FUNC(s64);

DECLARE_BASIC_PRINT_TYPE_FUNC(x8);

DECLARE_BASIC_PRINT_TYPE_FUNC(x16);

DECLARE_BASIC_PRINT_TYPE_FUNC(x32);

DECLARE_BASIC_PRINT_TYPE_FUNC(x64);



DECLARE_BASIC_PRINT_TYPE_FUNC(string);



#define FETCH_FUNC_NAME(method, type)	fetch_##method##_##type
@@ -234,6 +239,10 @@ ASSIGN_FETCH_FUNC(file_offset, ftype), \ 
#define ASSIGN_FETCH_TYPE(ptype, ftype, sign)			\

	__ASSIGN_FETCH_TYPE(#ptype, ptype, ftype, sizeof(ftype), sign, #ptype)



/* If ptype is an alias of atype, use this macro (show atype in format) */

#define ASSIGN_FETCH_TYPE_ALIAS(ptype, atype, ftype, sign)		\

	__ASSIGN_FETCH_TYPE(#ptype, ptype, ftype, sizeof(ftype), sign, #atype)



#define ASSIGN_FETCH_TYPE_END {}



#define FETCH_TYPE_STRING	0