[PATCH net 1/2] net/sched: Make cake_enqueue return NET_XMIT_CN when past buffer_limit

[PATCH net 1/2] net/sched: Make cake_enqueue return NET_XMIT_CN when past buffer_limit

[William Liu]

The following setup can trigger a WARNING in htb_activate due to
the condition: !cl->leaf.q->q.qlen

tc qdisc del dev lo root
tc qdisc add dev lo root handle 1: htb default 1
tc class add dev lo parent 1: classid 1:1 \
       htb rate 64bit
tc qdisc add dev lo parent 1:1 handle f: \
       cake memlimit 1b
ping -I lo -f -c1 -s64 -W0.001 127.0.0.1

This is because the low memlimit leads to a low buffer_limit, which
causes packet dropping. However, cake_enqueue still returns
NET_XMIT_SUCCESS, causing htb_enqueue to call htb_activate with an
empty child qdisc.

I do not believe return value of NET_XMIT_CN is necessary for packet
drops in the case of ack filtering, as that is meant to optimize
performance, not to signal congestion.

Fixes: 046f6fd5daef ("sched: Add Common Applications Kept Enhanced (cake) qdisc")
Signed-off-by: William Liu <will@willsroot.io>
Reviewed-by: Savino Dicanosa <savy@syst3mfailure.io>
---
 net/sched/sch_cake.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c
index dbcfb948c867..40814449f17a 100644
--- a/net/sched/sch_cake.c
+++ b/net/sched/sch_cake.c
@@ -1934,6 +1934,9 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch,
 			cake_drop(sch, to_free);
 		}
 		b->drop_overlimit += dropped;
+
+		if (dropped)
+			return NET_XMIT_CN;
 	}
 	return NET_XMIT_SUCCESS;
 }
-- 
2.43.0

[PATCH net 2/2] net/sched: Remove unnecessary WARNING condition for empty child qdisc in htb_activate

[William Liu]

The WARN_ON trigger based on !cl->leaf.q->q.qlen is unnecessary in
htb_activate. htb_dequeue_tree already accounts for that scenario.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: William Liu <will@willsroot.io>
Reviewed-by: Savino Dicanosa <savy@syst3mfailure.io>
---
 net/sched/sch_htb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index c968ea763774..b5e40c51655a 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -592,7 +592,7 @@ htb_change_class_mode(struct htb_sched *q, struct htb_class *cl, s64 *diff)
  */
 static inline void htb_activate(struct htb_sched *q, struct htb_class *cl)
 {
-	WARN_ON(cl->level || !cl->leaf.q || !cl->leaf.q->q.qlen);
+	WARN_ON(cl->level || !cl->leaf.q);
 
 	if (!cl->prio_activity) {
 		cl->prio_activity = 1 << cl->prio;
-- 
2.43.0

Re: [PATCH net 1/2] net/sched: Make cake_enqueue return NET_XMIT_CN when past buffer_limit

[Toke Høiland-Jørgensen]

William Liu <will@willsroot.io> writes:

> The following setup can trigger a WARNING in htb_activate due to
> the condition: !cl->leaf.q->q.qlen
>
> tc qdisc del dev lo root
> tc qdisc add dev lo root handle 1: htb default 1
> tc class add dev lo parent 1: classid 1:1 \
>        htb rate 64bit
> tc qdisc add dev lo parent 1:1 handle f: \
>        cake memlimit 1b
> ping -I lo -f -c1 -s64 -W0.001 127.0.0.1
>
> This is because the low memlimit leads to a low buffer_limit, which
> causes packet dropping. However, cake_enqueue still returns
> NET_XMIT_SUCCESS, causing htb_enqueue to call htb_activate with an
> empty child qdisc.
>
> I do not believe return value of NET_XMIT_CN is necessary for packet
> drops in the case of ack filtering, as that is meant to optimize
> performance, not to signal congestion.
>
> Fixes: 046f6fd5daef ("sched: Add Common Applications Kept Enhanced (cake) qdisc")
> Signed-off-by: William Liu <will@willsroot.io>
> Reviewed-by: Savino Dicanosa <savy@syst3mfailure.io>
> ---
>  net/sched/sch_cake.c | 3 +++
>  1 file changed, 3 i
> nsertions(+)
>
> diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c
> index dbcfb948c867..40814449f17a 100644
> --- a/net/sched/sch_cake.c
> +++ b/net/sched/sch_cake.c
> @@ -1934,6 +1934,9 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch,
>  			cake_drop(sch, to_free);
>  		}
>  		b->drop_overlimit += dropped;
> +
> +		if (dropped)
> +			return NET_XMIT_CN;

cake_drop() may drop from a different flow, so we can't unconditionally
return NET_XMIT_CN. We'll have to check the return code of cake_drop()
and only return NET_XMIT_CN if it's the same flow we just enqueued a
packet to (which is also what fq_codel does, BTW).

-Toke