mm: tracing: Add missing GFP flags to tracing

PATCH In review Mel Gorman 2 participants 3 messages May 10, 2011 – May 17, 2011

Subsystems (2)

Memory management Tracing

lore

Share & tools

lore

Mel Gorman

author

2011-05-10 10:09 UTC #0 lore raw

PATCH 1/1 mm: tracing: Add missing GFP flags to tracing

include/linux/gfp.h and include/trace/events/gfpflags.h is out of sync. When tracing is enabled, certain flags are not recognised and the text output is less useful as a result. Add the missing flags.

Signed-off-by Mel Gorman <[email protected]>

---
 include/trace/events/gfpflags.h |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

include/trace/events/gfpflags.h +5 -1

index e3615c0..9fe3a366 100644
@@ -10,6 +10,7 @@
  */
 #define show_gfp_flags(flags)						\
 	(flags) ? __print_flags(flags, "|",				\
+	{(unsigned long)GFP_TRANSHUGE,		"GFP_TRANSHUGE"},	\
 	{(unsigned long)GFP_HIGHUSER_MOVABLE,	"GFP_HIGHUSER_MOVABLE"}, \
 	{(unsigned long)GFP_HIGHUSER,		"GFP_HIGHUSER"},	\
 	{(unsigned long)GFP_USER,		"GFP_USER"},		\

@@ -32,6 +33,9 @@
 	{(unsigned long)__GFP_HARDWALL,		"GFP_HARDWALL"},	\
 	{(unsigned long)__GFP_THISNODE,		"GFP_THISNODE"},	\
 	{(unsigned long)__GFP_RECLAIMABLE,	"GFP_RECLAIMABLE"},	\
-	{(unsigned long)__GFP_MOVABLE,		"GFP_MOVABLE"}		\
+	{(unsigned long)__GFP_MOVABLE,		"GFP_MOVABLE"},		\
+	{(unsigned long)__GFP_NOTRACK,		"GFP_NOTRACK"},		\
+	{(unsigned long)__GFP_NO_KSWAPD,	"GFP_NO_KSWAPD"},	\
+	{(unsigned long)__GFP_OTHER_NODE,	"GFP_OTHER_NODE"}	\
 	) : "GFP_NOWAIT"

Andrew Morton

maintainer

2011-05-10 21:54 UTC #1 lore raw

Quoted 22 lines · On Tue, 10 May 2011 11:09:54 +0100 Mel Gorman <[email protected]> wrote:

include/linux/gfp.h and include/trace/events/gfpflags.h is out of sync. When tracing is enabled, certain flags are not recognised and the text output is less useful as a result. Add the missing flags.
Signed-off-by Mel Gorman <[email protected]>
---
 include/trace/events/gfpflags.h |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
include/trace/events/gfpflags.h +1 -0
index e3615c0..9fe3a366 100644
@@ -10,6 +10,7 @@
  */
 #define show_gfp_flags(flags)						\
 	(flags) ? __print_flags(flags, "|",				\
+	{(unsigned long)GFP_TRANSHUGE,		"GFP_TRANSHUGE"},	\
 	{(unsigned long)GFP_HIGHUSER_MOVABLE,	"GFP_HIGHUSER_MOVABLE"}, \
 	{(unsigned long)GFP_HIGHUSER,		"GFP_HIGHUSER"},	\
 	{(unsigned long)GFP_USER,		"GFP_USER"},		\

include/trace/events/gfpflags.h line 40

Quoted 9 lines

include/trace/events/gfpflags.h +4 -1

@@ -32,6 +33,9 @@
 	{(unsigned long)__GFP_HARDWALL,		"GFP_HARDWALL"},	\
 	{(unsigned long)__GFP_THISNODE,		"GFP_THISNODE"},	\
 	{(unsigned long)__GFP_RECLAIMABLE,	"GFP_RECLAIMABLE"},	\
-	{(unsigned long)__GFP_MOVABLE,		"GFP_MOVABLE"}		\
+	{(unsigned long)__GFP_MOVABLE,		"GFP_MOVABLE"},		\
+	{(unsigned long)__GFP_NOTRACK,		"GFP_NOTRACK"},		\
+	{(unsigned long)__GFP_NO_KSWAPD,	"GFP_NO_KSWAPD"},	\
+	{(unsigned long)__GFP_OTHER_NODE,	"GFP_OTHER_NODE"}	\
 	) : "GFP_NOWAIT"

The patch seems somewhat needed in 2.6.38.x, but 2.6.38 doesn't have __GFP_OTHER_NODE. So if you think this needs fixing in -stable, please prepare a separate patch for that.

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>

Mel Gorman

author

2011-05-17 09:41 UTC #2 lore raw

PATCH 1/1 mm: tracing: Add missing GFP flags to tracing

(For 2.6.38-stable)

Signed-off-by Mel Gorman <[email protected]>

---
 include/trace/events/gfpflags.h |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

include/trace/events/gfpflags.h +4 -1

index e3615c0..5cb8c1b 100644
@@ -10,6 +10,7 @@
  */
 #define show_gfp_flags(flags)						\
 	(flags) ? __print_flags(flags, "|",				\
+	{(unsigned long)GFP_TRANSHUGE,		"GFP_TRANSHUGE"},	\
 	{(unsigned long)GFP_HIGHUSER_MOVABLE,	"GFP_HIGHUSER_MOVABLE"}, \
 	{(unsigned long)GFP_HIGHUSER,		"GFP_HIGHUSER"},	\
 	{(unsigned long)GFP_USER,		"GFP_USER"},		\

@@ -32,6 +33,8 @@
 	{(unsigned long)__GFP_HARDWALL,		"GFP_HARDWALL"},	\
 	{(unsigned long)__GFP_THISNODE,		"GFP_THISNODE"},	\
 	{(unsigned long)__GFP_RECLAIMABLE,	"GFP_RECLAIMABLE"},	\
-	{(unsigned long)__GFP_MOVABLE,		"GFP_MOVABLE"}		\
+	{(unsigned long)__GFP_MOVABLE,		"GFP_MOVABLE"},		\
+	{(unsigned long)__GFP_NOTRACK,		"GFP_NOTRACK"},		\
+	{(unsigned long)__GFP_NO_KSWAPD,	"GFP_NO_KSWAPD"}	\
 	) : "GFP_NOWAIT"