Skip to content

L
linux
Commit df35d93b authored by Tom Zanussi's avatar Tom Zanussi Committed by Steven Rostedt (VMware)
Browse files
Options

tracing: Pass tracing_map_elt to hist_field accessor functions 

Some accessor functions, such as for variable references, require
access to a corrsponding tracing_map_elt.

Add a tracing_map_elt param to the function signature and update the
accessor functions accordingly.

Link: http://lkml.kernel.org/r/e0f292b068e9e4948da1d5af21b5ae0efa9b5717.1516069914.git.tom.zanussi@linux.intel.comSigned-off-by: default avatarTom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent af6a29bc
Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 34 deletions
kernel/trace/trace_events_hist.c
View file @ df35d93b
...@@ -26,8 +26,10 @@ ...@@ -26,8 +26,10 @@
struct hist_field; struct hist_field;
typedef u64 (*hist_field_fn_t) (struct hist_field *field, void *event, typedef u64 (*hist_field_fn_t) (struct hist_field *field,
struct ring_buffer_event *rbe); struct tracing_map_elt *elt,
struct ring_buffer_event *rbe,
void *event);
#define HIST_FIELD_OPERANDS_MAX 2 #define HIST_FIELD_OPERANDS_MAX 2
#define HIST_FIELDS_MAX (TRACING_MAP_FIELDS_MAX + TRACING_MAP_VARS_MAX) #define HIST_FIELDS_MAX (TRACING_MAP_FIELDS_MAX + TRACING_MAP_VARS_MAX)
...@@ -59,28 +61,36 @@ struct hist_field { ...@@ -59,28 +61,36 @@ struct hist_field {
char *name; char *name;
}; };
static u64 hist_field_none(struct hist_field *field, void *event, static u64 hist_field_none(struct hist_field *field,
struct ring_buffer_event *rbe) struct tracing_map_elt *elt,
struct ring_buffer_event *rbe,
void *event)
{ {
return 0; return 0;
} }
static u64 hist_field_counter(struct hist_field *field, void *event, static u64 hist_field_counter(struct hist_field *field,
struct ring_buffer_event *rbe) struct tracing_map_elt *elt,
struct ring_buffer_event *rbe,
void *event)
{ {
return 1; return 1;
} }
static u64 hist_field_string(struct hist_field *hist_field, void *event, static u64 hist_field_string(struct hist_field *hist_field,
struct ring_buffer_event *rbe) struct tracing_map_elt *elt,
struct ring_buffer_event *rbe,
void *event)
{ {
char *addr = (char *)(event + hist_field->field->offset); char *addr = (char *)(event + hist_field->field->offset);
return (u64)(unsigned long)addr; return (u64)(unsigned long)addr;
} }
static u64 hist_field_dynstring(struct hist_field *hist_field, void *event, static u64 hist_field_dynstring(struct hist_field *hist_field,
struct ring_buffer_event *rbe) struct tracing_map_elt *elt,
struct ring_buffer_event *rbe,
void *event)
{ {
u32 str_item = *(u32 *)(event + hist_field->field->offset); u32 str_item = *(u32 *)(event + hist_field->field->offset);
int str_loc = str_item & 0xffff; int str_loc = str_item & 0xffff;
...@@ -89,54 +99,64 @@ static u64 hist_field_dynstring(struct hist_field *hist_field, void *event, ...@@ -89,54 +99,64 @@ static u64 hist_field_dynstring(struct hist_field *hist_field, void *event,
return (u64)(unsigned long)addr; return (u64)(unsigned long)addr;
} }
static u64 hist_field_pstring(struct hist_field *hist_field, void *event, static u64 hist_field_pstring(struct hist_field *hist_field,
struct ring_buffer_event *rbe) struct tracing_map_elt *elt,
struct ring_buffer_event *rbe,
void *event)
{ {
char **addr = (char **)(event + hist_field->field->offset); char **addr = (char **)(event + hist_field->field->offset);
return (u64)(unsigned long)*addr; return (u64)(unsigned long)*addr;
} }
static u64 hist_field_log2(struct hist_field *hist_field, void *event, static u64 hist_field_log2(struct hist_field *hist_field,
struct ring_buffer_event *rbe) struct tracing_map_elt *elt,
struct ring_buffer_event *rbe,
void *event)
{ {
struct hist_field *operand = hist_field->operands[0]; struct hist_field *operand = hist_field->operands[0];
u64 val = operand->fn(operand, event, rbe); u64 val = operand->fn(operand, elt, rbe, event);
return (u64) ilog2(roundup_pow_of_two(val)); return (u64) ilog2(roundup_pow_of_two(val));
} }
static u64 hist_field_plus(struct hist_field *hist_field, void *event, static u64 hist_field_plus(struct hist_field *hist_field,
struct ring_buffer_event *rbe) struct tracing_map_elt *elt,
struct ring_buffer_event *rbe,
void *event)
{ {
struct hist_field *operand1 = hist_field->operands[0]; struct hist_field *operand1 = hist_field->operands[0];
struct hist_field *operand2 = hist_field->operands[1]; struct hist_field *operand2 = hist_field->operands[1];
u64 val1 = operand1->fn(operand1, event, rbe); u64 val1 = operand1->fn(operand1, elt, rbe, event);
u64 val2 = operand2->fn(operand2, event, rbe); u64 val2 = operand2->fn(operand2, elt, rbe, event);
return val1 + val2; return val1 + val2;
} }
static u64 hist_field_minus(struct hist_field *hist_field, void *event, static u64 hist_field_minus(struct hist_field *hist_field,
struct ring_buffer_event *rbe) struct tracing_map_elt *elt,
struct ring_buffer_event *rbe,
void *event)
{ {
struct hist_field *operand1 = hist_field->operands[0]; struct hist_field *operand1 = hist_field->operands[0];
struct hist_field *operand2 = hist_field->operands[1]; struct hist_field *operand2 = hist_field->operands[1];
u64 val1 = operand1->fn(operand1, event, rbe); u64 val1 = operand1->fn(operand1, elt, rbe, event);
u64 val2 = operand2->fn(operand2, event, rbe); u64 val2 = operand2->fn(operand2, elt, rbe, event);
return val1 - val2; return val1 - val2;
} }
static u64 hist_field_unary_minus(struct hist_field *hist_field, void *event, static u64 hist_field_unary_minus(struct hist_field *hist_field,
struct ring_buffer_event *rbe) struct tracing_map_elt *elt,
struct ring_buffer_event *rbe,
void *event)
{ {
struct hist_field *operand = hist_field->operands[0]; struct hist_field *operand = hist_field->operands[0];
s64 sval = (s64)operand->fn(operand, event, rbe); s64 sval = (s64)operand->fn(operand, elt, rbe, event);
u64 val = (u64)-sval; u64 val = (u64)-sval;
return val; return val;
...@@ -144,8 +164,9 @@ static u64 hist_field_unary_minus(struct hist_field *hist_field, void *event, ...@@ -144,8 +164,9 @@ static u64 hist_field_unary_minus(struct hist_field *hist_field, void *event,
#define DEFINE_HIST_FIELD_FN(type) \ #define DEFINE_HIST_FIELD_FN(type) \
static u64 hist_field_##type(struct hist_field *hist_field, \ static u64 hist_field_##type(struct hist_field *hist_field, \
void *event, \ struct tracing_map_elt *elt, \
struct ring_buffer_event *rbe) \ struct ring_buffer_event *rbe, \
void *event) \
{ \ { \
type *addr = (type *)(event + hist_field->field->offset); \ type *addr = (type *)(event + hist_field->field->offset); \
\ \
...@@ -233,8 +254,10 @@ struct hist_trigger_data { ...@@ -233,8 +254,10 @@ struct hist_trigger_data {
bool remove; bool remove;
}; };
static u64 hist_field_timestamp(struct hist_field *hist_field, void *event, static u64 hist_field_timestamp(struct hist_field *hist_field,
struct ring_buffer_event *rbe) struct tracing_map_elt *elt,
struct ring_buffer_event *rbe,
void *event)
{ {
struct hist_trigger_data *hist_data = hist_field->hist_data; struct hist_trigger_data *hist_data = hist_field->hist_data;
struct trace_array *tr = hist_data->event_file->tr; struct trace_array *tr = hist_data->event_file->tr;
...@@ -1570,7 +1593,7 @@ static void hist_trigger_elt_update(struct hist_trigger_data *hist_data, ...@@ -1570,7 +1593,7 @@ static void hist_trigger_elt_update(struct hist_trigger_data *hist_data,
for_each_hist_val_field(i, hist_data) { for_each_hist_val_field(i, hist_data) {
hist_field = hist_data->fields[i]; hist_field = hist_data->fields[i];
hist_val = hist_field->fn(hist_field, rec, rbe); hist_val = hist_field->fn(hist_field, elt, rbe, rec);
if (hist_field->flags & HIST_FIELD_FL_VAR) { if (hist_field->flags & HIST_FIELD_FL_VAR) {
var_idx = hist_field->var.idx; var_idx = hist_field->var.idx;
tracing_map_set_var(elt, var_idx, hist_val); tracing_map_set_var(elt, var_idx, hist_val);
...@@ -1582,7 +1605,7 @@ static void hist_trigger_elt_update(struct hist_trigger_data *hist_data, ...@@ -1582,7 +1605,7 @@ static void hist_trigger_elt_update(struct hist_trigger_data *hist_data,
for_each_hist_key_field(i, hist_data) { for_each_hist_key_field(i, hist_data) {
hist_field = hist_data->fields[i]; hist_field = hist_data->fields[i];
if (hist_field->flags & HIST_FIELD_FL_VAR) { if (hist_field->flags & HIST_FIELD_FL_VAR) {
hist_val = hist_field->fn(hist_field, rec, rbe); hist_val = hist_field->fn(hist_field, elt, rbe, rec);
var_idx = hist_field->var.idx; var_idx = hist_field->var.idx;
tracing_map_set_var(elt, var_idx, hist_val); tracing_map_set_var(elt, var_idx, hist_val);
} }
...@@ -1620,9 +1643,9 @@ static void event_hist_trigger(struct event_trigger_data *data, void *rec, ...@@ -1620,9 +1643,9 @@ static void event_hist_trigger(struct event_trigger_data *data, void *rec,
bool use_compound_key = (hist_data->n_keys > 1); bool use_compound_key = (hist_data->n_keys > 1);
unsigned long entries[HIST_STACKTRACE_DEPTH]; unsigned long entries[HIST_STACKTRACE_DEPTH];
char compound_key[HIST_KEY_SIZE_MAX]; char compound_key[HIST_KEY_SIZE_MAX];
struct tracing_map_elt *elt = NULL;
struct stack_trace stacktrace; struct stack_trace stacktrace;
struct hist_field *key_field; struct hist_field *key_field;
struct tracing_map_elt *elt;
u64 field_contents; u64 field_contents;
void *key = NULL; void *key = NULL;
unsigned int i; unsigned int i;
...@@ -1643,7 +1666,7 @@ static void event_hist_trigger(struct event_trigger_data *data, void *rec, ...@@ -1643,7 +1666,7 @@ static void event_hist_trigger(struct event_trigger_data *data, void *rec,
key = entries; key = entries;
} else { } else {
field_contents = key_field->fn(key_field, rec, rbe); field_contents = key_field->fn(key_field, elt, rbe, rec);
if (key_field->flags & HIST_FIELD_FL_STRING) { if (key_field->flags & HIST_FIELD_FL_STRING) {
key = (void *)(unsigned long)field_contents; key = (void *)(unsigned long)field_contents;
use_compound_key = true; use_compound_key = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7