Commit 57dc916b authored by Zi Yan's avatar Zi Yan Committed by Liu Shixin
Browse files

mm/migrate: add nr_split to trace_mm_migrate_pages stats. 

mainline inclusion
from mainline-v6.7-rc1
commit 49cac03a8f0a56cafa5329911564c97c130ced43
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9IP8P
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=49cac03a8f0a56cafa5329911564c97c130ced43

--------------------------------

Add nr_split to trace_mm_migrate_pages for large folio (including THP)
split events.

[akpm@linux-foundation.org: cleanup per Huang, Ying]
Link: https://lkml.kernel.org/r/20231017163129.2025214-2-zi.yan@sent.com


Signed-off-by: default avatarZi Yan <ziy@nvidia.com>
Reviewed-by: default avatar"Huang, Ying" <ying.huang@intel.com>
Reviewed-by: default avatarBaolin Wang <baolin.wang@linux.alibaba.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Huang Ying <ying.huang@intel.com>
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
parent 0adbd047

include/trace/events/migrate.h

+14 −10
Original line number Diff line number Diff line
@@ -49,10 +49,11 @@ TRACE_EVENT(mm_migrate_pages, 


	TP_PROTO(unsigned long succeeded, unsigned long failed,

		 unsigned long thp_succeeded, unsigned long thp_failed,

		 unsigned long thp_split, enum migrate_mode mode, int reason),

		 unsigned long thp_split, unsigned long large_folio_split,

		 enum migrate_mode mode, int reason),



	TP_ARGS(succeeded, failed, thp_succeeded, thp_failed,

		thp_split, mode, reason),

		thp_split, large_folio_split, mode, reason),



	TP_STRUCT__entry(

		__field(	unsigned long,		succeeded)
@@ -60,6 +61,7 @@ TRACE_EVENT(mm_migrate_pages, 
		__field(	unsigned long,		thp_succeeded)

		__field(	unsigned long,		thp_failed)

		__field(	unsigned long,		thp_split)

		__field(	unsigned long,		large_folio_split)

		__field(	enum migrate_mode,	mode)

		__field(	int,			reason)

	),
@@ -70,16 +72,18 @@ TRACE_EVENT(mm_migrate_pages, 
		__entry->thp_succeeded		= thp_succeeded;

		__entry->thp_failed			= thp_failed;

		__entry->thp_split			= thp_split;

		__entry->large_folio_split	= large_folio_split;

		__entry->mode				= mode;

		__entry->reason				= reason;

	),



	TP_printk("nr_succeeded=%lu nr_failed=%lu nr_thp_succeeded=%lu nr_thp_failed=%lu nr_thp_split=%lu mode=%s reason=%s",

	TP_printk("nr_succeeded=%lu nr_failed=%lu nr_thp_succeeded=%lu nr_thp_failed=%lu nr_thp_split=%lu nr_split=%lu mode=%s reason=%s",

		__entry->succeeded,

		__entry->failed,

		__entry->thp_succeeded,

		__entry->thp_failed,

		__entry->thp_split,

		__entry->large_folio_split,

		__print_symbolic(__entry->mode, MIGRATE_MODE),

		__print_symbolic(__entry->reason, MIGRATE_REASON))

);

mm/migrate.c

+3 −2
Original line number Diff line number Diff line
@@ -1702,7 +1702,7 @@ static int migrate_pages_batch(struct list_head *from, 


					if (!ret) {

						stats->nr_thp_split += is_thp;

						stats->nr_split += is_large;

						stats->nr_split++;

						break;

					} else if (reason == MR_LONGTERM_PIN &&

						   ret == -EAGAIN) {
@@ -1995,7 +1995,8 @@ int migrate_pages(struct list_head *from, new_folio_t get_new_folio, 
	count_vm_events(THP_MIGRATION_SPLIT, stats.nr_thp_split);

	trace_mm_migrate_pages(stats.nr_succeeded, stats.nr_failed_pages,

			       stats.nr_thp_succeeded, stats.nr_thp_failed,

			       stats.nr_thp_split, mode, reason);

			       stats.nr_thp_split, stats.nr_split, mode,

			       reason);



	if (ret_succeeded)

		*ret_succeeded = stats.nr_succeeded;