tracing/stat: fixes, cleanups
cover tracing/stat: fixes, cleanups
Hi,
Here are the latest histogram tracing core updates. Those are about output fixes, memory leak fixes and code clarity.
Thanks,
Frederic.
The following changes since commit 53059c9b67a62a3dc8c80204d3da42b9267ea5a0:
Frederic Weisbecker (1):
tracing/stat: replace linked list by an rbtree for sorting
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git tracing/stat
Li Zefan (3):
tracing/stat: change dummpy_cmp() to return -1 tracing/stat: remember to free root node tracing/stat: do some cleanups
kernel/trace/trace_stat.c | 60 ++++++++++++++++++--------------------------- 1 files changed, 24 insertions(+), 36 deletions(-)
PATCH 1/3 tracing/stat: change dummpy_cmp() to return -1
From: Li Zefan <[email protected]>
Currently the output of trace_stat/workqueues is totally reversed:
# cat /debug/tracing/trace_stat/workqueues
...
1 17 17 210 37 `-blk_unplug_work+0x0/0x57
1 3779 3779 181 11 |-cfq_kick_queue+0x0/0x2f
1 3796 3796 kblockd/1:120
...The correct output should be:
1 3796 3796 kblockd/1:120
1 3779 3779 181 11 |-cfq_kick_queue+0x0/0x2f
1 17 17 210 37 `-blk_unplug_work+0x0/0x57It's caused by "tracing/stat: replace linked list by an rbtree for sorting"
(53059c9b67a62a3dc8c80204d3da42b9267ea5a0).
dummpy_cmp() should return -1, so rb_node will always be inserted as right-most node in the rbtree, thus we sort the output in ascending order.
[ Impact: fix the output of trace_stat/workqueues ]
--- kernel/trace/trace_stat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/trace/trace_stat.c +1 -1
@@ -127,7 +127,7 @@ insert_stat(struct rb_root *root, struct stat_node *data, cmp_stat_t cmp)*/ static int dummy_cmp (void *p1,void *p2) { -return 1 ; +return -1 ; }/*
Signature · 1 line
1.6.2.3
PATCH 2/3 tracing/stat: remember to free root node
In reply to Frederic WeisbeckerFrom: Li Zefan <[email protected]>
When closing a trace_stat file, we destroy the rbtree constructed during file open, but there is memory leak that the root node is not freed.
[ Impact: fix memory leak when closing a trace_stat file ]
--- kernel/trace/trace_stat.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
kernel/trace/trace_stat.c +2 -2
@@ -60,8 +60,8 @@ static struct rb_node *release_next(struct rb_node *node)return node->rb_right; else {if (!parent) -return NULL ; -if (parent->rb_left == node) + ; +else if (parent->rb_left == node) parent->rb_left =NULL ;else parent->rb_right =NULL ;
Signature · 1 line
1.6.2.3
PATCH 3/3 tracing/stat: do some cleanups
In reply to Frederic WeisbeckerFrom: Li Zefan <[email protected]>
- remove duplicate code in stat_seq_init()
- update comments to reflect the change from stat list to stat rbtree
[ Impact: clean up ]
--- kernel/trace/trace_stat.c | 54 +++++++++++++++++--------------------------- 1 files changed, 21 insertions(+), 33 deletions(-)
kernel/trace/trace_stat.c +21 -33
@@ -93,10 +93,15 @@ static void destroy_session(struct stat_session *session)typedef int (*cmp_stat_t )(void *,void *); -static void -insert_stat (struct rb_root *root,struct stat_node *data,cmp_stat_t cmp) +static int insert_stat (struct rb_root *root,void *stat,cmp_stat_t cmp) {struct rb_node **new = &(root->rb_node), *parent =NULL ; +struct stat_node *data; + + data =kzalloc (sizeof (*data),GFP_KERNEL ); +if (!data) +return -ENOMEM ; + data->stat = stat;/* * Figure out where to put new node
@@ -118,12 +123,13 @@ insert_stat(struct rb_root *root, struct stat_node *data, cmp_stat_t cmp)rb_link_node (&data->node, parent, new);rb_insert_color (&data->node, root); +return 0 ; }/* * For tracers that don't provide a stat_cmp callback. -* This one will force an immediate insertion on tail of -* the list. +* This one will force an insertion as right-most node +* in the rbtree. */ static int dummy_cmp (void *p1,void *p2) {
@@ -131,15 +137,14 @@ static int dummy_cmp(void *p1, void *p2) }/* -* Initialize the stat list at each trace_stat file opening. +* Initialize the stat rbtree at each trace_stat file opening. * All of these copies and sorting are required on all opening * since the stats could have changed between two file sessions. */ static int stat_seq_init (struct stat_session *session) {struct tracer_stat *ts = session->ts; -struct stat_node *new_entry; -struct rb_root *root; +struct rb_root *root = &session->stat_root;void *stat;int ret =0 ;int i;
@@ -154,23 +159,12 @@ static int stat_seq_init(struct stat_session *session)if (!stat) goto exit; -/* -* The first entry. Actually this is the second, but the first -* one (the stat_list head) is pointless. -*/ - new_entry =kzalloc (sizeof (*new_entry),GFP_KERNEL ); -if (!new_entry) { - ret = -ENOMEM ; + ret =insert_stat (root, stat, ts->stat_cmp); +if (ret) goto exit; - } - root = &session->stat_root; -insert_stat (root, new_entry, dummy_cmp); - - new_entry->stat = stat;/* -* Iterate over the tracer stat entries and store them in a sorted -* list. +* Iterate over the tracer stat entries and store them in an rbtree. */ for (i =1 ; ; i++) { stat = ts->stat_next (stat, i);
@@ -179,22 +173,16 @@ static int stat_seq_init(struct stat_session *session)if (!stat)break ; - new_entry =kzalloc (sizeof (*new_entry),GFP_KERNEL ); -if (!new_entry) { - ret = -ENOMEM ; - goto exit_free_list; - } - - new_entry->stat = stat; - -insert_stat (root, new_entry, ts->stat_cmp); + ret =insert_stat (root, stat, ts->stat_cmp); +if (ret) + goto exit_free_rbtree; } exit:mutex_unlock (&session->stat_mutex);return ret; -exit_free_list: +exit_free_rbtree:reset_stat_session (session);mutex_unlock (&session->stat_mutex);return ret;
@@ -207,7 +195,7 @@ static void *stat_seq_start(struct seq_file *s, loff_t *pos)struct rb_node *node;int i; -/* Prevent from tracer switch or stat_list modification */ +/* Prevent from tracer switch or rbtree modification */ mutex_lock (&session->stat_mutex);/* If we are in the beginning of the file, print the headers */
@@ -285,7 +273,7 @@ static int tracing_stat_open(struct inode *inode, struct file *file) }/* -* Avoid consuming memory with our now useless list. +* Avoid consuming memory with our now useless rbtree. */ static int tracing_stat_release (struct inode *i,struct file *f) {
Signature · 1 line
1.6.2.3