Skip to content

Commit

Permalink
tracing: Add ring buffer event param to hist field functions
Browse files Browse the repository at this point in the history 
Some events such as timestamps require access to a ring_buffer_event
struct; add a param so that hist field functions can access that.

Link: http://lkml.kernel.org/r/2ff4af18e72b6002eb86b26b2a7f39cef7d1dfe4.1516069914.git.tom.zanussi@linux.intel.com

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
  • Loading branch information
Tom Zanussi authored and Steven Rostedt (VMware) committed Mar 10, 2018
1 parent 1ac4f51 commit fbd302c
Showing 1 changed file with 24 additions and 15 deletions.
39 changes: 24 additions & 15 deletions kernel/trace/trace_events_hist.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@

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, void *event,
struct ring_buffer_event *rbe);

#define HIST_FIELD_OPERANDS_MAX 2

Expand All @@ -40,24 +41,28 @@ struct hist_field {
struct hist_field *operands[HIST_FIELD_OPERANDS_MAX];
};

static u64 hist_field_none(struct hist_field *field, void *event)
static u64 hist_field_none(struct hist_field *field, void *event,
struct ring_buffer_event *rbe)
{
return 0;
}

static u64 hist_field_counter(struct hist_field *field, void *event)
static u64 hist_field_counter(struct hist_field *field, void *event,
struct ring_buffer_event *rbe)
{
return 1;
}

static u64 hist_field_string(struct hist_field *hist_field, void *event)
static u64 hist_field_string(struct hist_field *hist_field, void *event,
struct ring_buffer_event *rbe)
{
char *addr = (char *)(event + hist_field->field->offset);

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, void *event,
struct ring_buffer_event *rbe)
{
u32 str_item = *(u32 *)(event + hist_field->field->offset);
int str_loc = str_item & 0xffff;
Expand All @@ -66,24 +71,28 @@ static u64 hist_field_dynstring(struct hist_field *hist_field, void *event)
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, void *event,
struct ring_buffer_event *rbe)
{
char **addr = (char **)(event + hist_field->field->offset);

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, void *event,
struct ring_buffer_event *rbe)
{
struct hist_field *operand = hist_field->operands[0];

u64 val = operand->fn(operand, event);
u64 val = operand->fn(operand, event, rbe);

return (u64) ilog2(roundup_pow_of_two(val));
}

#define DEFINE_HIST_FIELD_FN(type) \
static u64 hist_field_##type(struct hist_field *hist_field, void *event)\
static u64 hist_field_##type(struct hist_field *hist_field, \
void *event, \
struct ring_buffer_event *rbe) \
{ \
type *addr = (type *)(event + hist_field->field->offset); \
\
Expand Down Expand Up @@ -871,16 +880,16 @@ create_hist_data(unsigned int map_bits,
}

static void hist_trigger_elt_update(struct hist_trigger_data *hist_data,
struct tracing_map_elt *elt,
void *rec)
struct tracing_map_elt *elt, void *rec,
struct ring_buffer_event *rbe)
{
struct hist_field *hist_field;
unsigned int i;
u64 hist_val;

for_each_hist_val_field(i, hist_data) {
hist_field = hist_data->fields[i];
hist_val = hist_field->fn(hist_field, rec);
hist_val = hist_field->fn(hist_field, rec, rbe);
tracing_map_update_sum(elt, i, hist_val);
}
}
Expand Down Expand Up @@ -910,7 +919,7 @@ static inline void add_to_key(char *compound_key, void *key,
}

static void event_hist_trigger(struct event_trigger_data *data, void *rec,
struct ring_buffer_event *event)
struct ring_buffer_event *rbe)
{
struct hist_trigger_data *hist_data = data->private_data;
bool use_compound_key = (hist_data->n_keys > 1);
Expand Down Expand Up @@ -939,7 +948,7 @@ static void event_hist_trigger(struct event_trigger_data *data, void *rec,

key = entries;
} else {
field_contents = key_field->fn(key_field, rec);
field_contents = key_field->fn(key_field, rec, rbe);
if (key_field->flags & HIST_FIELD_FL_STRING) {
key = (void *)(unsigned long)field_contents;
use_compound_key = true;
Expand All @@ -956,7 +965,7 @@ static void event_hist_trigger(struct event_trigger_data *data, void *rec,

elt = tracing_map_insert(hist_data->map, key);
if (elt)
hist_trigger_elt_update(hist_data, elt, rec);
hist_trigger_elt_update(hist_data, elt, rec, rbe);
}

static void hist_trigger_stacktrace_print(struct seq_file *m,
Expand Down

0 comments on commit fbd302c

Please sign in to comment.