Patch "net: sched: fix static key imbalance in case of ingress/clsact_init error" has been added to the 4.14-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
net: sched: fix static key imbalance in case of ingress/clsact_init error
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-sched-fix-static-key-imbalance-in-case-of-ingress-clsact_init-error.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Sun Dec 31 11:12:48 CET 2017
From: Jiri Pirko <[email protected]>
Date: Fri, 15 Dec 2017 12:40:13 +0100
Subject: net: sched: fix static key imbalance in case of ingress/clsact_init error
From: Jiri Pirko <[email protected]>
[ Upstream commit b59e6979a86384e68b0ab6ffeab11f0034fba82d ]
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.
--- net/sched/sch_ingress.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
net/sched/sch_ingress.c +5 -4
@@ -59,11 +59,12 @@ static int ingress_init(struct Qdisc *scstruct 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 *schstruct 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 *schif (err)return err; -net_inc_ingress_queue (); -net_inc_egress_queue (); - sch->flags |=TCQ_F_CPUSTATS ;return 0 ;
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/net-sched-fix-static-key-imbalance-in-case-of-ingress-clsact_init-error.patch queue-4.14/mlxsw-spectrum-disable-mac-learning-for-ovs-port.patch