Skip to contentSkip to conversation

trace:Add "gfp_t" support in synthetic_events

PATCH In review Zhengjun Xing 3 participants 8 messages Jul 12, 2019 – Sep 4, 2019 Tracing

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 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.

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..30f0f32aca62 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 +842,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,

Quoted 6 lines · Zhengjun Xing

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

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

Quoted 7 lines

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)

Looks good to me, 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..30f0f32aca62 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 +842,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 Steve,

Could you help to review? Thanks.

Quoted 86 lines · Tom Zanussi

Hi Zhengjun,

Quoted 6 lines · Zhengjun Xing

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

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

Quoted 7 lines
   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)

Looks good to me, 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..30f0f32aca62 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 +842,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
maintainer
#3 lore raw
Quoted 3 lines · On Tue, 13 Aug 2019 09:04:28 +0800 Xing Zhengjun…

Hi Steve,

Could you help to review? Thanks.

Thanks for the ping. Yes, I'll take a look at it. I'll be pulling in a lot of patches that have queued up.

-- Steve

Quoted 89 lines · Tom Zanussi
Quoted 86 lines

Hi Zhengjun,

Quoted 6 lines · Zhengjun Xing

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

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

Quoted 7 lines
   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)

Looks good to me, 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..30f0f32aca62 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 +842,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++;
  		}
  	}  
#4 lore raw

Hi Steve,

Quoted 11 lines · Steven Rostedt
Quoted 3 lines · On Tue, 13 Aug 2019 09:04:28 +0800 Xing Zhengjun…

Hi Steve,

Could you help to review? Thanks.

Thanks for the ping. Yes, I'll take a look at it. I'll be pulling in a lot of patches that have queued up.

-- Steve

Could you help to review? Thanks.

Quoted 92 lines
Quoted 91 lines · Tom Zanussi
Quoted 86 lines

Hi Zhengjun,

Quoted 6 lines · Zhengjun Xing

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

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

Quoted 7 lines
    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)

Looks good to me, 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..30f0f32aca62 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 +842,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
maintainer
#5 lore raw
In reply to Tom Zanussi
Quoted 15 lines · On Fri, 12 Jul 2019 11:05:06 -0500 Tom Zanussi <[email protected]> wrote:

Hi Zhengjun,

Quoted 12 lines · Zhengjun Xing

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

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)

Why is this Signed-off-by Tom? Tom, did you author part of this??

-- Steve

Quoted 71 lines
Quoted 1 line

Looks good to me, 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..30f0f32aca62 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 +842,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++;
 		}
 	}  
#6 lore raw

Hi Steve,

Quoted 20 lines · Steven Rostedt
Quoted 17 lines · On Fri, 12 Jul 2019 11:05:06 -0500 Tom Zanussi <[email protected]> wrote:

Hi Zhengjun,

Quoted 14 lines · Zhengjun Xing

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

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)

Quoted 4 lines
Quoted 1 line
Quoted 1 line

Why is this Signed-off-by Tom? Tom, did you author part of this??

Yeah, I added the part that prints the flag names.

Tom

Quoted 81 lines

-- Steve

Quoted 77 lines
Quoted 1 line

Looks good to me, thanks!

Tom

Quoted 71 lines
---
 kernel/trace/trace_events_hist.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
kernel/trace/trace_events_hist.c +8 -0
index ca6b0dff60c5..30f0f32aca62 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 +842,20 @@ static enum print_line_t
 print_synth_event(struct trace_iterator *iter,
 					 i == se->n_fields - 1 ?

""
: " ");

kernel/trace/trace_events_hist.c +3 -0
 			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-  
Quoted 1 line

fields[i]->name,

kernel/trace/trace_events_hist.c +0 -0
 					 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++;
 		}
 	}  
maintainer
#7 lore raw
Quoted 23 lines · On Wed, 04 Sep 2019 08:13:58 -0500 Tom Zanussi <[email protected]> wrote:

Hi Steve,

Quoted 20 lines · Steven Rostedt
Quoted 17 lines · On Fri, 12 Jul 2019 11:05:06 -0500 Tom Zanussi <[email protected]> wrote:

Hi Zhengjun,

Quoted 14 lines · Zhengjun Xing

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

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)

Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Quoted 1 line

Why is this Signed-off-by Tom? Tom, did you author part of this??

Yeah, I added the part that prints the flag names.

OK, I'll comment that in the patch change log.

Thanks!

-- Steve