mm-compaction-fix-the-migration-stats-in-trace_mm_compaction_migratepages.patch removed from -mm tree
The patch titled
Subject: mm: compaction: fix the migration stats in trace_mm_compaction_migratepages()
has been removed from the -mm tree. Its filename was
mm-compaction-fix-the-migration-stats-in-trace_mm_compaction_migratepages.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Baolin Wang <[email protected]>
Subject: mm: compaction: fix the migration stats in trace_mm_compaction_migratepages()
Now the migrate_pages() has changed to return the number of {normal page, THP, hugetlb} instead, thus we should not use the return value to calculate the number of pages migrated successfully. Instead we can just use the 'nr_succeeded' which indicates the number of normal pages migrated successfully to calculate the non-migrated pages in trace_mm_compaction_migratepages().
---
include/trace/events/compaction.h | 24 ++++-------------------- mm/compaction.c | 7 ++++--- 2 files changed, 8 insertions(+), 23 deletions(-)
include/trace/events/compaction.h renamed from include/trace/events/compaction.h~mm-compaction-fix-the-migration-stats-in-trace_mm_compaction_migratepages +4 -20
@@ -68,10 +68,9 @@ DEFINE_EVENT(mm_compaction_isolate_templ TRACE_EVENT(mm_compaction_migratepages, TP_PROTO(unsigned long nr_all, - int migrate_rc, - struct list_head *migratepages), + unsigned int nr_succeeded), - TP_ARGS(nr_all, migrate_rc, migratepages), + TP_ARGS(nr_all, nr_succeeded), TP_STRUCT__entry( __field(unsigned long, nr_migrated)
@@ -79,23 +78,8 @@ TRACE_EVENT(mm_compaction_migratepages, ), TP_fast_assign( - 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; + __entry->nr_migrated = nr_succeeded; + __entry->nr_failed = nr_all - nr_succeeded; ), TP_printk("nr_migrated=%lu nr_failed=%lu",
mm/compaction.c renamed from mm/compaction.c~mm-compaction-fix-the-migration-stats-in-trace_mm_compaction_migratepages +4 -3
@@ -2280,6 +2280,7 @@ compact_zone(struct compact_control *cc,unsigned long last_migrated_pfn;const bool sync = cc->mode !=MIGRATE_ASYNC ;bool update_cached; +unsigned int nr_succeeded =0 ;/* * These counters track activities during zone compaction. Initialize
@@ -2398,10 +2399,10 @@ compact_zone(struct compact_control *cc, err =migrate_pages (&cc->migratepages, compaction_alloc, compaction_free, (unsigned long )cc, cc->mode, -MR_COMPACTION ,NULL ); +MR_COMPACTION , &nr_succeeded); -trace_mm_compaction_migratepages (cc->nr_migratepages, err, - &cc->migratepages); +trace_mm_compaction_migratepages (cc->nr_migratepages, + nr_succeeded);/* All pages were either migrated or will be released */ cc->nr_migratepages =0 ;
_
Patches currently in -mm which might be from [email protected] are