Commit 48e6561b authored by Zi Yan's avatar Zi Yan Committed by Andrew Morton
Browse files

mm/page_alloc: remove trace_mm_alloc_contig_migrate_range_info() 

The trace event has not recorded the right data since it was introduced at
commit c8b36003 ("mm: add alloc_contig_migrate_range allocation
statistics").  Remove it.

Link: https://lkml.kernel.org/r/20250722194649.4135191-1-ziy@nvidia.com


Signed-off-by: default avatarZi Yan <ziy@nvidia.com>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202507220742.P3SaKlI6-lkp@intel.com/


Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Brendan Jackman <jackmanb@google.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Martin Liu <liumartin@google.com>
Cc: "Masami Hiramatsu (Google)" <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Richard Chang <richardycc@google.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 51191450

include/trace/events/kmem.h

+0 −40
Original line number Diff line number Diff line
@@ -304,46 +304,6 @@ TRACE_EVENT(mm_page_alloc_extfrag, 
		__entry->change_ownership)

);



#ifdef CONFIG_CONTIG_ALLOC

TRACE_EVENT(mm_alloc_contig_migrate_range_info,



	TP_PROTO(unsigned long start,

		 unsigned long end,

		 unsigned long nr_migrated,

		 unsigned long nr_reclaimed,

		 unsigned long nr_mapped,

		 acr_flags_t alloc_flags),



	TP_ARGS(start, end, nr_migrated, nr_reclaimed, nr_mapped, alloc_flags),



	TP_STRUCT__entry(

		__field(unsigned long, start)

		__field(unsigned long, end)

		__field(unsigned long, nr_migrated)

		__field(unsigned long, nr_reclaimed)

		__field(unsigned long, nr_mapped)

		__field(acr_flags_t, alloc_flags)

	),



	TP_fast_assign(

		__entry->start = start;

		__entry->end = end;

		__entry->nr_migrated = nr_migrated;

		__entry->nr_reclaimed = nr_reclaimed;

		__entry->nr_mapped = nr_mapped;

		__entry->alloc_flags = alloc_flags;

	),



	TP_printk("start=0x%lx end=0x%lx alloc_flags=%d nr_migrated=%lu nr_reclaimed=%lu nr_mapped=%lu",

		  __entry->start,

		  __entry->end,

		  __entry->alloc_flags,

		  __entry->nr_migrated,

		  __entry->nr_reclaimed,

		  __entry->nr_mapped)

);

#endif



TRACE_EVENT(mm_setup_per_zone_wmarks,



	TP_PROTO(struct zone *zone),

mm/page_alloc.c

+3 −29
Original line number Diff line number Diff line
@@ -6694,14 +6694,9 @@ static void alloc_contig_dump_pages(struct list_head *page_list) 
	}

}



/*

 * [start, end) must belong to a single zone.

 * @alloc_flags: using acr_flags_t to filter the type of migration in

 *		trace_mm_alloc_contig_migrate_range_info.

 */

/* [start, end) must belong to a single zone. */

static int __alloc_contig_migrate_range(struct compact_control *cc,

					unsigned long start, unsigned long end,

					acr_flags_t alloc_flags)

					unsigned long start, unsigned long end)

{

	/* This function is based on compact_zone() from compaction.c. */

	unsigned int nr_reclaimed;
@@ -6713,10 +6708,6 @@ static int __alloc_contig_migrate_range(struct compact_control *cc, 
		.gfp_mask = cc->gfp_mask,

		.reason = MR_CONTIG_RANGE,

	};

	struct page *page;

	unsigned long total_mapped = 0;

	unsigned long total_migrated = 0;

	unsigned long total_reclaimed = 0;



	lru_cache_disable();
@@ -6742,22 +6733,9 @@ static int __alloc_contig_migrate_range(struct compact_control *cc, 
							&cc->migratepages);

		cc->nr_migratepages -= nr_reclaimed;



		if (trace_mm_alloc_contig_migrate_range_info_enabled()) {

			total_reclaimed += nr_reclaimed;

			list_for_each_entry(page, &cc->migratepages, lru) {

				struct folio *folio = page_folio(page);



				total_mapped += folio_mapped(folio) *

						folio_nr_pages(folio);

			}

		}



		ret = migrate_pages(&cc->migratepages, alloc_migration_target,

			NULL, (unsigned long)&mtc, cc->mode, MR_CONTIG_RANGE, NULL);



		if (trace_mm_alloc_contig_migrate_range_info_enabled() && !ret)

			total_migrated += cc->nr_migratepages;



		/*

		 * On -ENOMEM, migrate_pages() bails out right away. It is pointless

		 * 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, 
		putback_movable_pages(&cc->migratepages);

	}



	trace_mm_alloc_contig_migrate_range_info(start, end, alloc_flags,

						 total_migrated,

						 total_reclaimed,

						 total_mapped);

	return (ret < 0) ? ret : 0;

}
@@ -6921,7 +6895,7 @@ int alloc_contig_range_noprof(unsigned long start, unsigned long end, 
	 * allocated.  So, if we fall through be sure to clear ret so that

	 * -EBUSY is not accidentally used or returned to caller.

	 */

	ret = __alloc_contig_migrate_range(&cc, start, end, alloc_flags);

	ret = __alloc_contig_migrate_range(&cc, start, end);

	if (ret && ret != -EBUSY)

		goto done;