Skip to content

Commit f31c766

Browse files
Lion AckermannSherryYang1
authored andcommitted
net/sched: Always pass notifications when child class becomes empty
[ Upstream commit 103406b38c600fec1fe375a77b27d87e314aea09 ] Certain classful qdiscs may invoke their classes' dequeue handler on an enqueue operation. This may unexpectedly empty the child qdisc and thus make an in-flight class passive via qlen_notify(). Most qdiscs do not expect such behaviour at this point in time and may re-activate the class eventually anyways which will lead to a use-after-free. The referenced fix commit attempted to fix this behavior for the HFSC case by moving the backlog accounting around, though this turned out to be incomplete since the parent's parent may run into the issue too. The following reproducer demonstrates this use-after-free: tc qdisc add dev lo root handle 1: drr tc filter add dev lo parent 1: basic classid 1:1 tc class add dev lo parent 1: classid 1:1 drr tc qdisc add dev lo parent 1:1 handle 2: hfsc def 1 tc class add dev lo parent 2: classid 2:1 hfsc rt m1 8 d 1 m2 0 tc qdisc add dev lo parent 2:1 handle 3: netem tc qdisc add dev lo parent 3:1 handle 4: blackhole echo 1 | socat -u STDIN UDP4-DATAGRAM:127.0.0.1:8888 tc class delete dev lo classid 1:1 echo 1 | socat -u STDIN UDP4-DATAGRAM:127.0.0.1:8888 Since backlog accounting issues leading to a use-after-frees on stale class pointers is a recurring pattern at this point, this patch takes a different approach. Instead of trying to fix the accounting, the patch ensures that qdisc_tree_reduce_backlog always calls qlen_notify when the child qdisc is empty. This solves the problem because deletion of qdiscs always involves a call to qdisc_reset() and / or qdisc_purge_queue() which ultimately resets its qlen to 0 thus causing the following qdisc_tree_reduce_backlog() to report to the parent. Note that this may call qlen_notify on passive classes multiple times. This is not a problem after the recent patch series that made all the classful qdiscs qlen_notify() handlers idempotent. Fixes: 3f98113 ("sch_hfsc: Fix qlen accounting bug when using peek in hfsc_enqueue()") Signed-off-by: Lion Ackermann <nnamrec@gmail.com> Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com> Acked-by: Cong Wang <xiyou.wangcong@gmail.com> Acked-by: Jamal Hadi Salim <jhs@mojatatu.com> Link: https://patch.msgid.link/d912cbd7-193b-4269-9857-525bee8bbb6a@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> (cherry picked from commit 3b290923ad2b23596208c1e29520badef4356a43) FOF: 0825 Signed-off-by: Sherry Yang <sherry.yang@oracle.com>
1 parent 2d76a4a commit f31c766

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

net/sched/sch_api.c

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -758,15 +758,12 @@ static u32 qdisc_alloc_handle(struct net_device *dev)
758758

759759
void qdisc_tree_reduce_backlog(struct Qdisc *sch, int n, int len)
760760
{
761-
bool qdisc_is_offloaded = sch->flags & TCQ_F_OFFLOADED;
762761
const struct Qdisc_class_ops *cops;
763762
unsigned long cl;
764763
u32 parentid;
765764
bool notify;
766765
int drops;
767766

768-
if (n == 0 && len == 0)
769-
return;
770767
drops = max_t(int, n, 0);
771768
rcu_read_lock();
772769
while ((parentid = sch->parent)) {
@@ -775,17 +772,8 @@ void qdisc_tree_reduce_backlog(struct Qdisc *sch, int n, int len)
775772

776773
if (sch->flags & TCQ_F_NOPARENT)
777774
break;
778-
/* Notify parent qdisc only if child qdisc becomes empty.
779-
*
780-
* If child was empty even before update then backlog
781-
* counter is screwed and we skip notification because
782-
* parent class is already passive.
783-
*
784-
* If the original child was offloaded then it is allowed
785-
* to be seem as empty, so the parent is notified anyway.
786-
*/
787-
notify = !sch->q.qlen && !WARN_ON_ONCE(!n &&
788-
!qdisc_is_offloaded);
775+
/* Notify parent qdisc only if child qdisc becomes empty. */
776+
notify = !sch->q.qlen;
789777
/* TODO: perform the search on a per txq basis */
790778
sch = qdisc_lookup(qdisc_dev(sch), TC_H_MAJ(parentid));
791779
if (sch == NULL) {
@@ -794,6 +782,9 @@ void qdisc_tree_reduce_backlog(struct Qdisc *sch, int n, int len)
794782
}
795783
cops = sch->ops->cl_ops;
796784
if (notify && cops->qlen_notify) {
785+
/* Note that qlen_notify must be idempotent as it may get called
786+
* multiple times.
787+
*/
797788
cl = cops->find(sch, parentid);
798789
cops->qlen_notify(sch, cl);
799790
}

0 commit comments

Comments
 (0)