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

Commit 50eb2672 authored by Namhyung Kim's avatar Namhyung Kim Committed by Steven Rostedt
Browse files

tracing/probes: Fix basic print type functions 



The print format of s32 type was "ld" and it's casted to "long".  So
it turned out to print 4294967295 for "-1" on 64-bit systems.  Not
sure whether it worked well on 32-bit systems.

Anyway, it doesn't need to have cast argument at all since it already
casted using type pointer - just get rid of it.  Thanks to Oleg for
pointing that out.

And print 0x prefix for unsigned type as it shows hex numbers.

Suggested-by: default avatarOleg Nesterov <oleg@redhat.com>
Acked-by: default avatarOleg Nesterov <oleg@redhat.com>
Acked-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: zhangwei(Jovi) <jovi.zhangwei@huawei.com>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent 306cfe20

kernel/trace/trace_probe.c

+11 −11
Original line number Diff line number Diff line
@@ -40,23 +40,23 @@ const char *reserved_field_names[] = { 
#define PRINT_TYPE_FMT_NAME(type)	print_type_format_##type



/* Printing  in basic type function template */

#define DEFINE_BASIC_PRINT_TYPE_FUNC(type, fmt, cast)			\

#define DEFINE_BASIC_PRINT_TYPE_FUNC(type, fmt)				\

static __kprobes int PRINT_TYPE_FUNC_NAME(type)(struct trace_seq *s,	\

						const char *name,	\

						void *data, void *ent)	\

{									\

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

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

}									\

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



DEFINE_BASIC_PRINT_TYPE_FUNC(u8, "%x", unsigned int)

DEFINE_BASIC_PRINT_TYPE_FUNC(u16, "%x", unsigned int)

DEFINE_BASIC_PRINT_TYPE_FUNC(u32, "%lx", unsigned long)

DEFINE_BASIC_PRINT_TYPE_FUNC(u64, "%llx", unsigned long long)

DEFINE_BASIC_PRINT_TYPE_FUNC(s8, "%d", int)

DEFINE_BASIC_PRINT_TYPE_FUNC(s16, "%d", int)

DEFINE_BASIC_PRINT_TYPE_FUNC(s32, "%ld", long)

DEFINE_BASIC_PRINT_TYPE_FUNC(s64, "%lld", long long)

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")



static inline void *get_rloc_data(u32 *dl)

{