mm-migration-add-trace-events-for-base-page-and-hugetlb-migrations.patch removed from -mm tree
The patch titled
Subject: mm/migration: add trace events for base page and HugeTLB migrations
has been removed from the -mm tree. Its filename was
mm-migration-add-trace-events-for-base-page-and-hugetlb-migrations.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Anshuman Khandual <[email protected]>
Subject: mm/migration: add trace events for base page and HugeTLB migrations
This adds two trace events for base page and HugeTLB page migrations. These events, closely follow the implementation details like setting and removing of PTE migration entries, which are essential operations for migration. The new CREATE_TRACE_POINTS in <mm/rmap.c> covers both <events/migration.h> and <events/tlb.h> based trace events. Hence drop redundant CREATE_TRACE_POINTS from other places which could have otherwise conflicted during build.
---
arch/x86/mm/init.c | 1 - include/trace/events/migrate.h | 31 +++++++++++++++++++++++++++++++ mm/migrate.c | 4 +++- mm/rmap.c | 6 ++++++ 4 files changed, 40 insertions(+), 2 deletions(-)
arch/x86/mm/init.c renamed from arch/x86/mm/init.c~mm-migration-add-trace-events-for-base-page-and-hugetlb-migrations +0 -1
@@ -31,7 +31,6 @@* We need to define the tracepoints somewhere, and tlb.c * is only compiled when SMP=y. */ -#define CREATE_TRACE_POINTS #include <trace/events/tlb.h> #include "mm_internal.h"
include/trace/events/migrate.h renamed from include/trace/events/migrate.h~mm-migration-add-trace-events-for-base-page-and-hugetlb-migrations +31 -0
@@ -105,6 +105,37 @@ TRACE_EVENT(mm_migrate_pages_start, __print_symbolic(__entry->reason, MIGRATE_REASON)) ); +DECLARE_EVENT_CLASS (migration_pte, + + TP_PROTO(unsigned long addr, unsigned long pte, int order), + +TP_ARGS (addr, pte, order), + +TP_STRUCT__entry ( + __field(unsigned long, addr) + __field(unsigned long, pte) +__field (int, order) + ), + +TP_fast_assign ( + __entry->addr = addr; + __entry->pte = pte; + __entry->order = order; + ), + +TP_printk ("addr=%lx, pte=%lx order=%d" , __entry->addr, __entry->pte, __entry->order) +); + +DEFINE_EVENT (migration_pte, set_migration_pte, + TP_PROTO(unsigned long addr, unsigned long pte, int order), +TP_ARGS (addr, pte, order) +); + +DEFINE_EVENT (migration_pte, remove_migration_pte, + TP_PROTO(unsigned long addr, unsigned long pte, int order), +TP_ARGS (addr, pte, order) +); +#endif /* _TRACE_MIGRATE_H */ /* This part must be outside protection */
mm/migrate.c renamed from mm/migrate.c~mm-migration-add-trace-events-for-base-page-and-hugetlb-migrations +3 -1
@@ -53,7 +53,6 @@#include <asm/tlbflush.h> -#define CREATE_TRACE_POINTS #include <trace/events/migrate.h> #include "internal.h"
@@ -249,6 +248,9 @@ static bool remove_migration_pte(structif (vma->vm_flags &VM_LOCKED )mlock_page_drain (smp_processor_id ()); +trace_remove_migration_pte (pvmw.address,pte_val (pte), +compound_order (new)); +/* No need to invalidate - it was non-present before */ update_mmu_cache (vma, pvmw.address, pvmw.pte); }
mm/rmap.c renamed from mm/rmap.c~mm-migration-add-trace-events-for-base-page-and-hugetlb-migrations +6 -0
@@ -76,7 +76,9 @@#include <asm/tlbflush.h> +#define CREATE_TRACE_POINTS #include <trace/events/tlb.h> +#include <trace/events/migrate.h> #include "internal.h"
@@ -1849,6 +1851,8 @@ static bool try_to_migrate_one(struct foif (pte_swp_uffd_wp (pteval)) swp_pte =pte_swp_mkuffd_wp (swp_pte);set_pte_at (mm, pvmw.address, pvmw.pte, swp_pte); +trace_set_migration_pte (pvmw.address,pte_val (swp_pte), +compound_order (&folio->page));/* * No need to invalidate here it will synchronize on * against the special swap migration pte.
@@ -1917,6 +1921,8 @@ static bool try_to_migrate_one(struct foif (pte_uffd_wp (pteval)) swp_pte =pte_swp_mkuffd_wp (swp_pte);set_pte_at (mm, address, pvmw.pte, swp_pte); +trace_set_migration_pte (address,pte_val (swp_pte), +compound_order (&folio->page));/* * No need to invalidate here it will synchronize on * against the special swap migration pte.
_
Patches currently in -mm which might be from [email protected] are