tracing: Add linear buckets to histogram logic
A message that is not in the archive (sent off-list or not yet received): [email protected]
Tom Zanussi
Reviewed-byHi Steve,
Looks good to me, just a couple nits below.
Quoted 75 lines · Steven Rostedt
From: "Steven Rostedt (VMware)" <[email protected]>
There's been several times I wished the histogram logic had a "grouping"
feature for the buckets. Currently, each bucket has a size of one. That
is, if you trace the amount of requested allocations, each allocation is
its own bucket, even if you are interested in what allocates 100 bytes or
less, 100 to 200, 200 to 300, etc.Also, without grouping, it fills up the allocated histogram buckets quickly. If you are tracking latency, and don't care if something is 200
microseconds off, or 201 microseconds off, but want to track them by say
10 microseconds each. This can not currently be done.There is a log2 but that grouping get's too big too fast for a lot of cases.
Introduce a "buckets=SIZE" command to each field where it will record in a
rounded number. For example:Quoted 1 line
# echo 'hist:keys=bytes_req.buckets=100:sort=bytes_req' >events/kmem/kmalloc/trigger
Quoted 1 line
# cat events/kmem/kmalloc/hist# event histogram # # trigger info: hist:keys=bytes_req.buckets=100:vals=hitcount:sort=bytes_req.buckets =100:size=2048 [active] #{
bytes_req: ~ 0-99 } hitcount: 3149
{bytes_req: ~ 100-199 } hitcount: 1468
{bytes_req: ~ 200-299 } hitcount: 39
{bytes_req: ~ 300-399 } hitcount: 306
{bytes_req: ~ 400-499 } hitcount: 364{ bytes_req: ~ 500-599 } hitcount: 32 { bytes_req: ~ 600-699 } hitcount: 69 { bytes_req: ~ 700-799 } hitcount: 37{
bytes_req: ~ 1200-1299 } hitcount: 16
{bytes_req: ~ 1400-1499 } hitcount: 30
{bytes_req: ~ 2000-2099 } hitcount: 6
{bytes_req: ~ 4000-4099 } hitcount: 2168
{bytes_req: ~ 5000-5099 } hitcount: 6Totals:
Hits: 7690 Entries: 13 Dropped: 0Signed-off-by Steven Rostedt (VMware) <[email protected]>---
Changes since v1:- Used modifier notation of ".buckets=SIZE" instead of hyphen
(Namhyung Kim)
- Incorporated it to be more like the ".log2" modifier (Tom Zanussi)
- Used "~" notation like the log2 modifier.kernel/trace/trace_events_hist.c | 65 ++++++++++++++++++++++++++++ ---- 1 file changed, 58 insertions(+), 7 deletions(-)kernel/trace/trace_events_hist.c +0
-0
kernel/trace/trace_events_hist.c struct hist_field { · line 123
Quoted 4 lines
kernel/trace/trace_events_hist.c +1
-0@@ -120,6 +120,7 @@ struct hist_field {unsigned int size;unsigned int offset;unsigned int is_signed; +unsigned long grouping;
Just wondering if it would be more consistent to name this 'buckets' or even 'bucket_size'.
Quoted 10 lines
kernel/trace/trace_events_hist.c +0
-0const char *type;struct hist_field *operands[HIST_FIELD_OPERANDS_MAX ];struct hist_trigger_data *hist_data;@@ -218,6 +219,27 @@ static u64 hist_field_log2(struct hist_field *hist_field, return (u64) ilog2(roundup_pow_of_two(val)); }
[snip]
kernel/trace/trace_events_hist.c static void hist_trigger_print_key(struct · line 4709
Quoted 10 lines
kernel/trace/trace_events_hist.c +5
-0@@ -4657,6 +4701,11 @@ static void hist_trigger_print_key(struct seq_file *m, }else if (key_field->flags &HIST_FIELD_FL_LOG2 ) {seq_printf (m,"%s: ~ 2^%-2llu" , field_name, *(u64 *)(key + key_field->offset)); + }else if (key_field->flags &HIST_FIELD_FL_BUCKET ) { +unsigned long grouping = key_field->grouping; + uval = *(u64 *)(key + key_field->offset); +seq_printf (m,"%s: ~ %llu-%llu" , field_name, + uval, uval + grouping -1 );
Need a space before 1 i.e. 'grouping - 1'?
Thanks,
Tom
Steven Rostedt
maintainerQuoted 9 lines · On Tue, 06 Jul 2021 17:09:24 -0500 Tom Zanussi <[email protected]> wrote:
Review struct hist_field { · line 123
Quoted 6 lines
+++
b/kernel/trace/trace_events_hist.c(quoted diff) +1
-0@@ -120,6 +120,7 @@ struct hist_field { unsigned int size; unsigned int offset; unsigned int is_signed; + unsigned long grouping;Just wondering if it would be more consistent to name this 'buckets' or even '
bucket_size'.
I originally did change it to that, but thought against it. I guess I could change that.
Thanks!
-- Steve
Quoted 9 lines
Quoted 9 lines
(quoted diff) +0
-0const char *type; struct hist_field *operands[HIST_FIELD_OPERANDS_MAX]; struct hist_trigger_data *hist_data;@@ -218,6 +219,27 @@ static u64 hist_field_log2(struct hist_field *hist_field, return (u64) ilog2(roundup_pow_of_two(val)); }
Hi Steve,
Quoted 34 lines · Steven Rostedt
From: "Steven Rostedt (VMware)" <[email protected]>
There's been several times I wished the histogram logic had a "grouping" feature for the buckets. Currently, each bucket has a size of one. That is, if you trace the amount of requested allocations, each allocation is its own bucket, even if you are interested in what allocates 100 bytes or less, 100 to 200, 200 to 300, etc.
Also, without grouping, it fills up the allocated histogram buckets quickly. If you are tracking latency, and don't care if something is 200 microseconds off, or 201 microseconds off, but want to track them by say 10 microseconds each. This can not currently be done.
There is a log2 but that grouping get's too big too fast for a lot of cases.
Introduce a "buckets=SIZE" command to each field where it will record in a rounded number. For example:
Quoted 2 lines
# echo 'hist:keys=bytes_req.buckets=100:sort=bytes_req' > events/kmem/kmalloc/trigger # cat events/kmem/kmalloc/hist# event histogram # # trigger info: hist:keys=bytes_req.buckets=100:vals=hitcount:sort=bytes_req.buckets=100:size=2048 [active] #{
bytes_req: ~ 0-99 } hitcount: 3149
{bytes_req: ~ 100-199 } hitcount: 1468
{bytes_req: ~ 200-299 } hitcount: 39
{bytes_req: ~ 300-399 } hitcount: 306
{bytes_req: ~ 400-499 } hitcount: 364
Quoted 8 lines
{ bytes_req: ~ 500-599 } hitcount: 32 { bytes_req: ~ 600-699 } hitcount: 69 { bytes_req: ~ 700-799 } hitcount: 37{
bytes_req: ~ 1200-1299 } hitcount: 16
{bytes_req: ~ 1400-1499 } hitcount: 30
{bytes_req: ~ 2000-2099 } hitcount: 6
{bytes_req: ~ 4000-4099 } hitcount: 2168
{bytes_req: ~ 5000-5099 } hitcount: 6
For consistency with the log2 histogram, I'd like to see
{ bytes_req: ~ 100 } hitcount: 3149
{ bytes_req: ~ 200 } hitcount: 1468
{ bytes_req: ~ 300 } hitcount: 39
...
Or, if you really care about the value range
{ bytes_req: 0 ~ 99 } hitcount: 3149
{ bytes_req: 100 ~ 199 } hitcount: 1468
{ bytes_req: 200 ~ 299 } hitcount: 39
...
Thanks,
Namhyung
Quoted 181 lines
Totals:
Hits: 7690 Entries: 13 Dropped: 0Signed-off-by Steven Rostedt (VMware) <[email protected]>---
Changes since v1:- Used modifier notation of ".buckets=SIZE" instead of hyphen (Namhyung Kim)
- Incorporated it to be more like the ".log2" modifier (Tom Zanussi)
- Used "~" notation like the log2 modifier.kernel/trace/trace_events_hist.c | 65 ++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 7 deletions(-)kernel/trace/trace_events_hist.c +58
-8@@ -120,6 +120,7 @@ struct hist_field {unsigned int size;unsigned int offset;unsigned int is_signed; +unsigned long grouping;const char *type;struct hist_field *operands[HIST_FIELD_OPERANDS_MAX ];struct hist_trigger_data *hist_data;@@ -218,6 +219,27 @@ static u64 hist_field_log2(struct hist_field *hist_field,return (u64 )ilog2 (roundup_pow_of_two (val)); } +static u64 hist_field_bucket (struct hist_field *hist_field, +struct tracing_map_elt *elt, +struct trace_buffer *buffer, +struct ring_buffer_event *rbe, +void *event) +{ +struct hist_field *operand = hist_field->operands[0 ]; +unsigned long grouping = hist_field->grouping; + +u64 val = operand->fn (operand, elt, buffer, rbe, event); + +if (WARN_ON_ONCE (!grouping)) +return val; + +if (val >=LONG_MAX ) + val =div64_ul (val, grouping); +else + val = (u64)((unsigned long )val / grouping); +return val * grouping; +} + static u64 hist_field_plus(struct hist_field *hist_field, struct tracing_map_elt *elt, struct trace_buffer *buffer,@@ -317,6 +339,7 @@ enum hist_field_flags {HIST_FIELD_FL_VAR_REF =1 <<14 ,HIST_FIELD_FL_CPU =1 <<15 ,HIST_FIELD_FL_ALIAS =1 <<16 , + HIST_FIELD_FL_BUCKET = 1 << 17, }; struct var_defs {@@ -1108,7 +1131,8 @@ static const char *hist_field_name(struct hist_field *field,if (field->field) field_name = field->field->name;else if (field->flags &HIST_FIELD_FL_LOG2 || - field->flags &HIST_FIELD_FL_ALIAS ) + field->flags &HIST_FIELD_FL_ALIAS || + field->flags &HIST_FIELD_FL_BUCKET ) field_name =hist_field_name (field->operands[0 ], ++level);else if (field->flags &HIST_FIELD_FL_CPU ) field_name ="cpu" ;@@ -1469,6 +1493,8 @@ static const char *get_hist_field_flags(struct hist_field *hist_field) flags_str ="syscall" ; else if (hist_field->flags & HIST_FIELD_FL_LOG2) flags_str ="log2" ; + else if (hist_field->flags & HIST_FIELD_FL_BUCKET) + flags_str ="buckets" ; else if (hist_field->flags & HIST_FIELD_FL_TIMESTAMP_USECS) flags_str ="usecs" ;@@ -1650,9 +1676,10 @@ static struct hist_field *create_hist_field(struct hist_trigger_data *hist_data, goto out; } -if (flags &HIST_FIELD_FL_LOG2 ) { -unsigned long fl = flags & ~HIST_FIELD_FL_LOG2 ; - hist_field->fn = hist_field_log2; +if (flags & (HIST_FIELD_FL_LOG2 |HIST_FIELD_FL_BUCKET )) { +unsigned long fl = flags & ~(HIST_FIELD_FL_LOG2 |HIST_FIELD_FL_BUCKET ); + hist_field->fn = flags &HIST_FIELD_FL_LOG2 ? hist_field_log2 : + hist_field_bucket; 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 );@@ -1943,7 +1970,7 @@ static struct hist_field *parse_var_ref(struct hist_trigger_data *hist_data,static struct ftrace_event_field *parse_field (struct hist_trigger_data *hist_data,struct trace_event_file *file, -char *field_str,unsigned long *flags) +char *field_str,unsigned long *flags,unsigned long *grouping) {struct ftrace_event_field *field =NULL ;char *field_name, *modifier, *str;@@ -1970,7 +1997,22 @@ parse_field(struct hist_trigger_data *hist_data, struct trace_event_file *file, *flags |=HIST_FIELD_FL_LOG2 ; else if (strcmp(modifier, "usecs") == 0) *flags |= HIST_FIELD_FL_TIMESTAMP_USECS; - else { + else if (strncmp(modifier, "bucket", 6) == 0) { + int ret; + + modifier += 6; + + if (*modifier == 's') + modifier++; + if (*modifier != '=') + goto error; + modifier++; + ret = kstrtoul(modifier, 0, grouping); + if (ret || !(*grouping)) + goto error; + *flags |= HIST_FIELD_FL_BUCKET; + } else { + error: hist_err(tr, HIST_ERR_BAD_FIELD_MODIFIER, errpos(modifier)); field = ERR_PTR(-EINVAL); goto out;@@ -2029,6 +2071,7 @@ static struct hist_field *parse_atom(struct hist_trigger_data *hist_data,char *s, *ref_system =NULL , *ref_event =NULL , *ref_var = str;struct ftrace_event_field *field =NULL ;struct hist_field *hist_field =NULL ; +unsigned long grouping =0 ;int ret =0 ; s =strchr (str,'.' );@@ -2066,7 +2109,7 @@ static struct hist_field *parse_atom(struct hist_trigger_data *hist_data, }else str = s; - field =parse_field (hist_data, file, str, flags); + field =parse_field (hist_data, file, str, flags, &grouping);if (IS_ERR (field)) { ret =PTR_ERR (field); goto out;@@ -2077,6 +2120,7 @@ static struct hist_field *parse_atom(struct hist_trigger_data *hist_data, ret = -ENOMEM ; goto out; } + hist_field->grouping = grouping;return hist_field; out:@@ -4657,6 +4701,11 @@ static void hist_trigger_print_key(struct seq_file *m, }else if (key_field->flags &HIST_FIELD_FL_LOG2 ) {seq_printf (m,"%s: ~ 2^%-2llu" , field_name, *(u64 *)(key + key_field->offset)); + }else if (key_field->flags &HIST_FIELD_FL_BUCKET ) { +unsigned long grouping = key_field->grouping; + uval = *(u64 *)(key + key_field->offset); +seq_printf (m,"%s: ~ %llu-%llu" , field_name, + uval, uval + grouping -1 ); }else if (key_field->flags &HIST_FIELD_FL_STRING ) {seq_printf (m,"%s: %-50s" , field_name, (char *)(key + key_field->offset));@@ -5096,6 +5145,8 @@ static void hist_field_print(struct seq_file *m, struct hist_field *hist_field)seq_printf (m,".%s" , flags); } } +if (hist_field->grouping) +seq_printf (m,"=%ld" , hist_field->grouping); } static int event_hist_trigger_print(struct seq_file *m, --2.31.1
Steven Rostedt
maintainerQuoted 12 lines · On Tue, 6 Jul 2021 16:20:07 -0700 Namhyung Kim <[email protected]> wrote:
Quoted 4 lines
{
bytes_req: ~ 1400-1499 } hitcount: 30
{bytes_req: ~ 2000-2099 } hitcount: 6
{bytes_req: ~ 4000-4099 } hitcount: 2168
{bytes_req: ~ 5000-5099 } hitcount: 6For consistency with the log2 histogram, I'd like to see
{
bytes_req: ~ 100 } hitcount: 3149
{bytes_req: ~ 200 } hitcount: 1468
{bytes_req: ~ 300 } hitcount: 39
...
Quoted 5 lines
Or, if you really care about the value range
{
bytes_req: 0 ~ 99 } hitcount: 3149
{bytes_req: 100 ~ 199 } hitcount: 1468
{bytes_req: 200 ~ 299 } hitcount: 39
(Let the bike-shedding begin! ;-)
I actually dislike the log2 notation. For example, I just ran it with this:
Quoted 2 lines
# echo 'hist:keys=bytes_req.log2:sort=bytes_req' > events/kmem/kmalloc/trigger # cat events/kmem/kmalloc/hist
# event histogram # # trigger info: hist:keys=bytes_req.log2:vals=hitcount:sort=bytes_req.log2:size=2048 [active] #
{ bytes_req: ~ 2^5 } hitcount: 8
{ bytes_req: ~ 2^6 } hitcount: 2
{ bytes_req: ~ 2^7 } hitcount: 4
{ bytes_req: ~ 2^8 } hitcount: 2
{ bytes_req: ~ 2^9 } hitcount: 2
{ bytes_req: ~ 2^10 } hitcount: 3Totals:
Hits: 21
Entries: 6
Dropped: 0And I don't know if that first entry is: 2^4 - 2^5 or if it is 2^5 - 2^6.
And to me '~' means "approximately", but I also took it as "not exactly". I used it as:
{ bytes_req: ~ 1400-1499 } hitcount: 30
To mean, it's "approximately somewhere between 1400 and 1499" so, I kept the "~".
Now for your suggestions:
Quoted 3 lines
{
bytes_req: ~ 100 } hitcount: 3149
{bytes_req: ~ 200 } hitcount: 1468
{bytes_req: ~ 300 } hitcount: 39
Suffers the same fate as I dislike in log2. Is " ~ 100" 0-100 or 100-200?
Quoted 3 lines
{
bytes_req: 0 ~ 99 } hitcount: 3149
{bytes_req: 100 ~ 199 } hitcount: 1468
{bytes_req: 200 ~ 299 } hitcount: 39
I feel is farther from log2 than my version. Stating that "~" means approximation, what does "0 ~ 99" really mean?
So far I prefer my original version.
BTW, we are also working on a user space parser for this, thus the output format of all hist logic is going to be a user space API (if it hasn't already become one.)
So we do need to get this correct for the long haul.
-- Steve
Quoted 16 lines · Steven Rostedt
Quoted 12 lines · On Tue, 6 Jul 2021 16:20:07 -0700 Namhyung Kim <[email protected]> wrote:
Quoted 4 lines
{
bytes_req: ~ 1400-1499 } hitcount: 30
{bytes_req: ~ 2000-2099 } hitcount: 6
{bytes_req: ~ 4000-4099 } hitcount: 2168
{bytes_req: ~ 5000-5099 } hitcount: 6For consistency with the log2 histogram, I'd like to see
{
bytes_req: ~ 100 } hitcount: 3149
{bytes_req: ~ 200 } hitcount: 1468
{bytes_req: ~ 300 } hitcount: 39
...
Quoted 7 lines
Quoted 5 lines
Or, if you really care about the value range
{
bytes_req: 0 ~ 99 } hitcount: 3149
{bytes_req: 100 ~ 199 } hitcount: 1468
{bytes_req: 200 ~ 299 } hitcount: 39(Let the bike-shedding begin! ;-)
Sorry about that! :)
Quoted 38 lines
I actually dislike the log2 notation. For example, I just ran it with this:
Quoted 2 lines
# echo 'hist:keys=bytes_req.log2:sort=bytes_req' > events/kmem/kmalloc/trigger # cat events/kmem/kmalloc/hist# event histogram # # trigger info: hist:keys=bytes_req.log2:vals=hitcount:sort=bytes_req.log2:size=2048 [active] #{ bytes_req: ~ 2^5 } hitcount: 8 { bytes_req: ~ 2^6 } hitcount: 2 { bytes_req: ~ 2^7 } hitcount: 4 { bytes_req: ~ 2^8 } hitcount: 2 { bytes_req: ~ 2^9 } hitcount: 2 { bytes_req: ~ 2^10 } hitcount: 3Totals:
Hits: 21 Entries: 6 Dropped: 0And I don't know if that first entry is: 2^4 - 2^5 or if it is 2^5 - 2^6.
And to me '~' means "approximately", but I also took it as "not exactly". I used it as:
{
bytes_req: ~ 1400-1499 } hitcount: 30To mean, it's "approximately somewhere between 1400 and 1499" so, I kept the "~".
Now for your suggestions:
Quoted 3 lines
{
bytes_req: ~ 100 } hitcount: 3149
{bytes_req: ~ 200 } hitcount: 1468
{bytes_req: ~ 300 } hitcount: 39
Quoted 8 lines
Suffers the same fate as I dislike in log2. Is " ~ 100" 0-100 or 100-200?
Quoted 3 lines
{
bytes_req: 0 ~ 99 } hitcount: 3149
{bytes_req: 100 ~ 199 } hitcount: 1468
{bytes_req: 200 ~ 299 } hitcount: 39I feel is farther from log2 than my version. Stating that "~" means approximation, what does "0 ~ 99" really mean?
To me, it means "range". The original intention was to express [FROM, TO) and I thought we can omit the FROM since it's same as TO of the previous line. But we can use inclusive ranges with FROM and TO for clarity.
But it's up to you. I don't object to your change.
Quoted 8 lines
So far I prefer my original version.
BTW, we are also working on a user space parser for this, thus the output format of all hist logic is going to be a user space API (if it hasn't already become one.)
So we do need to get this correct for the long haul.
Agreed.
Namhyung
Steven Rostedt
maintainerQuoted 9 lines · On Wed, 7 Jul 2021 07:00:32 -0700 Namhyung Kim <[email protected]> wrote:
Quoted 2 lines
I feel is farther from log2 than my version. Stating that "~" means approximation, what does "0 ~ 99" really mean?
To me, it means "range". The original intention was to express [FROM, TO) and I thought we can omit the FROM since it's same as TO of the previous line. But we can use inclusive ranges with FROM and TO for clarity.
But it's up to you. I don't object to your change.
Thanks, I'd like to keep it as is. Unless Tom has any issues with it.
Tom?
-- Steve
Quoted 12 lines · Steven Rostedt
Quoted 9 lines · On Wed, 7 Jul 2021 07:00:32 -0700 Namhyung Kim <[email protected]> wrote:
Quoted 3 lines
I feel is farther from log2 than my version. Stating that "~" means
approximation, what does "0 ~ 99" really mean?To me, it means "range". The original intention was to express [FROM, TO) and I thought we can omit the FROM since it's same as TO of the previous line. But we can use inclusive ranges with FROM and TO for clarity.
Quoted 5 lines
Quoted 1 line
But it's up to you. I don't object to your change.
Thanks, I'd like to keep it as is. Unless Tom has any issues with it.
Tom?
Yeah, I prefer the explicit ranges too - it leaves nothing open to interpretation.
Tom
Quoted 2 lines
-- Steve
A message that is not in the archive (sent off-list or not yet received): [email protected]
Steven Rostedt
maintainerQuoted 6 lines · On Wed, 7 Jul 2021 19:58:51 +0900 Masami Hiramatsu <[email protected]> wrote:
Looks good to me.
Reviewed-by Masami Hiramatsu <[email protected]>BTW, would you plan to add this field options to tracefs/README ? (at least Documentation should be updated)
Yep, both should be updated. I wanted to make sure this looked good before I spent time documented it ;-)
I'll add that as a second patch.
Thanks!
-- Steve
Steven Rostedt
maintainerPATCH v2 1/1 tracing: Add linear buckets to histogram logic
In reply to a message not in the archive[ Due to a cut and paste error, I messed up the To: line, and LKML
rejected the patch. Resending for archival ]
From: "Steven Rostedt (VMware)" <[email protected]>
There's been several times I wished the histogram logic had a "grouping" feature for the buckets. Currently, each bucket has a size of one. That is, if you trace the amount of requested allocations, each allocation is its own bucket, even if you are interested in what allocates 100 bytes or less, 100 to 200, 200 to 300, etc.
Also, without grouping, it fills up the allocated histogram buckets quickly. If you are tracking latency, and don't care if something is 200 microseconds off, or 201 microseconds off, but want to track them by say 10 microseconds each. This can not currently be done.
There is a log2 but that grouping get's too big too fast for a lot of cases.
Introduce a "buckets=SIZE" command to each field where it will record in a rounded number. For example:
Quoted 2 lines
# echo 'hist:keys=bytes_req.buckets=100:sort=bytes_req' > events/kmem/kmalloc/trigger # cat events/kmem/kmalloc/hist
# event histogram # # trigger info: hist:keys=bytes_req.buckets=100:vals=hitcount:sort=bytes_req.buckets=100:size=2048 [active] #
{ bytes_req: ~ 0-99 } hitcount: 3149
{ bytes_req: ~ 100-199 } hitcount: 1468
{ bytes_req: ~ 200-299 } hitcount: 39
{ bytes_req: ~ 300-399 } hitcount: 306
{ bytes_req: ~ 400-499 } hitcount: 364
{ bytes_req: ~ 500-599 } hitcount: 32
{ bytes_req: ~ 600-699 } hitcount: 69
{ bytes_req: ~ 700-799 } hitcount: 37 { bytes_req: ~ 1200-1299 } hitcount: 16
{ bytes_req: ~ 1400-1499 } hitcount: 30
{ bytes_req: ~ 2000-2099 } hitcount: 6
{ bytes_req: ~ 4000-4099 } hitcount: 2168
{ bytes_req: ~ 5000-5099 } hitcount: 6
Totals:
Hits: 7690
Entries: 13
Dropped: 0--- kernel/trace/trace_events_hist.c | 65 ++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 7 deletions(-)
kernel/trace/trace_events_hist.c +58 -7
@@ -120,6 +120,7 @@ struct hist_field {unsigned int size;unsigned int offset;unsigned int is_signed; +unsigned long grouping;const char *type;struct hist_field *operands[HIST_FIELD_OPERANDS_MAX ];struct hist_trigger_data *hist_data;
@@ -218,6 +219,27 @@ static u64 hist_field_log2(struct hist_field *hist_field,return (u64 )ilog2 (roundup_pow_of_two (val)); } +static u64 hist_field_bucket (struct hist_field *hist_field, +struct tracing_map_elt *elt, +struct trace_buffer *buffer, +struct ring_buffer_event *rbe, +void *event) +{ +struct hist_field *operand = hist_field->operands[0 ]; +unsigned long grouping = hist_field->grouping; + +u64 val = operand->fn (operand, elt, buffer, rbe, event); + +if (WARN_ON_ONCE (!grouping)) +return val; + +if (val >=LONG_MAX ) + val =div64_ul (val, grouping); +else + val = (u64)((unsigned long )val / grouping); +return val * grouping; +} + static u64 hist_field_plus(struct hist_field *hist_field, struct tracing_map_elt *elt, struct trace_buffer *buffer,
@@ -317,6 +339,7 @@ enum hist_field_flags {HIST_FIELD_FL_VAR_REF =1 <<14 ,HIST_FIELD_FL_CPU =1 <<15 ,HIST_FIELD_FL_ALIAS =1 <<16 , + HIST_FIELD_FL_BUCKET = 1 << 17, }; struct var_defs {
@@ -1108,7 +1131,8 @@ static const char *hist_field_name(struct hist_field *field,if (field->field) field_name = field->field->name;else if (field->flags &HIST_FIELD_FL_LOG2 || - field->flags &HIST_FIELD_FL_ALIAS ) + field->flags &HIST_FIELD_FL_ALIAS || + field->flags &HIST_FIELD_FL_BUCKET ) field_name =hist_field_name (field->operands[0 ], ++level);else if (field->flags &HIST_FIELD_FL_CPU ) field_name ="cpu" ;
@@ -1469,6 +1493,8 @@ static const char *get_hist_field_flags(struct hist_field *hist_field) flags_str ="syscall" ; else if (hist_field->flags & HIST_FIELD_FL_LOG2) flags_str ="log2" ; + else if (hist_field->flags & HIST_FIELD_FL_BUCKET) + flags_str ="buckets" ; else if (hist_field->flags & HIST_FIELD_FL_TIMESTAMP_USECS) flags_str ="usecs" ;
@@ -1657,9 +1683,10 @@ static struct hist_field *create_hist_field(struct hist_trigger_data *hist_data, goto out; } -if (flags &HIST_FIELD_FL_LOG2 ) { -unsigned long fl = flags & ~HIST_FIELD_FL_LOG2 ; - hist_field->fn = hist_field_log2; +if (flags & (HIST_FIELD_FL_LOG2 |HIST_FIELD_FL_BUCKET )) { +unsigned long fl = flags & ~(HIST_FIELD_FL_LOG2 |HIST_FIELD_FL_BUCKET ); + hist_field->fn = flags &HIST_FIELD_FL_LOG2 ? hist_field_log2 : + hist_field_bucket; 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 );
@@ -1950,7 +1977,7 @@ static struct hist_field *parse_var_ref(struct hist_trigger_data *hist_data,static struct ftrace_event_field *parse_field (struct hist_trigger_data *hist_data,struct trace_event_file *file, -char *field_str,unsigned long *flags) +char *field_str,unsigned long *flags,unsigned long *grouping) {struct ftrace_event_field *field =NULL ;char *field_name, *modifier, *str;
@@ -1977,7 +2004,22 @@ parse_field(struct hist_trigger_data *hist_data, struct trace_event_file *file, *flags |=HIST_FIELD_FL_LOG2 ; else if (strcmp(modifier, "usecs") == 0) *flags |= HIST_FIELD_FL_TIMESTAMP_USECS; - else { + else if (strncmp(modifier, "bucket", 6) == 0) { + int ret; + + modifier += 6; + + if (*modifier == 's') + modifier++; + if (*modifier != '=') + goto error; + modifier++; + ret = kstrtoul(modifier, 0, grouping); + if (ret || !(*grouping)) + goto error; + *flags |= HIST_FIELD_FL_BUCKET; + } else { + error: hist_err(tr, HIST_ERR_BAD_FIELD_MODIFIER, errpos(modifier)); field = ERR_PTR(-EINVAL); goto out;
@@ -2036,6 +2078,7 @@ static struct hist_field *parse_atom(struct hist_trigger_data *hist_data,char *s, *ref_system =NULL , *ref_event =NULL , *ref_var = str;struct ftrace_event_field *field =NULL ;struct hist_field *hist_field =NULL ; +unsigned long grouping =0 ;int ret =0 ; s =strchr (str,'.' );
@@ -2073,7 +2116,7 @@ static struct hist_field *parse_atom(struct hist_trigger_data *hist_data, }else str = s; - field =parse_field (hist_data, file, str, flags); + field =parse_field (hist_data, file, str, flags, &grouping);if (IS_ERR (field)) { ret =PTR_ERR (field); goto out;
@@ -2084,6 +2127,7 @@ static struct hist_field *parse_atom(struct hist_trigger_data *hist_data, ret = -ENOMEM ; goto out; } + hist_field->grouping = grouping;return hist_field; out:
@@ -4664,6 +4708,11 @@ static void hist_trigger_print_key(struct seq_file *m, }else if (key_field->flags &HIST_FIELD_FL_LOG2 ) {seq_printf (m,"%s: ~ 2^%-2llu" , field_name, *(u64 *)(key + key_field->offset)); + }else if (key_field->flags &HIST_FIELD_FL_BUCKET ) { +unsigned long grouping = key_field->grouping; + uval = *(u64 *)(key + key_field->offset); +seq_printf (m,"%s: ~ %llu-%llu" , field_name, + uval, uval + grouping -1 ); }else if (key_field->flags &HIST_FIELD_FL_STRING ) {seq_printf (m,"%s: %-50s" , field_name, (char *)(key + key_field->offset));
@@ -5103,6 +5152,8 @@ static void hist_field_print(struct seq_file *m, struct hist_field *hist_field)seq_printf (m,".%s" , flags); } } +if (hist_field->grouping) +seq_printf (m,"=%ld" , hist_field->grouping); } static int event_hist_trigger_print(struct seq_file *m,
Signature · 1 line
2.31.1
Steven Rostedt
maintainerQuoted 2 lines · On Wed, 7 Jul 2021 14:26:21 -0400 Steven Rostedt <[email protected]> wrote:
[ Due to a cut and paste error, I messed up the To: line, and LKML
rejected the patch. Resending for archival ]
I'm going to send a v3 anyway, to change the field from "grouping" to "buckets" as suggested by Tom, and also include a documentation patch.
-- Steve