| From: Tom Zanussi <tom.zanussi@linux.intel.com> |
| Date: Tue, 5 Sep 2017 16:57:35 -0500 |
| Subject: [PATCH 23/40] tracing: Add hist_field 'type' field |
| |
| Future support for synthetic events requires hist_field 'type' |
| information, so add a field for that. |
| |
| Also, make other hist_field attribute usage consistent (size, |
| is_signed, etc). |
| |
| 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 | 33 +++++++++++++++++++++++++++++++++ |
| 1 file changed, 33 insertions(+) |
| |
| --- a/kernel/trace/trace_events_hist.c |
| +++ b/kernel/trace/trace_events_hist.c |
| @@ -54,6 +54,7 @@ struct hist_field { |
| unsigned int size; |
| unsigned int offset; |
| unsigned int is_signed; |
| + const char *type; |
| struct hist_field *operands[HIST_FIELD_OPERANDS_MAX]; |
| struct hist_trigger_data *hist_data; |
| struct hist_var var; |
| @@ -650,6 +651,7 @@ static void destroy_hist_field(struct hi |
| |
| kfree(hist_field->var.name); |
| kfree(hist_field->name); |
| + kfree(hist_field->type); |
| |
| kfree(hist_field); |
| } |
| @@ -675,6 +677,10 @@ static struct hist_field *create_hist_fi |
| |
| if (flags & HIST_FIELD_FL_HITCOUNT) { |
| hist_field->fn = hist_field_counter; |
| + hist_field->size = sizeof(u64); |
| + hist_field->type = kstrdup("u64", GFP_KERNEL); |
| + if (!hist_field->type) |
| + goto free; |
| goto out; |
| } |
| |
| @@ -688,12 +694,18 @@ static struct hist_field *create_hist_fi |
| hist_field->fn = hist_field_log2; |
| hist_field->operands[0] = create_hist_field(hist_data, field, fl, NULL); |
| hist_field->size = hist_field->operands[0]->size; |
| + hist_field->type = kstrdup(hist_field->operands[0]->type, GFP_KERNEL); |
| + if (!hist_field->type) |
| + goto free; |
| goto out; |
| } |
| |
| if (flags & HIST_FIELD_FL_TIMESTAMP) { |
| hist_field->fn = hist_field_timestamp; |
| hist_field->size = sizeof(u64); |
| + hist_field->type = kstrdup("u64", GFP_KERNEL); |
| + if (!hist_field->type) |
| + goto free; |
| goto out; |
| } |
| |
| @@ -703,6 +715,11 @@ static struct hist_field *create_hist_fi |
| if (is_string_field(field)) { |
| flags |= HIST_FIELD_FL_STRING; |
| |
| + hist_field->size = MAX_FILTER_STR_VAL; |
| + hist_field->type = kstrdup(field->type, GFP_KERNEL); |
| + if (!hist_field->type) |
| + goto free; |
| + |
| if (field->filter_type == FILTER_STATIC_STRING) |
| hist_field->fn = hist_field_string; |
| else if (field->filter_type == FILTER_DYN_STRING) |
| @@ -710,6 +727,12 @@ static struct hist_field *create_hist_fi |
| else |
| hist_field->fn = hist_field_pstring; |
| } else { |
| + hist_field->size = field->size; |
| + hist_field->is_signed = field->is_signed; |
| + hist_field->type = kstrdup(field->type, GFP_KERNEL); |
| + if (!hist_field->type) |
| + goto free; |
| + |
| hist_field->fn = select_value_fn(field->size, |
| field->is_signed); |
| if (!hist_field->fn) { |
| @@ -917,6 +940,11 @@ static struct hist_field *parse_unary(st |
| expr->operands[0] = operand1; |
| expr->operator = FIELD_OP_UNARY_MINUS; |
| expr->name = expr_str(expr, 0); |
| + expr->type = kstrdup(operand1->type, GFP_KERNEL); |
| + if (!expr->type) { |
| + ret = -ENOMEM; |
| + goto free; |
| + } |
| |
| return expr; |
| free: |
| @@ -1005,6 +1033,11 @@ static struct hist_field *parse_expr(str |
| expr->operands[1] = operand2; |
| expr->operator = field_op; |
| expr->name = expr_str(expr, 0); |
| + expr->type = kstrdup(operand1->type, GFP_KERNEL); |
| + if (!expr->type) { |
| + ret = -ENOMEM; |
| + goto free; |
| + } |
| |
| switch (field_op) { |
| case FIELD_OP_MINUS: |