1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
|
From b531d492d5ef1cf9dba0f4888eb5fd8624a6d762 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@nbd.name>
Date: Fri, 7 Jul 2017 17:23:42 +0200
Subject: net: sched: switch default qdisc from pfifo_fast to fq_codel and remove pfifo_fast
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
net/sched/sch_generic.c | 140 ------------------------------------------------
1 file changed, 140 deletions(-)
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -600,207 +600,6 @@ struct Qdisc_ops noqueue_qdisc_ops __rea
.owner = THIS_MODULE,
};
-static const u8 prio2band[TC_PRIO_MAX + 1] = {
- 1, 2, 2, 2, 1, 2, 0, 0 , 1, 1, 1, 1, 1, 1, 1, 1
-};
-
-/* 3-band FIFO queue: old style, but should be a bit faster than
- generic prio+fifo combination.
- */
-
-#define PFIFO_FAST_BANDS 3
-
-/*
- * Private data for a pfifo_fast scheduler containing:
- * - rings for priority bands
- */
-struct pfifo_fast_priv {
- struct skb_array q[PFIFO_FAST_BANDS];
-};
-
-static inline struct skb_array *band2list(struct pfifo_fast_priv *priv,
- int band)
-{
- return &priv->q[band];
-}
-
-static int pfifo_fast_enqueue(struct sk_buff *skb, struct Qdisc *qdisc,
- struct sk_buff **to_free)
-{
- int band = prio2band[skb->priority & TC_PRIO_MAX];
- struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
- struct skb_array *q = band2list(priv, band);
- unsigned int pkt_len = qdisc_pkt_len(skb);
- int err;
-
- err = skb_array_produce(q, skb);
-
- if (unlikely(err))
- return qdisc_drop_cpu(skb, qdisc, to_free);
-
- qdisc_qstats_atomic_qlen_inc(qdisc);
- /* Note: skb can not be used after skb_array_produce(),
- * so we better not use qdisc_qstats_cpu_backlog_inc()
- */
- this_cpu_add(qdisc->cpu_qstats->backlog, pkt_len);
- return NET_XMIT_SUCCESS;
-}
-
-static struct sk_buff *pfifo_fast_dequeue(struct Qdisc *qdisc)
-{
- struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
- struct sk_buff *skb = NULL;
- int band;
-
- for (band = 0; band < PFIFO_FAST_BANDS && !skb; band++) {
- struct skb_array *q = band2list(priv, band);
-
- if (__skb_array_empty(q))
- continue;
-
- skb = __skb_array_consume(q);
- }
- if (likely(skb)) {
- qdisc_qstats_cpu_backlog_dec(qdisc, skb);
- qdisc_bstats_cpu_update(qdisc, skb);
- qdisc_qstats_atomic_qlen_dec(qdisc);
- }
-
- return skb;
-}
-
-static struct sk_buff *pfifo_fast_peek(struct Qdisc *qdisc)
-{
- struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
- struct sk_buff *skb = NULL;
- int band;
-
- for (band = 0; band < PFIFO_FAST_BANDS && !skb; band++) {
- struct skb_array *q = band2list(priv, band);
-
- skb = __skb_array_peek(q);
- }
-
- return skb;
-}
-
-static void pfifo_fast_reset(struct Qdisc *qdisc)
-{
- int i, band;
- struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
-
- for (band = 0; band < PFIFO_FAST_BANDS; band++) {
- struct skb_array *q = band2list(priv, band);
- struct sk_buff *skb;
-
- /* NULL ring is possible if destroy path is due to a failed
- * skb_array_init() in pfifo_fast_init() case.
- */
- if (!q->ring.queue)
- continue;
-
- while ((skb = __skb_array_consume(q)) != NULL)
- kfree_skb(skb);
- }
-
- for_each_possible_cpu(i) {
- struct gnet_stats_queue *q = per_cpu_ptr(qdisc->cpu_qstats, i);
-
- q->backlog = 0;
- }
-}
-
-static int pfifo_fast_dump(struct Qdisc *qdisc, struct sk_buff *skb)
-{
- struct tc_prio_qopt opt = { .bands = PFIFO_FAST_BANDS };
-
- memcpy(&opt.priomap, prio2band, TC_PRIO_MAX + 1);
- if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt))
- goto nla_put_failure;
- return skb->len;
-
-nla_put_failure:
- return -1;
-}
-
-static int pfifo_fast_init(struct Qdisc *qdisc, struct nlattr *opt,
- struct netlink_ext_ack *extack)
-{
- unsigned int qlen = qdisc_dev(qdisc)->tx_queue_len;
- struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
- int prio;
-
- /* guard against zero length rings */
- if (!qlen)
- return -EINVAL;
-
- for (prio = 0; prio < PFIFO_FAST_BANDS; prio++) {
- struct skb_array *q = band2list(priv, prio);
- int err;
-
- err = skb_array_init(q, qlen, GFP_KERNEL);
- if (err)
- return -ENOMEM;
- }
-
- /* Can by-pass the queue discipline */
- qdisc->flags |= TCQ_F_CAN_BYPASS;
- return 0;
-}
-
-static void pfifo_fast_destroy(struct Qdisc *sch)
-{
- struct pfifo_fast_priv *priv = qdisc_priv(sch);
- int prio;
-
- for (prio = 0; prio < PFIFO_FAST_BANDS; prio++) {
- struct skb_array *q = band2list(priv, prio);
-
- /* NULL ring is possible if destroy path is due to a failed
- * skb_array_init() in pfifo_fast_init() case.
- */
- if (!q->ring.queue)
- continue;
- /* Destroy ring but no need to kfree_skb because a call to
- * pfifo_fast_reset() has already done that work.
- */
- ptr_ring_cleanup(&q->ring, NULL);
- }
-}
-
-static int pfifo_fast_change_tx_queue_len(struct Qdisc *sch,
- unsigned int new_len)
-{
- struct pfifo_fast_priv *priv = qdisc_priv(sch);
- struct skb_array *bands[PFIFO_FAST_BANDS];
- int prio;
-
- for (prio = 0; prio < PFIFO_FAST_BANDS; prio++) {
- struct skb_array *q = band2list(priv, prio);
-
- bands[prio] = q;
- }
-
- return skb_array_resize_multiple(bands, PFIFO_FAST_BANDS, new_len,
- GFP_KERNEL);
-}
-
-struct Qdisc_ops pfifo_fast_ops __read_mostly = {
- .id = "pfifo_fast",
- .priv_size = sizeof(struct pfifo_fast_priv),
- .enqueue = pfifo_fast_enqueue,
- .dequeue = pfifo_fast_dequeue,
- .peek = pfifo_fast_peek,
- .init = pfifo_fast_init,
- .destroy = pfifo_fast_destroy,
- .reset = pfifo_fast_reset,
- .dump = pfifo_fast_dump,
- .change_tx_queue_len = pfifo_fast_change_tx_queue_len,
- .owner = THIS_MODULE,
- .static_flags = TCQ_F_NOLOCK | TCQ_F_CPUSTATS,
-};
-EXPORT_SYMBOL(pfifo_fast_ops);
-
static struct lock_class_key qdisc_tx_busylock;
static struct lock_class_key qdisc_running_key;
|
