1 files changed, 21 insertions, 4 deletions

diff --git a/include/trace/events/compaction.h b/include/trace/events/compaction.h
index 06f544ef2f6f..c6814b917bdf 100644
--- a/include/trace/events/compaction.h
+++ b/include/trace/events/compaction.h
@@ -5,6 +5,7 @@
 #define _TRACE_COMPACTION_H
 
 #include <linux/types.h>
+#include <linux/list.h>
 #include <linux/tracepoint.h>
 #include <trace/events/gfpflags.h>
 
@@ -47,10 +48,11 @@ DEFINE_EVENT(mm_compaction_isolate_template, mm_compaction_isolate_freepages,
 
 TRACE_EVENT(mm_compaction_migratepages,
 
-        TP_PROTO(unsigned long nr_migrated,
-                unsigned long nr_failed),
+        TP_PROTO(unsigned long nr_all,
+                int migrate_rc,
+                struct list_head *migratepages),
 
-        TP_ARGS(nr_migrated, nr_failed),
+        TP_ARGS(nr_all, migrate_rc, migratepages),
 
         TP_STRUCT__entry(
                 __field(unsigned long, nr_migrated)
@@ -58,7 +60,22 @@ TRACE_EVENT(mm_compaction_migratepages,
         ),
 
         TP_fast_assign(
-                __entry->nr_migrated = nr_migrated;
+                unsigned long nr_failed = 0;
+                struct list_head *page_lru;
+
+                /*
+                 * migrate_pages() returns either a non-negative number
+                 * with the number of pages that failed migration, or an
+                 * error code, in which case we need to count the remaining
+                 * pages manually
+                 */
+                if (migrate_rc >= 0)
+                        nr_failed = migrate_rc;
+                else
+                        list_for_each(page_lru, migratepages)
+                                nr_failed++;
+
+                __entry->nr_migrated = nr_all - nr_failed;
                 __entry->nr_failed = nr_failed;
         ),