mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 23:58:05 +00:00
net: sched: fix static key imbalance in case of ingress/clsact_init error
[ Upstream commitb59e6979a8
] Move static key increments to the beginning of the init function so they pair 1:1 with decrements in ingress/clsact_destroy, which is called in case ingress/clsact_init fails. Fixes:6529eaba33
("net: sched: introduce tcf block infractructure") Signed-off-by: Jiri Pirko <jiri@mellanox.com> Acked-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
215b69e208
commit
1129573044
1 changed files with 5 additions and 4 deletions
|
@ -59,11 +59,12 @@ static int ingress_init(struct Qdisc *sch, struct nlattr *opt)
|
|||
struct net_device *dev = qdisc_dev(sch);
|
||||
int err;
|
||||
|
||||
net_inc_ingress_queue();
|
||||
|
||||
err = tcf_block_get(&q->block, &dev->ingress_cl_list);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
net_inc_ingress_queue();
|
||||
sch->flags |= TCQ_F_CPUSTATS;
|
||||
|
||||
return 0;
|
||||
|
@ -153,6 +154,9 @@ static int clsact_init(struct Qdisc *sch, struct nlattr *opt)
|
|||
struct net_device *dev = qdisc_dev(sch);
|
||||
int err;
|
||||
|
||||
net_inc_ingress_queue();
|
||||
net_inc_egress_queue();
|
||||
|
||||
err = tcf_block_get(&q->ingress_block, &dev->ingress_cl_list);
|
||||
if (err)
|
||||
return err;
|
||||
|
@ -161,9 +165,6 @@ static int clsact_init(struct Qdisc *sch, struct nlattr *opt)
|
|||
if (err)
|
||||
return err;
|
||||
|
||||
net_inc_ingress_queue();
|
||||
net_inc_egress_queue();
|
||||
|
||||
sch->flags |= TCQ_F_CPUSTATS;
|
||||
|
||||
return 0;
|
||||
|
|
Loading…
Reference in a new issue