tracing: Allow multiple hitcount values in histograms

The hitcount is treated specially in the histograms - since it's
always expected to be there regardless of whether the user specified
anything or not, it's always added as the first histogram value.

Currently the code doesn't allow it to be added more than once as a
value, which is inconsistent with all the other possible values.  It
would seem to be a pointless thing to want to do, but other features
being added such as percent and graph modifiers don't work properly
with the current hitcount restrictions.

Fix this by allowing multiple hitcounts to be added.

Link: https://lore.kernel.org/linux-trace-kernel/166610812248.56030.16754785928712505251.stgit@devnote2
Signed-off-by: Tom Zanussi <zanussi@kernel.org>
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Tested-by: Tom Zanussi <zanussi@kernel.org>

diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index 1c82478e8dffe732eac72dc496cc5394e4563fe8..31d58ddcc1d9eaa1810ada90b89c726f163bc062 100644 (file)
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -1356,6 +1356,8 @@ static const char *hist_field_name(struct hist_field *field,
                        field_name = field->name;
        } else if (field->flags & HIST_FIELD_FL_TIMESTAMP)
                field_name = "common_timestamp";
+       else if (field->flags & HIST_FIELD_FL_HITCOUNT)
+               field_name = "hitcount";
 
        if (field_name == NULL)
                field_name = "";
@@ -2328,6 +2330,8 @@ parse_field(struct hist_trigger_data *hist_data, struct trace_event_file *file,
                        hist_data->attrs->ts_in_usecs = true;
        } else if (strcmp(field_name, "common_cpu") == 0)
                *flags |= HIST_FIELD_FL_CPU;
+       else if (strcmp(field_name, "hitcount") == 0)
+               *flags |= HIST_FIELD_FL_HITCOUNT;
        else {
                field = trace_find_event_field(file->event_call, field_name);
                if (!field || !field->size) {
@@ -4328,8 +4332,8 @@ static int create_var_field(struct hist_trigger_data *hist_data,
 static int create_val_fields(struct hist_trigger_data *hist_data,
                             struct trace_event_file *file)
 {
+       unsigned int i, j = 1, n_hitcount = 0;
        char *fields_str, *field_str;
-       unsigned int i, j = 1;
        int ret;
 
        ret = create_hitcount_val(hist_data);
@@ -4346,8 +4350,10 @@ static int create_val_fields(struct hist_trigger_data *hist_data,
                if (!field_str)
                        break;
 
-               if (strcmp(field_str, "hitcount") == 0)
-                       continue;
+               if (strcmp(field_str, "hitcount") == 0) {
+                       if (!n_hitcount++)
+                               continue;
+               }
 
                ret = create_val_field(hist_data, j++, file, field_str);
                if (ret)