Merge tag 'renesas-dt-fixes-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / kernel / trace / trace_events_hist.c

diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index 1c21d0e2a145a6e180116fc1fd0705ae7e3fdb17..1e1558c99d56090eea6a321c11d7790334fb0e24 100644 (file)
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -28,12 +28,16 @@ struct hist_field;
 
 typedef u64 (*hist_field_fn_t) (struct hist_field *field, void *event);
 
+#define HIST_FIELD_OPERANDS_MAX        2
+
 struct hist_field {
        struct ftrace_event_field       *field;
        unsigned long                   flags;
        hist_field_fn_t                 fn;
        unsigned int                    size;
        unsigned int                    offset;
+       unsigned int                    is_signed;
+       struct hist_field               *operands[HIST_FIELD_OPERANDS_MAX];
 };
 
 static u64 hist_field_none(struct hist_field *field, void *event)
@@ -71,7 +75,9 @@ static u64 hist_field_pstring(struct hist_field *hist_field, void *event)
 
 static u64 hist_field_log2(struct hist_field *hist_field, void *event)
 {
-       u64 val = *(u64 *)(event + hist_field->field->offset);
+       struct hist_field *operand = hist_field->operands[0];
+
+       u64 val = operand->fn(operand, event);
 
        return (u64) ilog2(roundup_pow_of_two(val));
 }
@@ -110,16 +116,16 @@ DEFINE_HIST_FIELD_FN(u8);
 #define HIST_KEY_SIZE_MAX      (MAX_FILTER_STR_VAL + HIST_STACKTRACE_SIZE)
 
 enum hist_field_flags {
-       HIST_FIELD_FL_HITCOUNT          = 1,
-       HIST_FIELD_FL_KEY               = 2,
-       HIST_FIELD_FL_STRING            = 4,
-       HIST_FIELD_FL_HEX               = 8,
-       HIST_FIELD_FL_SYM               = 16,
-       HIST_FIELD_FL_SYM_OFFSET        = 32,
-       HIST_FIELD_FL_EXECNAME          = 64,
-       HIST_FIELD_FL_SYSCALL           = 128,
-       HIST_FIELD_FL_STACKTRACE        = 256,
-       HIST_FIELD_FL_LOG2              = 512,
+       HIST_FIELD_FL_HITCOUNT          = 1 << 0,
+       HIST_FIELD_FL_KEY               = 1 << 1,
+       HIST_FIELD_FL_STRING            = 1 << 2,
+       HIST_FIELD_FL_HEX               = 1 << 3,
+       HIST_FIELD_FL_SYM               = 1 << 4,
+       HIST_FIELD_FL_SYM_OFFSET        = 1 << 5,
+       HIST_FIELD_FL_EXECNAME          = 1 << 6,
+       HIST_FIELD_FL_SYSCALL           = 1 << 7,
+       HIST_FIELD_FL_STACKTRACE        = 1 << 8,
+       HIST_FIELD_FL_LOG2              = 1 << 9,
 };
 
 struct hist_trigger_attrs {
@@ -146,6 +152,25 @@ struct hist_trigger_data {
        struct tracing_map              *map;
 };
 
+static const char *hist_field_name(struct hist_field *field,
+                                  unsigned int level)
+{
+       const char *field_name = "";
+
+       if (level > 1)
+               return field_name;
+
+       if (field->field)
+               field_name = field->field->name;
+       else if (field->flags & HIST_FIELD_FL_LOG2)
+               field_name = hist_field_name(field->operands[0], ++level);
+
+       if (field_name == NULL)
+               field_name = "";
+
+       return field_name;
+}
+
 static hist_field_fn_t select_value_fn(int field_size, int field_is_signed)
 {
        hist_field_fn_t fn = NULL;
@@ -340,8 +365,20 @@ static const struct tracing_map_ops hist_trigger_elt_comm_ops = {
        .elt_init       = hist_trigger_elt_comm_init,
 };
 
-static void destroy_hist_field(struct hist_field *hist_field)
+static void destroy_hist_field(struct hist_field *hist_field,
+                              unsigned int level)
 {
+       unsigned int i;
+
+       if (level > 2)
+               return;
+
+       if (!hist_field)
+               return;
+
+       for (i = 0; i < HIST_FIELD_OPERANDS_MAX; i++)
+               destroy_hist_field(hist_field->operands[i], level + 1);
+
        kfree(hist_field);
 }
 
@@ -368,7 +405,10 @@ static struct hist_field *create_hist_field(struct ftrace_event_field *field,
        }
 
        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->size = hist_field->operands[0]->size;
                goto out;
        }
 
@@ -388,7 +428,7 @@ static struct hist_field *create_hist_field(struct ftrace_event_field *field,
                hist_field->fn = select_value_fn(field->size,
                                                 field->is_signed);
                if (!hist_field->fn) {
-                       destroy_hist_field(hist_field);
+                       destroy_hist_field(hist_field, 0);
                        return NULL;
                }
        }
@@ -405,7 +445,7 @@ static void destroy_hist_fields(struct hist_trigger_data *hist_data)
 
        for (i = 0; i < TRACING_MAP_FIELDS_MAX; i++) {
                if (hist_data->fields[i]) {
-                       destroy_hist_field(hist_data->fields[i]);
+                       destroy_hist_field(hist_data->fields[i], 0);
                        hist_data->fields[i] = NULL;
                }
        }
@@ -450,7 +490,7 @@ static int create_val_field(struct hist_trigger_data *hist_data,
        }
 
        field = trace_find_event_field(file->event_call, field_name);
-       if (!field) {
+       if (!field || !field->size) {
                ret = -EINVAL;
                goto out;
        }
@@ -548,7 +588,7 @@ static int create_key_field(struct hist_trigger_data *hist_data,
                }
 
                field = trace_find_event_field(file->event_call, field_name);
-               if (!field) {
+               if (!field || !field->size) {
                        ret = -EINVAL;
                        goto out;
                }
@@ -653,7 +693,6 @@ static int is_descending(const char *str)
 static int create_sort_keys(struct hist_trigger_data *hist_data)
 {
        char *fields_str = hist_data->attrs->sort_key_str;
-       struct ftrace_event_field *field = NULL;
        struct tracing_map_sort_key *sort_key;
        int descending, ret = 0;
        unsigned int i, j;
@@ -670,7 +709,9 @@ static int create_sort_keys(struct hist_trigger_data *hist_data)
        }
 
        for (i = 0; i < TRACING_MAP_SORT_KEYS_MAX; i++) {
+               struct hist_field *hist_field;
                char *field_str, *field_name;
+               const char *test_name;
 
                sort_key = &hist_data->sort_keys[i];
 
@@ -703,8 +744,10 @@ static int create_sort_keys(struct hist_trigger_data *hist_data)
                }
 
                for (j = 1; j < hist_data->n_fields; j++) {
-                       field = hist_data->fields[j]->field;
-                       if (field && (strcmp(field_name, field->name) == 0)) {
+                       hist_field = hist_data->fields[j];
+                       test_name = hist_field_name(hist_field, 0);
+
+                       if (strcmp(field_name, test_name) == 0) {
                                sort_key->field_idx = j;
                                descending = is_descending(field_str);
                                if (descending < 0) {
@@ -952,6 +995,7 @@ hist_trigger_entry_print(struct seq_file *m,
        struct hist_field *key_field;
        char str[KSYM_SYMBOL_LEN];
        bool multiline = false;
+       const char *field_name;
        unsigned int i;
        u64 uval;
 
@@ -963,26 +1007,27 @@ hist_trigger_entry_print(struct seq_file *m,
                if (i > hist_data->n_vals)
                        seq_puts(m, ", ");
 
+               field_name = hist_field_name(key_field, 0);
+
                if (key_field->flags & HIST_FIELD_FL_HEX) {
                        uval = *(u64 *)(key + key_field->offset);
-                       seq_printf(m, "%s: %llx",
-                                  key_field->field->name, uval);
+                       seq_printf(m, "%s: %llx", field_name, uval);
                } else if (key_field->flags & HIST_FIELD_FL_SYM) {
                        uval = *(u64 *)(key + key_field->offset);
                        sprint_symbol_no_offset(str, uval);
-                       seq_printf(m, "%s: [%llx] %-45s",
-                                  key_field->field->name, uval, str);
+                       seq_printf(m, "%s: [%llx] %-45s", field_name,
+                                  uval, str);
                } else if (key_field->flags & HIST_FIELD_FL_SYM_OFFSET) {
                        uval = *(u64 *)(key + key_field->offset);
                        sprint_symbol(str, uval);
-                       seq_printf(m, "%s: [%llx] %-55s",
-                                  key_field->field->name, uval, str);
+                       seq_printf(m, "%s: [%llx] %-55s", field_name,
+                                  uval, str);
                } else if (key_field->flags & HIST_FIELD_FL_EXECNAME) {
                        char *comm = elt->private_data;
 
                        uval = *(u64 *)(key + key_field->offset);
-                       seq_printf(m, "%s: %-16s[%10llu]",
-                                  key_field->field->name, comm, uval);
+                       seq_printf(m, "%s: %-16s[%10llu]", field_name,
+                                  comm, uval);
                } else if (key_field->flags & HIST_FIELD_FL_SYSCALL) {
                        const char *syscall_name;
 
@@ -991,8 +1036,8 @@ hist_trigger_entry_print(struct seq_file *m,
                        if (!syscall_name)
                                syscall_name = "unknown_syscall";
 
-                       seq_printf(m, "%s: %-30s[%3llu]",
-                                  key_field->field->name, syscall_name, uval);
+                       seq_printf(m, "%s: %-30s[%3llu]", field_name,
+                                  syscall_name, uval);
                } else if (key_field->flags & HIST_FIELD_FL_STACKTRACE) {
                        seq_puts(m, "stacktrace:\n");
                        hist_trigger_stacktrace_print(m,
@@ -1000,15 +1045,14 @@ hist_trigger_entry_print(struct seq_file *m,
                                                      HIST_STACKTRACE_DEPTH);
                        multiline = true;
                } else if (key_field->flags & HIST_FIELD_FL_LOG2) {
-                       seq_printf(m, "%s: ~ 2^%-2llu", key_field->field->name,
+                       seq_printf(m, "%s: ~ 2^%-2llu", field_name,
                                   *(u64 *)(key + key_field->offset));
                } else if (key_field->flags & HIST_FIELD_FL_STRING) {
-                       seq_printf(m, "%s: %-50s", key_field->field->name,
+                       seq_printf(m, "%s: %-50s", field_name,
                                   (char *)(key + key_field->offset));
                } else {
                        uval = *(u64 *)(key + key_field->offset);
-                       seq_printf(m, "%s: %10llu", key_field->field->name,
-                                  uval);
+                       seq_printf(m, "%s: %10llu", field_name, uval);
                }
        }
 
@@ -1021,13 +1065,13 @@ hist_trigger_entry_print(struct seq_file *m,
                   tracing_map_read_sum(elt, HITCOUNT_IDX));
 
        for (i = 1; i < hist_data->n_vals; i++) {
+               field_name = hist_field_name(hist_data->fields[i], 0);
+
                if (hist_data->fields[i]->flags & HIST_FIELD_FL_HEX) {
-                       seq_printf(m, "  %s: %10llx",
-                                  hist_data->fields[i]->field->name,
+                       seq_printf(m, "  %s: %10llx", field_name,
                                   tracing_map_read_sum(elt, i));
                } else {
-                       seq_printf(m, "  %s: %10llu",
-                                  hist_data->fields[i]->field->name,
+                       seq_printf(m, "  %s: %10llu", field_name,
                                   tracing_map_read_sum(elt, i));
                }
        }
@@ -1062,7 +1106,7 @@ static void hist_trigger_show(struct seq_file *m,
                              struct event_trigger_data *data, int n)
 {
        struct hist_trigger_data *hist_data;
-       int n_entries, ret = 0;
+       int n_entries;
 
        if (n > 0)
                seq_puts(m, "\n\n");
@@ -1073,10 +1117,8 @@ static void hist_trigger_show(struct seq_file *m,
 
        hist_data = data->private_data;
        n_entries = print_entries(m, hist_data);
-       if (n_entries < 0) {
-               ret = n_entries;
+       if (n_entries < 0)
                n_entries = 0;
-       }
 
        seq_printf(m, "\nTotals:\n    Hits: %llu\n    Entries: %u\n    Dropped: %llu\n",
                   (u64)atomic64_read(&hist_data->map->hits),
@@ -1142,7 +1184,9 @@ static const char *get_hist_field_flags(struct hist_field *hist_field)
 
 static void hist_field_print(struct seq_file *m, struct hist_field *hist_field)
 {
-       seq_printf(m, "%s", hist_field->field->name);
+       const char *field_name = hist_field_name(hist_field, 0);
+
+       seq_printf(m, "%s", field_name);
        if (hist_field->flags) {
                const char *flags_str = get_hist_field_flags(hist_field);