Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit bd27a8750c9b849068d80e298f99940bb7128b33

Authored by Eric Dumazet
Committed by David S. Miller
1 parent 40c9c31e38
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

net_cls: Use __dev_get_by_index() 

We hold RTNL in tc_dump_tfilter(), we can avoid dev_hold()/dev_put()

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 2 additions and 2 deletions Inline Diff

1 /* 1 /*
2 * net/sched/cls_api.c Packet classifier API. 2 * net/sched/cls_api.c Packet classifier API.
3 * 3 *
4 * This program is free software; you can redistribute it and/or 4 * This program is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU General Public License 5 * modify it under the terms of the GNU General Public License
6 * as published by the Free Software Foundation; either version 6 * as published by the Free Software Foundation; either version
7 * 2 of the License, or (at your option) any later version. 7 * 2 of the License, or (at your option) any later version.
8 * 8 *
9 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> 9 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
10 * 10 *
11 * Changes: 11 * Changes:
12 * 12 *
13 * Eduardo J. Blanco <ejbs@netlabs.com.uy> :990222: kmod support 13 * Eduardo J. Blanco <ejbs@netlabs.com.uy> :990222: kmod support
14 * 14 *
15 */ 15 */
16 16
17 #include <linux/module.h> 17 #include <linux/module.h>
18 #include <linux/types.h> 18 #include <linux/types.h>
19 #include <linux/kernel.h> 19 #include <linux/kernel.h>
20 #include <linux/string.h> 20 #include <linux/string.h>
21 #include <linux/errno.h> 21 #include <linux/errno.h>
22 #include <linux/skbuff.h> 22 #include <linux/skbuff.h>
23 #include <linux/init.h> 23 #include <linux/init.h>
24 #include <linux/kmod.h> 24 #include <linux/kmod.h>
25 #include <linux/netlink.h> 25 #include <linux/netlink.h>
26 #include <linux/err.h> 26 #include <linux/err.h>
27 #include <net/net_namespace.h> 27 #include <net/net_namespace.h>
28 #include <net/sock.h> 28 #include <net/sock.h>
29 #include <net/netlink.h> 29 #include <net/netlink.h>
30 #include <net/pkt_sched.h> 30 #include <net/pkt_sched.h>
31 #include <net/pkt_cls.h> 31 #include <net/pkt_cls.h>
32 32
33 /* The list of all installed classifier types */ 33 /* The list of all installed classifier types */
34 34
35 static struct tcf_proto_ops *tcf_proto_base __read_mostly; 35 static struct tcf_proto_ops *tcf_proto_base __read_mostly;
36 36
37 /* Protects list of registered TC modules. It is pure SMP lock. */ 37 /* Protects list of registered TC modules. It is pure SMP lock. */
38 static DEFINE_RWLOCK(cls_mod_lock); 38 static DEFINE_RWLOCK(cls_mod_lock);
39 39
40 /* Find classifier type by string name */ 40 /* Find classifier type by string name */
41 41
42 static struct tcf_proto_ops *tcf_proto_lookup_ops(struct nlattr *kind) 42 static struct tcf_proto_ops *tcf_proto_lookup_ops(struct nlattr *kind)
43 { 43 {
44 struct tcf_proto_ops *t = NULL; 44 struct tcf_proto_ops *t = NULL;
45 45
46 if (kind) { 46 if (kind) {
47 read_lock(&cls_mod_lock); 47 read_lock(&cls_mod_lock);
48 for (t = tcf_proto_base; t; t = t->next) { 48 for (t = tcf_proto_base; t; t = t->next) {
49 if (nla_strcmp(kind, t->kind) == 0) { 49 if (nla_strcmp(kind, t->kind) == 0) {
50 if (!try_module_get(t->owner)) 50 if (!try_module_get(t->owner))
51 t = NULL; 51 t = NULL;
52 break; 52 break;
53 } 53 }
54 } 54 }
55 read_unlock(&cls_mod_lock); 55 read_unlock(&cls_mod_lock);
56 } 56 }
57 return t; 57 return t;
58 } 58 }
59 59
60 /* Register(unregister) new classifier type */ 60 /* Register(unregister) new classifier type */
61 61
62 int register_tcf_proto_ops(struct tcf_proto_ops *ops) 62 int register_tcf_proto_ops(struct tcf_proto_ops *ops)
63 { 63 {
64 struct tcf_proto_ops *t, **tp; 64 struct tcf_proto_ops *t, **tp;
65 int rc = -EEXIST; 65 int rc = -EEXIST;
66 66
67 write_lock(&cls_mod_lock); 67 write_lock(&cls_mod_lock);
68 for (tp = &tcf_proto_base; (t = *tp) != NULL; tp = &t->next) 68 for (tp = &tcf_proto_base; (t = *tp) != NULL; tp = &t->next)
69 if (!strcmp(ops->kind, t->kind)) 69 if (!strcmp(ops->kind, t->kind))
70 goto out; 70 goto out;
71 71
72 ops->next = NULL; 72 ops->next = NULL;
73 *tp = ops; 73 *tp = ops;
74 rc = 0; 74 rc = 0;
75 out: 75 out:
76 write_unlock(&cls_mod_lock); 76 write_unlock(&cls_mod_lock);
77 return rc; 77 return rc;
78 } 78 }
79 EXPORT_SYMBOL(register_tcf_proto_ops); 79 EXPORT_SYMBOL(register_tcf_proto_ops);
80 80
81 int unregister_tcf_proto_ops(struct tcf_proto_ops *ops) 81 int unregister_tcf_proto_ops(struct tcf_proto_ops *ops)
82 { 82 {
83 struct tcf_proto_ops *t, **tp; 83 struct tcf_proto_ops *t, **tp;
84 int rc = -ENOENT; 84 int rc = -ENOENT;
85 85
86 write_lock(&cls_mod_lock); 86 write_lock(&cls_mod_lock);
87 for (tp = &tcf_proto_base; (t=*tp) != NULL; tp = &t->next) 87 for (tp = &tcf_proto_base; (t=*tp) != NULL; tp = &t->next)
88 if (t == ops) 88 if (t == ops)
89 break; 89 break;
90 90
91 if (!t) 91 if (!t)
92 goto out; 92 goto out;
93 *tp = t->next; 93 *tp = t->next;
94 rc = 0; 94 rc = 0;
95 out: 95 out:
96 write_unlock(&cls_mod_lock); 96 write_unlock(&cls_mod_lock);
97 return rc; 97 return rc;
98 } 98 }
99 EXPORT_SYMBOL(unregister_tcf_proto_ops); 99 EXPORT_SYMBOL(unregister_tcf_proto_ops);
100 100
101 static int tfilter_notify(struct sk_buff *oskb, struct nlmsghdr *n, 101 static int tfilter_notify(struct sk_buff *oskb, struct nlmsghdr *n,
102 struct tcf_proto *tp, unsigned long fh, int event); 102 struct tcf_proto *tp, unsigned long fh, int event);
103 103
104 104
105 /* Select new prio value from the range, managed by kernel. */ 105 /* Select new prio value from the range, managed by kernel. */
106 106
107 static inline u32 tcf_auto_prio(struct tcf_proto *tp) 107 static inline u32 tcf_auto_prio(struct tcf_proto *tp)
108 { 108 {
109 u32 first = TC_H_MAKE(0xC0000000U, 0U); 109 u32 first = TC_H_MAKE(0xC0000000U, 0U);
110 110
111 if (tp) 111 if (tp)
112 first = tp->prio-1; 112 first = tp->prio-1;
113 113
114 return first; 114 return first;
115 } 115 }
116 116
117 /* Add/change/delete/get a filter node */ 117 /* Add/change/delete/get a filter node */
118 118
119 static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, void *arg) 119 static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
120 { 120 {
121 struct net *net = sock_net(skb->sk); 121 struct net *net = sock_net(skb->sk);
122 struct nlattr *tca[TCA_MAX + 1]; 122 struct nlattr *tca[TCA_MAX + 1];
123 spinlock_t *root_lock; 123 spinlock_t *root_lock;
124 struct tcmsg *t; 124 struct tcmsg *t;
125 u32 protocol; 125 u32 protocol;
126 u32 prio; 126 u32 prio;
127 u32 nprio; 127 u32 nprio;
128 u32 parent; 128 u32 parent;
129 struct net_device *dev; 129 struct net_device *dev;
130 struct Qdisc *q; 130 struct Qdisc *q;
131 struct tcf_proto **back, **chain; 131 struct tcf_proto **back, **chain;
132 struct tcf_proto *tp; 132 struct tcf_proto *tp;
133 struct tcf_proto_ops *tp_ops; 133 struct tcf_proto_ops *tp_ops;
134 const struct Qdisc_class_ops *cops; 134 const struct Qdisc_class_ops *cops;
135 unsigned long cl; 135 unsigned long cl;
136 unsigned long fh; 136 unsigned long fh;
137 int err; 137 int err;
138 int tp_created = 0; 138 int tp_created = 0;
139 139
140 if (net != &init_net) 140 if (net != &init_net)
141 return -EINVAL; 141 return -EINVAL;
142 142
143 replay: 143 replay:
144 t = NLMSG_DATA(n); 144 t = NLMSG_DATA(n);
145 protocol = TC_H_MIN(t->tcm_info); 145 protocol = TC_H_MIN(t->tcm_info);
146 prio = TC_H_MAJ(t->tcm_info); 146 prio = TC_H_MAJ(t->tcm_info);
147 nprio = prio; 147 nprio = prio;
148 parent = t->tcm_parent; 148 parent = t->tcm_parent;
149 cl = 0; 149 cl = 0;
150 150
151 if (prio == 0) { 151 if (prio == 0) {
152 /* If no priority is given, user wants we allocated it. */ 152 /* If no priority is given, user wants we allocated it. */
153 if (n->nlmsg_type != RTM_NEWTFILTER || !(n->nlmsg_flags&NLM_F_CREATE)) 153 if (n->nlmsg_type != RTM_NEWTFILTER || !(n->nlmsg_flags&NLM_F_CREATE))
154 return -ENOENT; 154 return -ENOENT;
155 prio = TC_H_MAKE(0x80000000U, 0U); 155 prio = TC_H_MAKE(0x80000000U, 0U);
156 } 156 }
157 157
158 /* Find head of filter chain. */ 158 /* Find head of filter chain. */
159 159
160 /* Find link */ 160 /* Find link */
161 dev = __dev_get_by_index(&init_net, t->tcm_ifindex); 161 dev = __dev_get_by_index(&init_net, t->tcm_ifindex);
162 if (dev == NULL) 162 if (dev == NULL)
163 return -ENODEV; 163 return -ENODEV;
164 164
165 err = nlmsg_parse(n, sizeof(*t), tca, TCA_MAX, NULL); 165 err = nlmsg_parse(n, sizeof(*t), tca, TCA_MAX, NULL);
166 if (err < 0) 166 if (err < 0)
167 return err; 167 return err;
168 168
169 /* Find qdisc */ 169 /* Find qdisc */
170 if (!parent) { 170 if (!parent) {
171 q = dev->qdisc; 171 q = dev->qdisc;
172 parent = q->handle; 172 parent = q->handle;
173 } else { 173 } else {
174 q = qdisc_lookup(dev, TC_H_MAJ(t->tcm_parent)); 174 q = qdisc_lookup(dev, TC_H_MAJ(t->tcm_parent));
175 if (q == NULL) 175 if (q == NULL)
176 return -EINVAL; 176 return -EINVAL;
177 } 177 }
178 178
179 /* Is it classful? */ 179 /* Is it classful? */
180 if ((cops = q->ops->cl_ops) == NULL) 180 if ((cops = q->ops->cl_ops) == NULL)
181 return -EINVAL; 181 return -EINVAL;
182 182
183 if (cops->tcf_chain == NULL) 183 if (cops->tcf_chain == NULL)
184 return -EOPNOTSUPP; 184 return -EOPNOTSUPP;
185 185
186 /* Do we search for filter, attached to class? */ 186 /* Do we search for filter, attached to class? */
187 if (TC_H_MIN(parent)) { 187 if (TC_H_MIN(parent)) {
188 cl = cops->get(q, parent); 188 cl = cops->get(q, parent);
189 if (cl == 0) 189 if (cl == 0)
190 return -ENOENT; 190 return -ENOENT;
191 } 191 }
192 192
193 /* And the last stroke */ 193 /* And the last stroke */
194 chain = cops->tcf_chain(q, cl); 194 chain = cops->tcf_chain(q, cl);
195 err = -EINVAL; 195 err = -EINVAL;
196 if (chain == NULL) 196 if (chain == NULL)
197 goto errout; 197 goto errout;
198 198
199 /* Check the chain for existence of proto-tcf with this priority */ 199 /* Check the chain for existence of proto-tcf with this priority */
200 for (back = chain; (tp=*back) != NULL; back = &tp->next) { 200 for (back = chain; (tp=*back) != NULL; back = &tp->next) {
201 if (tp->prio >= prio) { 201 if (tp->prio >= prio) {
202 if (tp->prio == prio) { 202 if (tp->prio == prio) {
203 if (!nprio || (tp->protocol != protocol && protocol)) 203 if (!nprio || (tp->protocol != protocol && protocol))
204 goto errout; 204 goto errout;
205 } else 205 } else
206 tp = NULL; 206 tp = NULL;
207 break; 207 break;
208 } 208 }
209 } 209 }
210 210
211 root_lock = qdisc_root_sleeping_lock(q); 211 root_lock = qdisc_root_sleeping_lock(q);
212 212
213 if (tp == NULL) { 213 if (tp == NULL) {
214 /* Proto-tcf does not exist, create new one */ 214 /* Proto-tcf does not exist, create new one */
215 215
216 if (tca[TCA_KIND] == NULL || !protocol) 216 if (tca[TCA_KIND] == NULL || !protocol)
217 goto errout; 217 goto errout;
218 218
219 err = -ENOENT; 219 err = -ENOENT;
220 if (n->nlmsg_type != RTM_NEWTFILTER || !(n->nlmsg_flags&NLM_F_CREATE)) 220 if (n->nlmsg_type != RTM_NEWTFILTER || !(n->nlmsg_flags&NLM_F_CREATE))
221 goto errout; 221 goto errout;
222 222
223 223
224 /* Create new proto tcf */ 224 /* Create new proto tcf */
225 225
226 err = -ENOBUFS; 226 err = -ENOBUFS;
227 tp = kzalloc(sizeof(*tp), GFP_KERNEL); 227 tp = kzalloc(sizeof(*tp), GFP_KERNEL);
228 if (tp == NULL) 228 if (tp == NULL)
229 goto errout; 229 goto errout;
230 err = -ENOENT; 230 err = -ENOENT;
231 tp_ops = tcf_proto_lookup_ops(tca[TCA_KIND]); 231 tp_ops = tcf_proto_lookup_ops(tca[TCA_KIND]);
232 if (tp_ops == NULL) { 232 if (tp_ops == NULL) {
233 #ifdef CONFIG_MODULES 233 #ifdef CONFIG_MODULES
234 struct nlattr *kind = tca[TCA_KIND]; 234 struct nlattr *kind = tca[TCA_KIND];
235 char name[IFNAMSIZ]; 235 char name[IFNAMSIZ];
236 236
237 if (kind != NULL && 237 if (kind != NULL &&
238 nla_strlcpy(name, kind, IFNAMSIZ) < IFNAMSIZ) { 238 nla_strlcpy(name, kind, IFNAMSIZ) < IFNAMSIZ) {
239 rtnl_unlock(); 239 rtnl_unlock();
240 request_module("cls_%s", name); 240 request_module("cls_%s", name);
241 rtnl_lock(); 241 rtnl_lock();
242 tp_ops = tcf_proto_lookup_ops(kind); 242 tp_ops = tcf_proto_lookup_ops(kind);
243 /* We dropped the RTNL semaphore in order to 243 /* We dropped the RTNL semaphore in order to
244 * perform the module load. So, even if we 244 * perform the module load. So, even if we
245 * succeeded in loading the module we have to 245 * succeeded in loading the module we have to
246 * replay the request. We indicate this using 246 * replay the request. We indicate this using
247 * -EAGAIN. 247 * -EAGAIN.
248 */ 248 */
249 if (tp_ops != NULL) { 249 if (tp_ops != NULL) {
250 module_put(tp_ops->owner); 250 module_put(tp_ops->owner);
251 err = -EAGAIN; 251 err = -EAGAIN;
252 } 252 }
253 } 253 }
254 #endif 254 #endif
255 kfree(tp); 255 kfree(tp);
256 goto errout; 256 goto errout;
257 } 257 }
258 tp->ops = tp_ops; 258 tp->ops = tp_ops;
259 tp->protocol = protocol; 259 tp->protocol = protocol;
260 tp->prio = nprio ? : TC_H_MAJ(tcf_auto_prio(*back)); 260 tp->prio = nprio ? : TC_H_MAJ(tcf_auto_prio(*back));
261 tp->q = q; 261 tp->q = q;
262 tp->classify = tp_ops->classify; 262 tp->classify = tp_ops->classify;
263 tp->classid = parent; 263 tp->classid = parent;
264 264
265 err = tp_ops->init(tp); 265 err = tp_ops->init(tp);
266 if (err != 0) { 266 if (err != 0) {
267 module_put(tp_ops->owner); 267 module_put(tp_ops->owner);
268 kfree(tp); 268 kfree(tp);
269 goto errout; 269 goto errout;
270 } 270 }
271 271
272 tp_created = 1; 272 tp_created = 1;
273 273
274 } else if (tca[TCA_KIND] && nla_strcmp(tca[TCA_KIND], tp->ops->kind)) 274 } else if (tca[TCA_KIND] && nla_strcmp(tca[TCA_KIND], tp->ops->kind))
275 goto errout; 275 goto errout;
276 276
277 fh = tp->ops->get(tp, t->tcm_handle); 277 fh = tp->ops->get(tp, t->tcm_handle);
278 278
279 if (fh == 0) { 279 if (fh == 0) {
280 if (n->nlmsg_type == RTM_DELTFILTER && t->tcm_handle == 0) { 280 if (n->nlmsg_type == RTM_DELTFILTER && t->tcm_handle == 0) {
281 spin_lock_bh(root_lock); 281 spin_lock_bh(root_lock);
282 *back = tp->next; 282 *back = tp->next;
283 spin_unlock_bh(root_lock); 283 spin_unlock_bh(root_lock);
284 284
285 tfilter_notify(skb, n, tp, fh, RTM_DELTFILTER); 285 tfilter_notify(skb, n, tp, fh, RTM_DELTFILTER);
286 tcf_destroy(tp); 286 tcf_destroy(tp);
287 err = 0; 287 err = 0;
288 goto errout; 288 goto errout;
289 } 289 }
290 290
291 err = -ENOENT; 291 err = -ENOENT;
292 if (n->nlmsg_type != RTM_NEWTFILTER || 292 if (n->nlmsg_type != RTM_NEWTFILTER ||
293 !(n->nlmsg_flags & NLM_F_CREATE)) 293 !(n->nlmsg_flags & NLM_F_CREATE))
294 goto errout; 294 goto errout;
295 } else { 295 } else {
296 switch (n->nlmsg_type) { 296 switch (n->nlmsg_type) {
297 case RTM_NEWTFILTER: 297 case RTM_NEWTFILTER:
298 err = -EEXIST; 298 err = -EEXIST;
299 if (n->nlmsg_flags & NLM_F_EXCL) { 299 if (n->nlmsg_flags & NLM_F_EXCL) {
300 if (tp_created) 300 if (tp_created)
301 tcf_destroy(tp); 301 tcf_destroy(tp);
302 goto errout; 302 goto errout;
303 } 303 }
304 break; 304 break;
305 case RTM_DELTFILTER: 305 case RTM_DELTFILTER:
306 err = tp->ops->delete(tp, fh); 306 err = tp->ops->delete(tp, fh);
307 if (err == 0) 307 if (err == 0)
308 tfilter_notify(skb, n, tp, fh, RTM_DELTFILTER); 308 tfilter_notify(skb, n, tp, fh, RTM_DELTFILTER);
309 goto errout; 309 goto errout;
310 case RTM_GETTFILTER: 310 case RTM_GETTFILTER:
311 err = tfilter_notify(skb, n, tp, fh, RTM_NEWTFILTER); 311 err = tfilter_notify(skb, n, tp, fh, RTM_NEWTFILTER);
312 goto errout; 312 goto errout;
313 default: 313 default:
314 err = -EINVAL; 314 err = -EINVAL;
315 goto errout; 315 goto errout;
316 } 316 }
317 } 317 }
318 318
319 err = tp->ops->change(tp, cl, t->tcm_handle, tca, &fh); 319 err = tp->ops->change(tp, cl, t->tcm_handle, tca, &fh);
320 if (err == 0) { 320 if (err == 0) {
321 if (tp_created) { 321 if (tp_created) {
322 spin_lock_bh(root_lock); 322 spin_lock_bh(root_lock);
323 tp->next = *back; 323 tp->next = *back;
324 *back = tp; 324 *back = tp;
325 spin_unlock_bh(root_lock); 325 spin_unlock_bh(root_lock);
326 } 326 }
327 tfilter_notify(skb, n, tp, fh, RTM_NEWTFILTER); 327 tfilter_notify(skb, n, tp, fh, RTM_NEWTFILTER);
328 } else { 328 } else {
329 if (tp_created) 329 if (tp_created)
330 tcf_destroy(tp); 330 tcf_destroy(tp);
331 } 331 }
332 332
333 errout: 333 errout:
334 if (cl) 334 if (cl)
335 cops->put(q, cl); 335 cops->put(q, cl);
336 if (err == -EAGAIN) 336 if (err == -EAGAIN)
337 /* Replay the request. */ 337 /* Replay the request. */
338 goto replay; 338 goto replay;
339 return err; 339 return err;
340 } 340 }
341 341
342 static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp, 342 static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp,
343 unsigned long fh, u32 pid, u32 seq, u16 flags, int event) 343 unsigned long fh, u32 pid, u32 seq, u16 flags, int event)
344 { 344 {
345 struct tcmsg *tcm; 345 struct tcmsg *tcm;
346 struct nlmsghdr *nlh; 346 struct nlmsghdr *nlh;
347 unsigned char *b = skb_tail_pointer(skb); 347 unsigned char *b = skb_tail_pointer(skb);
348 348
349 nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*tcm), flags); 349 nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*tcm), flags);
350 tcm = NLMSG_DATA(nlh); 350 tcm = NLMSG_DATA(nlh);
351 tcm->tcm_family = AF_UNSPEC; 351 tcm->tcm_family = AF_UNSPEC;
352 tcm->tcm__pad1 = 0; 352 tcm->tcm__pad1 = 0;
353 tcm->tcm__pad2 = 0; 353 tcm->tcm__pad2 = 0;
354 tcm->tcm_ifindex = qdisc_dev(tp->q)->ifindex; 354 tcm->tcm_ifindex = qdisc_dev(tp->q)->ifindex;
355 tcm->tcm_parent = tp->classid; 355 tcm->tcm_parent = tp->classid;
356 tcm->tcm_info = TC_H_MAKE(tp->prio, tp->protocol); 356 tcm->tcm_info = TC_H_MAKE(tp->prio, tp->protocol);
357 NLA_PUT_STRING(skb, TCA_KIND, tp->ops->kind); 357 NLA_PUT_STRING(skb, TCA_KIND, tp->ops->kind);
358 tcm->tcm_handle = fh; 358 tcm->tcm_handle = fh;
359 if (RTM_DELTFILTER != event) { 359 if (RTM_DELTFILTER != event) {
360 tcm->tcm_handle = 0; 360 tcm->tcm_handle = 0;
361 if (tp->ops->dump && tp->ops->dump(tp, fh, skb, tcm) < 0) 361 if (tp->ops->dump && tp->ops->dump(tp, fh, skb, tcm) < 0)
362 goto nla_put_failure; 362 goto nla_put_failure;
363 } 363 }
364 nlh->nlmsg_len = skb_tail_pointer(skb) - b; 364 nlh->nlmsg_len = skb_tail_pointer(skb) - b;
365 return skb->len; 365 return skb->len;
366 366
367 nlmsg_failure: 367 nlmsg_failure:
368 nla_put_failure: 368 nla_put_failure:
369 nlmsg_trim(skb, b); 369 nlmsg_trim(skb, b);
370 return -1; 370 return -1;
371 } 371 }
372 372
373 static int tfilter_notify(struct sk_buff *oskb, struct nlmsghdr *n, 373 static int tfilter_notify(struct sk_buff *oskb, struct nlmsghdr *n,
374 struct tcf_proto *tp, unsigned long fh, int event) 374 struct tcf_proto *tp, unsigned long fh, int event)
375 { 375 {
376 struct sk_buff *skb; 376 struct sk_buff *skb;
377 u32 pid = oskb ? NETLINK_CB(oskb).pid : 0; 377 u32 pid = oskb ? NETLINK_CB(oskb).pid : 0;
378 378
379 skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL); 379 skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
380 if (!skb) 380 if (!skb)
381 return -ENOBUFS; 381 return -ENOBUFS;
382 382
383 if (tcf_fill_node(skb, tp, fh, pid, n->nlmsg_seq, 0, event) <= 0) { 383 if (tcf_fill_node(skb, tp, fh, pid, n->nlmsg_seq, 0, event) <= 0) {
384 kfree_skb(skb); 384 kfree_skb(skb);
385 return -EINVAL; 385 return -EINVAL;
386 } 386 }
387 387
388 return rtnetlink_send(skb, &init_net, pid, RTNLGRP_TC, 388 return rtnetlink_send(skb, &init_net, pid, RTNLGRP_TC,
389 n->nlmsg_flags & NLM_F_ECHO); 389 n->nlmsg_flags & NLM_F_ECHO);
390 } 390 }
391 391
392 struct tcf_dump_args { 392 struct tcf_dump_args {
393 struct tcf_walker w; 393 struct tcf_walker w;
394 struct sk_buff *skb; 394 struct sk_buff *skb;
395 struct netlink_callback *cb; 395 struct netlink_callback *cb;
396 }; 396 };
397 397
398 static int tcf_node_dump(struct tcf_proto *tp, unsigned long n, 398 static int tcf_node_dump(struct tcf_proto *tp, unsigned long n,
399 struct tcf_walker *arg) 399 struct tcf_walker *arg)
400 { 400 {
401 struct tcf_dump_args *a = (void *)arg; 401 struct tcf_dump_args *a = (void *)arg;
402 402
403 return tcf_fill_node(a->skb, tp, n, NETLINK_CB(a->cb->skb).pid, 403 return tcf_fill_node(a->skb, tp, n, NETLINK_CB(a->cb->skb).pid,
404 a->cb->nlh->nlmsg_seq, NLM_F_MULTI, RTM_NEWTFILTER); 404 a->cb->nlh->nlmsg_seq, NLM_F_MULTI, RTM_NEWTFILTER);
405 } 405 }
406 406
407 /* called with RTNL */
407 static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb) 408 static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb)
408 { 409 {
409 struct net *net = sock_net(skb->sk); 410 struct net *net = sock_net(skb->sk);
410 int t; 411 int t;
411 int s_t; 412 int s_t;
412 struct net_device *dev; 413 struct net_device *dev;
413 struct Qdisc *q; 414 struct Qdisc *q;
414 struct tcf_proto *tp, **chain; 415 struct tcf_proto *tp, **chain;
415 struct tcmsg *tcm = (struct tcmsg *)NLMSG_DATA(cb->nlh); 416 struct tcmsg *tcm = (struct tcmsg *)NLMSG_DATA(cb->nlh);
416 unsigned long cl = 0; 417 unsigned long cl = 0;
417 const struct Qdisc_class_ops *cops; 418 const struct Qdisc_class_ops *cops;
418 struct tcf_dump_args arg; 419 struct tcf_dump_args arg;
419 420
420 if (net != &init_net) 421 if (net != &init_net)
421 return 0; 422 return 0;
422 423
423 if (cb->nlh->nlmsg_len < NLMSG_LENGTH(sizeof(*tcm))) 424 if (cb->nlh->nlmsg_len < NLMSG_LENGTH(sizeof(*tcm)))
424 return skb->len; 425 return skb->len;
425 if ((dev = dev_get_by_index(&init_net, tcm->tcm_ifindex)) == NULL) 426 if ((dev = __dev_get_by_index(&init_net, tcm->tcm_ifindex)) == NULL)
426 return skb->len; 427 return skb->len;
427 428
428 if (!tcm->tcm_parent) 429 if (!tcm->tcm_parent)
429 q = dev->qdisc; 430 q = dev->qdisc;
430 else 431 else
431 q = qdisc_lookup(dev, TC_H_MAJ(tcm->tcm_parent)); 432 q = qdisc_lookup(dev, TC_H_MAJ(tcm->tcm_parent));
432 if (!q) 433 if (!q)
433 goto out; 434 goto out;
434 if ((cops = q->ops->cl_ops) == NULL) 435 if ((cops = q->ops->cl_ops) == NULL)
435 goto errout; 436 goto errout;
436 if (cops->tcf_chain == NULL) 437 if (cops->tcf_chain == NULL)
437 goto errout; 438 goto errout;
438 if (TC_H_MIN(tcm->tcm_parent)) { 439 if (TC_H_MIN(tcm->tcm_parent)) {
439 cl = cops->get(q, tcm->tcm_parent); 440 cl = cops->get(q, tcm->tcm_parent);
440 if (cl == 0) 441 if (cl == 0)
441 goto errout; 442 goto errout;
442 } 443 }
443 chain = cops->tcf_chain(q, cl); 444 chain = cops->tcf_chain(q, cl);
444 if (chain == NULL) 445 if (chain == NULL)
445 goto errout; 446 goto errout;
446 447
447 s_t = cb->args[0]; 448 s_t = cb->args[0];
448 449
449 for (tp=*chain, t=0; tp; tp = tp->next, t++) { 450 for (tp=*chain, t=0; tp; tp = tp->next, t++) {
450 if (t < s_t) continue; 451 if (t < s_t) continue;
451 if (TC_H_MAJ(tcm->tcm_info) && 452 if (TC_H_MAJ(tcm->tcm_info) &&
452 TC_H_MAJ(tcm->tcm_info) != tp->prio) 453 TC_H_MAJ(tcm->tcm_info) != tp->prio)
453 continue; 454 continue;
454 if (TC_H_MIN(tcm->tcm_info) && 455 if (TC_H_MIN(tcm->tcm_info) &&
455 TC_H_MIN(tcm->tcm_info) != tp->protocol) 456 TC_H_MIN(tcm->tcm_info) != tp->protocol)
456 continue; 457 continue;
457 if (t > s_t) 458 if (t > s_t)
458 memset(&cb->args[1], 0, sizeof(cb->args)-sizeof(cb->args[0])); 459 memset(&cb->args[1], 0, sizeof(cb->args)-sizeof(cb->args[0]));
459 if (cb->args[1] == 0) { 460 if (cb->args[1] == 0) {
460 if (tcf_fill_node(skb, tp, 0, NETLINK_CB(cb->skb).pid, 461 if (tcf_fill_node(skb, tp, 0, NETLINK_CB(cb->skb).pid,
461 cb->nlh->nlmsg_seq, NLM_F_MULTI, 462 cb->nlh->nlmsg_seq, NLM_F_MULTI,
462 RTM_NEWTFILTER) <= 0) 463 RTM_NEWTFILTER) <= 0)
463 break; 464 break;
464 465
465 cb->args[1] = 1; 466 cb->args[1] = 1;
466 } 467 }
467 if (tp->ops->walk == NULL) 468 if (tp->ops->walk == NULL)
468 continue; 469 continue;
469 arg.w.fn = tcf_node_dump; 470 arg.w.fn = tcf_node_dump;
470 arg.skb = skb; 471 arg.skb = skb;
471 arg.cb = cb; 472 arg.cb = cb;
472 arg.w.stop = 0; 473 arg.w.stop = 0;
473 arg.w.skip = cb->args[1]-1; 474 arg.w.skip = cb->args[1]-1;
474 arg.w.count = 0; 475 arg.w.count = 0;
475 tp->ops->walk(tp, &arg.w); 476 tp->ops->walk(tp, &arg.w);
476 cb->args[1] = arg.w.count+1; 477 cb->args[1] = arg.w.count+1;
477 if (arg.w.stop) 478 if (arg.w.stop)
478 break; 479 break;
479 } 480 }
480 481
481 cb->args[0] = t; 482 cb->args[0] = t;
482 483
483 errout: 484 errout:
484 if (cl) 485 if (cl)
485 cops->put(q, cl); 486 cops->put(q, cl);
486 out: 487 out:
487 dev_put(dev);
488 return skb->len; 488 return skb->len;
489 } 489 }
490 490
491 void tcf_exts_destroy(struct tcf_proto *tp, struct tcf_exts *exts) 491 void tcf_exts_destroy(struct tcf_proto *tp, struct tcf_exts *exts)
492 { 492 {
493 #ifdef CONFIG_NET_CLS_ACT 493 #ifdef CONFIG_NET_CLS_ACT
494 if (exts->action) { 494 if (exts->action) {
495 tcf_action_destroy(exts->action, TCA_ACT_UNBIND); 495 tcf_action_destroy(exts->action, TCA_ACT_UNBIND);
496 exts->action = NULL; 496 exts->action = NULL;
497 } 497 }
498 #endif 498 #endif
499 } 499 }
500 EXPORT_SYMBOL(tcf_exts_destroy); 500 EXPORT_SYMBOL(tcf_exts_destroy);
501 501
502 int tcf_exts_validate(struct tcf_proto *tp, struct nlattr **tb, 502 int tcf_exts_validate(struct tcf_proto *tp, struct nlattr **tb,
503 struct nlattr *rate_tlv, struct tcf_exts *exts, 503 struct nlattr *rate_tlv, struct tcf_exts *exts,
504 const struct tcf_ext_map *map) 504 const struct tcf_ext_map *map)
505 { 505 {
506 memset(exts, 0, sizeof(*exts)); 506 memset(exts, 0, sizeof(*exts));
507 507
508 #ifdef CONFIG_NET_CLS_ACT 508 #ifdef CONFIG_NET_CLS_ACT
509 { 509 {
510 struct tc_action *act; 510 struct tc_action *act;
511 511
512 if (map->police && tb[map->police]) { 512 if (map->police && tb[map->police]) {
513 act = tcf_action_init_1(tb[map->police], rate_tlv, 513 act = tcf_action_init_1(tb[map->police], rate_tlv,
514 "police", TCA_ACT_NOREPLACE, 514 "police", TCA_ACT_NOREPLACE,
515 TCA_ACT_BIND); 515 TCA_ACT_BIND);
516 if (IS_ERR(act)) 516 if (IS_ERR(act))
517 return PTR_ERR(act); 517 return PTR_ERR(act);
518 518
519 act->type = TCA_OLD_COMPAT; 519 act->type = TCA_OLD_COMPAT;
520 exts->action = act; 520 exts->action = act;
521 } else if (map->action && tb[map->action]) { 521 } else if (map->action && tb[map->action]) {
522 act = tcf_action_init(tb[map->action], rate_tlv, NULL, 522 act = tcf_action_init(tb[map->action], rate_tlv, NULL,
523 TCA_ACT_NOREPLACE, TCA_ACT_BIND); 523 TCA_ACT_NOREPLACE, TCA_ACT_BIND);
524 if (IS_ERR(act)) 524 if (IS_ERR(act))
525 return PTR_ERR(act); 525 return PTR_ERR(act);
526 526
527 exts->action = act; 527 exts->action = act;
528 } 528 }
529 } 529 }
530 #else 530 #else
531 if ((map->action && tb[map->action]) || 531 if ((map->action && tb[map->action]) ||
532 (map->police && tb[map->police])) 532 (map->police && tb[map->police]))
533 return -EOPNOTSUPP; 533 return -EOPNOTSUPP;
534 #endif 534 #endif
535 535
536 return 0; 536 return 0;
537 } 537 }
538 EXPORT_SYMBOL(tcf_exts_validate); 538 EXPORT_SYMBOL(tcf_exts_validate);
539 539
540 void tcf_exts_change(struct tcf_proto *tp, struct tcf_exts *dst, 540 void tcf_exts_change(struct tcf_proto *tp, struct tcf_exts *dst,
541 struct tcf_exts *src) 541 struct tcf_exts *src)
542 { 542 {
543 #ifdef CONFIG_NET_CLS_ACT 543 #ifdef CONFIG_NET_CLS_ACT
544 if (src->action) { 544 if (src->action) {
545 struct tc_action *act; 545 struct tc_action *act;
546 tcf_tree_lock(tp); 546 tcf_tree_lock(tp);
547 act = dst->action; 547 act = dst->action;
548 dst->action = src->action; 548 dst->action = src->action;
549 tcf_tree_unlock(tp); 549 tcf_tree_unlock(tp);
550 if (act) 550 if (act)
551 tcf_action_destroy(act, TCA_ACT_UNBIND); 551 tcf_action_destroy(act, TCA_ACT_UNBIND);
552 } 552 }
553 #endif 553 #endif
554 } 554 }
555 EXPORT_SYMBOL(tcf_exts_change); 555 EXPORT_SYMBOL(tcf_exts_change);
556 556
557 int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts, 557 int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts,
558 const struct tcf_ext_map *map) 558 const struct tcf_ext_map *map)
559 { 559 {
560 #ifdef CONFIG_NET_CLS_ACT 560 #ifdef CONFIG_NET_CLS_ACT
561 if (map->action && exts->action) { 561 if (map->action && exts->action) {
562 /* 562 /*
563 * again for backward compatible mode - we want 563 * again for backward compatible mode - we want
564 * to work with both old and new modes of entering 564 * to work with both old and new modes of entering
565 * tc data even if iproute2 was newer - jhs 565 * tc data even if iproute2 was newer - jhs
566 */ 566 */
567 struct nlattr *nest; 567 struct nlattr *nest;
568 568
569 if (exts->action->type != TCA_OLD_COMPAT) { 569 if (exts->action->type != TCA_OLD_COMPAT) {
570 nest = nla_nest_start(skb, map->action); 570 nest = nla_nest_start(skb, map->action);
571 if (nest == NULL) 571 if (nest == NULL)
572 goto nla_put_failure; 572 goto nla_put_failure;
573 if (tcf_action_dump(skb, exts->action, 0, 0) < 0) 573 if (tcf_action_dump(skb, exts->action, 0, 0) < 0)
574 goto nla_put_failure; 574 goto nla_put_failure;
575 nla_nest_end(skb, nest); 575 nla_nest_end(skb, nest);
576 } else if (map->police) { 576 } else if (map->police) {
577 nest = nla_nest_start(skb, map->police); 577 nest = nla_nest_start(skb, map->police);
578 if (nest == NULL) 578 if (nest == NULL)
579 goto nla_put_failure; 579 goto nla_put_failure;
580 if (tcf_action_dump_old(skb, exts->action, 0, 0) < 0) 580 if (tcf_action_dump_old(skb, exts->action, 0, 0) < 0)
581 goto nla_put_failure; 581 goto nla_put_failure;
582 nla_nest_end(skb, nest); 582 nla_nest_end(skb, nest);
583 } 583 }
584 } 584 }
585 #endif 585 #endif
586 return 0; 586 return 0;
587 nla_put_failure: __attribute__ ((unused)) 587 nla_put_failure: __attribute__ ((unused))
588 return -1; 588 return -1;
589 } 589 }
590 EXPORT_SYMBOL(tcf_exts_dump); 590 EXPORT_SYMBOL(tcf_exts_dump);
591 591
592 592
593 int tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts, 593 int tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts,
594 const struct tcf_ext_map *map) 594 const struct tcf_ext_map *map)
595 { 595 {
596 #ifdef CONFIG_NET_CLS_ACT 596 #ifdef CONFIG_NET_CLS_ACT
597 if (exts->action) 597 if (exts->action)
598 if (tcf_action_copy_stats(skb, exts->action, 1) < 0) 598 if (tcf_action_copy_stats(skb, exts->action, 1) < 0)
599 goto nla_put_failure; 599 goto nla_put_failure;
600 #endif 600 #endif
601 return 0; 601 return 0;
602 nla_put_failure: __attribute__ ((unused)) 602 nla_put_failure: __attribute__ ((unused))
603 return -1; 603 return -1;
604 } 604 }
605 EXPORT_SYMBOL(tcf_exts_dump_stats); 605 EXPORT_SYMBOL(tcf_exts_dump_stats);
606 606
607 static int __init tc_filter_init(void) 607 static int __init tc_filter_init(void)
608 { 608 {
609 rtnl_register(PF_UNSPEC, RTM_NEWTFILTER, tc_ctl_tfilter, NULL); 609 rtnl_register(PF_UNSPEC, RTM_NEWTFILTER, tc_ctl_tfilter, NULL);
610 rtnl_register(PF_UNSPEC, RTM_DELTFILTER, tc_ctl_tfilter, NULL); 610 rtnl_register(PF_UNSPEC, RTM_DELTFILTER, tc_ctl_tfilter, NULL);
611 rtnl_register(PF_UNSPEC, RTM_GETTFILTER, tc_ctl_tfilter, 611 rtnl_register(PF_UNSPEC, RTM_GETTFILTER, tc_ctl_tfilter,
612 tc_dump_tfilter); 612 tc_dump_tfilter);
613 613
614 return 0; 614 return 0;
615 } 615 }
616 616
617 subsys_initcall(tc_filter_init); 617 subsys_initcall(tc_filter_init);