1 // SPDX-License-Identifier: GPL-2.0-or-later <<
2 /* 1 /*
3 * net/sched/sch_htb.c Hierarchical token buc 2 * net/sched/sch_htb.c Hierarchical token bucket, feed tree version
4 * 3 *
>> 4 * This program is free software; you can redistribute it and/or
>> 5 * modify it under the terms of the GNU General Public License
>> 6 * as published by the Free Software Foundation; either version
>> 7 * 2 of the License, or (at your option) any later version.
>> 8 *
5 * Authors: Martin Devera, <devik@cdi.cz> 9 * Authors: Martin Devera, <devik@cdi.cz>
6 * 10 *
7 * Credits (in time order) for older HTB versi 11 * Credits (in time order) for older HTB versions:
8 * Stef Coene <stef.coene@docum.o 12 * Stef Coene <stef.coene@docum.org>
9 * HTB support at LARTC m 13 * HTB support at LARTC mailing list
10 * Ondrej Kraus, <krauso@barr.cz> 14 * Ondrej Kraus, <krauso@barr.cz>
11 * found missing INIT_QDI 15 * found missing INIT_QDISC(htb)
12 * Vladimir Smelhaus, Aamer Akhte 16 * Vladimir Smelhaus, Aamer Akhter, Bert Hubert
13 * helped a lot to locate 17 * helped a lot to locate nasty class stall bug
14 * Andi Kleen, Jamal Hadi, Bert H 18 * Andi Kleen, Jamal Hadi, Bert Hubert
15 * code review and helpfu 19 * code review and helpful comments on shaping
16 * Tomasz Wrona, <tw@eter.tym.pl> 20 * Tomasz Wrona, <tw@eter.tym.pl>
17 * created test case so t 21 * created test case so that I was able to fix nasty bug
18 * Wilfried Weissmann 22 * Wilfried Weissmann
19 * spotted bug in dequeue 23 * spotted bug in dequeue code and helped with fix
20 * Jiri Fojtasek 24 * Jiri Fojtasek
21 * fixed requeue routine 25 * fixed requeue routine
22 * and many others. thanks. 26 * and many others. thanks.
23 */ 27 */
24 #include <linux/module.h> 28 #include <linux/module.h>
25 #include <linux/moduleparam.h> 29 #include <linux/moduleparam.h>
26 #include <linux/types.h> 30 #include <linux/types.h>
27 #include <linux/kernel.h> 31 #include <linux/kernel.h>
28 #include <linux/string.h> 32 #include <linux/string.h>
29 #include <linux/errno.h> 33 #include <linux/errno.h>
30 #include <linux/skbuff.h> 34 #include <linux/skbuff.h>
31 #include <linux/list.h> 35 #include <linux/list.h>
32 #include <linux/compiler.h> 36 #include <linux/compiler.h>
33 #include <linux/rbtree.h> 37 #include <linux/rbtree.h>
34 #include <linux/workqueue.h> 38 #include <linux/workqueue.h>
35 #include <linux/slab.h> 39 #include <linux/slab.h>
36 #include <net/netlink.h> 40 #include <net/netlink.h>
37 #include <net/sch_generic.h> 41 #include <net/sch_generic.h>
38 #include <net/pkt_sched.h> 42 #include <net/pkt_sched.h>
39 #include <net/pkt_cls.h> <<
40 43
41 /* HTB algorithm. 44 /* HTB algorithm.
42 Author: devik@cdi.cz 45 Author: devik@cdi.cz
43 ========================================== 46 ========================================================================
44 HTB is like TBF with multiple classes. It 47 HTB is like TBF with multiple classes. It is also similar to CBQ because
45 it allows to assign priority to each class 48 it allows to assign priority to each class in hierarchy.
46 In fact it is another implementation of Fl 49 In fact it is another implementation of Floyd's formal sharing.
47 50
48 Levels: 51 Levels:
49 Each class is assigned level. Leaf has ALW 52 Each class is assigned level. Leaf has ALWAYS level 0 and root
50 classes have level TC_HTB_MAXDEPTH-1. Inte 53 classes have level TC_HTB_MAXDEPTH-1. Interior nodes has level
51 one less than their parent. 54 one less than their parent.
52 */ 55 */
53 56
54 static int htb_hysteresis __read_mostly = 0; / 57 static int htb_hysteresis __read_mostly = 0; /* whether to use mode hysteresis for speedup */
55 #define HTB_VER 0x30011 /* major must !! 58 #define HTB_VER 0x30011 /* major must be matched with number suplied by TC as version */
56 59
57 #if HTB_VER >> 16 != TC_HTB_PROTOVER 60 #if HTB_VER >> 16 != TC_HTB_PROTOVER
58 #error "Mismatched sch_htb.c and pkt_sch.h" 61 #error "Mismatched sch_htb.c and pkt_sch.h"
59 #endif 62 #endif
60 63
61 /* Module parameter and sysfs export */ 64 /* Module parameter and sysfs export */
62 module_param (htb_hysteresis, int, 0640); 65 module_param (htb_hysteresis, int, 0640);
63 MODULE_PARM_DESC(htb_hysteresis, "Hysteresis m 66 MODULE_PARM_DESC(htb_hysteresis, "Hysteresis mode, less CPU load, less accurate");
64 67
65 static int htb_rate_est = 0; /* htb classes ha 68 static int htb_rate_est = 0; /* htb classes have a default rate estimator */
66 module_param(htb_rate_est, int, 0640); 69 module_param(htb_rate_est, int, 0640);
67 MODULE_PARM_DESC(htb_rate_est, "setup a defaul 70 MODULE_PARM_DESC(htb_rate_est, "setup a default rate estimator (4sec 16sec) for htb classes");
68 71
69 /* used internaly to keep status of single cla 72 /* used internaly to keep status of single class */
70 enum htb_cmode { 73 enum htb_cmode {
71 HTB_CANT_SEND, /* class can't 74 HTB_CANT_SEND, /* class can't send and can't borrow */
72 HTB_MAY_BORROW, /* class can't 75 HTB_MAY_BORROW, /* class can't send but may borrow */
73 HTB_CAN_SEND /* class can s 76 HTB_CAN_SEND /* class can send */
74 }; 77 };
75 78
76 struct htb_prio { 79 struct htb_prio {
77 union { 80 union {
78 struct rb_root row; 81 struct rb_root row;
79 struct rb_root feed; 82 struct rb_root feed;
80 }; 83 };
81 struct rb_node *ptr; 84 struct rb_node *ptr;
82 /* When class changes from state 1->2 85 /* When class changes from state 1->2 and disconnects from
83 * parent's feed then we lost ptr valu 86 * parent's feed then we lost ptr value and start from the
84 * first child again. Here we store cl 87 * first child again. Here we store classid of the
85 * last valid ptr (used when ptr is NU 88 * last valid ptr (used when ptr is NULL).
86 */ 89 */
87 u32 last_ptr_id; 90 u32 last_ptr_id;
88 }; 91 };
89 92
90 /* interior & leaf nodes; props specific to le 93 /* interior & leaf nodes; props specific to leaves are marked L:
91 * To reduce false sharing, place mostly read 94 * To reduce false sharing, place mostly read fields at beginning,
92 * and mostly written ones at the end. 95 * and mostly written ones at the end.
93 */ 96 */
94 struct htb_class { 97 struct htb_class {
95 struct Qdisc_class_common common; 98 struct Qdisc_class_common common;
96 struct psched_ratecfg rate; 99 struct psched_ratecfg rate;
97 struct psched_ratecfg ceil; 100 struct psched_ratecfg ceil;
98 s64 buffer, cbuffe 101 s64 buffer, cbuffer;/* token bucket depth/rate */
99 s64 mbuffer; 102 s64 mbuffer; /* max wait time */
100 u32 prio; 103 u32 prio; /* these two are used only by leaves... */
101 int quantum; 104 int quantum; /* but stored for parent-to-leaf return */
102 105
103 struct tcf_proto __rcu *filter_list; 106 struct tcf_proto __rcu *filter_list; /* class attached filters */
104 struct tcf_block *block; !! 107 int filter_cnt;
>> 108 int refcnt; /* usage count of this class */
105 109
106 int level; 110 int level; /* our level (see above) */
107 unsigned int children; 111 unsigned int children;
108 struct htb_class *parent; 112 struct htb_class *parent; /* parent class */
109 113
110 struct net_rate_estimator __rcu *rate_ 114 struct net_rate_estimator __rcu *rate_est;
111 115
112 /* 116 /*
113 * Written often fields 117 * Written often fields
114 */ 118 */
115 struct gnet_stats_basic_sync bstats; !! 119 struct gnet_stats_basic_packed bstats;
116 struct gnet_stats_basic_sync bstats_bi <<
117 struct tc_htb_xstats xstats; /* our 120 struct tc_htb_xstats xstats; /* our special stats */
118 121
119 /* token bucket parameters */ 122 /* token bucket parameters */
120 s64 tokens, ctoken 123 s64 tokens, ctokens;/* current number of tokens */
121 s64 t_c; 124 s64 t_c; /* checkpoint time */
122 125
123 union { 126 union {
124 struct htb_class_leaf { 127 struct htb_class_leaf {
>> 128 struct list_head drop_list;
125 int defici 129 int deficit[TC_HTB_MAXDEPTH];
126 struct Qdisc *q; 130 struct Qdisc *q;
127 struct netdev_queue *o <<
128 } leaf; 131 } leaf;
129 struct htb_class_inner { 132 struct htb_class_inner {
130 struct htb_prio clprio 133 struct htb_prio clprio[TC_HTB_NUMPRIO];
131 } inner; 134 } inner;
132 }; !! 135 } un;
133 s64 pq_key; 136 s64 pq_key;
134 137
135 int prio_activity; 138 int prio_activity; /* for which prios are we active */
136 enum htb_cmode cmode; 139 enum htb_cmode cmode; /* current mode of the class */
137 struct rb_node pq_node; 140 struct rb_node pq_node; /* node for event queue */
138 struct rb_node node[TC_HTB_NU 141 struct rb_node node[TC_HTB_NUMPRIO]; /* node for self or feed tree */
139 142
140 unsigned int drops ____cacheline_align 143 unsigned int drops ____cacheline_aligned_in_smp;
141 unsigned int overlimits; <<
142 }; 144 };
143 145
144 struct htb_level { 146 struct htb_level {
145 struct rb_root wait_pq; 147 struct rb_root wait_pq;
146 struct htb_prio hprio[TC_HTB_NUMPRIO]; 148 struct htb_prio hprio[TC_HTB_NUMPRIO];
147 }; 149 };
148 150
149 struct htb_sched { 151 struct htb_sched {
150 struct Qdisc_class_hash clhash; 152 struct Qdisc_class_hash clhash;
151 int defcls; 153 int defcls; /* class where unclassified flows go to */
152 int rate2quantum; 154 int rate2quantum; /* quant = rate / rate2quantum */
153 155
154 /* filters for qdisc itself */ 156 /* filters for qdisc itself */
155 struct tcf_proto __rcu *filter_list; 157 struct tcf_proto __rcu *filter_list;
156 struct tcf_block *block; <<
157 158
158 #define HTB_WARN_TOOMANYEVENTS 0x1 159 #define HTB_WARN_TOOMANYEVENTS 0x1
159 unsigned int warned; /* onl 160 unsigned int warned; /* only one warning */
160 int direct_qlen; 161 int direct_qlen;
161 struct work_struct work; 162 struct work_struct work;
162 163
163 /* non shaped skbs; let them go direct 164 /* non shaped skbs; let them go directly thru */
164 struct qdisc_skb_head direct_queue; 165 struct qdisc_skb_head direct_queue;
165 u32 direct_pkts; !! 166 long direct_pkts;
166 u32 overlimits; <<
167 167
168 struct qdisc_watchdog watchdog; 168 struct qdisc_watchdog watchdog;
169 169
170 s64 now; /* cac 170 s64 now; /* cached dequeue time */
>> 171 struct list_head drops[TC_HTB_NUMPRIO];/* active leaves (for drops) */
171 172
172 /* time of nearest event per level (ro 173 /* time of nearest event per level (row) */
173 s64 near_ev_cache[ 174 s64 near_ev_cache[TC_HTB_MAXDEPTH];
174 175
175 int row_mask[TC_HT 176 int row_mask[TC_HTB_MAXDEPTH];
176 177
177 struct htb_level hlevel[TC_HTB_ 178 struct htb_level hlevel[TC_HTB_MAXDEPTH];
178 <<
179 struct Qdisc **direct_qdisc <<
180 unsigned int num_direct_qdi <<
181 <<
182 bool offload; <<
183 }; 179 };
184 180
185 /* find class in global hash table using given 181 /* find class in global hash table using given handle */
186 static inline struct htb_class *htb_find(u32 h 182 static inline struct htb_class *htb_find(u32 handle, struct Qdisc *sch)
187 { 183 {
188 struct htb_sched *q = qdisc_priv(sch); 184 struct htb_sched *q = qdisc_priv(sch);
189 struct Qdisc_class_common *clc; 185 struct Qdisc_class_common *clc;
190 186
191 clc = qdisc_class_find(&q->clhash, han 187 clc = qdisc_class_find(&q->clhash, handle);
192 if (clc == NULL) 188 if (clc == NULL)
193 return NULL; 189 return NULL;
194 return container_of(clc, struct htb_cl 190 return container_of(clc, struct htb_class, common);
195 } 191 }
196 192
197 static unsigned long htb_search(struct Qdisc * <<
198 { <<
199 return (unsigned long)htb_find(handle, <<
200 } <<
201 <<
202 #define HTB_DIRECT ((struct htb_class *)-1L) <<
203 <<
204 /** 193 /**
205 * htb_classify - classify a packet into class 194 * htb_classify - classify a packet into class
206 * @skb: the socket buffer <<
207 * @sch: the active queue discipline <<
208 * @qerr: pointer for returned status code <<
209 * 195 *
210 * It returns NULL if the packet should be dro 196 * It returns NULL if the packet should be dropped or -1 if the packet
211 * should be passed directly thru. In all othe 197 * should be passed directly thru. In all other cases leaf class is returned.
212 * We allow direct class selection by classid 198 * We allow direct class selection by classid in priority. The we examine
213 * filters in qdisc and in inner nodes (if hig 199 * filters in qdisc and in inner nodes (if higher filter points to the inner
214 * node). If we end up with classid MAJOR:0 we 200 * node). If we end up with classid MAJOR:0 we enqueue the skb into special
215 * internal fifo (direct). These packets then 201 * internal fifo (direct). These packets then go directly thru. If we still
216 * have no valid leaf we try to use MAJOR:defa 202 * have no valid leaf we try to use MAJOR:default leaf. It still unsuccessful
217 * then finish and return direct queue. 203 * then finish and return direct queue.
218 */ 204 */
>> 205 #define HTB_DIRECT ((struct htb_class *)-1L)
>> 206
219 static struct htb_class *htb_classify(struct s 207 static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch,
220 int *qer 208 int *qerr)
221 { 209 {
222 struct htb_sched *q = qdisc_priv(sch); 210 struct htb_sched *q = qdisc_priv(sch);
223 struct htb_class *cl; 211 struct htb_class *cl;
224 struct tcf_result res; 212 struct tcf_result res;
225 struct tcf_proto *tcf; 213 struct tcf_proto *tcf;
226 int result; 214 int result;
227 215
228 /* allow to select class by setting sk 216 /* allow to select class by setting skb->priority to valid classid;
229 * note that nfmark can be used too by 217 * note that nfmark can be used too by attaching filter fw with no
230 * rules in it 218 * rules in it
231 */ 219 */
232 if (skb->priority == sch->handle) 220 if (skb->priority == sch->handle)
233 return HTB_DIRECT; /* X:0 221 return HTB_DIRECT; /* X:0 (direct flow) selected */
234 cl = htb_find(skb->priority, sch); 222 cl = htb_find(skb->priority, sch);
235 if (cl) { 223 if (cl) {
236 if (cl->level == 0) 224 if (cl->level == 0)
237 return cl; 225 return cl;
238 /* Start with inner filter cha 226 /* Start with inner filter chain if a non-leaf class is selected */
239 tcf = rcu_dereference_bh(cl->f 227 tcf = rcu_dereference_bh(cl->filter_list);
240 } else { 228 } else {
241 tcf = rcu_dereference_bh(q->fi 229 tcf = rcu_dereference_bh(q->filter_list);
242 } 230 }
243 231
244 *qerr = NET_XMIT_SUCCESS | __NET_XMIT_ 232 *qerr = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
245 while (tcf && (result = tcf_classify(s !! 233 while (tcf && (result = tc_classify(skb, tcf, &res, false)) >= 0) {
246 #ifdef CONFIG_NET_CLS_ACT 234 #ifdef CONFIG_NET_CLS_ACT
247 switch (result) { 235 switch (result) {
248 case TC_ACT_QUEUED: 236 case TC_ACT_QUEUED:
249 case TC_ACT_STOLEN: 237 case TC_ACT_STOLEN:
250 case TC_ACT_TRAP: <<
251 *qerr = NET_XMIT_SUCCE 238 *qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
252 fallthrough; <<
253 case TC_ACT_SHOT: 239 case TC_ACT_SHOT:
254 return NULL; 240 return NULL;
255 } 241 }
256 #endif 242 #endif
257 cl = (void *)res.class; 243 cl = (void *)res.class;
258 if (!cl) { 244 if (!cl) {
259 if (res.classid == sch 245 if (res.classid == sch->handle)
260 return HTB_DIR 246 return HTB_DIRECT; /* X:0 (direct flow) */
261 cl = htb_find(res.clas 247 cl = htb_find(res.classid, sch);
262 if (!cl) 248 if (!cl)
263 break; /* fil 249 break; /* filter selected invalid classid */
264 } 250 }
265 if (!cl->level) 251 if (!cl->level)
266 return cl; /* we 252 return cl; /* we hit leaf; return it */
267 253
268 /* we have got inner class; ap 254 /* we have got inner class; apply inner filter chain */
269 tcf = rcu_dereference_bh(cl->f 255 tcf = rcu_dereference_bh(cl->filter_list);
270 } 256 }
271 /* classification failed; try to use d 257 /* classification failed; try to use default class */
272 cl = htb_find(TC_H_MAKE(TC_H_MAJ(sch-> 258 cl = htb_find(TC_H_MAKE(TC_H_MAJ(sch->handle), q->defcls), sch);
273 if (!cl || cl->level) 259 if (!cl || cl->level)
274 return HTB_DIRECT; /* bad 260 return HTB_DIRECT; /* bad default .. this is safe bet */
275 return cl; 261 return cl;
276 } 262 }
277 263
278 /** 264 /**
279 * htb_add_to_id_tree - adds class to the roun 265 * htb_add_to_id_tree - adds class to the round robin list
280 * @root: the root of the tree <<
281 * @cl: the class to add <<
282 * @prio: the give prio in class <<
283 * 266 *
284 * Routine adds class to the list (actually tr 267 * Routine adds class to the list (actually tree) sorted by classid.
285 * Make sure that class is not already on such 268 * Make sure that class is not already on such list for given prio.
286 */ 269 */
287 static void htb_add_to_id_tree(struct rb_root 270 static void htb_add_to_id_tree(struct rb_root *root,
288 struct htb_clas 271 struct htb_class *cl, int prio)
289 { 272 {
290 struct rb_node **p = &root->rb_node, * 273 struct rb_node **p = &root->rb_node, *parent = NULL;
291 274
292 while (*p) { 275 while (*p) {
293 struct htb_class *c; 276 struct htb_class *c;
294 parent = *p; 277 parent = *p;
295 c = rb_entry(parent, struct ht 278 c = rb_entry(parent, struct htb_class, node[prio]);
296 279
297 if (cl->common.classid > c->co 280 if (cl->common.classid > c->common.classid)
298 p = &parent->rb_right; 281 p = &parent->rb_right;
299 else 282 else
300 p = &parent->rb_left; 283 p = &parent->rb_left;
301 } 284 }
302 rb_link_node(&cl->node[prio], parent, 285 rb_link_node(&cl->node[prio], parent, p);
303 rb_insert_color(&cl->node[prio], root) 286 rb_insert_color(&cl->node[prio], root);
304 } 287 }
305 288
306 /** 289 /**
307 * htb_add_to_wait_tree - adds class to the ev 290 * htb_add_to_wait_tree - adds class to the event queue with delay
308 * @q: the priority event queue <<
309 * @cl: the class to add <<
310 * @delay: delay in microseconds <<
311 * 291 *
312 * The class is added to priority event queue 292 * The class is added to priority event queue to indicate that class will
313 * change its mode in cl->pq_key microseconds. 293 * change its mode in cl->pq_key microseconds. Make sure that class is not
314 * already in the queue. 294 * already in the queue.
315 */ 295 */
316 static void htb_add_to_wait_tree(struct htb_sc 296 static void htb_add_to_wait_tree(struct htb_sched *q,
317 struct htb_cl 297 struct htb_class *cl, s64 delay)
318 { 298 {
319 struct rb_node **p = &q->hlevel[cl->le 299 struct rb_node **p = &q->hlevel[cl->level].wait_pq.rb_node, *parent = NULL;
320 300
321 cl->pq_key = q->now + delay; 301 cl->pq_key = q->now + delay;
322 if (cl->pq_key == q->now) 302 if (cl->pq_key == q->now)
323 cl->pq_key++; 303 cl->pq_key++;
324 304
325 /* update the nearest event cache */ 305 /* update the nearest event cache */
326 if (q->near_ev_cache[cl->level] > cl-> 306 if (q->near_ev_cache[cl->level] > cl->pq_key)
327 q->near_ev_cache[cl->level] = 307 q->near_ev_cache[cl->level] = cl->pq_key;
328 308
329 while (*p) { 309 while (*p) {
330 struct htb_class *c; 310 struct htb_class *c;
331 parent = *p; 311 parent = *p;
332 c = rb_entry(parent, struct ht 312 c = rb_entry(parent, struct htb_class, pq_node);
333 if (cl->pq_key >= c->pq_key) 313 if (cl->pq_key >= c->pq_key)
334 p = &parent->rb_right; 314 p = &parent->rb_right;
335 else 315 else
336 p = &parent->rb_left; 316 p = &parent->rb_left;
337 } 317 }
338 rb_link_node(&cl->pq_node, parent, p); 318 rb_link_node(&cl->pq_node, parent, p);
339 rb_insert_color(&cl->pq_node, &q->hlev 319 rb_insert_color(&cl->pq_node, &q->hlevel[cl->level].wait_pq);
340 } 320 }
341 321
342 /** 322 /**
343 * htb_next_rb_node - finds next node in binar 323 * htb_next_rb_node - finds next node in binary tree
344 * @n: the current node in binary tree <<
345 * 324 *
346 * When we are past last key we return NULL. 325 * When we are past last key we return NULL.
347 * Average complexity is 2 steps per call. 326 * Average complexity is 2 steps per call.
348 */ 327 */
349 static inline void htb_next_rb_node(struct rb_ 328 static inline void htb_next_rb_node(struct rb_node **n)
350 { 329 {
351 *n = rb_next(*n); 330 *n = rb_next(*n);
352 } 331 }
353 332
354 /** 333 /**
355 * htb_add_class_to_row - add class to its row 334 * htb_add_class_to_row - add class to its row
356 * @q: the priority event queue <<
357 * @cl: the class to add <<
358 * @mask: the given priorities in class in bit <<
359 * 335 *
360 * The class is added to row at priorities mar 336 * The class is added to row at priorities marked in mask.
361 * It does nothing if mask == 0. 337 * It does nothing if mask == 0.
362 */ 338 */
363 static inline void htb_add_class_to_row(struct 339 static inline void htb_add_class_to_row(struct htb_sched *q,
364 struct 340 struct htb_class *cl, int mask)
365 { 341 {
366 q->row_mask[cl->level] |= mask; 342 q->row_mask[cl->level] |= mask;
367 while (mask) { 343 while (mask) {
368 int prio = ffz(~mask); 344 int prio = ffz(~mask);
369 mask &= ~(1 << prio); 345 mask &= ~(1 << prio);
370 htb_add_to_id_tree(&q->hlevel[ 346 htb_add_to_id_tree(&q->hlevel[cl->level].hprio[prio].row, cl, prio);
371 } 347 }
372 } 348 }
373 349
374 /* If this triggers, it is a bug in this code, 350 /* If this triggers, it is a bug in this code, but it need not be fatal */
375 static void htb_safe_rb_erase(struct rb_node * 351 static void htb_safe_rb_erase(struct rb_node *rb, struct rb_root *root)
376 { 352 {
377 if (RB_EMPTY_NODE(rb)) { 353 if (RB_EMPTY_NODE(rb)) {
378 WARN_ON(1); 354 WARN_ON(1);
379 } else { 355 } else {
380 rb_erase(rb, root); 356 rb_erase(rb, root);
381 RB_CLEAR_NODE(rb); 357 RB_CLEAR_NODE(rb);
382 } 358 }
383 } 359 }
384 360
385 361
386 /** 362 /**
387 * htb_remove_class_from_row - removes class f 363 * htb_remove_class_from_row - removes class from its row
388 * @q: the priority event queue <<
389 * @cl: the class to add <<
390 * @mask: the given priorities in class in bit <<
391 * 364 *
392 * The class is removed from row at priorities 365 * The class is removed from row at priorities marked in mask.
393 * It does nothing if mask == 0. 366 * It does nothing if mask == 0.
394 */ 367 */
395 static inline void htb_remove_class_from_row(s 368 static inline void htb_remove_class_from_row(struct htb_sched *q,
396 369 struct htb_class *cl, int mask)
397 { 370 {
398 int m = 0; 371 int m = 0;
399 struct htb_level *hlevel = &q->hlevel[ 372 struct htb_level *hlevel = &q->hlevel[cl->level];
400 373
401 while (mask) { 374 while (mask) {
402 int prio = ffz(~mask); 375 int prio = ffz(~mask);
403 struct htb_prio *hprio = &hlev 376 struct htb_prio *hprio = &hlevel->hprio[prio];
404 377
405 mask &= ~(1 << prio); 378 mask &= ~(1 << prio);
406 if (hprio->ptr == cl->node + p 379 if (hprio->ptr == cl->node + prio)
407 htb_next_rb_node(&hpri 380 htb_next_rb_node(&hprio->ptr);
408 381
409 htb_safe_rb_erase(cl->node + p 382 htb_safe_rb_erase(cl->node + prio, &hprio->row);
410 if (!hprio->row.rb_node) 383 if (!hprio->row.rb_node)
411 m |= 1 << prio; 384 m |= 1 << prio;
412 } 385 }
413 q->row_mask[cl->level] &= ~m; 386 q->row_mask[cl->level] &= ~m;
414 } 387 }
415 388
416 /** 389 /**
417 * htb_activate_prios - creates active classe' 390 * htb_activate_prios - creates active classe's feed chain
418 * @q: the priority event queue <<
419 * @cl: the class to activate <<
420 * 391 *
421 * The class is connected to ancestors and/or 392 * The class is connected to ancestors and/or appropriate rows
422 * for priorities it is participating on. cl-> 393 * for priorities it is participating on. cl->cmode must be new
423 * (activated) mode. It does nothing if cl->pr 394 * (activated) mode. It does nothing if cl->prio_activity == 0.
424 */ 395 */
425 static void htb_activate_prios(struct htb_sche 396 static void htb_activate_prios(struct htb_sched *q, struct htb_class *cl)
426 { 397 {
427 struct htb_class *p = cl->parent; 398 struct htb_class *p = cl->parent;
428 long m, mask = cl->prio_activity; 399 long m, mask = cl->prio_activity;
429 400
430 while (cl->cmode == HTB_MAY_BORROW && 401 while (cl->cmode == HTB_MAY_BORROW && p && mask) {
431 m = mask; 402 m = mask;
432 while (m) { 403 while (m) {
433 unsigned int prio = ff !! 404 int prio = ffz(~m);
434 <<
435 if (WARN_ON_ONCE(prio <<
436 break; <<
437 m &= ~(1 << prio); 405 m &= ~(1 << prio);
438 406
439 if (p->inner.clprio[pr !! 407 if (p->un.inner.clprio[prio].feed.rb_node)
440 /* parent alre 408 /* parent already has its feed in use so that
441 * reset bit i 409 * reset bit in mask as parent is already ok
442 */ 410 */
443 mask &= ~(1 << 411 mask &= ~(1 << prio);
444 412
445 htb_add_to_id_tree(&p- !! 413 htb_add_to_id_tree(&p->un.inner.clprio[prio].feed, cl, prio);
446 } 414 }
447 p->prio_activity |= mask; 415 p->prio_activity |= mask;
448 cl = p; 416 cl = p;
449 p = cl->parent; 417 p = cl->parent;
450 418
451 } 419 }
452 if (cl->cmode == HTB_CAN_SEND && mask) 420 if (cl->cmode == HTB_CAN_SEND && mask)
453 htb_add_class_to_row(q, cl, ma 421 htb_add_class_to_row(q, cl, mask);
454 } 422 }
455 423
456 /** 424 /**
457 * htb_deactivate_prios - remove class from fe 425 * htb_deactivate_prios - remove class from feed chain
458 * @q: the priority event queue <<
459 * @cl: the class to deactivate <<
460 * 426 *
461 * cl->cmode must represent old mode (before d 427 * cl->cmode must represent old mode (before deactivation). It does
462 * nothing if cl->prio_activity == 0. Class is 428 * nothing if cl->prio_activity == 0. Class is removed from all feed
463 * chains and rows. 429 * chains and rows.
464 */ 430 */
465 static void htb_deactivate_prios(struct htb_sc 431 static void htb_deactivate_prios(struct htb_sched *q, struct htb_class *cl)
466 { 432 {
467 struct htb_class *p = cl->parent; 433 struct htb_class *p = cl->parent;
468 long m, mask = cl->prio_activity; 434 long m, mask = cl->prio_activity;
469 435
470 while (cl->cmode == HTB_MAY_BORROW && 436 while (cl->cmode == HTB_MAY_BORROW && p && mask) {
471 m = mask; 437 m = mask;
472 mask = 0; 438 mask = 0;
473 while (m) { 439 while (m) {
474 int prio = ffz(~m); 440 int prio = ffz(~m);
475 m &= ~(1 << prio); 441 m &= ~(1 << prio);
476 442
477 if (p->inner.clprio[pr !! 443 if (p->un.inner.clprio[prio].ptr == cl->node + prio) {
478 /* we are remo 444 /* we are removing child which is pointed to from
479 * parent feed 445 * parent feed - forget the pointer but remember
480 * classid 446 * classid
481 */ 447 */
482 p->inner.clpri !! 448 p->un.inner.clprio[prio].last_ptr_id = cl->common.classid;
483 p->inner.clpri !! 449 p->un.inner.clprio[prio].ptr = NULL;
484 } 450 }
485 451
486 htb_safe_rb_erase(cl-> 452 htb_safe_rb_erase(cl->node + prio,
487 &p-> !! 453 &p->un.inner.clprio[prio].feed);
488 454
489 if (!p->inner.clprio[p !! 455 if (!p->un.inner.clprio[prio].feed.rb_node)
490 mask |= 1 << p 456 mask |= 1 << prio;
491 } 457 }
492 458
493 p->prio_activity &= ~mask; 459 p->prio_activity &= ~mask;
494 cl = p; 460 cl = p;
495 p = cl->parent; 461 p = cl->parent;
496 462
497 } 463 }
498 if (cl->cmode == HTB_CAN_SEND && mask) 464 if (cl->cmode == HTB_CAN_SEND && mask)
499 htb_remove_class_from_row(q, c 465 htb_remove_class_from_row(q, cl, mask);
500 } 466 }
501 467
502 static inline s64 htb_lowater(const struct htb 468 static inline s64 htb_lowater(const struct htb_class *cl)
503 { 469 {
504 if (htb_hysteresis) 470 if (htb_hysteresis)
505 return cl->cmode != HTB_CANT_S 471 return cl->cmode != HTB_CANT_SEND ? -cl->cbuffer : 0;
506 else 472 else
507 return 0; 473 return 0;
508 } 474 }
509 static inline s64 htb_hiwater(const struct htb 475 static inline s64 htb_hiwater(const struct htb_class *cl)
510 { 476 {
511 if (htb_hysteresis) 477 if (htb_hysteresis)
512 return cl->cmode == HTB_CAN_SE 478 return cl->cmode == HTB_CAN_SEND ? -cl->buffer : 0;
513 else 479 else
514 return 0; 480 return 0;
515 } 481 }
516 482
517 483
518 /** 484 /**
519 * htb_class_mode - computes and returns curre 485 * htb_class_mode - computes and returns current class mode
520 * @cl: the target class <<
521 * @diff: diff time in microseconds <<
522 * 486 *
523 * It computes cl's mode at time cl->t_c+diff 487 * It computes cl's mode at time cl->t_c+diff and returns it. If mode
524 * is not HTB_CAN_SEND then cl->pq_key is upda 488 * is not HTB_CAN_SEND then cl->pq_key is updated to time difference
525 * from now to time when cl will change its st 489 * from now to time when cl will change its state.
526 * Also it is worth to note that class mode do 490 * Also it is worth to note that class mode doesn't change simply
527 * at cl->{c,}tokens == 0 but there can rather 491 * at cl->{c,}tokens == 0 but there can rather be hysteresis of
528 * 0 .. -cl->{c,}buffer range. It is meant to 492 * 0 .. -cl->{c,}buffer range. It is meant to limit number of
529 * mode transitions per time unit. The speed g 493 * mode transitions per time unit. The speed gain is about 1/6.
530 */ 494 */
531 static inline enum htb_cmode 495 static inline enum htb_cmode
532 htb_class_mode(struct htb_class *cl, s64 *diff 496 htb_class_mode(struct htb_class *cl, s64 *diff)
533 { 497 {
534 s64 toks; 498 s64 toks;
535 499
536 if ((toks = (cl->ctokens + *diff)) < h 500 if ((toks = (cl->ctokens + *diff)) < htb_lowater(cl)) {
537 *diff = -toks; 501 *diff = -toks;
538 return HTB_CANT_SEND; 502 return HTB_CANT_SEND;
539 } 503 }
540 504
541 if ((toks = (cl->tokens + *diff)) >= h 505 if ((toks = (cl->tokens + *diff)) >= htb_hiwater(cl))
542 return HTB_CAN_SEND; 506 return HTB_CAN_SEND;
543 507
544 *diff = -toks; 508 *diff = -toks;
545 return HTB_MAY_BORROW; 509 return HTB_MAY_BORROW;
546 } 510 }
547 511
548 /** 512 /**
549 * htb_change_class_mode - changes classe's mo 513 * htb_change_class_mode - changes classe's mode
550 * @q: the priority event queue <<
551 * @cl: the target class <<
552 * @diff: diff time in microseconds <<
553 * 514 *
554 * This should be the only way how to change c 515 * This should be the only way how to change classe's mode under normal
555 * circumstances. Routine will update feed lis !! 516 * cirsumstances. Routine will update feed lists linkage, change mode
556 * and add class to the wait event queue if ap 517 * and add class to the wait event queue if appropriate. New mode should
557 * be different from old one and cl->pq_key ha 518 * be different from old one and cl->pq_key has to be valid if changing
558 * to mode other than HTB_CAN_SEND (see htb_ad 519 * to mode other than HTB_CAN_SEND (see htb_add_to_wait_tree).
559 */ 520 */
560 static void 521 static void
561 htb_change_class_mode(struct htb_sched *q, str 522 htb_change_class_mode(struct htb_sched *q, struct htb_class *cl, s64 *diff)
562 { 523 {
563 enum htb_cmode new_mode = htb_class_mo 524 enum htb_cmode new_mode = htb_class_mode(cl, diff);
564 525
565 if (new_mode == cl->cmode) 526 if (new_mode == cl->cmode)
566 return; 527 return;
567 528
568 if (new_mode == HTB_CANT_SEND) { <<
569 cl->overlimits++; <<
570 q->overlimits++; <<
571 } <<
572 <<
573 if (cl->prio_activity) { /* not 529 if (cl->prio_activity) { /* not necessary: speed optimization */
574 if (cl->cmode != HTB_CANT_SEND 530 if (cl->cmode != HTB_CANT_SEND)
575 htb_deactivate_prios(q 531 htb_deactivate_prios(q, cl);
576 cl->cmode = new_mode; 532 cl->cmode = new_mode;
577 if (new_mode != HTB_CANT_SEND) 533 if (new_mode != HTB_CANT_SEND)
578 htb_activate_prios(q, 534 htb_activate_prios(q, cl);
579 } else 535 } else
580 cl->cmode = new_mode; 536 cl->cmode = new_mode;
581 } 537 }
582 538
583 /** 539 /**
584 * htb_activate - inserts leaf cl into appropr 540 * htb_activate - inserts leaf cl into appropriate active feeds
585 * @q: the priority event queue <<
586 * @cl: the target class <<
587 * 541 *
588 * Routine learns (new) priority of leaf and a 542 * Routine learns (new) priority of leaf and activates feed chain
589 * for the prio. It can be called on already a 543 * for the prio. It can be called on already active leaf safely.
590 * It also adds leaf into droplist. 544 * It also adds leaf into droplist.
591 */ 545 */
592 static inline void htb_activate(struct htb_sch 546 static inline void htb_activate(struct htb_sched *q, struct htb_class *cl)
593 { 547 {
594 WARN_ON(cl->level || !cl->leaf.q || !c !! 548 WARN_ON(cl->level || !cl->un.leaf.q || !cl->un.leaf.q->q.qlen);
595 549
596 if (!cl->prio_activity) { 550 if (!cl->prio_activity) {
597 cl->prio_activity = 1 << cl->p 551 cl->prio_activity = 1 << cl->prio;
598 htb_activate_prios(q, cl); 552 htb_activate_prios(q, cl);
>> 553 list_add_tail(&cl->un.leaf.drop_list,
>> 554 q->drops + cl->prio);
599 } 555 }
600 } 556 }
601 557
602 /** 558 /**
603 * htb_deactivate - remove leaf cl from active 559 * htb_deactivate - remove leaf cl from active feeds
604 * @q: the priority event queue <<
605 * @cl: the target class <<
606 * 560 *
607 * Make sure that leaf is active. In the other 561 * Make sure that leaf is active. In the other words it can't be called
608 * with non-active leaf. It also removes class 562 * with non-active leaf. It also removes class from the drop list.
609 */ 563 */
610 static inline void htb_deactivate(struct htb_s 564 static inline void htb_deactivate(struct htb_sched *q, struct htb_class *cl)
611 { 565 {
612 WARN_ON(!cl->prio_activity); 566 WARN_ON(!cl->prio_activity);
613 567
614 htb_deactivate_prios(q, cl); 568 htb_deactivate_prios(q, cl);
615 cl->prio_activity = 0; 569 cl->prio_activity = 0;
>> 570 list_del_init(&cl->un.leaf.drop_list);
>> 571 }
>> 572
>> 573 static void htb_enqueue_tail(struct sk_buff *skb, struct Qdisc *sch,
>> 574 struct qdisc_skb_head *qh)
>> 575 {
>> 576 struct sk_buff *last = qh->tail;
>> 577
>> 578 if (last) {
>> 579 skb->next = NULL;
>> 580 last->next = skb;
>> 581 qh->tail = skb;
>> 582 } else {
>> 583 qh->tail = skb;
>> 584 qh->head = skb;
>> 585 }
>> 586 qh->qlen++;
616 } 587 }
617 588
618 static int htb_enqueue(struct sk_buff *skb, st 589 static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch,
619 struct sk_buff **to_fre 590 struct sk_buff **to_free)
620 { 591 {
621 int ret; !! 592 int uninitialized_var(ret);
622 unsigned int len = qdisc_pkt_len(skb); <<
623 struct htb_sched *q = qdisc_priv(sch); 593 struct htb_sched *q = qdisc_priv(sch);
624 struct htb_class *cl = htb_classify(sk 594 struct htb_class *cl = htb_classify(skb, sch, &ret);
625 595
626 if (cl == HTB_DIRECT) { 596 if (cl == HTB_DIRECT) {
627 /* enqueue to helper queue */ 597 /* enqueue to helper queue */
628 if (q->direct_queue.qlen < q-> 598 if (q->direct_queue.qlen < q->direct_qlen) {
629 __qdisc_enqueue_tail(s !! 599 htb_enqueue_tail(skb, sch, &q->direct_queue);
630 q->direct_pkts++; 600 q->direct_pkts++;
631 } else { 601 } else {
632 return qdisc_drop(skb, 602 return qdisc_drop(skb, sch, to_free);
633 } 603 }
634 #ifdef CONFIG_NET_CLS_ACT 604 #ifdef CONFIG_NET_CLS_ACT
635 } else if (!cl) { 605 } else if (!cl) {
636 if (ret & __NET_XMIT_BYPASS) 606 if (ret & __NET_XMIT_BYPASS)
637 qdisc_qstats_drop(sch) 607 qdisc_qstats_drop(sch);
638 __qdisc_drop(skb, to_free); 608 __qdisc_drop(skb, to_free);
639 return ret; 609 return ret;
640 #endif 610 #endif
641 } else if ((ret = qdisc_enqueue(skb, c !! 611 } else if ((ret = qdisc_enqueue(skb, cl->un.leaf.q,
642 to_fre 612 to_free)) != NET_XMIT_SUCCESS) {
643 if (net_xmit_drop_count(ret)) 613 if (net_xmit_drop_count(ret)) {
644 qdisc_qstats_drop(sch) 614 qdisc_qstats_drop(sch);
645 cl->drops++; 615 cl->drops++;
646 } 616 }
647 return ret; 617 return ret;
648 } else { 618 } else {
649 htb_activate(q, cl); 619 htb_activate(q, cl);
650 } 620 }
651 621
652 sch->qstats.backlog += len; !! 622 qdisc_qstats_backlog_inc(sch, skb);
653 sch->q.qlen++; 623 sch->q.qlen++;
654 return NET_XMIT_SUCCESS; 624 return NET_XMIT_SUCCESS;
655 } 625 }
656 626
657 static inline void htb_accnt_tokens(struct htb 627 static inline void htb_accnt_tokens(struct htb_class *cl, int bytes, s64 diff)
658 { 628 {
659 s64 toks = diff + cl->tokens; 629 s64 toks = diff + cl->tokens;
660 630
661 if (toks > cl->buffer) 631 if (toks > cl->buffer)
662 toks = cl->buffer; 632 toks = cl->buffer;
663 toks -= (s64) psched_l2t_ns(&cl->rate, 633 toks -= (s64) psched_l2t_ns(&cl->rate, bytes);
664 if (toks <= -cl->mbuffer) 634 if (toks <= -cl->mbuffer)
665 toks = 1 - cl->mbuffer; 635 toks = 1 - cl->mbuffer;
666 636
667 cl->tokens = toks; 637 cl->tokens = toks;
668 } 638 }
669 639
670 static inline void htb_accnt_ctokens(struct ht 640 static inline void htb_accnt_ctokens(struct htb_class *cl, int bytes, s64 diff)
671 { 641 {
672 s64 toks = diff + cl->ctokens; 642 s64 toks = diff + cl->ctokens;
673 643
674 if (toks > cl->cbuffer) 644 if (toks > cl->cbuffer)
675 toks = cl->cbuffer; 645 toks = cl->cbuffer;
676 toks -= (s64) psched_l2t_ns(&cl->ceil, 646 toks -= (s64) psched_l2t_ns(&cl->ceil, bytes);
677 if (toks <= -cl->mbuffer) 647 if (toks <= -cl->mbuffer)
678 toks = 1 - cl->mbuffer; 648 toks = 1 - cl->mbuffer;
679 649
680 cl->ctokens = toks; 650 cl->ctokens = toks;
681 } 651 }
682 652
683 /** 653 /**
684 * htb_charge_class - charges amount "bytes" t 654 * htb_charge_class - charges amount "bytes" to leaf and ancestors
685 * @q: the priority event queue <<
686 * @cl: the class to start iterate <<
687 * @level: the minimum level to account <<
688 * @skb: the socket buffer <<
689 * 655 *
690 * Routine assumes that packet "bytes" long wa 656 * Routine assumes that packet "bytes" long was dequeued from leaf cl
691 * borrowing from "level". It accounts bytes t 657 * borrowing from "level". It accounts bytes to ceil leaky bucket for
692 * leaf and all ancestors and to rate bucket f 658 * leaf and all ancestors and to rate bucket for ancestors at levels
693 * "level" and higher. It also handles possibl 659 * "level" and higher. It also handles possible change of mode resulting
694 * from the update. Note that mode can also in 660 * from the update. Note that mode can also increase here (MAY_BORROW to
695 * CAN_SEND) because we can use more precise c 661 * CAN_SEND) because we can use more precise clock that event queue here.
696 * In such case we remove class from event que 662 * In such case we remove class from event queue first.
697 */ 663 */
698 static void htb_charge_class(struct htb_sched 664 static void htb_charge_class(struct htb_sched *q, struct htb_class *cl,
699 int level, struct 665 int level, struct sk_buff *skb)
700 { 666 {
701 int bytes = qdisc_pkt_len(skb); 667 int bytes = qdisc_pkt_len(skb);
702 enum htb_cmode old_mode; 668 enum htb_cmode old_mode;
703 s64 diff; 669 s64 diff;
704 670
705 while (cl) { 671 while (cl) {
706 diff = min_t(s64, q->now - cl- 672 diff = min_t(s64, q->now - cl->t_c, cl->mbuffer);
707 if (cl->level >= level) { 673 if (cl->level >= level) {
708 if (cl->level == level 674 if (cl->level == level)
709 cl->xstats.len 675 cl->xstats.lends++;
710 htb_accnt_tokens(cl, b 676 htb_accnt_tokens(cl, bytes, diff);
711 } else { 677 } else {
712 cl->xstats.borrows++; 678 cl->xstats.borrows++;
713 cl->tokens += diff; 679 cl->tokens += diff; /* we moved t_c; update tokens */
714 } 680 }
715 htb_accnt_ctokens(cl, bytes, d 681 htb_accnt_ctokens(cl, bytes, diff);
716 cl->t_c = q->now; 682 cl->t_c = q->now;
717 683
718 old_mode = cl->cmode; 684 old_mode = cl->cmode;
719 diff = 0; 685 diff = 0;
720 htb_change_class_mode(q, cl, & 686 htb_change_class_mode(q, cl, &diff);
721 if (old_mode != cl->cmode) { 687 if (old_mode != cl->cmode) {
722 if (old_mode != HTB_CA 688 if (old_mode != HTB_CAN_SEND)
723 htb_safe_rb_er 689 htb_safe_rb_erase(&cl->pq_node, &q->hlevel[cl->level].wait_pq);
724 if (cl->cmode != HTB_C 690 if (cl->cmode != HTB_CAN_SEND)
725 htb_add_to_wai 691 htb_add_to_wait_tree(q, cl, diff);
726 } 692 }
727 693
728 /* update basic stats except f 694 /* update basic stats except for leaves which are already updated */
729 if (cl->level) 695 if (cl->level)
730 bstats_update(&cl->bst 696 bstats_update(&cl->bstats, skb);
731 697
732 cl = cl->parent; 698 cl = cl->parent;
733 } 699 }
734 } 700 }
735 701
736 /** 702 /**
737 * htb_do_events - make mode changes to classe 703 * htb_do_events - make mode changes to classes at the level
738 * @q: the priority event queue <<
739 * @level: which wait_pq in 'q->hlevel' <<
740 * @start: start jiffies <<
741 * 704 *
742 * Scans event queue for pending events and ap 705 * Scans event queue for pending events and applies them. Returns time of
743 * next pending event (0 for no event in pq, q 706 * next pending event (0 for no event in pq, q->now for too many events).
744 * Note: Applied are events whose have cl->pq_ 707 * Note: Applied are events whose have cl->pq_key <= q->now.
745 */ 708 */
746 static s64 htb_do_events(struct htb_sched *q, 709 static s64 htb_do_events(struct htb_sched *q, const int level,
747 unsigned long start) 710 unsigned long start)
748 { 711 {
749 /* don't run for longer than 2 jiffies 712 /* don't run for longer than 2 jiffies; 2 is used instead of
750 * 1 to simplify things when jiffy is 713 * 1 to simplify things when jiffy is going to be incremented
751 * too soon 714 * too soon
752 */ 715 */
753 unsigned long stop_at = start + 2; 716 unsigned long stop_at = start + 2;
754 struct rb_root *wait_pq = &q->hlevel[l 717 struct rb_root *wait_pq = &q->hlevel[level].wait_pq;
755 718
756 while (time_before(jiffies, stop_at)) 719 while (time_before(jiffies, stop_at)) {
757 struct htb_class *cl; 720 struct htb_class *cl;
758 s64 diff; 721 s64 diff;
759 struct rb_node *p = rb_first(w 722 struct rb_node *p = rb_first(wait_pq);
760 723
761 if (!p) 724 if (!p)
762 return 0; 725 return 0;
763 726
764 cl = rb_entry(p, struct htb_cl 727 cl = rb_entry(p, struct htb_class, pq_node);
765 if (cl->pq_key > q->now) 728 if (cl->pq_key > q->now)
766 return cl->pq_key; 729 return cl->pq_key;
767 730
768 htb_safe_rb_erase(p, wait_pq); 731 htb_safe_rb_erase(p, wait_pq);
769 diff = min_t(s64, q->now - cl- 732 diff = min_t(s64, q->now - cl->t_c, cl->mbuffer);
770 htb_change_class_mode(q, cl, & 733 htb_change_class_mode(q, cl, &diff);
771 if (cl->cmode != HTB_CAN_SEND) 734 if (cl->cmode != HTB_CAN_SEND)
772 htb_add_to_wait_tree(q 735 htb_add_to_wait_tree(q, cl, diff);
773 } 736 }
774 737
775 /* too much load - let's continue afte 738 /* too much load - let's continue after a break for scheduling */
776 if (!(q->warned & HTB_WARN_TOOMANYEVEN 739 if (!(q->warned & HTB_WARN_TOOMANYEVENTS)) {
777 pr_warn("htb: too many events! 740 pr_warn("htb: too many events!\n");
778 q->warned |= HTB_WARN_TOOMANYE 741 q->warned |= HTB_WARN_TOOMANYEVENTS;
779 } 742 }
780 743
781 return q->now; 744 return q->now;
782 } 745 }
783 746
784 /* Returns class->node+prio from id-tree where 747 /* Returns class->node+prio from id-tree where classe's id is >= id. NULL
785 * is no such one exists. 748 * is no such one exists.
786 */ 749 */
787 static struct rb_node *htb_id_find_next_upper( 750 static struct rb_node *htb_id_find_next_upper(int prio, struct rb_node *n,
788 751 u32 id)
789 { 752 {
790 struct rb_node *r = NULL; 753 struct rb_node *r = NULL;
791 while (n) { 754 while (n) {
792 struct htb_class *cl = 755 struct htb_class *cl =
793 rb_entry(n, struct htb_cla 756 rb_entry(n, struct htb_class, node[prio]);
794 757
795 if (id > cl->common.classid) { 758 if (id > cl->common.classid) {
796 n = n->rb_right; 759 n = n->rb_right;
797 } else if (id < cl->common.cla 760 } else if (id < cl->common.classid) {
798 r = n; 761 r = n;
799 n = n->rb_left; 762 n = n->rb_left;
800 } else { 763 } else {
801 return n; 764 return n;
802 } 765 }
803 } 766 }
804 return r; 767 return r;
805 } 768 }
806 769
807 /** 770 /**
808 * htb_lookup_leaf - returns next leaf class i 771 * htb_lookup_leaf - returns next leaf class in DRR order
809 * @hprio: the current one <<
810 * @prio: which prio in class <<
811 * 772 *
812 * Find leaf where current feed pointers point 773 * Find leaf where current feed pointers points to.
813 */ 774 */
814 static struct htb_class *htb_lookup_leaf(struc 775 static struct htb_class *htb_lookup_leaf(struct htb_prio *hprio, const int prio)
815 { 776 {
816 int i; 777 int i;
817 struct { 778 struct {
818 struct rb_node *root; 779 struct rb_node *root;
819 struct rb_node **pptr; 780 struct rb_node **pptr;
820 u32 *pid; 781 u32 *pid;
821 } stk[TC_HTB_MAXDEPTH], *sp = stk; 782 } stk[TC_HTB_MAXDEPTH], *sp = stk;
822 783
823 BUG_ON(!hprio->row.rb_node); 784 BUG_ON(!hprio->row.rb_node);
824 sp->root = hprio->row.rb_node; 785 sp->root = hprio->row.rb_node;
825 sp->pptr = &hprio->ptr; 786 sp->pptr = &hprio->ptr;
826 sp->pid = &hprio->last_ptr_id; 787 sp->pid = &hprio->last_ptr_id;
827 788
828 for (i = 0; i < 65535; i++) { 789 for (i = 0; i < 65535; i++) {
829 if (!*sp->pptr && *sp->pid) { 790 if (!*sp->pptr && *sp->pid) {
830 /* ptr was invalidated 791 /* ptr was invalidated but id is valid - try to recover
831 * the original or nex 792 * the original or next ptr
832 */ 793 */
833 *sp->pptr = 794 *sp->pptr =
834 htb_id_find_next_u 795 htb_id_find_next_upper(prio, sp->root, *sp->pid);
835 } 796 }
836 *sp->pid = 0; /* ptr is vali 797 *sp->pid = 0; /* ptr is valid now so that remove this hint as it
837 * can become 798 * can become out of date quickly
838 */ 799 */
839 if (!*sp->pptr) { /* we 800 if (!*sp->pptr) { /* we are at right end; rewind & go up */
840 *sp->pptr = sp->root; 801 *sp->pptr = sp->root;
841 while ((*sp->pptr)->rb 802 while ((*sp->pptr)->rb_left)
842 *sp->pptr = (* 803 *sp->pptr = (*sp->pptr)->rb_left;
843 if (sp > stk) { 804 if (sp > stk) {
844 sp--; 805 sp--;
845 if (!*sp->pptr 806 if (!*sp->pptr) {
846 WARN_O 807 WARN_ON(1);
847 return 808 return NULL;
848 } 809 }
849 htb_next_rb_no 810 htb_next_rb_node(sp->pptr);
850 } 811 }
851 } else { 812 } else {
852 struct htb_class *cl; 813 struct htb_class *cl;
853 struct htb_prio *clp; 814 struct htb_prio *clp;
854 815
855 cl = rb_entry(*sp->ppt 816 cl = rb_entry(*sp->pptr, struct htb_class, node[prio]);
856 if (!cl->level) 817 if (!cl->level)
857 return cl; 818 return cl;
858 clp = &cl->inner.clpri !! 819 clp = &cl->un.inner.clprio[prio];
859 (++sp)->root = clp->fe 820 (++sp)->root = clp->feed.rb_node;
860 sp->pptr = &clp->ptr; 821 sp->pptr = &clp->ptr;
861 sp->pid = &clp->last_p 822 sp->pid = &clp->last_ptr_id;
862 } 823 }
863 } 824 }
864 WARN_ON(1); 825 WARN_ON(1);
865 return NULL; 826 return NULL;
866 } 827 }
867 828
868 /* dequeues packet at given priority and level 829 /* dequeues packet at given priority and level; call only if
869 * you are sure that there is active class at 830 * you are sure that there is active class at prio/level
870 */ 831 */
871 static struct sk_buff *htb_dequeue_tree(struct 832 static struct sk_buff *htb_dequeue_tree(struct htb_sched *q, const int prio,
872 const 833 const int level)
873 { 834 {
874 struct sk_buff *skb = NULL; 835 struct sk_buff *skb = NULL;
875 struct htb_class *cl, *start; 836 struct htb_class *cl, *start;
876 struct htb_level *hlevel = &q->hlevel[ 837 struct htb_level *hlevel = &q->hlevel[level];
877 struct htb_prio *hprio = &hlevel->hpri 838 struct htb_prio *hprio = &hlevel->hprio[prio];
878 839
879 /* look initial class up in the row */ 840 /* look initial class up in the row */
880 start = cl = htb_lookup_leaf(hprio, pr 841 start = cl = htb_lookup_leaf(hprio, prio);
881 842
882 do { 843 do {
883 next: 844 next:
884 if (unlikely(!cl)) 845 if (unlikely(!cl))
885 return NULL; 846 return NULL;
886 847
887 /* class can be empty - it is 848 /* class can be empty - it is unlikely but can be true if leaf
888 * qdisc drops packets in enqu 849 * qdisc drops packets in enqueue routine or if someone used
889 * graft operation on the leaf 850 * graft operation on the leaf since last dequeue;
890 * simply deactivate and skip 851 * simply deactivate and skip such class
891 */ 852 */
892 if (unlikely(cl->leaf.q->q.qle !! 853 if (unlikely(cl->un.leaf.q->q.qlen == 0)) {
893 struct htb_class *next 854 struct htb_class *next;
894 htb_deactivate(q, cl); 855 htb_deactivate(q, cl);
895 856
896 /* row/level might bec 857 /* row/level might become empty */
897 if ((q->row_mask[level 858 if ((q->row_mask[level] & (1 << prio)) == 0)
898 return NULL; 859 return NULL;
899 860
900 next = htb_lookup_leaf 861 next = htb_lookup_leaf(hprio, prio);
901 862
902 if (cl == start) 863 if (cl == start) /* fix start if we just deleted it */
903 start = next; 864 start = next;
904 cl = next; 865 cl = next;
905 goto next; 866 goto next;
906 } 867 }
907 868
908 skb = cl->leaf.q->dequeue(cl-> !! 869 skb = cl->un.leaf.q->dequeue(cl->un.leaf.q);
909 if (likely(skb != NULL)) 870 if (likely(skb != NULL))
910 break; 871 break;
911 872
912 qdisc_warn_nonwc("htb", cl->le !! 873 qdisc_warn_nonwc("htb", cl->un.leaf.q);
913 htb_next_rb_node(level ? &cl-> !! 874 htb_next_rb_node(level ? &cl->parent->un.inner.clprio[prio].ptr:
914 &q->h 875 &q->hlevel[0].hprio[prio].ptr);
915 cl = htb_lookup_leaf(hprio, pr 876 cl = htb_lookup_leaf(hprio, prio);
916 877
917 } while (cl != start); 878 } while (cl != start);
918 879
919 if (likely(skb != NULL)) { 880 if (likely(skb != NULL)) {
920 bstats_update(&cl->bstats, skb 881 bstats_update(&cl->bstats, skb);
921 cl->leaf.deficit[level] -= qdi !! 882 cl->un.leaf.deficit[level] -= qdisc_pkt_len(skb);
922 if (cl->leaf.deficit[level] < !! 883 if (cl->un.leaf.deficit[level] < 0) {
923 cl->leaf.deficit[level !! 884 cl->un.leaf.deficit[level] += cl->quantum;
924 htb_next_rb_node(level !! 885 htb_next_rb_node(level ? &cl->parent->un.inner.clprio[prio].ptr :
925 886 &q->hlevel[0].hprio[prio].ptr);
926 } 887 }
927 /* this used to be after charg 888 /* this used to be after charge_class but this constelation
928 * gives us slightly better pe 889 * gives us slightly better performance
929 */ 890 */
930 if (!cl->leaf.q->q.qlen) !! 891 if (!cl->un.leaf.q->q.qlen)
931 htb_deactivate(q, cl); 892 htb_deactivate(q, cl);
932 htb_charge_class(q, cl, level, 893 htb_charge_class(q, cl, level, skb);
933 } 894 }
934 return skb; 895 return skb;
935 } 896 }
936 897
937 static struct sk_buff *htb_dequeue(struct Qdis 898 static struct sk_buff *htb_dequeue(struct Qdisc *sch)
938 { 899 {
939 struct sk_buff *skb; 900 struct sk_buff *skb;
940 struct htb_sched *q = qdisc_priv(sch); 901 struct htb_sched *q = qdisc_priv(sch);
941 int level; 902 int level;
942 s64 next_event; 903 s64 next_event;
943 unsigned long start_at; 904 unsigned long start_at;
944 905
945 /* try to dequeue direct packets as hi 906 /* try to dequeue direct packets as high prio (!) to minimize cpu work */
946 skb = __qdisc_dequeue_head(&q->direct_ 907 skb = __qdisc_dequeue_head(&q->direct_queue);
947 if (skb != NULL) { 908 if (skb != NULL) {
948 ok: 909 ok:
949 qdisc_bstats_update(sch, skb); 910 qdisc_bstats_update(sch, skb);
950 qdisc_qstats_backlog_dec(sch, 911 qdisc_qstats_backlog_dec(sch, skb);
951 sch->q.qlen--; 912 sch->q.qlen--;
952 return skb; 913 return skb;
953 } 914 }
954 915
955 if (!sch->q.qlen) 916 if (!sch->q.qlen)
956 goto fin; 917 goto fin;
957 q->now = ktime_get_ns(); 918 q->now = ktime_get_ns();
958 start_at = jiffies; 919 start_at = jiffies;
959 920
960 next_event = q->now + 5LLU * NSEC_PER_ 921 next_event = q->now + 5LLU * NSEC_PER_SEC;
961 922
962 for (level = 0; level < TC_HTB_MAXDEPT 923 for (level = 0; level < TC_HTB_MAXDEPTH; level++) {
963 /* common case optimization - 924 /* common case optimization - skip event handler quickly */
964 int m; 925 int m;
965 s64 event = q->near_ev_cache[l 926 s64 event = q->near_ev_cache[level];
966 927
967 if (q->now >= event) { 928 if (q->now >= event) {
968 event = htb_do_events( 929 event = htb_do_events(q, level, start_at);
969 if (!event) 930 if (!event)
970 event = q->now 931 event = q->now + NSEC_PER_SEC;
971 q->near_ev_cache[level 932 q->near_ev_cache[level] = event;
972 } 933 }
973 934
974 if (next_event > event) 935 if (next_event > event)
975 next_event = event; 936 next_event = event;
976 937
977 m = ~q->row_mask[level]; 938 m = ~q->row_mask[level];
978 while (m != (int)(-1)) { 939 while (m != (int)(-1)) {
979 int prio = ffz(m); 940 int prio = ffz(m);
980 941
981 m |= 1 << prio; 942 m |= 1 << prio;
982 skb = htb_dequeue_tree 943 skb = htb_dequeue_tree(q, prio, level);
983 if (likely(skb != NULL 944 if (likely(skb != NULL))
984 goto ok; 945 goto ok;
985 } 946 }
986 } 947 }
>> 948 qdisc_qstats_overlimit(sch);
987 if (likely(next_event > q->now)) 949 if (likely(next_event > q->now))
988 qdisc_watchdog_schedule_ns(&q- 950 qdisc_watchdog_schedule_ns(&q->watchdog, next_event);
989 else 951 else
990 schedule_work(&q->work); 952 schedule_work(&q->work);
991 fin: 953 fin:
992 return skb; 954 return skb;
993 } 955 }
994 956
995 /* reset all classes */ 957 /* reset all classes */
996 /* always caled under BH & queue lock */ 958 /* always caled under BH & queue lock */
997 static void htb_reset(struct Qdisc *sch) 959 static void htb_reset(struct Qdisc *sch)
998 { 960 {
999 struct htb_sched *q = qdisc_priv(sch); 961 struct htb_sched *q = qdisc_priv(sch);
1000 struct htb_class *cl; 962 struct htb_class *cl;
1001 unsigned int i; 963 unsigned int i;
1002 964
1003 for (i = 0; i < q->clhash.hashsize; i 965 for (i = 0; i < q->clhash.hashsize; i++) {
1004 hlist_for_each_entry(cl, &q-> 966 hlist_for_each_entry(cl, &q->clhash.hash[i], common.hnode) {
1005 if (cl->level) 967 if (cl->level)
1006 memset(&cl->i !! 968 memset(&cl->un.inner, 0, sizeof(cl->un.inner));
1007 else { 969 else {
1008 if (cl->leaf. !! 970 if (cl->un.leaf.q)
1009 qdisc !! 971 qdisc_reset(cl->un.leaf.q);
>> 972 INIT_LIST_HEAD(&cl->un.leaf.drop_list);
1010 } 973 }
1011 cl->prio_activity = 0 974 cl->prio_activity = 0;
1012 cl->cmode = HTB_CAN_S 975 cl->cmode = HTB_CAN_SEND;
1013 } 976 }
1014 } 977 }
1015 qdisc_watchdog_cancel(&q->watchdog); 978 qdisc_watchdog_cancel(&q->watchdog);
1016 __qdisc_reset_queue(&q->direct_queue) 979 __qdisc_reset_queue(&q->direct_queue);
>> 980 sch->q.qlen = 0;
>> 981 sch->qstats.backlog = 0;
1017 memset(q->hlevel, 0, sizeof(q->hlevel 982 memset(q->hlevel, 0, sizeof(q->hlevel));
1018 memset(q->row_mask, 0, sizeof(q->row_ 983 memset(q->row_mask, 0, sizeof(q->row_mask));
>> 984 for (i = 0; i < TC_HTB_NUMPRIO; i++)
>> 985 INIT_LIST_HEAD(q->drops + i);
1019 } 986 }
1020 987
1021 static const struct nla_policy htb_policy[TCA 988 static const struct nla_policy htb_policy[TCA_HTB_MAX + 1] = {
1022 [TCA_HTB_PARMS] = { .len = sizeof(str 989 [TCA_HTB_PARMS] = { .len = sizeof(struct tc_htb_opt) },
1023 [TCA_HTB_INIT] = { .len = sizeof(str 990 [TCA_HTB_INIT] = { .len = sizeof(struct tc_htb_glob) },
1024 [TCA_HTB_CTAB] = { .type = NLA_BINAR 991 [TCA_HTB_CTAB] = { .type = NLA_BINARY, .len = TC_RTAB_SIZE },
1025 [TCA_HTB_RTAB] = { .type = NLA_BINAR 992 [TCA_HTB_RTAB] = { .type = NLA_BINARY, .len = TC_RTAB_SIZE },
1026 [TCA_HTB_DIRECT_QLEN] = { .type = NLA 993 [TCA_HTB_DIRECT_QLEN] = { .type = NLA_U32 },
1027 [TCA_HTB_RATE64] = { .type = NLA_U64 994 [TCA_HTB_RATE64] = { .type = NLA_U64 },
1028 [TCA_HTB_CEIL64] = { .type = NLA_U64 995 [TCA_HTB_CEIL64] = { .type = NLA_U64 },
1029 [TCA_HTB_OFFLOAD] = { .type = NLA_FLA <<
1030 }; 996 };
1031 997
1032 static void htb_work_func(struct work_struct 998 static void htb_work_func(struct work_struct *work)
1033 { 999 {
1034 struct htb_sched *q = container_of(wo 1000 struct htb_sched *q = container_of(work, struct htb_sched, work);
1035 struct Qdisc *sch = q->watchdog.qdisc 1001 struct Qdisc *sch = q->watchdog.qdisc;
1036 1002
1037 rcu_read_lock(); 1003 rcu_read_lock();
1038 __netif_schedule(qdisc_root(sch)); 1004 __netif_schedule(qdisc_root(sch));
1039 rcu_read_unlock(); 1005 rcu_read_unlock();
1040 } 1006 }
1041 1007
1042 static int htb_offload(struct net_device *dev !! 1008 static int htb_init(struct Qdisc *sch, struct nlattr *opt)
1043 { 1009 {
1044 return dev->netdev_ops->ndo_setup_tc( <<
1045 } <<
1046 <<
1047 static int htb_init(struct Qdisc *sch, struct <<
1048 struct netlink_ext_ack *e <<
1049 { <<
1050 struct net_device *dev = qdisc_dev(sc <<
1051 struct tc_htb_qopt_offload offload_op <<
1052 struct htb_sched *q = qdisc_priv(sch) 1010 struct htb_sched *q = qdisc_priv(sch);
1053 struct nlattr *tb[TCA_HTB_MAX + 1]; 1011 struct nlattr *tb[TCA_HTB_MAX + 1];
1054 struct tc_htb_glob *gopt; 1012 struct tc_htb_glob *gopt;
1055 unsigned int ntx; <<
1056 bool offload; <<
1057 int err; 1013 int err;
1058 !! 1014 int i;
1059 qdisc_watchdog_init(&q->watchdog, sch <<
1060 INIT_WORK(&q->work, htb_work_func); <<
1061 1015
1062 if (!opt) 1016 if (!opt)
1063 return -EINVAL; 1017 return -EINVAL;
1064 1018
1065 err = tcf_block_get(&q->block, &q->fi !! 1019 err = nla_parse_nested(tb, TCA_HTB_MAX, opt, htb_policy);
1066 if (err) <<
1067 return err; <<
1068 <<
1069 err = nla_parse_nested_deprecated(tb, <<
1070 NUL <<
1071 if (err < 0) 1020 if (err < 0)
1072 return err; 1021 return err;
1073 1022
1074 if (!tb[TCA_HTB_INIT]) 1023 if (!tb[TCA_HTB_INIT])
1075 return -EINVAL; 1024 return -EINVAL;
1076 1025
1077 gopt = nla_data(tb[TCA_HTB_INIT]); 1026 gopt = nla_data(tb[TCA_HTB_INIT]);
1078 if (gopt->version != HTB_VER >> 16) 1027 if (gopt->version != HTB_VER >> 16)
1079 return -EINVAL; 1028 return -EINVAL;
1080 1029
1081 offload = nla_get_flag(tb[TCA_HTB_OFF <<
1082 <<
1083 if (offload) { <<
1084 if (sch->parent != TC_H_ROOT) <<
1085 NL_SET_ERR_MSG(extack <<
1086 return -EOPNOTSUPP; <<
1087 } <<
1088 <<
1089 if (!tc_can_offload(dev) || ! <<
1090 NL_SET_ERR_MSG(extack <<
1091 return -EOPNOTSUPP; <<
1092 } <<
1093 <<
1094 q->num_direct_qdiscs = dev->r <<
1095 q->direct_qdiscs = kcalloc(q- <<
1096 si <<
1097 GF <<
1098 if (!q->direct_qdiscs) <<
1099 return -ENOMEM; <<
1100 } <<
1101 <<
1102 err = qdisc_class_hash_init(&q->clhas 1030 err = qdisc_class_hash_init(&q->clhash);
1103 if (err < 0) 1031 if (err < 0)
1104 return err; 1032 return err;
>> 1033 for (i = 0; i < TC_HTB_NUMPRIO; i++)
>> 1034 INIT_LIST_HEAD(q->drops + i);
>> 1035
>> 1036 qdisc_watchdog_init(&q->watchdog, sch);
>> 1037 INIT_WORK(&q->work, htb_work_func);
>> 1038 qdisc_skb_head_init(&q->direct_queue);
1105 1039
1106 if (tb[TCA_HTB_DIRECT_QLEN]) 1040 if (tb[TCA_HTB_DIRECT_QLEN])
1107 q->direct_qlen = nla_get_u32( 1041 q->direct_qlen = nla_get_u32(tb[TCA_HTB_DIRECT_QLEN]);
1108 else 1042 else
1109 q->direct_qlen = qdisc_dev(sc 1043 q->direct_qlen = qdisc_dev(sch)->tx_queue_len;
1110 1044
1111 if ((q->rate2quantum = gopt->rate2qua 1045 if ((q->rate2quantum = gopt->rate2quantum) < 1)
1112 q->rate2quantum = 1; 1046 q->rate2quantum = 1;
1113 q->defcls = gopt->defcls; 1047 q->defcls = gopt->defcls;
1114 1048
1115 if (!offload) <<
1116 return 0; <<
1117 <<
1118 for (ntx = 0; ntx < q->num_direct_qdi <<
1119 struct netdev_queue *dev_queu <<
1120 struct Qdisc *qdisc; <<
1121 <<
1122 qdisc = qdisc_create_dflt(dev <<
1123 TC_ <<
1124 if (!qdisc) { <<
1125 return -ENOMEM; <<
1126 } <<
1127 <<
1128 q->direct_qdiscs[ntx] = qdisc <<
1129 qdisc->flags |= TCQ_F_ONETXQU <<
1130 } <<
1131 <<
1132 sch->flags |= TCQ_F_MQROOT; <<
1133 <<
1134 offload_opt = (struct tc_htb_qopt_off <<
1135 .command = TC_HTB_CREATE, <<
1136 .parent_classid = TC_H_MAJ(sc <<
1137 .classid = TC_H_MIN(q->defcls <<
1138 .extack = extack, <<
1139 }; <<
1140 err = htb_offload(dev, &offload_opt); <<
1141 if (err) <<
1142 return err; <<
1143 <<
1144 /* Defer this assignment, so that htb <<
1145 * parts (especially calling ndo_setu <<
1146 */ <<
1147 q->offload = true; <<
1148 <<
1149 return 0; 1049 return 0;
1150 } 1050 }
1151 1051
1152 static void htb_attach_offload(struct Qdisc * <<
1153 { <<
1154 struct net_device *dev = qdisc_dev(sc <<
1155 struct htb_sched *q = qdisc_priv(sch) <<
1156 unsigned int ntx; <<
1157 <<
1158 for (ntx = 0; ntx < q->num_direct_qdi <<
1159 struct Qdisc *old, *qdisc = q <<
1160 <<
1161 old = dev_graft_qdisc(qdisc-> <<
1162 qdisc_put(old); <<
1163 qdisc_hash_add(qdisc, false); <<
1164 } <<
1165 for (ntx = q->num_direct_qdiscs; ntx <<
1166 struct netdev_queue *dev_queu <<
1167 struct Qdisc *old = dev_graft <<
1168 <<
1169 qdisc_put(old); <<
1170 } <<
1171 <<
1172 kfree(q->direct_qdiscs); <<
1173 q->direct_qdiscs = NULL; <<
1174 } <<
1175 <<
1176 static void htb_attach_software(struct Qdisc <<
1177 { <<
1178 struct net_device *dev = qdisc_dev(sc <<
1179 unsigned int ntx; <<
1180 <<
1181 /* Resemble qdisc_graft behavior. */ <<
1182 for (ntx = 0; ntx < dev->num_tx_queue <<
1183 struct netdev_queue *dev_queu <<
1184 struct Qdisc *old = dev_graft <<
1185 <<
1186 qdisc_refcount_inc(sch); <<
1187 <<
1188 qdisc_put(old); <<
1189 } <<
1190 } <<
1191 <<
1192 static void htb_attach(struct Qdisc *sch) <<
1193 { <<
1194 struct htb_sched *q = qdisc_priv(sch) <<
1195 <<
1196 if (q->offload) <<
1197 htb_attach_offload(sch); <<
1198 else <<
1199 htb_attach_software(sch); <<
1200 } <<
1201 <<
1202 static int htb_dump(struct Qdisc *sch, struct 1052 static int htb_dump(struct Qdisc *sch, struct sk_buff *skb)
1203 { 1053 {
1204 struct htb_sched *q = qdisc_priv(sch) 1054 struct htb_sched *q = qdisc_priv(sch);
1205 struct nlattr *nest; 1055 struct nlattr *nest;
1206 struct tc_htb_glob gopt; 1056 struct tc_htb_glob gopt;
1207 1057
1208 if (q->offload) <<
1209 sch->flags |= TCQ_F_OFFLOADED <<
1210 else <<
1211 sch->flags &= ~TCQ_F_OFFLOADE <<
1212 <<
1213 sch->qstats.overlimits = q->overlimit <<
1214 /* Its safe to not acquire qdisc lock 1058 /* Its safe to not acquire qdisc lock. As we hold RTNL,
1215 * no change can happen on the qdisc 1059 * no change can happen on the qdisc parameters.
1216 */ 1060 */
1217 1061
1218 gopt.direct_pkts = q->direct_pkts; 1062 gopt.direct_pkts = q->direct_pkts;
1219 gopt.version = HTB_VER; 1063 gopt.version = HTB_VER;
1220 gopt.rate2quantum = q->rate2quantum; 1064 gopt.rate2quantum = q->rate2quantum;
1221 gopt.defcls = q->defcls; 1065 gopt.defcls = q->defcls;
1222 gopt.debug = 0; 1066 gopt.debug = 0;
1223 1067
1224 nest = nla_nest_start_noflag(skb, TCA !! 1068 nest = nla_nest_start(skb, TCA_OPTIONS);
1225 if (nest == NULL) 1069 if (nest == NULL)
1226 goto nla_put_failure; 1070 goto nla_put_failure;
1227 if (nla_put(skb, TCA_HTB_INIT, sizeof 1071 if (nla_put(skb, TCA_HTB_INIT, sizeof(gopt), &gopt) ||
1228 nla_put_u32(skb, TCA_HTB_DIRECT_Q 1072 nla_put_u32(skb, TCA_HTB_DIRECT_QLEN, q->direct_qlen))
1229 goto nla_put_failure; 1073 goto nla_put_failure;
1230 if (q->offload && nla_put_flag(skb, T <<
1231 goto nla_put_failure; <<
1232 1074
1233 return nla_nest_end(skb, nest); 1075 return nla_nest_end(skb, nest);
1234 1076
1235 nla_put_failure: 1077 nla_put_failure:
1236 nla_nest_cancel(skb, nest); 1078 nla_nest_cancel(skb, nest);
1237 return -1; 1079 return -1;
1238 } 1080 }
1239 1081
1240 static int htb_dump_class(struct Qdisc *sch, 1082 static int htb_dump_class(struct Qdisc *sch, unsigned long arg,
1241 struct sk_buff *skb 1083 struct sk_buff *skb, struct tcmsg *tcm)
1242 { 1084 {
1243 struct htb_class *cl = (struct htb_cl 1085 struct htb_class *cl = (struct htb_class *)arg;
1244 struct htb_sched *q = qdisc_priv(sch) <<
1245 struct nlattr *nest; 1086 struct nlattr *nest;
1246 struct tc_htb_opt opt; 1087 struct tc_htb_opt opt;
1247 1088
1248 /* Its safe to not acquire qdisc lock 1089 /* Its safe to not acquire qdisc lock. As we hold RTNL,
1249 * no change can happen on the class 1090 * no change can happen on the class parameters.
1250 */ 1091 */
1251 tcm->tcm_parent = cl->parent ? cl->pa 1092 tcm->tcm_parent = cl->parent ? cl->parent->common.classid : TC_H_ROOT;
1252 tcm->tcm_handle = cl->common.classid; 1093 tcm->tcm_handle = cl->common.classid;
1253 if (!cl->level && cl->leaf.q) !! 1094 if (!cl->level && cl->un.leaf.q)
1254 tcm->tcm_info = cl->leaf.q->h !! 1095 tcm->tcm_info = cl->un.leaf.q->handle;
1255 1096
1256 nest = nla_nest_start_noflag(skb, TCA !! 1097 nest = nla_nest_start(skb, TCA_OPTIONS);
1257 if (nest == NULL) 1098 if (nest == NULL)
1258 goto nla_put_failure; 1099 goto nla_put_failure;
1259 1100
1260 memset(&opt, 0, sizeof(opt)); 1101 memset(&opt, 0, sizeof(opt));
1261 1102
1262 psched_ratecfg_getrate(&opt.rate, &cl 1103 psched_ratecfg_getrate(&opt.rate, &cl->rate);
1263 opt.buffer = PSCHED_NS2TICKS(cl->buff 1104 opt.buffer = PSCHED_NS2TICKS(cl->buffer);
1264 psched_ratecfg_getrate(&opt.ceil, &cl 1105 psched_ratecfg_getrate(&opt.ceil, &cl->ceil);
1265 opt.cbuffer = PSCHED_NS2TICKS(cl->cbu 1106 opt.cbuffer = PSCHED_NS2TICKS(cl->cbuffer);
1266 opt.quantum = cl->quantum; 1107 opt.quantum = cl->quantum;
1267 opt.prio = cl->prio; 1108 opt.prio = cl->prio;
1268 opt.level = cl->level; 1109 opt.level = cl->level;
1269 if (nla_put(skb, TCA_HTB_PARMS, sizeo 1110 if (nla_put(skb, TCA_HTB_PARMS, sizeof(opt), &opt))
1270 goto nla_put_failure; 1111 goto nla_put_failure;
1271 if (q->offload && nla_put_flag(skb, T <<
1272 goto nla_put_failure; <<
1273 if ((cl->rate.rate_bytes_ps >= (1ULL 1112 if ((cl->rate.rate_bytes_ps >= (1ULL << 32)) &&
1274 nla_put_u64_64bit(skb, TCA_HTB_RA 1113 nla_put_u64_64bit(skb, TCA_HTB_RATE64, cl->rate.rate_bytes_ps,
1275 TCA_HTB_PAD)) 1114 TCA_HTB_PAD))
1276 goto nla_put_failure; 1115 goto nla_put_failure;
1277 if ((cl->ceil.rate_bytes_ps >= (1ULL 1116 if ((cl->ceil.rate_bytes_ps >= (1ULL << 32)) &&
1278 nla_put_u64_64bit(skb, TCA_HTB_CE 1117 nla_put_u64_64bit(skb, TCA_HTB_CEIL64, cl->ceil.rate_bytes_ps,
1279 TCA_HTB_PAD)) 1118 TCA_HTB_PAD))
1280 goto nla_put_failure; 1119 goto nla_put_failure;
1281 1120
1282 return nla_nest_end(skb, nest); 1121 return nla_nest_end(skb, nest);
1283 1122
1284 nla_put_failure: 1123 nla_put_failure:
1285 nla_nest_cancel(skb, nest); 1124 nla_nest_cancel(skb, nest);
1286 return -1; 1125 return -1;
1287 } 1126 }
1288 1127
1289 static void htb_offload_aggregate_stats(struc <<
1290 struc <<
1291 { <<
1292 u64 bytes = 0, packets = 0; <<
1293 struct htb_class *c; <<
1294 unsigned int i; <<
1295 <<
1296 gnet_stats_basic_sync_init(&cl->bstat <<
1297 <<
1298 for (i = 0; i < q->clhash.hashsize; i <<
1299 hlist_for_each_entry(c, &q->c <<
1300 struct htb_class *p = <<
1301 <<
1302 while (p && p->level <<
1303 p = p->parent <<
1304 <<
1305 if (p != cl) <<
1306 continue; <<
1307 <<
1308 bytes += u64_stats_re <<
1309 packets += u64_stats_ <<
1310 if (c->level == 0) { <<
1311 bytes += u64_ <<
1312 packets += u6 <<
1313 } <<
1314 } <<
1315 } <<
1316 _bstats_update(&cl->bstats, bytes, pa <<
1317 } <<
1318 <<
1319 static int 1128 static int
1320 htb_dump_class_stats(struct Qdisc *sch, unsig 1129 htb_dump_class_stats(struct Qdisc *sch, unsigned long arg, struct gnet_dump *d)
1321 { 1130 {
1322 struct htb_class *cl = (struct htb_cl 1131 struct htb_class *cl = (struct htb_class *)arg;
1323 struct htb_sched *q = qdisc_priv(sch) <<
1324 struct gnet_stats_queue qs = { 1132 struct gnet_stats_queue qs = {
1325 .drops = cl->drops, 1133 .drops = cl->drops,
1326 .overlimits = cl->overlimits, <<
1327 }; 1134 };
1328 __u32 qlen = 0; 1135 __u32 qlen = 0;
1329 1136
1330 if (!cl->level && cl->leaf.q) !! 1137 if (!cl->level && cl->un.leaf.q) {
1331 qdisc_qstats_qlen_backlog(cl- !! 1138 qlen = cl->un.leaf.q->q.qlen;
1332 !! 1139 qs.backlog = cl->un.leaf.q->qstats.backlog;
>> 1140 }
1333 cl->xstats.tokens = clamp_t(s64, PSCH 1141 cl->xstats.tokens = clamp_t(s64, PSCHED_NS2TICKS(cl->tokens),
1334 INT_MIN, 1142 INT_MIN, INT_MAX);
1335 cl->xstats.ctokens = clamp_t(s64, PSC 1143 cl->xstats.ctokens = clamp_t(s64, PSCHED_NS2TICKS(cl->ctokens),
1336 INT_MIN, 1144 INT_MIN, INT_MAX);
1337 1145
1338 if (q->offload) { !! 1146 if (gnet_stats_copy_basic(qdisc_root_sleeping_running(sch),
1339 if (!cl->level) { !! 1147 d, NULL, &cl->bstats) < 0 ||
1340 if (cl->leaf.q) <<
1341 cl->bstats = <<
1342 else <<
1343 gnet_stats_ba <<
1344 _bstats_update(&cl->b <<
1345 u64_st <<
1346 u64_st <<
1347 } else { <<
1348 htb_offload_aggregate <<
1349 } <<
1350 } <<
1351 <<
1352 if (gnet_stats_copy_basic(d, NULL, &c <<
1353 gnet_stats_copy_rate_est(d, &cl-> 1148 gnet_stats_copy_rate_est(d, &cl->rate_est) < 0 ||
1354 gnet_stats_copy_queue(d, NULL, &q 1149 gnet_stats_copy_queue(d, NULL, &qs, qlen) < 0)
1355 return -1; 1150 return -1;
1356 1151
1357 return gnet_stats_copy_app(d, &cl->xs 1152 return gnet_stats_copy_app(d, &cl->xstats, sizeof(cl->xstats));
1358 } 1153 }
1359 1154
1360 static struct netdev_queue * <<
1361 htb_select_queue(struct Qdisc *sch, struct tc <<
1362 { <<
1363 struct net_device *dev = qdisc_dev(sc <<
1364 struct tc_htb_qopt_offload offload_op <<
1365 struct htb_sched *q = qdisc_priv(sch) <<
1366 int err; <<
1367 <<
1368 if (!q->offload) <<
1369 return sch->dev_queue; <<
1370 <<
1371 offload_opt = (struct tc_htb_qopt_off <<
1372 .command = TC_HTB_LEAF_QUERY_ <<
1373 .classid = TC_H_MIN(tcm->tcm_ <<
1374 }; <<
1375 err = htb_offload(dev, &offload_opt); <<
1376 if (err || offload_opt.qid >= dev->nu <<
1377 return NULL; <<
1378 return netdev_get_tx_queue(dev, offlo <<
1379 } <<
1380 <<
1381 static struct Qdisc * <<
1382 htb_graft_helper(struct netdev_queue *dev_que <<
1383 { <<
1384 struct net_device *dev = dev_queue->d <<
1385 struct Qdisc *old_q; <<
1386 <<
1387 if (dev->flags & IFF_UP) <<
1388 dev_deactivate(dev); <<
1389 old_q = dev_graft_qdisc(dev_queue, ne <<
1390 if (new_q) <<
1391 new_q->flags |= TCQ_F_ONETXQU <<
1392 if (dev->flags & IFF_UP) <<
1393 dev_activate(dev); <<
1394 <<
1395 return old_q; <<
1396 } <<
1397 <<
1398 static struct netdev_queue *htb_offload_get_q <<
1399 { <<
1400 struct netdev_queue *queue; <<
1401 <<
1402 queue = cl->leaf.offload_queue; <<
1403 if (!(cl->leaf.q->flags & TCQ_F_BUILT <<
1404 WARN_ON(cl->leaf.q->dev_queue <<
1405 <<
1406 return queue; <<
1407 } <<
1408 <<
1409 static void htb_offload_move_qdisc(struct Qdi <<
1410 struct htb <<
1411 { <<
1412 struct netdev_queue *queue_old, *queu <<
1413 struct net_device *dev = qdisc_dev(sc <<
1414 <<
1415 queue_old = htb_offload_get_queue(cl_ <<
1416 queue_new = htb_offload_get_queue(cl_ <<
1417 <<
1418 if (!destroying) { <<
1419 struct Qdisc *qdisc; <<
1420 <<
1421 if (dev->flags & IFF_UP) <<
1422 dev_deactivate(dev); <<
1423 qdisc = dev_graft_qdisc(queue <<
1424 WARN_ON(qdisc != cl_old->leaf <<
1425 } <<
1426 <<
1427 if (!(cl_old->leaf.q->flags & TCQ_F_B <<
1428 cl_old->leaf.q->dev_queue = q <<
1429 cl_old->leaf.offload_queue = queue_ne <<
1430 <<
1431 if (!destroying) { <<
1432 struct Qdisc *qdisc; <<
1433 <<
1434 qdisc = dev_graft_qdisc(queue <<
1435 if (dev->flags & IFF_UP) <<
1436 dev_activate(dev); <<
1437 WARN_ON(!(qdisc->flags & TCQ_ <<
1438 } <<
1439 } <<
1440 <<
1441 static int htb_graft(struct Qdisc *sch, unsig 1155 static int htb_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
1442 struct Qdisc **old, stru !! 1156 struct Qdisc **old)
1443 { 1157 {
1444 struct netdev_queue *dev_queue = sch- <<
1445 struct htb_class *cl = (struct htb_cl 1158 struct htb_class *cl = (struct htb_class *)arg;
1446 struct htb_sched *q = qdisc_priv(sch) <<
1447 struct Qdisc *old_q; <<
1448 1159
1449 if (cl->level) 1160 if (cl->level)
1450 return -EINVAL; 1161 return -EINVAL;
>> 1162 if (new == NULL &&
>> 1163 (new = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops,
>> 1164 cl->common.classid)) == NULL)
>> 1165 return -ENOBUFS;
1451 1166
1452 if (q->offload) !! 1167 *old = qdisc_replace(sch, new, &cl->un.leaf.q);
1453 dev_queue = htb_offload_get_q <<
1454 <<
1455 if (!new) { <<
1456 new = qdisc_create_dflt(dev_q <<
1457 cl->c <<
1458 if (!new) <<
1459 return -ENOBUFS; <<
1460 } <<
1461 <<
1462 if (q->offload) { <<
1463 /* One ref for cl->leaf.q, th <<
1464 qdisc_refcount_inc(new); <<
1465 old_q = htb_graft_helper(dev_ <<
1466 } <<
1467 <<
1468 *old = qdisc_replace(sch, new, &cl->l <<
1469 <<
1470 if (q->offload) { <<
1471 WARN_ON(old_q != *old); <<
1472 qdisc_put(old_q); <<
1473 } <<
1474 <<
1475 return 0; 1168 return 0;
1476 } 1169 }
1477 1170
1478 static struct Qdisc *htb_leaf(struct Qdisc *s 1171 static struct Qdisc *htb_leaf(struct Qdisc *sch, unsigned long arg)
1479 { 1172 {
1480 struct htb_class *cl = (struct htb_cl 1173 struct htb_class *cl = (struct htb_class *)arg;
1481 return !cl->level ? cl->leaf.q : NULL !! 1174 return !cl->level ? cl->un.leaf.q : NULL;
1482 } 1175 }
1483 1176
1484 static void htb_qlen_notify(struct Qdisc *sch 1177 static void htb_qlen_notify(struct Qdisc *sch, unsigned long arg)
1485 { 1178 {
1486 struct htb_class *cl = (struct htb_cl 1179 struct htb_class *cl = (struct htb_class *)arg;
1487 1180
1488 htb_deactivate(qdisc_priv(sch), cl); !! 1181 if (cl->un.leaf.q->q.qlen == 0)
>> 1182 htb_deactivate(qdisc_priv(sch), cl);
>> 1183 }
>> 1184
>> 1185 static unsigned long htb_get(struct Qdisc *sch, u32 classid)
>> 1186 {
>> 1187 struct htb_class *cl = htb_find(classid, sch);
>> 1188 if (cl)
>> 1189 cl->refcnt++;
>> 1190 return (unsigned long)cl;
1489 } 1191 }
1490 1192
1491 static inline int htb_parent_last_child(struc 1193 static inline int htb_parent_last_child(struct htb_class *cl)
1492 { 1194 {
1493 if (!cl->parent) 1195 if (!cl->parent)
1494 /* the root class */ 1196 /* the root class */
1495 return 0; 1197 return 0;
1496 if (cl->parent->children > 1) 1198 if (cl->parent->children > 1)
1497 /* not the last child */ 1199 /* not the last child */
1498 return 0; 1200 return 0;
1499 return 1; 1201 return 1;
1500 } 1202 }
1501 1203
1502 static void htb_parent_to_leaf(struct Qdisc * !! 1204 static void htb_parent_to_leaf(struct htb_sched *q, struct htb_class *cl,
1503 struct Qdisc * 1205 struct Qdisc *new_q)
1504 { 1206 {
1505 struct htb_sched *q = qdisc_priv(sch) <<
1506 struct htb_class *parent = cl->parent 1207 struct htb_class *parent = cl->parent;
1507 1208
1508 WARN_ON(cl->level || !cl->leaf.q || c !! 1209 WARN_ON(cl->level || !cl->un.leaf.q || cl->prio_activity);
1509 1210
1510 if (parent->cmode != HTB_CAN_SEND) 1211 if (parent->cmode != HTB_CAN_SEND)
1511 htb_safe_rb_erase(&parent->pq 1212 htb_safe_rb_erase(&parent->pq_node,
1512 &q->hlevel[ 1213 &q->hlevel[parent->level].wait_pq);
1513 1214
1514 parent->level = 0; 1215 parent->level = 0;
1515 memset(&parent->inner, 0, sizeof(pare !! 1216 memset(&parent->un.inner, 0, sizeof(parent->un.inner));
1516 parent->leaf.q = new_q ? new_q : &noo !! 1217 INIT_LIST_HEAD(&parent->un.leaf.drop_list);
>> 1218 parent->un.leaf.q = new_q ? new_q : &noop_qdisc;
1517 parent->tokens = parent->buffer; 1219 parent->tokens = parent->buffer;
1518 parent->ctokens = parent->cbuffer; 1220 parent->ctokens = parent->cbuffer;
1519 parent->t_c = ktime_get_ns(); 1221 parent->t_c = ktime_get_ns();
1520 parent->cmode = HTB_CAN_SEND; 1222 parent->cmode = HTB_CAN_SEND;
1521 if (q->offload) <<
1522 parent->leaf.offload_queue = <<
1523 } <<
1524 <<
1525 static void htb_parent_to_leaf_offload(struct <<
1526 struct <<
1527 struct <<
1528 { <<
1529 struct Qdisc *old_q; <<
1530 <<
1531 /* One ref for cl->leaf.q, the other <<
1532 if (new_q) <<
1533 qdisc_refcount_inc(new_q); <<
1534 old_q = htb_graft_helper(dev_queue, n <<
1535 WARN_ON(!(old_q->flags & TCQ_F_BUILTI <<
1536 } <<
1537 <<
1538 static int htb_destroy_class_offload(struct Q <<
1539 bool las <<
1540 struct n <<
1541 { <<
1542 struct tc_htb_qopt_offload offload_op <<
1543 struct netdev_queue *dev_queue; <<
1544 struct Qdisc *q = cl->leaf.q; <<
1545 struct Qdisc *old; <<
1546 int err; <<
1547 <<
1548 if (cl->level) <<
1549 return -EINVAL; <<
1550 <<
1551 WARN_ON(!q); <<
1552 dev_queue = htb_offload_get_queue(cl) <<
1553 /* When destroying, caller qdisc_graf <<
1554 * qdisc_put for the qdisc being dest <<
1555 * does not need to graft or qdisc_pu <<
1556 */ <<
1557 if (!destroying) { <<
1558 old = htb_graft_helper(dev_qu <<
1559 /* Last qdisc grafted should <<
1560 * calling htb_delete. <<
1561 */ <<
1562 WARN_ON(old != q); <<
1563 } <<
1564 <<
1565 if (cl->parent) { <<
1566 _bstats_update(&cl->parent->b <<
1567 u64_stats_read <<
1568 u64_stats_read <<
1569 } <<
1570 <<
1571 offload_opt = (struct tc_htb_qopt_off <<
1572 .command = !last_child ? TC_H <<
1573 destroying ? TC_HT <<
1574 TC_HTB_LEAF_DEL_LA <<
1575 .classid = cl->common.classid <<
1576 .extack = extack, <<
1577 }; <<
1578 err = htb_offload(qdisc_dev(sch), &of <<
1579 <<
1580 if (!destroying) { <<
1581 if (!err) <<
1582 qdisc_put(old); <<
1583 else <<
1584 htb_graft_helper(dev_ <<
1585 } <<
1586 <<
1587 if (last_child) <<
1588 return err; <<
1589 <<
1590 if (!err && offload_opt.classid != TC <<
1591 u32 classid = TC_H_MAJ(sch->h <<
1592 TC_H_MIN(offloa <<
1593 struct htb_class *moved_cl = <<
1594 <<
1595 htb_offload_move_qdisc(sch, m <<
1596 } <<
1597 <<
1598 return err; <<
1599 } 1223 }
1600 1224
1601 static void htb_destroy_class(struct Qdisc *s 1225 static void htb_destroy_class(struct Qdisc *sch, struct htb_class *cl)
1602 { 1226 {
1603 if (!cl->level) { 1227 if (!cl->level) {
1604 WARN_ON(!cl->leaf.q); !! 1228 WARN_ON(!cl->un.leaf.q);
1605 qdisc_put(cl->leaf.q); !! 1229 qdisc_destroy(cl->un.leaf.q);
1606 } 1230 }
1607 gen_kill_estimator(&cl->rate_est); 1231 gen_kill_estimator(&cl->rate_est);
1608 tcf_block_put(cl->block); !! 1232 tcf_destroy_chain(&cl->filter_list);
1609 kfree(cl); 1233 kfree(cl);
1610 } 1234 }
1611 1235
1612 static void htb_destroy(struct Qdisc *sch) 1236 static void htb_destroy(struct Qdisc *sch)
1613 { 1237 {
1614 struct net_device *dev = qdisc_dev(sc <<
1615 struct tc_htb_qopt_offload offload_op <<
1616 struct htb_sched *q = qdisc_priv(sch) 1238 struct htb_sched *q = qdisc_priv(sch);
1617 struct hlist_node *next; 1239 struct hlist_node *next;
1618 bool nonempty, changed; <<
1619 struct htb_class *cl; 1240 struct htb_class *cl;
1620 unsigned int i; 1241 unsigned int i;
1621 1242
1622 cancel_work_sync(&q->work); 1243 cancel_work_sync(&q->work);
1623 qdisc_watchdog_cancel(&q->watchdog); 1244 qdisc_watchdog_cancel(&q->watchdog);
1624 /* This line used to be after htb_des 1245 /* This line used to be after htb_destroy_class call below
1625 * and surprisingly it worked in 2.4. 1246 * and surprisingly it worked in 2.4. But it must precede it
1626 * because filter need its target cla 1247 * because filter need its target class alive to be able to call
1627 * unbind_filter on it (without Oops) 1248 * unbind_filter on it (without Oops).
1628 */ 1249 */
1629 tcf_block_put(q->block); !! 1250 tcf_destroy_chain(&q->filter_list);
1630 1251
1631 for (i = 0; i < q->clhash.hashsize; i 1252 for (i = 0; i < q->clhash.hashsize; i++) {
1632 hlist_for_each_entry(cl, &q-> !! 1253 hlist_for_each_entry(cl, &q->clhash.hash[i], common.hnode)
1633 tcf_block_put(cl->blo !! 1254 tcf_destroy_chain(&cl->filter_list);
1634 cl->block = NULL; !! 1255 }
1635 } !! 1256 for (i = 0; i < q->clhash.hashsize; i++) {
>> 1257 hlist_for_each_entry_safe(cl, next, &q->clhash.hash[i],
>> 1258 common.hnode)
>> 1259 htb_destroy_class(sch, cl);
1636 } 1260 }
1637 <<
1638 do { <<
1639 nonempty = false; <<
1640 changed = false; <<
1641 for (i = 0; i < q->clhash.has <<
1642 hlist_for_each_entry_ <<
1643 <<
1644 bool last_chi <<
1645 <<
1646 if (!q->offlo <<
1647 htb_d <<
1648 conti <<
1649 } <<
1650 <<
1651 nonempty = tr <<
1652 <<
1653 if (cl->level <<
1654 conti <<
1655 <<
1656 changed = tru <<
1657 <<
1658 last_child = <<
1659 htb_destroy_c <<
1660 <<
1661 qdisc_class_h <<
1662 <<
1663 if (cl->paren <<
1664 cl->p <<
1665 if (last_chil <<
1666 htb_p <<
1667 htb_destroy_c <<
1668 } <<
1669 } <<
1670 } while (changed); <<
1671 WARN_ON(nonempty); <<
1672 <<
1673 qdisc_class_hash_destroy(&q->clhash); 1261 qdisc_class_hash_destroy(&q->clhash);
1674 __qdisc_reset_queue(&q->direct_queue) 1262 __qdisc_reset_queue(&q->direct_queue);
1675 <<
1676 if (q->offload) { <<
1677 offload_opt = (struct tc_htb_ <<
1678 .command = TC_HTB_DES <<
1679 }; <<
1680 htb_offload(dev, &offload_opt <<
1681 } <<
1682 <<
1683 if (!q->direct_qdiscs) <<
1684 return; <<
1685 for (i = 0; i < q->num_direct_qdiscs <<
1686 qdisc_put(q->direct_qdiscs[i] <<
1687 kfree(q->direct_qdiscs); <<
1688 } 1263 }
1689 1264
1690 static int htb_delete(struct Qdisc *sch, unsi !! 1265 static int htb_delete(struct Qdisc *sch, unsigned long arg)
1691 struct netlink_ext_ack <<
1692 { 1266 {
1693 struct htb_sched *q = qdisc_priv(sch) 1267 struct htb_sched *q = qdisc_priv(sch);
1694 struct htb_class *cl = (struct htb_cl 1268 struct htb_class *cl = (struct htb_class *)arg;
1695 struct Qdisc *new_q = NULL; 1269 struct Qdisc *new_q = NULL;
1696 int last_child = 0; 1270 int last_child = 0;
1697 int err; <<
1698 1271
1699 /* TODO: why don't allow to delete su 1272 /* TODO: why don't allow to delete subtree ? references ? does
1700 * tc subsys guarantee us that in htb 1273 * tc subsys guarantee us that in htb_destroy it holds no class
1701 * refs so that we can remove childre 1274 * refs so that we can remove children safely there ?
1702 */ 1275 */
1703 if (cl->children || qdisc_class_in_us !! 1276 if (cl->children || cl->filter_cnt)
1704 NL_SET_ERR_MSG(extack, "HTB c <<
1705 return -EBUSY; 1277 return -EBUSY;
1706 } <<
1707 1278
1708 if (!cl->level && htb_parent_last_chi !! 1279 if (!cl->level && htb_parent_last_child(cl)) {
>> 1280 new_q = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops,
>> 1281 cl->parent->common.classid);
1709 last_child = 1; 1282 last_child = 1;
1710 <<
1711 if (q->offload) { <<
1712 err = htb_destroy_class_offlo <<
1713 <<
1714 if (err) <<
1715 return err; <<
1716 } <<
1717 <<
1718 if (last_child) { <<
1719 struct netdev_queue *dev_queu <<
1720 <<
1721 if (q->offload) <<
1722 dev_queue = htb_offlo <<
1723 <<
1724 new_q = qdisc_create_dflt(dev <<
1725 cl- <<
1726 NUL <<
1727 if (q->offload) <<
1728 htb_parent_to_leaf_of <<
1729 } 1283 }
1730 1284
1731 sch_tree_lock(sch); 1285 sch_tree_lock(sch);
1732 1286
1733 if (!cl->level) !! 1287 if (!cl->level) {
1734 qdisc_purge_queue(cl->leaf.q) !! 1288 unsigned int qlen = cl->un.leaf.q->q.qlen;
>> 1289 unsigned int backlog = cl->un.leaf.q->qstats.backlog;
>> 1290
>> 1291 qdisc_reset(cl->un.leaf.q);
>> 1292 qdisc_tree_reduce_backlog(cl->un.leaf.q, qlen, backlog);
>> 1293 }
1735 1294
1736 /* delete from hash and active; remai 1295 /* delete from hash and active; remainder in destroy_class */
1737 qdisc_class_hash_remove(&q->clhash, & 1296 qdisc_class_hash_remove(&q->clhash, &cl->common);
1738 if (cl->parent) 1297 if (cl->parent)
1739 cl->parent->children--; 1298 cl->parent->children--;
1740 1299
1741 if (cl->prio_activity) 1300 if (cl->prio_activity)
1742 htb_deactivate(q, cl); 1301 htb_deactivate(q, cl);
1743 1302
1744 if (cl->cmode != HTB_CAN_SEND) 1303 if (cl->cmode != HTB_CAN_SEND)
1745 htb_safe_rb_erase(&cl->pq_nod 1304 htb_safe_rb_erase(&cl->pq_node,
1746 &q->hlevel[ 1305 &q->hlevel[cl->level].wait_pq);
1747 1306
1748 if (last_child) 1307 if (last_child)
1749 htb_parent_to_leaf(sch, cl, n !! 1308 htb_parent_to_leaf(q, cl, new_q);
1750 1309
1751 sch_tree_unlock(sch); !! 1310 BUG_ON(--cl->refcnt == 0);
>> 1311 /*
>> 1312 * This shouldn't happen: we "hold" one cops->get() when called
>> 1313 * from tc_ctl_tclass; the destroy method is done from cops->put().
>> 1314 */
1752 1315
1753 htb_destroy_class(sch, cl); !! 1316 sch_tree_unlock(sch);
1754 return 0; 1317 return 0;
1755 } 1318 }
1756 1319
>> 1320 static void htb_put(struct Qdisc *sch, unsigned long arg)
>> 1321 {
>> 1322 struct htb_class *cl = (struct htb_class *)arg;
>> 1323
>> 1324 if (--cl->refcnt == 0)
>> 1325 htb_destroy_class(sch, cl);
>> 1326 }
>> 1327
1757 static int htb_change_class(struct Qdisc *sch 1328 static int htb_change_class(struct Qdisc *sch, u32 classid,
1758 u32 parentid, str 1329 u32 parentid, struct nlattr **tca,
1759 unsigned long *ar !! 1330 unsigned long *arg)
1760 { 1331 {
1761 int err = -EINVAL; 1332 int err = -EINVAL;
1762 struct htb_sched *q = qdisc_priv(sch) 1333 struct htb_sched *q = qdisc_priv(sch);
1763 struct htb_class *cl = (struct htb_cl 1334 struct htb_class *cl = (struct htb_class *)*arg, *parent;
1764 struct tc_htb_qopt_offload offload_op <<
1765 struct nlattr *opt = tca[TCA_OPTIONS] 1335 struct nlattr *opt = tca[TCA_OPTIONS];
1766 struct nlattr *tb[TCA_HTB_MAX + 1]; 1336 struct nlattr *tb[TCA_HTB_MAX + 1];
1767 struct Qdisc *parent_qdisc = NULL; <<
1768 struct netdev_queue *dev_queue; <<
1769 struct tc_htb_opt *hopt; 1337 struct tc_htb_opt *hopt;
1770 u64 rate64, ceil64; 1338 u64 rate64, ceil64;
1771 int warn = 0; <<
1772 1339
1773 /* extract all subattrs from opt attr 1340 /* extract all subattrs from opt attr */
1774 if (!opt) 1341 if (!opt)
1775 goto failure; 1342 goto failure;
1776 1343
1777 err = nla_parse_nested_deprecated(tb, !! 1344 err = nla_parse_nested(tb, TCA_HTB_MAX, opt, htb_policy);
1778 ext <<
1779 if (err < 0) 1345 if (err < 0)
1780 goto failure; 1346 goto failure;
1781 1347
1782 err = -EINVAL; 1348 err = -EINVAL;
1783 if (tb[TCA_HTB_PARMS] == NULL) 1349 if (tb[TCA_HTB_PARMS] == NULL)
1784 goto failure; 1350 goto failure;
1785 1351
1786 parent = parentid == TC_H_ROOT ? NULL 1352 parent = parentid == TC_H_ROOT ? NULL : htb_find(parentid, sch);
1787 1353
1788 hopt = nla_data(tb[TCA_HTB_PARMS]); 1354 hopt = nla_data(tb[TCA_HTB_PARMS]);
1789 if (!hopt->rate.rate || !hopt->ceil.r 1355 if (!hopt->rate.rate || !hopt->ceil.rate)
1790 goto failure; 1356 goto failure;
1791 1357
1792 if (q->offload) { <<
1793 /* Options not supported by t <<
1794 if (hopt->rate.overhead || ho <<
1795 NL_SET_ERR_MSG(extack <<
1796 goto failure; <<
1797 } <<
1798 if (hopt->rate.mpu || hopt->c <<
1799 NL_SET_ERR_MSG(extack <<
1800 goto failure; <<
1801 } <<
1802 } <<
1803 <<
1804 /* Keeping backward compatible with r 1358 /* Keeping backward compatible with rate_table based iproute2 tc */
1805 if (hopt->rate.linklayer == TC_LINKLA 1359 if (hopt->rate.linklayer == TC_LINKLAYER_UNAWARE)
1806 qdisc_put_rtab(qdisc_get_rtab !! 1360 qdisc_put_rtab(qdisc_get_rtab(&hopt->rate, tb[TCA_HTB_RTAB]));
1807 <<
1808 1361
1809 if (hopt->ceil.linklayer == TC_LINKLA 1362 if (hopt->ceil.linklayer == TC_LINKLAYER_UNAWARE)
1810 qdisc_put_rtab(qdisc_get_rtab !! 1363 qdisc_put_rtab(qdisc_get_rtab(&hopt->ceil, tb[TCA_HTB_CTAB]));
1811 <<
1812 <<
1813 rate64 = tb[TCA_HTB_RATE64] ? nla_get <<
1814 ceil64 = tb[TCA_HTB_CEIL64] ? nla_get <<
1815 1364
1816 if (!cl) { /* new class 1365 if (!cl) { /* new class */
1817 struct net_device *dev = qdis !! 1366 struct Qdisc *new_q;
1818 struct Qdisc *new_q, *old_q; <<
1819 int prio; 1367 int prio;
1820 struct { 1368 struct {
1821 struct nlattr 1369 struct nlattr nla;
1822 struct gnet_estimator 1370 struct gnet_estimator opt;
1823 } est = { 1371 } est = {
1824 .nla = { 1372 .nla = {
1825 .nla_len 1373 .nla_len = nla_attr_size(sizeof(est.opt)),
1826 .nla_type 1374 .nla_type = TCA_RATE,
1827 }, 1375 },
1828 .opt = { 1376 .opt = {
1829 /* 4s interva 1377 /* 4s interval, 16s averaging constant */
1830 .interval 1378 .interval = 2,
1831 .ewma_log 1379 .ewma_log = 2,
1832 }, 1380 },
1833 }; 1381 };
1834 1382
1835 /* check for valid classid */ 1383 /* check for valid classid */
1836 if (!classid || TC_H_MAJ(clas 1384 if (!classid || TC_H_MAJ(classid ^ sch->handle) ||
1837 htb_find(classid, sch)) 1385 htb_find(classid, sch))
1838 goto failure; 1386 goto failure;
1839 1387
1840 /* check maximal depth */ 1388 /* check maximal depth */
1841 if (parent && parent->parent 1389 if (parent && parent->parent && parent->parent->level < 2) {
1842 NL_SET_ERR_MSG_MOD(ex !! 1390 pr_err("htb: tree is too deep\n");
1843 goto failure; 1391 goto failure;
1844 } 1392 }
1845 err = -ENOBUFS; 1393 err = -ENOBUFS;
1846 cl = kzalloc(sizeof(*cl), GFP 1394 cl = kzalloc(sizeof(*cl), GFP_KERNEL);
1847 if (!cl) 1395 if (!cl)
1848 goto failure; 1396 goto failure;
1849 1397
1850 gnet_stats_basic_sync_init(&c <<
1851 gnet_stats_basic_sync_init(&c <<
1852 <<
1853 err = tcf_block_get(&cl->bloc <<
1854 if (err) { <<
1855 kfree(cl); <<
1856 goto failure; <<
1857 } <<
1858 if (htb_rate_est || tca[TCA_R 1398 if (htb_rate_est || tca[TCA_RATE]) {
1859 err = gen_new_estimat 1399 err = gen_new_estimator(&cl->bstats, NULL,
1860 1400 &cl->rate_est,
1861 1401 NULL,
1862 !! 1402 qdisc_root_sleeping_running(sch),
1863 1403 tca[TCA_RATE] ? : &est.nla);
1864 if (err) !! 1404 if (err) {
1865 goto err_bloc !! 1405 kfree(cl);
>> 1406 goto failure;
>> 1407 }
1866 } 1408 }
1867 1409
>> 1410 cl->refcnt = 1;
1868 cl->children = 0; 1411 cl->children = 0;
>> 1412 INIT_LIST_HEAD(&cl->un.leaf.drop_list);
1869 RB_CLEAR_NODE(&cl->pq_node); 1413 RB_CLEAR_NODE(&cl->pq_node);
1870 1414
1871 for (prio = 0; prio < TC_HTB_ 1415 for (prio = 0; prio < TC_HTB_NUMPRIO; prio++)
1872 RB_CLEAR_NODE(&cl->no 1416 RB_CLEAR_NODE(&cl->node[prio]);
1873 1417
1874 cl->common.classid = classid; <<
1875 <<
1876 /* Make sure nothing interrup <<
1877 * ndo_setup_tc calls. <<
1878 */ <<
1879 ASSERT_RTNL(); <<
1880 <<
1881 /* create leaf qdisc early be 1418 /* create leaf qdisc early because it uses kmalloc(GFP_KERNEL)
1882 * so that can't be used insi 1419 * so that can't be used inside of sch_tree_lock
1883 * -- thanks to Karlis Peisen 1420 * -- thanks to Karlis Peisenieks
1884 */ 1421 */
1885 if (!q->offload) { !! 1422 new_q = qdisc_create_dflt(sch->dev_queue,
1886 dev_queue = sch->dev_ !! 1423 &pfifo_qdisc_ops, classid);
1887 } else if (!(parent && !paren <<
1888 /* Assign a dev_queue <<
1889 offload_opt = (struct <<
1890 .command = TC <<
1891 .classid = cl <<
1892 .parent_class <<
1893 TC_H_ <<
1894 TC_HT <<
1895 .rate = max_t <<
1896 .ceil = max_t <<
1897 .prio = hopt- <<
1898 .quantum = ho <<
1899 .extack = ext <<
1900 }; <<
1901 err = htb_offload(dev <<
1902 if (err) { <<
1903 NL_SET_ERR_MS <<
1904 <<
1905 goto err_kill <<
1906 } <<
1907 dev_queue = netdev_ge <<
1908 } else { /* First child. */ <<
1909 dev_queue = htb_offlo <<
1910 old_q = htb_graft_hel <<
1911 WARN_ON(old_q != pare <<
1912 offload_opt = (struct <<
1913 .command = TC <<
1914 .classid = cl <<
1915 .parent_class <<
1916 TC_H_ <<
1917 .rate = max_t <<
1918 .ceil = max_t <<
1919 .prio = hopt- <<
1920 .quantum = ho <<
1921 .extack = ext <<
1922 }; <<
1923 err = htb_offload(dev <<
1924 if (err) { <<
1925 NL_SET_ERR_MS <<
1926 <<
1927 htb_graft_hel <<
1928 goto err_kill <<
1929 } <<
1930 _bstats_update(&paren <<
1931 u64_st <<
1932 u64_st <<
1933 qdisc_put(old_q); <<
1934 } <<
1935 new_q = qdisc_create_dflt(dev <<
1936 cla <<
1937 if (q->offload) { <<
1938 /* One ref for cl->le <<
1939 if (new_q) <<
1940 qdisc_refcoun <<
1941 old_q = htb_graft_hel <<
1942 /* No qdisc_put neede <<
1943 WARN_ON(!(old_q->flag <<
1944 } <<
1945 sch_tree_lock(sch); 1424 sch_tree_lock(sch);
1946 if (parent && !parent->level) 1425 if (parent && !parent->level) {
>> 1426 unsigned int qlen = parent->un.leaf.q->q.qlen;
>> 1427 unsigned int backlog = parent->un.leaf.q->qstats.backlog;
>> 1428
1947 /* turn parent into i 1429 /* turn parent into inner node */
1948 qdisc_purge_queue(par !! 1430 qdisc_reset(parent->un.leaf.q);
1949 parent_qdisc = parent !! 1431 qdisc_tree_reduce_backlog(parent->un.leaf.q, qlen, backlog);
>> 1432 qdisc_destroy(parent->un.leaf.q);
1950 if (parent->prio_acti 1433 if (parent->prio_activity)
1951 htb_deactivat 1434 htb_deactivate(q, parent);
1952 1435
1953 /* remove from evt li 1436 /* remove from evt list because of level change */
1954 if (parent->cmode != 1437 if (parent->cmode != HTB_CAN_SEND) {
1955 htb_safe_rb_e 1438 htb_safe_rb_erase(&parent->pq_node, &q->hlevel[0].wait_pq);
1956 parent->cmode 1439 parent->cmode = HTB_CAN_SEND;
1957 } 1440 }
1958 parent->level = (pare 1441 parent->level = (parent->parent ? parent->parent->level
1959 : TC 1442 : TC_HTB_MAXDEPTH) - 1;
1960 memset(&parent->inner !! 1443 memset(&parent->un.inner, 0, sizeof(parent->un.inner));
1961 } 1444 }
1962 <<
1963 /* leaf (we) needs elementary 1445 /* leaf (we) needs elementary qdisc */
1964 cl->leaf.q = new_q ? new_q : !! 1446 cl->un.leaf.q = new_q ? new_q : &noop_qdisc;
1965 if (q->offload) <<
1966 cl->leaf.offload_queu <<
1967 1447
>> 1448 cl->common.classid = classid;
1968 cl->parent = parent; 1449 cl->parent = parent;
1969 1450
1970 /* set class to be in HTB_CAN 1451 /* set class to be in HTB_CAN_SEND state */
1971 cl->tokens = PSCHED_TICKS2NS( 1452 cl->tokens = PSCHED_TICKS2NS(hopt->buffer);
1972 cl->ctokens = PSCHED_TICKS2NS 1453 cl->ctokens = PSCHED_TICKS2NS(hopt->cbuffer);
1973 cl->mbuffer = 60ULL * NSEC_PE 1454 cl->mbuffer = 60ULL * NSEC_PER_SEC; /* 1min */
1974 cl->t_c = ktime_get_ns(); 1455 cl->t_c = ktime_get_ns();
1975 cl->cmode = HTB_CAN_SEND; 1456 cl->cmode = HTB_CAN_SEND;
1976 1457
1977 /* attach to the hash list an 1458 /* attach to the hash list and parent's family */
1978 qdisc_class_hash_insert(&q->c 1459 qdisc_class_hash_insert(&q->clhash, &cl->common);
1979 if (parent) 1460 if (parent)
1980 parent->children++; 1461 parent->children++;
1981 if (cl->leaf.q != &noop_qdisc <<
1982 qdisc_hash_add(cl->le <<
1983 } else { 1462 } else {
1984 if (tca[TCA_RATE]) { 1463 if (tca[TCA_RATE]) {
1985 err = gen_replace_est 1464 err = gen_replace_estimator(&cl->bstats, NULL,
1986 1465 &cl->rate_est,
1987 1466 NULL,
1988 !! 1467 qdisc_root_sleeping_running(sch),
1989 1468 tca[TCA_RATE]);
1990 if (err) 1469 if (err)
1991 return err; 1470 return err;
1992 } 1471 }
1993 <<
1994 if (q->offload) { <<
1995 struct net_device *de <<
1996 <<
1997 offload_opt = (struct <<
1998 .command = TC <<
1999 .classid = cl <<
2000 .rate = max_t <<
2001 .ceil = max_t <<
2002 .prio = hopt- <<
2003 .quantum = ho <<
2004 .extack = ext <<
2005 }; <<
2006 err = htb_offload(dev <<
2007 if (err) <<
2008 /* Estimator <<
2009 * as well, s <<
2010 * the estima <<
2011 * offload an <<
2012 * only when <<
2013 */ <<
2014 return err; <<
2015 } <<
2016 <<
2017 sch_tree_lock(sch); 1472 sch_tree_lock(sch);
2018 } 1473 }
2019 1474
>> 1475 rate64 = tb[TCA_HTB_RATE64] ? nla_get_u64(tb[TCA_HTB_RATE64]) : 0;
>> 1476
>> 1477 ceil64 = tb[TCA_HTB_CEIL64] ? nla_get_u64(tb[TCA_HTB_CEIL64]) : 0;
>> 1478
2020 psched_ratecfg_precompute(&cl->rate, 1479 psched_ratecfg_precompute(&cl->rate, &hopt->rate, rate64);
2021 psched_ratecfg_precompute(&cl->ceil, 1480 psched_ratecfg_precompute(&cl->ceil, &hopt->ceil, ceil64);
2022 1481
2023 /* it used to be a nasty bug here, we 1482 /* it used to be a nasty bug here, we have to check that node
2024 * is really leaf before changing cl- !! 1483 * is really leaf before changing cl->un.leaf !
2025 */ 1484 */
2026 if (!cl->level) { 1485 if (!cl->level) {
2027 u64 quantum = cl->rate.rate_b 1486 u64 quantum = cl->rate.rate_bytes_ps;
2028 1487
2029 do_div(quantum, q->rate2quant 1488 do_div(quantum, q->rate2quantum);
2030 cl->quantum = min_t(u64, quan 1489 cl->quantum = min_t(u64, quantum, INT_MAX);
2031 1490
2032 if (!hopt->quantum && cl->qua 1491 if (!hopt->quantum && cl->quantum < 1000) {
2033 warn = -1; !! 1492 pr_warn("HTB: quantum of class %X is small. Consider r2q change.\n",
>> 1493 cl->common.classid);
2034 cl->quantum = 1000; 1494 cl->quantum = 1000;
2035 } 1495 }
2036 if (!hopt->quantum && cl->qua 1496 if (!hopt->quantum && cl->quantum > 200000) {
2037 warn = 1; !! 1497 pr_warn("HTB: quantum of class %X is big. Consider r2q change.\n",
>> 1498 cl->common.classid);
2038 cl->quantum = 200000; 1499 cl->quantum = 200000;
2039 } 1500 }
2040 if (hopt->quantum) 1501 if (hopt->quantum)
2041 cl->quantum = hopt->q 1502 cl->quantum = hopt->quantum;
2042 if ((cl->prio = hopt->prio) > 1503 if ((cl->prio = hopt->prio) >= TC_HTB_NUMPRIO)
2043 cl->prio = TC_HTB_NUM 1504 cl->prio = TC_HTB_NUMPRIO - 1;
2044 } 1505 }
2045 1506
2046 cl->buffer = PSCHED_TICKS2NS(hopt->bu 1507 cl->buffer = PSCHED_TICKS2NS(hopt->buffer);
2047 cl->cbuffer = PSCHED_TICKS2NS(hopt->c 1508 cl->cbuffer = PSCHED_TICKS2NS(hopt->cbuffer);
2048 1509
2049 sch_tree_unlock(sch); 1510 sch_tree_unlock(sch);
2050 qdisc_put(parent_qdisc); <<
2051 <<
2052 if (warn) <<
2053 NL_SET_ERR_MSG_FMT_MOD(extack <<
2054 "quant <<
2055 cl->co <<
2056 1511
2057 qdisc_class_hash_grow(sch, &q->clhash 1512 qdisc_class_hash_grow(sch, &q->clhash);
2058 1513
2059 *arg = (unsigned long)cl; 1514 *arg = (unsigned long)cl;
2060 return 0; 1515 return 0;
2061 1516
2062 err_kill_estimator: <<
2063 gen_kill_estimator(&cl->rate_est); <<
2064 err_block_put: <<
2065 tcf_block_put(cl->block); <<
2066 kfree(cl); <<
2067 failure: 1517 failure:
2068 return err; 1518 return err;
2069 } 1519 }
2070 1520
2071 static struct tcf_block *htb_tcf_block(struct !! 1521 static struct tcf_proto __rcu **htb_find_tcf(struct Qdisc *sch,
2072 struct !! 1522 unsigned long arg)
2073 { 1523 {
2074 struct htb_sched *q = qdisc_priv(sch) 1524 struct htb_sched *q = qdisc_priv(sch);
2075 struct htb_class *cl = (struct htb_cl 1525 struct htb_class *cl = (struct htb_class *)arg;
>> 1526 struct tcf_proto __rcu **fl = cl ? &cl->filter_list : &q->filter_list;
2076 1527
2077 return cl ? cl->block : q->block; !! 1528 return fl;
2078 } 1529 }
2079 1530
2080 static unsigned long htb_bind_filter(struct Q 1531 static unsigned long htb_bind_filter(struct Qdisc *sch, unsigned long parent,
2081 u32 clas 1532 u32 classid)
2082 { 1533 {
2083 struct htb_class *cl = htb_find(class 1534 struct htb_class *cl = htb_find(classid, sch);
2084 1535
2085 /*if (cl && !cl->level) return 0; 1536 /*if (cl && !cl->level) return 0;
2086 * The line above used to be there to 1537 * The line above used to be there to prevent attaching filters to
2087 * leaves. But at least tc_index filt 1538 * leaves. But at least tc_index filter uses this just to get class
2088 * for other reasons so that we have 1539 * for other reasons so that we have to allow for it.
2089 * ---- 1540 * ----
2090 * 19.6.2002 As Werner explained it i 1541 * 19.6.2002 As Werner explained it is ok - bind filter is just
2091 * another way to "lock" the class - 1542 * another way to "lock" the class - unlike "get" this lock can
2092 * be broken by class during destroy 1543 * be broken by class during destroy IIUC.
2093 */ 1544 */
2094 if (cl) 1545 if (cl)
2095 qdisc_class_get(&cl->common); !! 1546 cl->filter_cnt++;
2096 return (unsigned long)cl; 1547 return (unsigned long)cl;
2097 } 1548 }
2098 1549
2099 static void htb_unbind_filter(struct Qdisc *s 1550 static void htb_unbind_filter(struct Qdisc *sch, unsigned long arg)
2100 { 1551 {
2101 struct htb_class *cl = (struct htb_cl 1552 struct htb_class *cl = (struct htb_class *)arg;
2102 1553
2103 qdisc_class_put(&cl->common); !! 1554 if (cl)
>> 1555 cl->filter_cnt--;
2104 } 1556 }
2105 1557
2106 static void htb_walk(struct Qdisc *sch, struc 1558 static void htb_walk(struct Qdisc *sch, struct qdisc_walker *arg)
2107 { 1559 {
2108 struct htb_sched *q = qdisc_priv(sch) 1560 struct htb_sched *q = qdisc_priv(sch);
2109 struct htb_class *cl; 1561 struct htb_class *cl;
2110 unsigned int i; 1562 unsigned int i;
2111 1563
2112 if (arg->stop) 1564 if (arg->stop)
2113 return; 1565 return;
2114 1566
2115 for (i = 0; i < q->clhash.hashsize; i 1567 for (i = 0; i < q->clhash.hashsize; i++) {
2116 hlist_for_each_entry(cl, &q-> 1568 hlist_for_each_entry(cl, &q->clhash.hash[i], common.hnode) {
2117 if (!tc_qdisc_stats_d !! 1569 if (arg->count < arg->skip) {
>> 1570 arg->count++;
>> 1571 continue;
>> 1572 }
>> 1573 if (arg->fn(sch, (unsigned long)cl, arg) < 0) {
>> 1574 arg->stop = 1;
2118 return; 1575 return;
>> 1576 }
>> 1577 arg->count++;
2119 } 1578 }
2120 } 1579 }
2121 } 1580 }
2122 1581
2123 static const struct Qdisc_class_ops htb_class 1582 static const struct Qdisc_class_ops htb_class_ops = {
2124 .select_queue = htb_select_qu <<
2125 .graft = htb_graft, 1583 .graft = htb_graft,
2126 .leaf = htb_leaf, 1584 .leaf = htb_leaf,
2127 .qlen_notify = htb_qlen_noti 1585 .qlen_notify = htb_qlen_notify,
2128 .find = htb_search, !! 1586 .get = htb_get,
>> 1587 .put = htb_put,
2129 .change = htb_change_cl 1588 .change = htb_change_class,
2130 .delete = htb_delete, 1589 .delete = htb_delete,
2131 .walk = htb_walk, 1590 .walk = htb_walk,
2132 .tcf_block = htb_tcf_block !! 1591 .tcf_chain = htb_find_tcf,
2133 .bind_tcf = htb_bind_filt 1592 .bind_tcf = htb_bind_filter,
2134 .unbind_tcf = htb_unbind_fi 1593 .unbind_tcf = htb_unbind_filter,
2135 .dump = htb_dump_clas 1594 .dump = htb_dump_class,
2136 .dump_stats = htb_dump_clas 1595 .dump_stats = htb_dump_class_stats,
2137 }; 1596 };
2138 1597
2139 static struct Qdisc_ops htb_qdisc_ops __read_ 1598 static struct Qdisc_ops htb_qdisc_ops __read_mostly = {
2140 .cl_ops = &htb_class_op 1599 .cl_ops = &htb_class_ops,
2141 .id = "htb", 1600 .id = "htb",
2142 .priv_size = sizeof(struct 1601 .priv_size = sizeof(struct htb_sched),
2143 .enqueue = htb_enqueue, 1602 .enqueue = htb_enqueue,
2144 .dequeue = htb_dequeue, 1603 .dequeue = htb_dequeue,
2145 .peek = qdisc_peek_de 1604 .peek = qdisc_peek_dequeued,
2146 .init = htb_init, 1605 .init = htb_init,
2147 .attach = htb_attach, <<
2148 .reset = htb_reset, 1606 .reset = htb_reset,
2149 .destroy = htb_destroy, 1607 .destroy = htb_destroy,
2150 .dump = htb_dump, 1608 .dump = htb_dump,
2151 .owner = THIS_MODULE, 1609 .owner = THIS_MODULE,
2152 }; 1610 };
2153 MODULE_ALIAS_NET_SCH("htb"); <<
2154 1611
2155 static int __init htb_module_init(void) 1612 static int __init htb_module_init(void)
2156 { 1613 {
2157 return register_qdisc(&htb_qdisc_ops) 1614 return register_qdisc(&htb_qdisc_ops);
2158 } 1615 }
2159 static void __exit htb_module_exit(void) 1616 static void __exit htb_module_exit(void)
2160 { 1617 {
2161 unregister_qdisc(&htb_qdisc_ops); 1618 unregister_qdisc(&htb_qdisc_ops);
2162 } 1619 }
2163 1620
2164 module_init(htb_module_init) 1621 module_init(htb_module_init)
2165 module_exit(htb_module_exit) 1622 module_exit(htb_module_exit)
2166 MODULE_LICENSE("GPL"); 1623 MODULE_LICENSE("GPL");
2167 MODULE_DESCRIPTION("Hierarchical Token Bucket <<
2168 1624
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.