2019-05-22 08:45:30

by Kirill Tkhai

Subject: [PATCH] mm: Rename mm_vmscan_lru_shrink_inactive trace event variables

Rename nr_activate{0,1} into nr_activate{anon,file} since this
is exported into userspace, e.g., it's shown here:

/sys/kernel/debug/tracing/events/vmscan/mm_vmscan_lru_shrink_inactive/format.

Now we have:
field:unsigned int nr_activate0; offset:64; size:4; signed:0;
field:unsigned int nr_activate1; offset:68; size:4; signed:0;

The patch changes these to:
field:unsigned int nr_activate_anon; offset:64; size:4; signed:0;
field:unsigned int nr_activate_file; offset:68; size:4; signed:0;

which is better readable.

Suggested-by: Michael Jeanson <[email protected]>
Signed-off-by: Kirill Tkhai <[email protected]>
---
include/trace/events/vmscan.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h
index a5ab2973e8dc..c316279715f4 100644
--- a/include/trace/events/vmscan.h
+++ b/include/trace/events/vmscan.h
@@ -348,8 +348,8 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
__field(unsigned long, nr_writeback)
__field(unsigned long, nr_congested)
__field(unsigned long, nr_immediate)
- __field(unsigned int, nr_activate0)
- __field(unsigned int, nr_activate1)
+ __field(unsigned int, nr_activate_anon)
+ __field(unsigned int, nr_activate_file)
__field(unsigned long, nr_ref_keep)
__field(unsigned long, nr_unmap_fail)
__field(int, priority)
@@ -364,8 +364,8 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
__entry->nr_writeback = stat->nr_writeback;
__entry->nr_congested = stat->nr_congested;
__entry->nr_immediate = stat->nr_immediate;
- __entry->nr_activate0 = stat->nr_activate[0];
- __entry->nr_activate1 = stat->nr_activate[1];
+ __entry->nr_activate_anon = stat->nr_activate[0];
+ __entry->nr_activate_file = stat->nr_activate[1];
__entry->nr_ref_keep = stat->nr_ref_keep;
__entry->nr_unmap_fail = stat->nr_unmap_fail;
__entry->priority = priority;
@@ -377,7 +377,7 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
__entry->nr_scanned, __entry->nr_reclaimed,
__entry->nr_dirty, __entry->nr_writeback,
__entry->nr_congested, __entry->nr_immediate,
- __entry->nr_activate0, __entry->nr_activate1,
+ __entry->nr_activate_anon, __entry->nr_activate_file,
__entry->nr_ref_keep, __entry->nr_unmap_fail,
__entry->priority,
show_reclaim_flags(__entry->reclaim_flags))

2019-05-22 10:19:25

by Kirill Tkhai

Subject: [PATCH v2] mm: Rename mm_vmscan_lru_shrink_inactive trace event variables

Rename nr_activate{0,1} into nr_activate{anon,file} since this
is exported into userspace, e.g., it's shown here:

/sys/kernel/debug/tracing/events/vmscan/mm_vmscan_lru_shrink_inactive/format

v2: Changed suggested person (sorry, Mathieu :))

Suggested-by: Mathieu Desnoyers <[email protected]>
Signed-off-by: Kirill Tkhai <[email protected]>
---
include/trace/events/vmscan.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h
index a5ab2973e8dc..c316279715f4 100644
--- a/include/trace/events/vmscan.h
+++ b/include/trace/events/vmscan.h
@@ -348,8 +348,8 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
__field(unsigned long, nr_writeback)
__field(unsigned long, nr_congested)
__field(unsigned long, nr_immediate)
- __field(unsigned int, nr_activate0)
- __field(unsigned int, nr_activate1)
+ __field(unsigned int, nr_activate_anon)
+ __field(unsigned int, nr_activate_file)
__field(unsigned long, nr_ref_keep)
__field(unsigned long, nr_unmap_fail)
__field(int, priority)
@@ -364,8 +364,8 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
__entry->nr_writeback = stat->nr_writeback;
__entry->nr_congested = stat->nr_congested;
__entry->nr_immediate = stat->nr_immediate;
- __entry->nr_activate0 = stat->nr_activate[0];
- __entry->nr_activate1 = stat->nr_activate[1];
+ __entry->nr_activate_anon = stat->nr_activate[0];
+ __entry->nr_activate_file = stat->nr_activate[1];
__entry->nr_ref_keep = stat->nr_ref_keep;
__entry->nr_unmap_fail = stat->nr_unmap_fail;
__entry->priority = priority;
@@ -377,7 +377,7 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
__entry->nr_scanned, __entry->nr_reclaimed,
__entry->nr_dirty, __entry->nr_writeback,
__entry->nr_congested, __entry->nr_immediate,
- __entry->nr_activate0, __entry->nr_activate1,
+ __entry->nr_activate_anon, __entry->nr_activate_file,
__entry->nr_ref_keep, __entry->nr_unmap_fail,
__entry->priority,
show_reclaim_flags(__entry->reclaim_flags))

2019-05-22 14:47:49

by Sebastien Boisvert

Subject: Re: [lttng-dev] [PATCH v2] mm: Rename mm_vmscan_lru_shrink_inactive trace event variables

On 2019-05-22 6:17 a.m., Kirill Tkhai wrote:
> Rename nr_activate{0,1} into nr_activate{anon,file} since this

Rename nr_activate{0,1} into nr_activate{anon,file}
^
add an underscore here
(nr_activate_anon, nr_activate_file).


> is exported into userspace, e.g., it's shown here:
>
> /sys/kernel/debug/tracing/events/vmscan/mm_vmscan_lru_shrink_inactive/format
>
> v2: Changed suggested person (sorry, Mathieu :))
>
> Suggested-by: Mathieu Desnoyers <[email protected]>
> Signed-off-by: Kirill Tkhai <[email protected]>
> ---
> include/trace/events/vmscan.h | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h
> index a5ab2973e8dc..c316279715f4 100644
> --- a/include/trace/events/vmscan.h
> +++ b/include/trace/events/vmscan.h
> @@ -348,8 +348,8 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
> __field(unsigned long, nr_writeback)
> __field(unsigned long, nr_congested)
> __field(unsigned long, nr_immediate)
> - __field(unsigned int, nr_activate0)
> - __field(unsigned int, nr_activate1)
> + __field(unsigned int, nr_activate_anon)
> + __field(unsigned int, nr_activate_file)
> __field(unsigned long, nr_ref_keep)
> __field(unsigned long, nr_unmap_fail)
> __field(int, priority)
> @@ -364,8 +364,8 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
> __entry->nr_writeback = stat->nr_writeback;
> __entry->nr_congested = stat->nr_congested;
> __entry->nr_immediate = stat->nr_immediate;
> - __entry->nr_activate0 = stat->nr_activate[0];
> - __entry->nr_activate1 = stat->nr_activate[1];
> + __entry->nr_activate_anon = stat->nr_activate[0];
> + __entry->nr_activate_file = stat->nr_activate[1];
> __entry->nr_ref_keep = stat->nr_ref_keep;
> __entry->nr_unmap_fail = stat->nr_unmap_fail;
> __entry->priority = priority;
> @@ -377,7 +377,7 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
> __entry->nr_scanned, __entry->nr_reclaimed,
> __entry->nr_dirty, __entry->nr_writeback,
> __entry->nr_congested, __entry->nr_immediate,
> - __entry->nr_activate0, __entry->nr_activate1,
> + __entry->nr_activate_anon, __entry->nr_activate_file,
> __entry->nr_ref_keep, __entry->nr_unmap_fail,
> __entry->priority,
> show_reclaim_flags(__entry->reclaim_flags))
> _______________________________________________
> lttng-dev mailing list
> [email protected]
> https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
>

2019-05-23 16:14:46

by Kirill Tkhai

Subject: [PATCH v3] mm: Rename mm_vmscan_lru_shrink_inactive trace event variables

Rename nr_activate{0,1} into nr_activate_{anon,file} since this
is exported into userspace, e.g., it's shown here:

/sys/kernel/debug/tracing/events/vmscan/mm_vmscan_lru_shrink_inactive/format

v3: Fix comment
v2: Changed suggested person

Suggested-by: Mathieu Desnoyers <[email protected]>
Signed-off-by: Kirill Tkhai <[email protected]>
---
include/trace/events/vmscan.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h
index a5ab2973e8dc..c316279715f4 100644
--- a/include/trace/events/vmscan.h
+++ b/include/trace/events/vmscan.h
@@ -348,8 +348,8 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
__field(unsigned long, nr_writeback)
__field(unsigned long, nr_congested)
__field(unsigned long, nr_immediate)
- __field(unsigned int, nr_activate0)
- __field(unsigned int, nr_activate1)
+ __field(unsigned int, nr_activate_anon)
+ __field(unsigned int, nr_activate_file)
__field(unsigned long, nr_ref_keep)
__field(unsigned long, nr_unmap_fail)
__field(int, priority)
@@ -364,8 +364,8 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
__entry->nr_writeback = stat->nr_writeback;
__entry->nr_congested = stat->nr_congested;
__entry->nr_immediate = stat->nr_immediate;
- __entry->nr_activate0 = stat->nr_activate[0];
- __entry->nr_activate1 = stat->nr_activate[1];
+ __entry->nr_activate_anon = stat->nr_activate[0];
+ __entry->nr_activate_file = stat->nr_activate[1];
__entry->nr_ref_keep = stat->nr_ref_keep;
__entry->nr_unmap_fail = stat->nr_unmap_fail;
__entry->priority = priority;
@@ -377,7 +377,7 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
__entry->nr_scanned, __entry->nr_reclaimed,
__entry->nr_dirty, __entry->nr_writeback,
__entry->nr_congested, __entry->nr_immediate,
- __entry->nr_activate0, __entry->nr_activate1,
+ __entry->nr_activate_anon, __entry->nr_activate_file,
__entry->nr_ref_keep, __entry->nr_unmap_fail,
__entry->priority,
show_reclaim_flags(__entry->reclaim_flags))