The patch titled Subject: mm/migration: add trace events for THP migrations has been removed from the -mm tree. Its filename was mm-migration-add-trace-events-for-thp-migrations.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Anshuman Khandual <anshuman.khandual@xxxxxxx> Subject: mm/migration: add trace events for THP migrations This adds two trace events for PMD based THP migration without split. These events closely follow the implementation details like setting and removing of PMD migration entries, which are essential operations for THP migration. Link: https://lkml.kernel.org/r/1641531575-28524-1-git-send-email-anshuman.khandual@xxxxxxx Signed-off-by: Anshuman Khandual <anshuman.khandual@xxxxxxx> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Zi Yan <ziy@xxxxxxxxxx> Cc: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx> Cc: John Hubbard <jhubbard@xxxxxxxxxx> Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/trace/events/thp.h | 37 +++++++++++++++++++++++++++++++++++ mm/huge_memory.c | 5 ++++ 2 files changed, 42 insertions(+) --- a/include/trace/events/thp.h~mm-migration-add-trace-events-for-thp-migrations +++ a/include/trace/events/thp.h @@ -83,6 +83,43 @@ TRACE_EVENT(hugepage_splitting, __entry->addr, __entry->pte) ); +TRACE_EVENT(set_migration_pmd, + + TP_PROTO(unsigned long addr, unsigned long pmd), + + TP_ARGS(addr, pmd), + + TP_STRUCT__entry( + __field(unsigned long, addr) + __field(unsigned long, pmd) + ), + + TP_fast_assign( + __entry->addr = addr; + __entry->pmd = pmd; + ), + + TP_printk("create pmd migration entry addr=%lx, pmd=%lx", __entry->addr, __entry->pmd) +); + +TRACE_EVENT(remove_migration_pmd, + + TP_PROTO(unsigned long addr, unsigned long pmd), + + TP_ARGS(addr, pmd), + + TP_STRUCT__entry( + __field(unsigned long, addr) + __field(unsigned long, pmd) + ), + + TP_fast_assign( + __entry->addr = addr; + __entry->pmd = pmd; + ), + + TP_printk("remove pmd migration entry addr=%lx, val=%lx", __entry->addr, __entry->pmd) +); #endif /* _TRACE_THP_H */ /* This part must be outside protection */ --- a/mm/huge_memory.c~mm-migration-add-trace-events-for-thp-migrations +++ a/mm/huge_memory.c @@ -39,6 +39,9 @@ #include <asm/pgalloc.h> #include "internal.h" +#define CREATE_TRACE_POINTS +#include <trace/events/thp.h> + /* * By default, transparent hugepage support is disabled in order to avoid * risking an increased memory footprint for applications that are not @@ -3163,6 +3166,7 @@ void set_pmd_migration_entry(struct page set_pmd_at(mm, address, pvmw->pmd, pmdswp); page_remove_rmap(page, true); put_page(page); + trace_set_migration_pmd(address, pmd_val(pmdswp)); } void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new) @@ -3196,5 +3200,6 @@ void remove_migration_pmd(struct page_vm if ((vma->vm_flags & VM_LOCKED) && !PageDoubleMap(new)) mlock_vma_page(new); update_mmu_cache_pmd(vma, address, pvmw->pmd); + trace_remove_migration_pmd(address, pmd_val(pmde)); } #endif _ Patches currently in -mm which might be from anshuman.khandual@xxxxxxx are mm-debug_vm_pgtable-update-comments-regarding-migration-swap-entries.patch mm-page_alloc-modify-the-comment-section-for-alloc_contig_pages.patch mm-thp-drop-unused-trace-events-hugepage_.patch