On Mon, 16 Mar 2026 09:09:05 -0700 Thomas Ballasi
<[email protected]> wrote:
> Changes in v8:
> - Removed in_task() mention in PID commit message
> - Moved __entry->pid to __entry->ent.pid
>
Below is how this update altered mm.git.
It's a minor change, so I'll retain Shakeel's Acked-by and Reviewed-by
on the first two patches.
--- a/include/trace/events/vmscan.h~b
+++ a/include/trace/events/vmscan.h
@@ -132,20 +132,18 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_rec
__field( unsigned long, gfp_flags )
__field( u64, memcg_id )
__field( int, order )
- __field( int, pid )
),
TP_fast_assign(
__entry->gfp_flags = (__force unsigned long)gfp_flags;
__entry->order = order;
- __entry->pid = current->pid;
__entry->memcg_id = mem_cgroup_id(memcg);
),
TP_printk("order=%d gfp_flags=%s pid=%d memcg_id=%llu %s",
__entry->order,
show_gfp_flags(__entry->gfp_flags),
- __entry->pid,
+ __entry->ent.pid,
__entry->memcg_id,
__event_in_irq() ? "(in-irq)" : "")
);
@@ -182,18 +180,16 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_rec
TP_STRUCT__entry(
__field( unsigned long, nr_reclaimed )
__field( u64, memcg_id )
- __field( int, pid )
),
TP_fast_assign(
__entry->nr_reclaimed = nr_reclaimed;
__entry->memcg_id = mem_cgroup_id(memcg);
- __entry->pid = current->pid;
),
TP_printk("nr_reclaimed=%lu pid=%d memcg_id=%llu %s",
__entry->nr_reclaimed,
- __entry->pid,
+ __entry->ent.pid,
__entry->memcg_id,
__event_in_irq() ? "(in-irq)" : "")
);
@@ -238,10 +234,9 @@ TRACE_EVENT(mm_shrink_slab_start,
__field(unsigned long, cache_items)
__field(unsigned long long, delta)
__field(unsigned long, total_scan)
- __field(u64, memcg_id)
__field(int, priority)
__field(int, nid)
- __field(int, pid)
+ __field(u64, memcg_id)
),
TP_fast_assign(
@@ -255,14 +250,13 @@ TRACE_EVENT(mm_shrink_slab_start,
__entry->priority = priority;
__entry->nid = sc->nid;
__entry->memcg_id = mem_cgroup_id(memcg);
- __entry->pid = current->pid;
),
TP_printk("%pS %p: nid: %d pid: %d memcg_id: %llu objects to shrink %ld
gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d %s",
__entry->shrink,
__entry->shr,
__entry->nid,
- __entry->pid,
+ __entry->ent.pid,
__entry->memcg_id,
__entry->nr_objects_to_shrink,
show_gfp_flags(__entry->gfp_flags),
@@ -288,7 +282,6 @@ TRACE_EVENT(mm_shrink_slab_end,
__field(long, total_scan)
__field(int, nid)
__field(int, retval)
- __field(int, pid)
__field(u64, memcg_id)
),
@@ -300,7 +293,6 @@ TRACE_EVENT(mm_shrink_slab_end,
__entry->total_scan = total_scan;
__entry->nid = nid;
__entry->retval = shrinker_retval;
- __entry->pid = current->pid;
__entry->memcg_id = mem_cgroup_id(memcg);
),
@@ -308,7 +300,7 @@ TRACE_EVENT(mm_shrink_slab_end,
__entry->shrink,
__entry->shr,
__entry->nid,
- __entry->pid,
+ __entry->ent.pid,
__entry->memcg_id,
__entry->unused_scan,
__entry->new_scan,
_