80 lines
2.8 KiB
Diff
80 lines
2.8 KiB
Diff
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
|
Date: Mon, 26 Jun 2017 17:49:15 -0500
|
|
Subject: [PATCH 14/32] tracing: Add hist_data member to hist_field
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.11/older/patches-4.11.9-rt7.tar.xz
|
|
|
|
Allow hist_data access via hist_field. Some users of hist_fields
|
|
require or will require more access to the associated hist_data.
|
|
|
|
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
|
|
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,
|
|
@@ -415,7 +416,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;
|
|
@@ -427,6 +429,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;
|
|
@@ -440,7 +444,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;
|
|
}
|
|
@@ -493,7 +497,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;
|
|
|
|
@@ -539,7 +543,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;
|
|
@@ -649,7 +653,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;
|