Skip to contentSkip to conversation

tracing: Add verbose gfp_flag printing to synthetic events

PATCH In review Zhengjun Xing 2 participants 3 messages Jul 11, 2019 – Jul 12, 2019 Tracing

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 tracing: Add verbose gfp_flag printing to synthetic events

Add on top of 'trace:add "gfp_t" support in synthetic_events'.

Prints the gfp flags as hex in addition to the human-readable flag string. Example output:

whoopsie-630 [000] ...1 78.969452: testevent: bar=b20 (GFP_ATOMIC|__GFP_ZERO)

    rcuc/0-11  [000] ...1 81.097555: testevent: bar=a20 (GFP_ATOMIC)
    rcuc/0-11  [000] ...1 81.583123: testevent: bar=a20 (GFP_ATOMIC)
---
 kernel/trace/trace_events_hist.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
kernel/trace/trace_events_hist.c +19 -0
index ca6b0dff60c5..938ef3f54c5c 100644
@@ -13,6 +13,10 @@
 #include <linux/rculist.h>
 #include <linux/tracefs.h>
 
+/* for gfp flag names */
+#include <linux/trace_events.h>
+#include <trace/events/mmflags.h>
+
 #include "tracing_map.h"
 #include "trace.h"
 #include "trace_dynevent.h"
@@ -752,6 +756,8 @@ static int synth_field_size(char *type)
 		size = sizeof(unsigned long);
 	else if (strcmp(type, "pid_t") == 0)
 		size = sizeof(pid_t);
+	else if (strcmp(type, "gfp_t") == 0)
+		size = sizeof(gfp_t);
 	else if (synth_field_is_string(type))
 		size = synth_field_string_size(type);
 
@@ -792,6 +798,8 @@ static const char *synth_field_fmt(char *type)
 		fmt = "%lu";
 	else if (strcmp(type, "pid_t") == 0)
 		fmt = "%d";
+	else if (strcmp(type, "gfp_t") == 0)
+		fmt = "%x";
 	else if (synth_field_is_string(type))
 		fmt = "%s";
 
@@ -834,9 +838,20 @@ static enum print_line_t print_synth_event(struct trace_iterator *iter,
 					 i == se->n_fields - 1 ? "" : " ");
 			n_u64 += STR_VAR_LEN_MAX / sizeof(u64);
 		} else {
+			struct trace_print_flags __flags[] = {
+			    __def_gfpflag_names, {-1, NULL} };
+
 			trace_seq_printf(s, print_fmt, se->fields[i]->name,
 					 entry->fields[n_u64],
 					 i == se->n_fields - 1 ? "" : " ");
+
+			if (strcmp(se->fields[i]->type, "gfp_t") == 0) {
+				trace_seq_puts(s, " (");
+				trace_print_flags_seq(s, "|",
+						      entry->fields[n_u64],
+						      __flags);
+				trace_seq_putc(s, ')');
+			}
 			n_u64++;
 		}
 	}
Signature · 1 line
2.14.1
#1 lore raw

Hi Zhengjun,

The patch itself looks fine to me, but could you please create a v3 with a couple changes to the commit message? I noticed you dropped your original commit message - please add it back and combine with part of mine, as below. Also, please keep your original Subject line ('[PATCH] trace:add "gfp_t" support in synthetic_events') (but the first word after trace:, 'add', should be capitalized.)

Quoted 1 line · Zhengjun Xing

Add on top of 'trace:add "gfp_t" support in synthetic_events'.

Please remove this part but keep the part below.

Quoted 9 lines

Prints the gfp flags as hex in addition to the human-readable flag string. Example output:

whoopsie-630 [000] ...1 78.969452: testevent: bar=b20
(GFP_ATOMIC|__GFP_ZERO)

    rcuc/0-11  [000] ...1 81.097555: testevent: bar=a20 (GFP_ATOMIC)
    rcuc/0-11  [000] ...1 81.583123: testevent: bar=a20 (GFP_ATOMIC)

So basically, something like this:

[PATCH] trace: Add "gfp_t" support in synthetic_events

Add "gfp_t" support in synthetic_events, then the "gfp_t" type parameter in some functions can be traced.

Print the gfp flags as hex in addition to the human-readable flag string. Example output:

whoopsie-630 [000] ...1 78.969452: testevent: bar=b20 (GFP_ATOMIC|__GFP_ZERO)

    rcuc/0-11  [000] ...1 81.097555: testevent: bar=a20 (GFP_ATOMIC)
    rcuc/0-11  [000] ...1 81.583123: testevent: bar=a20 (GFP_ATOMIC)
Quoted 2 lines

Thanks,

Tom

Quoted 65 lines
---
 kernel/trace/trace_events_hist.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
kernel/trace/trace_events_hist.c +11 -0
index ca6b0dff60c5..938ef3f54c5c 100644
@@ -13,6 +13,10 @@
 #include <linux/rculist.h>
 #include <linux/tracefs.h>
 
+/* for gfp flag names */
+#include <linux/trace_events.h>
+#include <trace/events/mmflags.h>
+
 #include "tracing_map.h"
 #include "trace.h"
 #include "trace_dynevent.h"
@@ -752,6 +756,8 @@ static int synth_field_size(char *type)
 		size = sizeof(unsigned long);
 	else if (strcmp(type, "pid_t") == 0)
 		size = sizeof(pid_t);
+	else if (strcmp(type, "gfp_t") == 0)
+		size = sizeof(gfp_t);
 	else if (synth_field_is_string(type))
 		size = synth_field_string_size(type);
 
@@ -792,6 +798,8 @@ static const char *synth_field_fmt(char *type)
 		fmt = "%lu";
 	else if (strcmp(type, "pid_t") == 0)
 		fmt = "%d";
+	else if (strcmp(type, "gfp_t") == 0)
+		fmt = "%x";
 	else if (synth_field_is_string(type))
 		fmt = "%s";
 
@@ -834,9 +838,20 @@ static enum print_line_t
 print_synth_event(struct trace_iterator *iter,
 					 i == se->n_fields - 1 ? ""
 : " ");
 			n_u64 += STR_VAR_LEN_MAX / sizeof(u64);
 		} else {
+			struct trace_print_flags __flags[] = {
+			    __def_gfpflag_names, {-1, NULL} };
+
 			trace_seq_printf(s, print_fmt, se-
 >fields[i]->name,
 					 entry->fields[n_u64],
 					 i == se->n_fields - 1 ? ""

: " ");

kernel/trace/trace_events_hist.c +2 -0
+
+			if (strcmp(se->fields[i]->type, "gfp_t") ==

0) {

kernel/trace/trace_events_hist.c +3 -0
+				trace_seq_puts(s, " (");
+				trace_print_flags_seq(s, "|",
+						      entry-
Quoted 1 line

fields[n_u64],

kernel/trace/trace_events_hist.c +3 -0
+						      __flags);
+				trace_seq_putc(s, ')');
+			}
 			n_u64++;
 		}
 	}
#2 lore raw

Hi Tom,

Quoted 9 lines · Tom Zanussi

Hi Zhengjun,

The patch itself looks fine to me, but could you please create a v3 with a couple changes to the commit message? I noticed you dropped your original commit message - please add it back and combine with part of mine, as below. Also, please keep your original Subject line ('[PATCH] trace:add "gfp_t" support in synthetic_events') (but the first word after trace:, 'add', should be capitalized.)

Thanks. I will send v3 version patch soon.

Quoted 102 lines · Zhengjun Xing
Quoted 1 line

Add on top of 'trace:add "gfp_t" support in synthetic_events'.

Please remove this part but keep the part below.

Quoted 9 lines

Prints the gfp flags as hex in addition to the human-readable flag string. Example output:

   whoopsie-630 [000] ...1 78.969452: testevent: bar=b20
(GFP_ATOMIC|__GFP_ZERO)
     rcuc/0-11  [000] ...1 81.097555: testevent: bar=a20 (GFP_ATOMIC)
     rcuc/0-11  [000] ...1 81.583123: testevent: bar=a20 (GFP_ATOMIC)

So basically, something like this:

[PATCH] trace: Add "gfp_t" support in synthetic_events

Add "gfp_t" support in synthetic_events, then the "gfp_t" type parameter in some functions can be traced.

Print the gfp flags as hex in addition to the human-readable flag string. Example output:

   whoopsie-630 [000] ...1 78.969452: testevent: bar=b20 (GFP_ATOMIC|__GFP_ZERO)
     rcuc/0-11  [000] ...1 81.097555: testevent: bar=a20 (GFP_ATOMIC)
     rcuc/0-11  [000] ...1 81.583123: testevent: bar=a20 (GFP_ATOMIC)
Quoted 2 lines

Thanks,

Tom

Quoted 65 lines
---
  kernel/trace/trace_events_hist.c | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
kernel/trace/trace_events_hist.c +11 -0
index ca6b0dff60c5..938ef3f54c5c 100644
@@ -13,6 +13,10 @@
  #include <linux/rculist.h>
  #include <linux/tracefs.h>
 
+/* for gfp flag names */
+#include <linux/trace_events.h>
+#include <trace/events/mmflags.h>
+
  #include "tracing_map.h"
  #include "trace.h"
  #include "trace_dynevent.h"
@@ -752,6 +756,8 @@ static int synth_field_size(char *type)
  		size = sizeof(unsigned long);
  	else if (strcmp(type, "pid_t") == 0)
  		size = sizeof(pid_t);
+	else if (strcmp(type, "gfp_t") == 0)
+		size = sizeof(gfp_t);
  	else if (synth_field_is_string(type))
  		size = synth_field_string_size(type);
 
@@ -792,6 +798,8 @@ static const char *synth_field_fmt(char *type)
  		fmt = "%lu";
  	else if (strcmp(type, "pid_t") == 0)
  		fmt = "%d";
+	else if (strcmp(type, "gfp_t") == 0)
+		fmt = "%x";
  	else if (synth_field_is_string(type))
  		fmt = "%s";
 
@@ -834,9 +838,20 @@ static enum print_line_t
 print_synth_event(struct trace_iterator *iter,
  					 i == se->n_fields - 1 ? ""
 : " ");
  			n_u64 += STR_VAR_LEN_MAX / sizeof(u64);
  		} else {
+			struct trace_print_flags __flags[] = {
+			    __def_gfpflag_names, {-1, NULL} };
+
  			trace_seq_printf(s, print_fmt, se-
 > fields[i]->name,
  					 entry->fields[n_u64],
  					 i == se->n_fields - 1 ? ""

: " ");

kernel/trace/trace_events_hist.c +2 -0
+
+			if (strcmp(se->fields[i]->type, "gfp_t") ==

0) {

kernel/trace/trace_events_hist.c +3 -0
+				trace_seq_puts(s, " (");
+				trace_print_flags_seq(s, "|",
+						      entry-
Quoted 1 line

fields[n_u64],

kernel/trace/trace_events_hist.c +3 -0
+						      __flags);
+				trace_seq_putc(s, ')');
+			}
  			n_u64++;
  		}
  	}
Signature · 1 line
Zhengjun Xing