@@ -6694,14 +6694,9 @@ static void alloc_contig_dump_pages(struct list_head *page_list)
6694
6694
}
6695
6695
}
6696
6696
6697
- /*
6698
- * [start, end) must belong to a single zone.
6699
- * @alloc_flags: using acr_flags_t to filter the type of migration in
6700
- * trace_mm_alloc_contig_migrate_range_info.
6701
- */
6697
+ /* [start, end) must belong to a single zone. */
6702
6698
static int __alloc_contig_migrate_range (struct compact_control * cc ,
6703
- unsigned long start , unsigned long end ,
6704
- acr_flags_t alloc_flags )
6699
+ unsigned long start , unsigned long end )
6705
6700
{
6706
6701
/* This function is based on compact_zone() from compaction.c. */
6707
6702
unsigned int nr_reclaimed ;
@@ -6713,10 +6708,6 @@ static int __alloc_contig_migrate_range(struct compact_control *cc,
6713
6708
.gfp_mask = cc -> gfp_mask ,
6714
6709
.reason = MR_CONTIG_RANGE ,
6715
6710
};
6716
- struct page * page ;
6717
- unsigned long total_mapped = 0 ;
6718
- unsigned long total_migrated = 0 ;
6719
- unsigned long total_reclaimed = 0 ;
6720
6711
6721
6712
lru_cache_disable ();
6722
6713
@@ -6742,22 +6733,9 @@ static int __alloc_contig_migrate_range(struct compact_control *cc,
6742
6733
& cc -> migratepages );
6743
6734
cc -> nr_migratepages -= nr_reclaimed ;
6744
6735
6745
- if (trace_mm_alloc_contig_migrate_range_info_enabled ()) {
6746
- total_reclaimed += nr_reclaimed ;
6747
- list_for_each_entry (page , & cc -> migratepages , lru ) {
6748
- struct folio * folio = page_folio (page );
6749
-
6750
- total_mapped += folio_mapped (folio ) *
6751
- folio_nr_pages (folio );
6752
- }
6753
- }
6754
-
6755
6736
ret = migrate_pages (& cc -> migratepages , alloc_migration_target ,
6756
6737
NULL , (unsigned long )& mtc , cc -> mode , MR_CONTIG_RANGE , NULL );
6757
6738
6758
- if (trace_mm_alloc_contig_migrate_range_info_enabled () && !ret )
6759
- total_migrated += cc -> nr_migratepages ;
6760
-
6761
6739
/*
6762
6740
* On -ENOMEM, migrate_pages() bails out right away. It is pointless
6763
6741
* to retry again over this error, so do the same here.
@@ -6773,10 +6751,6 @@ static int __alloc_contig_migrate_range(struct compact_control *cc,
6773
6751
putback_movable_pages (& cc -> migratepages );
6774
6752
}
6775
6753
6776
- trace_mm_alloc_contig_migrate_range_info (start , end , alloc_flags ,
6777
- total_migrated ,
6778
- total_reclaimed ,
6779
- total_mapped );
6780
6754
return (ret < 0 ) ? ret : 0 ;
6781
6755
}
6782
6756
@@ -6921,7 +6895,7 @@ int alloc_contig_range_noprof(unsigned long start, unsigned long end,
6921
6895
* allocated. So, if we fall through be sure to clear ret so that
6922
6896
* -EBUSY is not accidentally used or returned to caller.
6923
6897
*/
6924
- ret = __alloc_contig_migrate_range (& cc , start , end , alloc_flags );
6898
+ ret = __alloc_contig_migrate_range (& cc , start , end );
6925
6899
if (ret && ret != - EBUSY )
6926
6900
goto done ;
6927
6901
0 commit comments