Patch "net_sch: red: Fix the new offload indication" has been added to the 4.15-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
net_sch: red: Fix the new offload indication
to the 4.15-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_sch-red-fix-the-new-offload-indication.patch
and it can be found in the queue-4.15 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 Mon Apr 9 10:16:32 CEST 2018
From: Nogah Frankel <[email protected]>
Date: Mon, 25 Dec 2017 10:51:41 +0200
Subject: net_sch: red: Fix the new offload indication
From: Nogah Frankel <[email protected]>
[ Upstream commit 8234af2db3614d78b49e77ef46ea8cfab6586568 ]
Update the offload flag, TCQ_F_OFFLOADED, in each dump call (and ignore the offloading function return value in relation to this flag). This is done because a qdisc is being initialized, and therefore offloaded before being grafted. Since the ability of the driver to offload the qdisc depends on its location, a qdisc can be offloaded and un-offloaded by graft calls, that doesn't effect the qdisc itself.
--- net/sched/sch_red.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)
net/sched/sch_red.c +14 -12
@@ -157,7 +157,6 @@ static int red_offload(struct Qdisc *sch .handle = sch->handle, .parent = sch->parent, }; -int err;if (!tc_can_offload (dev) || !dev->netdev_ops->ndo_setup_tc)return -EOPNOTSUPP ;
@@ -172,14 +171,7 @@ static int red_offload(struct Qdisc *sch opt.command =TC_RED_DESTROY ; } - err = dev->netdev_ops->ndo_setup_tc (dev,TC_SETUP_QDISC_RED , &opt); - -if (!err && enable) - sch->flags |=TCQ_F_OFFLOADED ; -else - sch->flags &= ~TCQ_F_OFFLOADED ; - -return err; +return dev->netdev_ops->ndo_setup_tc (dev,TC_SETUP_QDISC_RED , &opt); }static void red_destroy (struct Qdisc *sch)
@@ -294,12 +286,22 @@ static int red_dump_offload_stats(struct .stats.qstats = &sch->qstats, }, }; +int err; + + sch->flags &= ~TCQ_F_OFFLOADED ; -if (!(sch->flags &TCQ_F_OFFLOADED )) +if (!tc_can_offload (dev) || !dev->netdev_ops->ndo_setup_tc) +return 0 ; + + err = dev->netdev_ops->ndo_setup_tc (dev,TC_SETUP_QDISC_RED , + &hw_stats); +if (err == -EOPNOTSUPP )return 0 ; -return dev->netdev_ops->ndo_setup_tc (dev,TC_SETUP_QDISC_RED , - &hw_stats); +if (!err) + sch->flags |=TCQ_F_OFFLOADED ; + +return err; }static int red_dump (struct Qdisc *sch,struct sk_buff *skb)
Patches currently in stable-queue which might be from [email protected] are
queue-4.15/net_sch-red-fix-the-new-offload-indication.patch