| From: Tom Zanussi <tom.zanussi@linux.intel.com> |
| Date: Mon, 15 Jan 2018 20:51:47 -0600 |
| Subject: [PATCH 21/48] tracing: Add hist_data member to hist_field |
| |
| Allow hist_data access via hist_field. Some users of hist_fields |
| require or will require more access to the associated hist_data. |
| |
| Link: http://lkml.kernel.org/r/d04cd0768f5228ebb4ac0ba4a847bc4d14d4826f.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> |
| (cherry picked from commit 14ab3edac407939009700c04215935576250e969) |
| Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> |
| --- |
| kernel/trace/trace_events_hist.c | 14 +++++++++----- |
| 1 file changed, 9 insertions(+), 5 deletions(-) |
| |
| --- a/kernel/trace/trace_events_hist.c |
| +++ b/kernel/trace/trace_events_hist.c |
| @@ -39,6 +39,7 @@ struct hist_field { |
| unsigned int offset; |
| unsigned int is_signed; |
| struct hist_field *operands[HIST_FIELD_OPERANDS_MAX]; |
| + struct hist_trigger_data *hist_data; |
| }; |
| |
| static u64 hist_field_none(struct hist_field *field, void *event, |
| @@ -420,7 +421,8 @@ static void destroy_hist_field(struct hi |
| kfree(hist_field); |
| } |
| |
| -static struct hist_field *create_hist_field(struct ftrace_event_field *field, |
| +static struct hist_field *create_hist_field(struct hist_trigger_data *hist_data, |
| + struct ftrace_event_field *field, |
| unsigned long flags) |
| { |
| struct hist_field *hist_field; |
| @@ -432,6 +434,8 @@ static struct hist_field *create_hist_fi |
| if (!hist_field) |
| return NULL; |
| |
| + hist_field->hist_data = hist_data; |
| + |
| if (flags & HIST_FIELD_FL_HITCOUNT) { |
| hist_field->fn = hist_field_counter; |
| goto out; |
| @@ -445,7 +449,7 @@ static struct hist_field *create_hist_fi |
| if (flags & HIST_FIELD_FL_LOG2) { |
| unsigned long fl = flags & ~HIST_FIELD_FL_LOG2; |
| hist_field->fn = hist_field_log2; |
| - hist_field->operands[0] = create_hist_field(field, fl); |
| + hist_field->operands[0] = create_hist_field(hist_data, field, fl); |
| hist_field->size = hist_field->operands[0]->size; |
| goto out; |
| } |
| @@ -498,7 +502,7 @@ static void destroy_hist_fields(struct h |
| static int create_hitcount_val(struct hist_trigger_data *hist_data) |
| { |
| hist_data->fields[HITCOUNT_IDX] = |
| - create_hist_field(NULL, HIST_FIELD_FL_HITCOUNT); |
| + create_hist_field(hist_data, NULL, HIST_FIELD_FL_HITCOUNT); |
| if (!hist_data->fields[HITCOUNT_IDX]) |
| return -ENOMEM; |
| |
| @@ -544,7 +548,7 @@ static int create_val_field(struct hist_ |
| } |
| } |
| |
| - hist_data->fields[val_idx] = create_hist_field(field, flags); |
| + hist_data->fields[val_idx] = create_hist_field(hist_data, field, flags); |
| if (!hist_data->fields[val_idx]) { |
| ret = -ENOMEM; |
| goto out; |
| @@ -654,7 +658,7 @@ static int create_key_field(struct hist_ |
| } |
| } |
| |
| - hist_data->fields[key_idx] = create_hist_field(field, flags); |
| + hist_data->fields[key_idx] = create_hist_field(hist_data, field, flags); |
| if (!hist_data->fields[key_idx]) { |
| ret = -ENOMEM; |
| goto out; |