Skip to content

Commit 77ddaff

Browse files
dtahtdavem330
authored andcommitted
fq_codel: Kill useless per-flow dropped statistic
It is almost impossible to get anything other than a 0 out of flow->dropped statistic with a tc class dump, as it resets to 0 on every round. It also conflates ecn marks with drops. It would have been useful had it kept a cumulative drop count, but it doesn't. This patch doesn't change the API, it just stops tracking a stat and state that is impossible to measure and nobody uses. Signed-off-by: Dave Taht <dave.taht@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent ae697f3 commit 77ddaff

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

net/sched/sch_fq_codel.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ struct fq_codel_flow {
4545
struct sk_buff *tail;
4646
struct list_head flowchain;
4747
int deficit;
48-
u32 dropped; /* number of drops (or ECN marks) on this flow */
4948
struct codel_vars cvars;
5049
}; /* please try to keep this structure <= 64 bytes */
5150

@@ -175,7 +174,6 @@ static unsigned int fq_codel_drop(struct Qdisc *sch, unsigned int max_packets,
175174

176175
/* Tell codel to increase its signal strength also */
177176
flow->cvars.count += i;
178-
flow->dropped += i;
179177
q->backlogs[idx] -= len;
180178
q->memory_usage -= mem;
181179
sch->qstats.drops += i;
@@ -213,7 +211,6 @@ static int fq_codel_enqueue(struct sk_buff *skb, struct Qdisc *sch,
213211
list_add_tail(&flow->flowchain, &q->new_flows);
214212
q->new_flow_count++;
215213
flow->deficit = q->quantum;
216-
flow->dropped = 0;
217214
}
218215
get_codel_cb(skb)->mem_usage = skb->truesize;
219216
q->memory_usage += get_codel_cb(skb)->mem_usage;
@@ -312,9 +309,6 @@ static struct sk_buff *fq_codel_dequeue(struct Qdisc *sch)
312309
&flow->cvars, &q->cstats, qdisc_pkt_len,
313310
codel_get_enqueue_time, drop_func, dequeue_func);
314311

315-
flow->dropped += q->cstats.drop_count - prev_drop_count;
316-
flow->dropped += q->cstats.ecn_mark - prev_ecn_mark;
317-
318312
if (!skb) {
319313
/* force a pass through old_flows to prevent starvation */
320314
if ((head == &q->new_flows) && !list_empty(&q->old_flows))
@@ -660,7 +654,7 @@ static int fq_codel_dump_class_stats(struct Qdisc *sch, unsigned long cl,
660654
sch_tree_unlock(sch);
661655
}
662656
qs.backlog = q->backlogs[idx];
663-
qs.drops = flow->dropped;
657+
qs.drops = 0;
664658
}
665659
if (gnet_stats_copy_queue(d, NULL, &qs, qs.qlen) < 0)
666660
return -1;

0 commit comments

Comments
 (0)