[RFC PATCH 1/2] mm: vmscan: remove shrinker's nr_deferred from tracepoint

Yang Shi
2020-09-16T18:59:24Z

The shrinker's nr_deferred will be removed in the following patch, this is a preparation
patch to make it bisectable.

Signed-off-by: Yang Shi <shy828301@gmail.com>
---
include/trace/events/vmscan.h | 26 +++++++-------------------
mm/vmscan.c | 4 ++--
2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h
index 2070df64958e..27f268bbeba4 100644
--- a/include/trace/events/vmscan.h
+++ b/include/trace/events/vmscan.h
@@ -184,18 +184,15 @@ DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_softlimit_re

TRACE_EVENT(mm_shrink_slab_start,
TP_PROTO(struct shrinker *shr, struct shrink_control *sc,
- long nr_objects_to_shrink, unsigned long cache_items,
- unsigned long long delta, unsigned long total_scan,
- int priority),
+ unsigned long cache_items, unsigned long long delta,
+ unsigned long total_scan, int priority),

- TP_ARGS(shr, sc, nr_objects_to_shrink, cache_items, delta, total_scan,
- priority),
+ TP_ARGS(shr, sc, cache_items, delta, total_scan, priority),

TP_STRUCT__entry(
__field(struct shrinker *, shr)
__field(void *, shrink)
__field(int, nid)
- __field(long, nr_objects_to_shrink)
__field(gfp_t, gfp_flags)
__field(unsigned long, cache_items)
__field(unsigned long long, delta)
@@ -207,7 +204,6 @@ TRACE_EVENT(mm_shrink_slab_start,
__entry->shr = shr;
__entry->shrink = shr->scan_objects;
__entry->nid = sc->nid;
- __entry->nr_objects_to_shrink = nr_objects_to_shrink;
__entry->gfp_flags = sc->gfp_mask;
__entry->cache_items = cache_items;
__entry->delta = delta;
@@ -215,11 +211,10 @@ TRACE_EVENT(mm_shrink_slab_start,
__entry->priority = priority;
),

- TP_printk("%pS %p: nid: %d objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d",
+ TP_printk("%pS %p: nid: %d gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d",
__entry->shrink,
__entry->shr,
__entry->nid,
- __entry->nr_objects_to_shrink,
show_gfp_flags(__entry->gfp_flags),
__entry->cache_items,
__entry->delta,
@@ -229,17 +224,14 @@ TRACE_EVENT(mm_shrink_slab_start,

TRACE_EVENT(mm_shrink_slab_end,
TP_PROTO(struct shrinker *shr, int nid, int shrinker_retval,
- long unused_scan_cnt, long new_scan_cnt, long total_scan),
+ long total_scan),

- TP_ARGS(shr, nid, shrinker_retval, unused_scan_cnt, new_scan_cnt,
- total_scan),
+ TP_ARGS(shr, nid, shrinker_retval, total_scan),

TP_STRUCT__entry(
__field(struct shrinker *, shr)
__field(int, nid)
__field(void *, shrink)
- __field(long, unused_scan)
- __field(long, new_scan)
__field(int, retval)
__field(long, total_scan)
),
@@ -248,18 +240,14 @@ TRACE_EVENT(mm_shrink_slab_end,
__entry->shr = shr;
__entry->nid = nid;
__entry->shrink = shr->scan_objects;
- __entry->unused_scan = unused_scan_cnt;
- __entry->new_scan = new_scan_cnt;
__entry->retval = shrinker_retval;
__entry->total_scan = total_scan;
),

- TP_printk("%pS %p: nid: %d unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d",
+ TP_printk("%pS %p: nid: %d total_scan %ld last shrinker return val %d",
__entry->shrink,
__entry->shr,
__entry->nid,
- __entry->unused_scan,
- __entry->new_scan,
__entry->total_scan,
__entry->retval)
);
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 9727dd8e2581..48ebea97f12f 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -485,7 +485,7 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl,
if (total_scan > freeable * 2)
total_scan = freeable * 2;

- trace_mm_shrink_slab_start(shrinker, shrinkctl, nr,
+ trace_mm_shrink_slab_start(shrinker, shrinkctl,
freeable, delta, total_scan, priority);

/*
@@ -537,7 +537,7 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl,
else
new_nr = atomic_long_read(&shrinker->nr_deferred[nid]);

- trace_mm_shrink_slab_end(shrinker, nid, freed, nr, new_nr, total_scan);
+ trace_mm_shrink_slab_end(shrinker, nid, freed, total_scan);
return freed;
}

--
2.26.2