taskstats: factor out reply assembling
PATCH 1/2 taskstats: factor out reply assembling
Introduce mk_reply() helper which does all nla_put()s on reply.
Saves 453 bytes and a preparation for the next patch.
taskstats.c | 55 ++++++++++++++++++++++++++++--------------------------- 1 files changed, 28 insertions(+), 27 deletions(-)
kernel/taskstats.c renamed from kernel/taskstats.c~5_factor +28 -27
@@ -348,6 +348,25 @@ static int parse(struct nlattr *na, cpumreturn ret; } +static int mk_reply (struct sk_buff *skb,int type,u32 pid,struct taskstats *stats) +{ +struct nlattr *na; +int aggr; + + aggr =TASKSTATS_TYPE_AGGR_TGID ; +if (type ==TASKSTATS_TYPE_PID ) + aggr =TASKSTATS_TYPE_AGGR_PID ; + + na =nla_nest_start (skb, aggr); +NLA_PUT_U32 (skb, type, pid); + NLA_PUT_TYPE(skb, struct taskstats, TASKSTATS_TYPE_STATS, *stats); +nla_nest_end (skb, na); + +return 0 ; +nla_put_failure: +return -1 ; +} +static int taskstats_user_cmd (struct sk_buff *skb,struct genl_info *info) {int rc =0 ;
@@ -355,7 +374,6 @@ static int taskstats_user_cmd(struct sk_struct taskstats stats;void *reply;size_t size; -struct nlattr *na;cpumask_t mask; rc =parse (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK ], &mask);
@@ -387,27 +405,21 @@ static int taskstats_user_cmd(struct sk_if (rc <0 ) goto err; - na =nla_nest_start (rep_skb,TASKSTATS_TYPE_AGGR_PID ); -NLA_PUT_U32 (rep_skb,TASKSTATS_TYPE_PID , pid); - NLA_PUT_TYPE(rep_skb, struct taskstats, TASKSTATS_TYPE_STATS, - stats); +if (mk_reply (rep_skb,TASKSTATS_TYPE_PID , pid, &stats)) + goto nla_put_failure; }else if (info->attrs[TASKSTATS_CMD_ATTR_TGID ]) {u32 tgid =nla_get_u32 (info->attrs[TASKSTATS_CMD_ATTR_TGID ]); rc =fill_tgid (tgid,NULL , &stats);if (rc <0 ) goto err; - na =nla_nest_start (rep_skb,TASKSTATS_TYPE_AGGR_TGID ); -NLA_PUT_U32 (rep_skb,TASKSTATS_TYPE_TGID , tgid); - NLA_PUT_TYPE(rep_skb, struct taskstats, TASKSTATS_TYPE_STATS, - stats); +if (mk_reply (rep_skb,TASKSTATS_TYPE_TGID , tgid, &stats)) + goto nla_put_failure; }else { rc = -EINVAL ; goto err; } -nla_nest_end (rep_skb, na); -return send_reply (rep_skb, info->snd_pid); nla_put_failure:
@@ -451,7 +463,6 @@ void taskstats_exit(struct task_struct *void *reply;size_t size;int is_thread_group; -struct nlattr *na;if (!family_registered)return ;
@@ -486,27 +497,17 @@ void taskstats_exit(struct task_struct *if (rc <0 ) goto err_skb; - na =nla_nest_start (rep_skb,TASKSTATS_TYPE_AGGR_PID ); -NLA_PUT_U32 (rep_skb,TASKSTATS_TYPE_PID , (u32 )tsk->pid); - NLA_PUT_TYPE(rep_skb, struct taskstats, TASKSTATS_TYPE_STATS, - *tidstats); -nla_nest_end (rep_skb, na); - -if (!is_thread_group) - goto send; +if (mk_reply (rep_skb,TASKSTATS_TYPE_PID , tsk->pid, tidstats)) + goto nla_put_failure;/* * Doesn't matter if tsk is the leader or the last group member leaving */ -if (!group_dead) +if (!is_thread_group || !group_dead) goto send; - na =nla_nest_start (rep_skb,TASKSTATS_TYPE_AGGR_TGID ); -NLA_PUT_U32 (rep_skb,TASKSTATS_TYPE_TGID , (u32 )tsk->tgid); -/* No locking needed for tsk->signal->stats since group is dead */ - NLA_PUT_TYPE(rep_skb, struct taskstats, TASKSTATS_TYPE_STATS, - *tsk->signal->stats); -nla_nest_end (rep_skb, na); +if (mk_reply (rep_skb,TASKSTATS_TYPE_TGID , tsk->tgid, tsk->signal->stats)) + goto nla_put_failure; send:send_cpu_listeners (rep_skb, listeners);
Quoted 5 lines · Oleg Nesterov
Introduce
mk_reply()helper which does all nla_put()s on reply.Saves 453 bytes and a preparation for the next patch.
Signed-off-by Oleg Nesterov <[email protected]>
Quoted 114 lines
taskstats.c | 55 ++++++++++++++++++++++++++++--------------------------- 1 files changed, 28 insertions(+), 27 deletions(-)kernel/taskstats.c renamed from kernel/taskstats.c~5_factor +28
-27@@ -348,6 +348,25 @@ static int parse(struct nlattr *na, cpumreturn ret; } +static int mk_reply (struct sk_buff *skb,int type,u32 pid,struct taskstats *stats) +{ +struct nlattr *na; +int aggr; + + aggr =TASKSTATS_TYPE_AGGR_TGID ; +if (type ==TASKSTATS_TYPE_PID ) + aggr =TASKSTATS_TYPE_AGGR_PID ; + + na =nla_nest_start (skb, aggr); +NLA_PUT_U32 (skb, type, pid); + NLA_PUT_TYPE(skb, struct taskstats, TASKSTATS_TYPE_STATS, *stats); +nla_nest_end (skb, na); + +return 0 ; +nla_put_failure: +return -1 ; +} +static int taskstats_user_cmd (struct sk_buff *skb,struct genl_info *info) {int rc =0 ;@@ -355,7 +374,6 @@ static int taskstats_user_cmd(struct sk_struct taskstats stats;void *reply;size_t size; -struct nlattr *na;cpumask_t mask; rc =parse (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK ], &mask);@@ -387,27 +405,21 @@ static int taskstats_user_cmd(struct sk_if (rc <0 ) goto err; - na =nla_nest_start (rep_skb,TASKSTATS_TYPE_AGGR_PID ); -NLA_PUT_U32 (rep_skb,TASKSTATS_TYPE_PID , pid); - NLA_PUT_TYPE(rep_skb, struct taskstats, TASKSTATS_TYPE_STATS, - stats); +if (mk_reply (rep_skb,TASKSTATS_TYPE_PID , pid, &stats)) + goto nla_put_failure; }else if (info->attrs[TASKSTATS_CMD_ATTR_TGID ]) {u32 tgid =nla_get_u32 (info->attrs[TASKSTATS_CMD_ATTR_TGID ]); rc =fill_tgid (tgid,NULL , &stats);if (rc <0 ) goto err; - na =nla_nest_start (rep_skb,TASKSTATS_TYPE_AGGR_TGID ); -NLA_PUT_U32 (rep_skb,TASKSTATS_TYPE_TGID , tgid); - NLA_PUT_TYPE(rep_skb, struct taskstats, TASKSTATS_TYPE_STATS, - stats); +if (mk_reply (rep_skb,TASKSTATS_TYPE_TGID , tgid, &stats)) + goto nla_put_failure; }else { rc = -EINVAL ; goto err; } -nla_nest_end (rep_skb, na); -return send_reply (rep_skb, info->snd_pid); nla_put_failure:@@ -451,7 +463,6 @@ void taskstats_exit(struct task_struct *void *reply;size_t size;int is_thread_group; -struct nlattr *na;if (!family_registered)return ;@@ -486,27 +497,17 @@ void taskstats_exit(struct task_struct *if (rc <0 ) goto err_skb; - na =nla_nest_start (rep_skb,TASKSTATS_TYPE_AGGR_PID ); -NLA_PUT_U32 (rep_skb,TASKSTATS_TYPE_PID , (u32 )tsk->pid); - NLA_PUT_TYPE(rep_skb, struct taskstats, TASKSTATS_TYPE_STATS, - *tidstats); -nla_nest_end (rep_skb, na); - -if (!is_thread_group) - goto send; +if (mk_reply (rep_skb,TASKSTATS_TYPE_PID , tsk->pid, tidstats)) + goto nla_put_failure;/* * Doesn't matter if tsk is the leader or the last group member leaving */ -if (!group_dead) +if (!is_thread_group || !group_dead) goto send; - na =nla_nest_start (rep_skb,TASKSTATS_TYPE_AGGR_TGID ); -NLA_PUT_U32 (rep_skb,TASKSTATS_TYPE_TGID , (u32 )tsk->tgid); -/* No locking needed for tsk->signal->stats since group is dead */ - NLA_PUT_TYPE(rep_skb, struct taskstats, TASKSTATS_TYPE_STATS, - *tsk->signal->stats); -nla_nest_end (rep_skb, na); +if (mk_reply (rep_skb,TASKSTATS_TYPE_TGID , tsk->tgid, tsk->signal->stats)) + goto nla_put_failure; send:send_cpu_listeners (rep_skb, listeners);
Quoted 24 lines · Oleg Nesterov
Introduce
mk_reply()helper which does all nla_put()s on reply.Saves 453 bytes and a preparation for the next patch.
Signed-off-by Oleg Nesterov <[email protected]>taskstats.c | 55 ++++++++++++++++++++++++++++--------------------------- 1 files changed, 28 insertions(+), 27 deletions(-)kernel/taskstats.c renamed from kernel/taskstats.c~5_factor +9
-0@@ -348,6 +348,25 @@ static int parse(struct nlattr *na, cpumreturn ret; } +static int mk_reply (struct sk_buff *skb,int type,u32 pid,struct taskstats *stats) +{ +struct nlattr *na; +int aggr; + + aggr =TASKSTATS_TYPE_AGGR_TGID ; +if (type ==TASKSTATS_TYPE_PID ) + aggr =TASKSTATS_TYPE_AGGR_PID ; +
kernel/taskstats.c static int parse(struct nlattr *na, cpum · line 369
Quoted 10 lines
kernel/taskstats.c renamed from kernel/taskstats.c~5_factor +10
-0+ na =nla_nest_start (skb, aggr); +NLA_PUT_U32 (skb, type, pid); + NLA_PUT_TYPE(skb, struct taskstats, TASKSTATS_TYPE_STATS, *stats); +nla_nest_end (skb, na); + +return 0 ; +nla_put_failure: +return -1 ; +} +
How about using
aggr = (type == TASKSTATS_TYPE_PID) ? TASKSTATS_TYPE_AGGR_PID :
TASKSTATS_TYPE_AGGR_TGID;
Quoted 75 lines
kernel/taskstats.c renamed from kernel/taskstats.c~5_factor +7
-22static int taskstats_user_cmd (struct sk_buff *skb,struct genl_info *info) {int rc =0 ;@@ -355,7 +374,6 @@ static int taskstats_user_cmd(struct sk_struct taskstats stats;void *reply;size_t size; -struct nlattr *na;cpumask_t mask; rc =parse (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK ], &mask);@@ -387,27 +405,21 @@ static int taskstats_user_cmd(struct sk_if (rc <0 ) goto err; - na =nla_nest_start (rep_skb,TASKSTATS_TYPE_AGGR_PID ); -NLA_PUT_U32 (rep_skb,TASKSTATS_TYPE_PID , pid); - NLA_PUT_TYPE(rep_skb, struct taskstats, TASKSTATS_TYPE_STATS, - stats); +if (mk_reply (rep_skb,TASKSTATS_TYPE_PID , pid, &stats)) + goto nla_put_failure; }else if (info->attrs[TASKSTATS_CMD_ATTR_TGID ]) {u32 tgid =nla_get_u32 (info->attrs[TASKSTATS_CMD_ATTR_TGID ]); rc =fill_tgid (tgid,NULL , &stats);if (rc <0 ) goto err; - na =nla_nest_start (rep_skb,TASKSTATS_TYPE_AGGR_TGID ); -NLA_PUT_U32 (rep_skb,TASKSTATS_TYPE_TGID , tgid); - NLA_PUT_TYPE(rep_skb, struct taskstats, TASKSTATS_TYPE_STATS, - stats); +if (mk_reply (rep_skb,TASKSTATS_TYPE_TGID , tgid, &stats)) + goto nla_put_failure; }else { rc = -EINVAL ; goto err; } -nla_nest_end (rep_skb, na); -return send_reply (rep_skb, info->snd_pid); nla_put_failure:@@ -451,7 +463,6 @@ void taskstats_exit(struct task_struct *void *reply;size_t size;int is_thread_group; -struct nlattr *na;if (!family_registered)return ;@@ -486,27 +497,17 @@ void taskstats_exit(struct task_struct *if (rc <0 ) goto err_skb; - na =nla_nest_start (rep_skb,TASKSTATS_TYPE_AGGR_PID ); -NLA_PUT_U32 (rep_skb,TASKSTATS_TYPE_PID , (u32 )tsk->pid); - NLA_PUT_TYPE(rep_skb, struct taskstats, TASKSTATS_TYPE_STATS, - *tidstats); -nla_nest_end (rep_skb, na); - -if (!is_thread_group) - goto send; +if (mk_reply (rep_skb,TASKSTATS_TYPE_PID , tsk->pid, tidstats)) + goto nla_put_failure;/* * Doesn't matter if tsk is the leader or the last group member leaving */ -if (!group_dead) +if (!is_thread_group || !group_dead) goto send; - na =nla_nest_start (rep_skb,TASKSTATS_TYPE_AGGR_TGID );
kernel/taskstats.c void taskstats_exit(struct task_struct * · line 513
Quoted 10 lines
kernel/taskstats.c renamed from kernel/taskstats.c~5_factor +2
-5-NLA_PUT_U32 (rep_skb,TASKSTATS_TYPE_TGID , (u32 )tsk->tgid); -/* No locking needed for tsk->signal->stats since group is dead */ - NLA_PUT_TYPE(rep_skb, struct taskstats, TASKSTATS_TYPE_STATS, - *tsk->signal->stats); -nla_nest_end (rep_skb, na); +if (mk_reply (rep_skb,TASKSTATS_TYPE_TGID , tsk->tgid, tsk->signal->stats)) + goto nla_put_failure; send:send_cpu_listeners (rep_skb, listeners);
Looks good!
Signature · 3 lines
Balbir Singh, Linux Technology Center, IBM Software Labs
* Oleg Nesterov <[email protected]> 2006-11-01 21:26
Quoted 23 lines
Introduce
mk_reply()helper which does all nla_put()s on reply.Saves 453 bytes and a preparation for the next patch.
Signed-off-by Oleg Nesterov <[email protected]>taskstats.c | 55 ++++++++++++++++++++++++++++--------------------------- 1 files changed, 28 insertions(+), 27 deletions(-)kernel/taskstats.c renamed from kernel/taskstats.c~5_factor +8
-0@@ -348,6 +348,25 @@ static int parse(struct nlattr *na, cpumreturn ret; } +static int mk_reply (struct sk_buff *skb,int type,u32 pid,struct taskstats *stats) +{ +struct nlattr *na; +int aggr; + + aggr =TASKSTATS_TYPE_AGGR_TGID ; +if (type ==TASKSTATS_TYPE_PID ) + aggr =TASKSTATS_TYPE_AGGR_PID ;
kernel/taskstats.c static int parse(struct nlattr *na, cpum · line 368
Quoted 10 lines
kernel/taskstats.c renamed from kernel/taskstats.c~5_factor +10
-0+ + na =nla_nest_start (skb, aggr); +NLA_PUT_U32 (skb, type, pid); + NLA_PUT_TYPE(skb, struct taskstats, TASKSTATS_TYPE_STATS, *stats); +nla_nest_end (skb, na); + +return 0 ; +nla_put_failure: +return -1 ; +}
nla_nest_start() may return NULL, either rely on prepare_reply() to be correct and BUG() on failure or do proper error handling for all functions.
Quoted 16 lines · Thomas Graf
* Oleg Nesterov <[email protected]> 2006-11-01 21:26
Quoted 15 lines
Introduce
mk_reply()helper which does all nla_put()s on reply.Saves 453 bytes and a preparation for the next patch.
Signed-off-by Oleg Nesterov <[email protected]>taskstats.c | 55 ++++++++++++++++++++++++++++--------------------------- 1 files changed, 28 insertions(+), 27 deletions(-)kernel/taskstats.c renamed from kernel/taskstats.c~5_factor +0
-0@@ -348,6 +348,25 @@ static int parse(struct nlattr *na, cpumreturn ret; }
Quoted 10 lines
kernel/taskstats.c static int parse(struct nlattr *na, cpum · line 360
Quoted 10 lines
kernel/taskstats.c renamed from kernel/taskstats.c~5_factor +10
-0+static int mk_reply (struct sk_buff *skb,int type,u32 pid,struct taskstats *stats) +{ +struct nlattr *na; +int aggr; + + aggr =TASKSTATS_TYPE_AGGR_TGID ; +if (type ==TASKSTATS_TYPE_PID ) + aggr =TASKSTATS_TYPE_AGGR_PID ; + + na =nla_nest_start (skb, aggr);
if (!na) goto nla_put_failure;
Quoted 4 lines
Quoted 4 lines
kernel/taskstats.c renamed from kernel/taskstats.c~5_factor +4
-0+NLA_PUT_U32 (skb, type, pid); + NLA_PUT_TYPE(skb, struct taskstats, TASKSTATS_TYPE_STATS, *stats); +nla_nest_end (skb, na); +
Quoted 8 lines
kernel/taskstats.c static int parse(struct nlattr *na, cpum · line 368
Quoted 4 lines
kernel/taskstats.c renamed from kernel/taskstats.c~5_factor +4
-0+return 0 ; +nla_put_failure: +return -1 ; +}
nla_nest_start()may return NULL, either rely onprepare_reply()to be correct andBUG()on failure or do proper error handling for all functions.
Thanks for catching that bug which was present in the unrefactored code. The error path from prepare_reply() which generates the skb is being handled already.
But as you point out, nla_nest_start failure, unlike those of the NLA_PUT_* macros, isn't handled by having a nla_put_failure label alone. So we'll need to add something like the above since we certainly don't want a BUG() on failure !
Thanks,
Shailabh
Quoted 11 lines · Balbir Singh
kernel/taskstats.c static int parse(struct nlattr *na, cpum · line 358
Quoted 4 lines · Oleg Nesterov
kernel/taskstats.c renamed from kernel/taskstats.c~5_factor +4
-0+ + aggr =TASKSTATS_TYPE_AGGR_TGID ; +if (type ==TASKSTATS_TYPE_PID ) + aggr =TASKSTATS_TYPE_AGGR_PID ;How about using
aggr = (type ==
TASKSTATS_TYPE_PID) ?TASKSTATS_TYPE_AGGR_PID:TASKSTATS_TYPE_AGGR_TGID;
I personally think this is much better. In fact, i did exactly same, but then changed it because (I think) CodingStyle police doesn't like '?:'.
Or it does?
Oleg.
Quoted 11 lines · Oleg Nesterov
Quoted 9 lines · Balbir Singh
kernel/taskstats.c static int parse(struct nlattr *na, cpum · line 358
Quoted 4 lines · Oleg Nesterov
kernel/taskstats.c renamed from kernel/taskstats.c~5_factor +4
-0+ + aggr =TASKSTATS_TYPE_AGGR_TGID ; +if (type ==TASKSTATS_TYPE_PID ) + aggr =TASKSTATS_TYPE_AGGR_PID ;How about using
aggr = (type ==
TASKSTATS_TYPE_PID) ?TASKSTATS_TYPE_AGGR_PID:TASKSTATS_TYPE_AGGR_TGID;
Quoted 7 lines
I personally think this is much better. In fact, i did exactly same, but then changed it because (I think) CodingStyle police doesn't like '?:'.
Or it does?
Oleg.
There is an issue with double assignment if the type is TASKSTATS_TYPE_PID most of the time. I see the '?' operator in several places in the code.
Signature · 3 lines
Balbir Singh, Linux Technology Center, IBM Software Labs