net_sched: sch_fq: ensure maxrate fq parameter applies to EDT flows (08e14fe4) · Commits · 戴 / test

When EDT conversion happened, fq lost the ability to enfore a maxrate for all flows. It kept it for non EDT flows. This commit restores the functionality. Tested: tc qd replace dev eth0 root fq maxrate 500Mbit netperf -P0 -H host -- -O THROUGHPUT 489.75 Fixes: ("tcp: switch tcp and sch_fq to new earliest departure time model") Signed-off-by:

Eric Dumazet <edumazet@google.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/sched/sch_fq.c

+19 −12

Original line number	Diff line number	Diff line
		@@ -469,23 +469,30 @@ begin:
		goto begin;
		}
		prefetch(&skb->end);
		f->credit -= qdisc_pkt_len(skb);
		plen = qdisc_pkt_len(skb);
		f->credit -= plen;

		if (ktime_to_ns(skb->tstamp) \|\| !q->rate_enable)
		if (!q->rate_enable)
		goto out;

		rate = q->flow_max_rate;

		/* If EDT time was provided for this skb, we need to
		* update f->time_next_packet only if this qdisc enforces
		* a flow max rate.
		*/
		if (!skb->tstamp) {
		if (skb->sk)
		rate = min(skb->sk->sk_pacing_rate, rate);

		if (rate <= q->low_rate_threshold) {
		f->credit = 0;
		plen = qdisc_pkt_len(skb);
		} else {
		plen = max(qdisc_pkt_len(skb), q->quantum);
		plen = max(plen, q->quantum);
		if (f->credit > 0)
		goto out;
		}
		}
		if (rate != ~0UL) {
		u64 len = (u64)plen * NSEC_PER_SEC;

Admin message