leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tracing: Rename update the enum_map file

Browse Source 
The enum_map file is used to display a list of symbol
to name conversions. As its now used to resolve sizeof
lets update the name and description.

Link: http://lkml.kernel.org/r/20170531215653.3240-13-jeremy.linton@arm.com

Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
Jeremy Linton 2017-05-31 16:56:53 -05:00 committed by Steven Rostedt (VMware)
parent ff910cfdc6
commit 681bec0367
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kernel/trace/Kconfig
View File

@ -667,30 +667,30 @@ config RING_BUFFER_STARTUP_TEST
If unsure, say N If unsure, say N
config TRACE_ENUM_MAP_FILE config TRACE_EVAL_MAP_FILE
bool "Show enum mappings for trace events" bool "Show eval mappings for trace events"
depends on TRACING depends on TRACING
help help
The "print fmt" of the trace events will show the enum names instead The "print fmt" of the trace events will show the enum/sizeof names
of their values. This can cause problems for user space tools that instead of their values. This can cause problems for user space tools
use this string to parse the raw data as user space does not know that use this string to parse the raw data as user space does not know
how to convert the string to its value. how to convert the string to its value.
To fix this, there's a special macro in the kernel that can be used To fix this, there's a special macro in the kernel that can be used
to convert the enum into its value. If this macro is used, then the to convert an enum/sizeof into its value. If this macro is used, then
print fmt strings will have the enums converted to their values. the print fmt strings will be converted to their values.
If something does not get converted properly, this option can be If something does not get converted properly, this option can be
used to show what enums the kernel tried to convert. used to show what enums/sizeof the kernel tried to convert.
This option is for debugging the enum conversions. A file is created This option is for debugging the conversions. A file is created
in the tracing directory called "enum_map" that will show the enum in the tracing directory called "eval_map" that will show the
names matched with their values and what trace event system they names matched with their values and what trace event system they
belong too. belong too.
Normally, the mapping of the strings to values will be freed after Normally, the mapping of the strings to values will be freed after
boot up or module load. With this option, they will not be freed, as boot up or module load. With this option, they will not be freed, as
they are needed for the "enum_map" file. Enabling this option will they are needed for the "eval_map" file. Enabling this option will
increase the memory footprint of the running kernel. increase the memory footprint of the running kernel.
If unsure, say N If unsure, say N

20
kernel/trace/trace.c
View File

@ -120,8 +120,8 @@ enum ftrace_dump_mode ftrace_dump_on_oops;
/* When set, tracing will stop when a WARN*() is hit */ /* When set, tracing will stop when a WARN*() is hit */
int __disable_trace_on_warning; int __disable_trace_on_warning;
#ifdef CONFIG_TRACE_ENUM_MAP_FILE #ifdef CONFIG_TRACE_EVAL_MAP_FILE
/* Map of enums to their values, for "enum_map" file */ /* Map of enums to their values, for "eval_map" file */
struct trace_eval_map_head { struct trace_eval_map_head {
struct module *mod; struct module *mod;
unsigned long length; unsigned long length;
@ -145,7 +145,7 @@ static DEFINE_MUTEX(trace_eval_mutex);
* one at the beginning, and one at the end. The beginning item contains * one at the beginning, and one at the end. The beginning item contains
* the count of the saved maps (head.length), and the module they * the count of the saved maps (head.length), and the module they
* belong to if not built in (head.mod). The ending item contains a * belong to if not built in (head.mod). The ending item contains a
* pointer to the next array of saved enum_eval/enum_map items. * pointer to the next array of saved eval_map items.
*/ */
union trace_eval_map_item { union trace_eval_map_item {
struct trace_eval_map map; struct trace_eval_map map;
@ -154,7 +154,7 @@ union trace_eval_map_item {
}; };
static union trace_eval_map_item *trace_eval_maps; static union trace_eval_map_item *trace_eval_maps;
#endif /* CONFIG_TRACE_ENUM_MAP_FILE */ #endif /* CONFIG_TRACE_EVAL_MAP_FILE */
static int tracing_set_tracer(struct trace_array *tr, const char *buf); static int tracing_set_tracer(struct trace_array *tr, const char *buf);
@ -4744,7 +4744,7 @@ static const struct file_operations tracing_saved_cmdlines_size_fops = {
.write = tracing_saved_cmdlines_size_write, .write = tracing_saved_cmdlines_size_write,
}; };
#ifdef CONFIG_TRACE_ENUM_MAP_FILE #ifdef CONFIG_TRACE_EVAL_MAP_FILE
static union trace_eval_map_item * static union trace_eval_map_item *
update_eval_map(union trace_eval_map_item *ptr) update_eval_map(union trace_eval_map_item *ptr)
{ {
@ -4895,15 +4895,15 @@ trace_insert_eval_map_file(struct module *mod, struct trace_eval_map **start,
static void trace_create_eval_file(struct dentry *d_tracer) static void trace_create_eval_file(struct dentry *d_tracer)
{ {
trace_create_file("enum_map", 0444, d_tracer, trace_create_file("eval_map", 0444, d_tracer,
NULL, &tracing_eval_map_fops); NULL, &tracing_eval_map_fops);
} }
#else /* CONFIG_TRACE_ENUM_MAP_FILE */ #else /* CONFIG_TRACE_EVAL_MAP_FILE */
static inline void trace_create_eval_file(struct dentry *d_tracer) { } static inline void trace_create_eval_file(struct dentry *d_tracer) { }
static inline void trace_insert_eval_map_file(struct module *mod, static inline void trace_insert_eval_map_file(struct module *mod,
struct trace_eval_map **start, int len) { } struct trace_eval_map **start, int len) { }
#endif /* !CONFIG_TRACE_ENUM_MAP_FILE */ #endif /* !CONFIG_TRACE_EVAL_MAP_FILE */
static void trace_insert_eval_map(struct module *mod, static void trace_insert_eval_map(struct module *mod,
struct trace_eval_map **start, int len) struct trace_eval_map **start, int len)
@ -7759,7 +7759,7 @@ static void trace_module_add_evals(struct module *mod)
trace_insert_eval_map(mod, mod->trace_evals, mod->num_trace_evals); trace_insert_eval_map(mod, mod->trace_evals, mod->num_trace_evals);
} }
#ifdef CONFIG_TRACE_ENUM_MAP_FILE #ifdef CONFIG_TRACE_EVAL_MAP_FILE
static void trace_module_remove_evals(struct module *mod) static void trace_module_remove_evals(struct module *mod)
{ {
union trace_eval_map_item *map; union trace_eval_map_item *map;
@ -7789,7 +7789,7 @@ static void trace_module_remove_evals(struct module *mod)
} }
#else #else
static inline void trace_module_remove_evals(struct module *mod) { } static inline void trace_module_remove_evals(struct module *mod) { }
#endif /* CONFIG_TRACE_ENUM_MAP_FILE */ #endif /* CONFIG_TRACE_EVAL_MAP_FILE */
static int trace_module_notify(struct notifier_block *self, static int trace_module_notify(struct notifier_block *self,
unsigned long val, void *data) unsigned long val, void *data)