Diff markup
1 /* 1 /*
2 * Anycast support for IPv6 2 * Anycast support for IPv6
3 * Linux INET6 implementation 3 * Linux INET6 implementation
4 * 4 *
5 * Authors: 5 * Authors:
6 * David L Stevens (dlstevens@us.ibm.com) 6 * David L Stevens (dlstevens@us.ibm.com)
7 * 7 *
8 * based heavily on net/ipv6/mcast.c 8 * based heavily on net/ipv6/mcast.c
9 * 9 *
10 * This program is free software; you can 10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU G 11 * modify it under the terms of the GNU General Public License
12 * as published by the Free Software Foun 12 * as published by the Free Software Foundation; either version
13 * 2 of the License, or (at your option) 13 * 2 of the License, or (at your option) any later version.
14 */ 14 */
15 15
16 #include <linux/capability.h> 16 #include <linux/capability.h>
17 #include <linux/module.h> 17 #include <linux/module.h>
18 #include <linux/errno.h> 18 #include <linux/errno.h>
19 #include <linux/types.h> 19 #include <linux/types.h>
20 #include <linux/random.h> 20 #include <linux/random.h>
21 #include <linux/string.h> 21 #include <linux/string.h>
22 #include <linux/socket.h> 22 #include <linux/socket.h>
23 #include <linux/sockios.h> 23 #include <linux/sockios.h>
24 #include <linux/net.h> 24 #include <linux/net.h>
25 #include <linux/in6.h> 25 #include <linux/in6.h>
26 #include <linux/netdevice.h> 26 #include <linux/netdevice.h>
27 #include <linux/if_arp.h> 27 #include <linux/if_arp.h>
28 #include <linux/route.h> 28 #include <linux/route.h>
29 #include <linux/init.h> 29 #include <linux/init.h>
30 #include <linux/proc_fs.h> 30 #include <linux/proc_fs.h>
31 #include <linux/seq_file.h> 31 #include <linux/seq_file.h>
32 32
33 #include <net/net_namespace.h> 33 #include <net/net_namespace.h>
34 #include <net/sock.h> 34 #include <net/sock.h>
35 #include <net/snmp.h> 35 #include <net/snmp.h>
36 36
37 #include <net/ipv6.h> 37 #include <net/ipv6.h>
38 #include <net/protocol.h> 38 #include <net/protocol.h>
39 #include <net/if_inet6.h> 39 #include <net/if_inet6.h>
40 #include <net/ndisc.h> 40 #include <net/ndisc.h>
41 #include <net/addrconf.h> 41 #include <net/addrconf.h>
42 #include <net/ip6_route.h> 42 #include <net/ip6_route.h>
43 43
44 #include <net/checksum.h> 44 #include <net/checksum.h>
45 45
46 static int ipv6_dev_ac_dec(struct net_device * 46 static int ipv6_dev_ac_dec(struct net_device *dev, struct in6_addr *addr);
47 47
48 /* Big ac list lock for all the sockets */ 48 /* Big ac list lock for all the sockets */
49 static DEFINE_RWLOCK(ipv6_sk_ac_lock); 49 static DEFINE_RWLOCK(ipv6_sk_ac_lock);
50 50
51 static int <<
52 ip6_onlink(struct in6_addr *addr, struct net_d <<
53 { <<
54 struct inet6_dev *idev; <<
55 struct inet6_ifaddr *ifa; <<
56 int onlink; <<
57 <<
58 onlink = 0; <<
59 rcu_read_lock(); <<
60 idev = __in6_dev_get(dev); <<
61 if (idev) { <<
62 read_lock_bh(&idev->lock); <<
63 for (ifa=idev->addr_list; ifa; <<
64 onlink = ipv6_prefix_e <<
65 <<
66 if (onlink) <<
67 break; <<
68 } <<
69 read_unlock_bh(&idev->lock); <<
70 } <<
71 rcu_read_unlock(); <<
72 return onlink; <<
73 } <<
74 51
75 /* 52 /*
76 * socket join an anycast group 53 * socket join an anycast group
77 */ 54 */
78 55
79 int ipv6_sock_ac_join(struct sock *sk, int ifi 56 int ipv6_sock_ac_join(struct sock *sk, int ifindex, struct in6_addr *addr)
80 { 57 {
81 struct ipv6_pinfo *np = inet6_sk(sk); 58 struct ipv6_pinfo *np = inet6_sk(sk);
82 struct net_device *dev = NULL; 59 struct net_device *dev = NULL;
83 struct inet6_dev *idev; 60 struct inet6_dev *idev;
84 struct ipv6_ac_socklist *pac; 61 struct ipv6_ac_socklist *pac;
85 int ishost = !ipv6_devconf.forward !! 62 struct net *net = sock_net(sk);
>> 63 int ishost = !net->ipv6.devconf_all->forwarding;
86 int err = 0; 64 int err = 0;
87 65
88 if (!capable(CAP_NET_ADMIN)) 66 if (!capable(CAP_NET_ADMIN))
89 return -EPERM; 67 return -EPERM;
90 if (ipv6_addr_is_multicast(addr)) 68 if (ipv6_addr_is_multicast(addr))
91 return -EINVAL; 69 return -EINVAL;
92 if (ipv6_chk_addr(&init_net, addr, NUL !! 70 if (ipv6_chk_addr(net, addr, NULL, 0))
93 return -EINVAL; 71 return -EINVAL;
94 72
95 pac = sock_kmalloc(sk, sizeof(struct i 73 pac = sock_kmalloc(sk, sizeof(struct ipv6_ac_socklist), GFP_KERNEL);
96 if (pac == NULL) 74 if (pac == NULL)
97 return -ENOMEM; 75 return -ENOMEM;
98 pac->acl_next = NULL; 76 pac->acl_next = NULL;
99 ipv6_addr_copy(&pac->acl_addr, addr); 77 ipv6_addr_copy(&pac->acl_addr, addr);
100 78
101 if (ifindex == 0) { 79 if (ifindex == 0) {
102 struct rt6_info *rt; 80 struct rt6_info *rt;
103 81
104 rt = rt6_lookup(addr, NULL, 0, !! 82 rt = rt6_lookup(net, addr, NULL, 0, 0);
105 if (rt) { 83 if (rt) {
106 dev = rt->rt6i_dev; 84 dev = rt->rt6i_dev;
107 dev_hold(dev); 85 dev_hold(dev);
108 dst_release(&rt->u.dst 86 dst_release(&rt->u.dst);
109 } else if (ishost) { 87 } else if (ishost) {
110 err = -EADDRNOTAVAIL; 88 err = -EADDRNOTAVAIL;
111 goto out_free_pac; 89 goto out_free_pac;
112 } else { 90 } else {
113 /* router, no matching 91 /* router, no matching interface: just pick one */
114 92
115 dev = dev_get_by_flags !! 93 dev = dev_get_by_flags(net, IFF_UP, IFF_UP|IFF_LOOPBACK);
116 } 94 }
117 } else 95 } else
118 dev = dev_get_by_index(&init_n !! 96 dev = dev_get_by_index(net, ifindex);
119 97
120 if (dev == NULL) { 98 if (dev == NULL) {
121 err = -ENODEV; 99 err = -ENODEV;
122 goto out_free_pac; 100 goto out_free_pac;
123 } 101 }
124 102
125 idev = in6_dev_get(dev); 103 idev = in6_dev_get(dev);
126 if (!idev) { 104 if (!idev) {
127 if (ifindex) 105 if (ifindex)
128 err = -ENODEV; 106 err = -ENODEV;
129 else 107 else
130 err = -EADDRNOTAVAIL; 108 err = -EADDRNOTAVAIL;
131 goto out_dev_put; 109 goto out_dev_put;
132 } 110 }
133 /* reset ishost, now that we have a sp 111 /* reset ishost, now that we have a specific device */
134 ishost = !idev->cnf.forwarding; 112 ishost = !idev->cnf.forwarding;
135 in6_dev_put(idev); 113 in6_dev_put(idev);
136 114
137 pac->acl_ifindex = dev->ifindex; 115 pac->acl_ifindex = dev->ifindex;
138 116
139 /* XXX 117 /* XXX
140 * For hosts, allow link-local or matc 118 * For hosts, allow link-local or matching prefix anycasts.
141 * This obviates the need for propagat 119 * This obviates the need for propagating anycast routes while
142 * still allowing some non-router anyc 120 * still allowing some non-router anycast participation.
143 */ 121 */
144 if (!ip6_onlink(addr, dev)) { !! 122 if (!ipv6_chk_prefix(addr, dev)) {
145 if (ishost) 123 if (ishost)
146 err = -EADDRNOTAVAIL; 124 err = -EADDRNOTAVAIL;
147 if (err) 125 if (err)
148 goto out_dev_put; 126 goto out_dev_put;
149 } 127 }
150 128
151 err = ipv6_dev_ac_inc(dev, addr); 129 err = ipv6_dev_ac_inc(dev, addr);
152 if (err) 130 if (err)
153 goto out_dev_put; 131 goto out_dev_put;
154 132
155 write_lock_bh(&ipv6_sk_ac_lock); 133 write_lock_bh(&ipv6_sk_ac_lock);
156 pac->acl_next = np->ipv6_ac_list; 134 pac->acl_next = np->ipv6_ac_list;
157 np->ipv6_ac_list = pac; 135 np->ipv6_ac_list = pac;
158 write_unlock_bh(&ipv6_sk_ac_lock); 136 write_unlock_bh(&ipv6_sk_ac_lock);
159 137
160 dev_put(dev); 138 dev_put(dev);
161 139
162 return 0; 140 return 0;
163 141
164 out_dev_put: 142 out_dev_put:
165 dev_put(dev); 143 dev_put(dev);
166 out_free_pac: 144 out_free_pac:
167 sock_kfree_s(sk, pac, sizeof(*pac)); 145 sock_kfree_s(sk, pac, sizeof(*pac));
168 return err; 146 return err;
169 } 147 }
170 148
171 /* 149 /*
172 * socket leave an anycast group 150 * socket leave an anycast group
173 */ 151 */
174 int ipv6_sock_ac_drop(struct sock *sk, int ifi 152 int ipv6_sock_ac_drop(struct sock *sk, int ifindex, struct in6_addr *addr)
175 { 153 {
176 struct ipv6_pinfo *np = inet6_sk(sk); 154 struct ipv6_pinfo *np = inet6_sk(sk);
177 struct net_device *dev; 155 struct net_device *dev;
178 struct ipv6_ac_socklist *pac, *prev_pa 156 struct ipv6_ac_socklist *pac, *prev_pac;
>> 157 struct net *net = sock_net(sk);
179 158
180 write_lock_bh(&ipv6_sk_ac_lock); 159 write_lock_bh(&ipv6_sk_ac_lock);
181 prev_pac = NULL; 160 prev_pac = NULL;
182 for (pac = np->ipv6_ac_list; pac; pac 161 for (pac = np->ipv6_ac_list; pac; pac = pac->acl_next) {
183 if ((ifindex == 0 || pac->acl_ 162 if ((ifindex == 0 || pac->acl_ifindex == ifindex) &&
184 ipv6_addr_equal(&pac->acl 163 ipv6_addr_equal(&pac->acl_addr, addr))
185 break; 164 break;
186 prev_pac = pac; 165 prev_pac = pac;
187 } 166 }
188 if (!pac) { 167 if (!pac) {
189 write_unlock_bh(&ipv6_sk_ac_lo 168 write_unlock_bh(&ipv6_sk_ac_lock);
190 return -ENOENT; 169 return -ENOENT;
191 } 170 }
192 if (prev_pac) 171 if (prev_pac)
193 prev_pac->acl_next = pac->acl_ 172 prev_pac->acl_next = pac->acl_next;
194 else 173 else
195 np->ipv6_ac_list = pac->acl_ne 174 np->ipv6_ac_list = pac->acl_next;
196 175
197 write_unlock_bh(&ipv6_sk_ac_lock); 176 write_unlock_bh(&ipv6_sk_ac_lock);
198 177
199 dev = dev_get_by_index(&init_net, pac- !! 178 dev = dev_get_by_index(net, pac->acl_ifindex);
200 if (dev) { 179 if (dev) {
201 ipv6_dev_ac_dec(dev, &pac->acl 180 ipv6_dev_ac_dec(dev, &pac->acl_addr);
202 dev_put(dev); 181 dev_put(dev);
203 } 182 }
204 sock_kfree_s(sk, pac, sizeof(*pac)); 183 sock_kfree_s(sk, pac, sizeof(*pac));
205 return 0; 184 return 0;
206 } 185 }
207 186
208 void ipv6_sock_ac_close(struct sock *sk) 187 void ipv6_sock_ac_close(struct sock *sk)
209 { 188 {
210 struct ipv6_pinfo *np = inet6_sk(sk); 189 struct ipv6_pinfo *np = inet6_sk(sk);
211 struct net_device *dev = NULL; 190 struct net_device *dev = NULL;
212 struct ipv6_ac_socklist *pac; 191 struct ipv6_ac_socklist *pac;
>> 192 struct net *net = sock_net(sk);
213 int prev_index; 193 int prev_index;
214 194
215 write_lock_bh(&ipv6_sk_ac_lock); 195 write_lock_bh(&ipv6_sk_ac_lock);
216 pac = np->ipv6_ac_list; 196 pac = np->ipv6_ac_list;
217 np->ipv6_ac_list = NULL; 197 np->ipv6_ac_list = NULL;
218 write_unlock_bh(&ipv6_sk_ac_lock); 198 write_unlock_bh(&ipv6_sk_ac_lock);
219 199
220 prev_index = 0; 200 prev_index = 0;
221 while (pac) { 201 while (pac) {
222 struct ipv6_ac_socklist *next 202 struct ipv6_ac_socklist *next = pac->acl_next;
223 203
224 if (pac->acl_ifindex != prev_i 204 if (pac->acl_ifindex != prev_index) {
225 if (dev) 205 if (dev)
226 dev_put(dev); 206 dev_put(dev);
227 dev = dev_get_by_index !! 207 dev = dev_get_by_index(net, pac->acl_ifindex);
228 prev_index = pac->acl_ 208 prev_index = pac->acl_ifindex;
229 } 209 }
230 if (dev) 210 if (dev)
231 ipv6_dev_ac_dec(dev, & 211 ipv6_dev_ac_dec(dev, &pac->acl_addr);
232 sock_kfree_s(sk, pac, sizeof(* 212 sock_kfree_s(sk, pac, sizeof(*pac));
233 pac = next; 213 pac = next;
234 } 214 }
235 if (dev) 215 if (dev)
236 dev_put(dev); 216 dev_put(dev);
237 } 217 }
238 218
239 #if 0 219 #if 0
240 /* The function is not used, which is funny. A 220 /* The function is not used, which is funny. Apparently, author
241 * supposed to use it to filter out datagrams 221 * supposed to use it to filter out datagrams inside udp/raw but forgot.
242 * 222 *
243 * It is OK, anycasts are not special comparin 223 * It is OK, anycasts are not special comparing to delivery to unicasts.
244 */ 224 */
245 225
246 int inet6_ac_check(struct sock *sk, struct in6 226 int inet6_ac_check(struct sock *sk, struct in6_addr *addr, int ifindex)
247 { 227 {
248 struct ipv6_ac_socklist *pac; 228 struct ipv6_ac_socklist *pac;
249 struct ipv6_pinfo *np = inet6_sk(sk); 229 struct ipv6_pinfo *np = inet6_sk(sk);
250 int found; 230 int found;
251 231
252 found = 0; 232 found = 0;
253 read_lock(&ipv6_sk_ac_lock); 233 read_lock(&ipv6_sk_ac_lock);
254 for (pac=np->ipv6_ac_list; pac; pac=pa 234 for (pac=np->ipv6_ac_list; pac; pac=pac->acl_next) {
255 if (ifindex && pac->acl_ifinde 235 if (ifindex && pac->acl_ifindex != ifindex)
256 continue; 236 continue;
257 found = ipv6_addr_equal(&pac-> 237 found = ipv6_addr_equal(&pac->acl_addr, addr);
258 if (found) 238 if (found)
259 break; 239 break;
260 } 240 }
261 read_unlock(&ipv6_sk_ac_lock); 241 read_unlock(&ipv6_sk_ac_lock);
262 242
263 return found; 243 return found;
264 } 244 }
265 245
266 #endif 246 #endif
267 247
268 static void aca_put(struct ifacaddr6 *ac) 248 static void aca_put(struct ifacaddr6 *ac)
269 { 249 {
270 if (atomic_dec_and_test(&ac->aca_refcn 250 if (atomic_dec_and_test(&ac->aca_refcnt)) {
271 in6_dev_put(ac->aca_idev); 251 in6_dev_put(ac->aca_idev);
272 dst_release(&ac->aca_rt->u.dst 252 dst_release(&ac->aca_rt->u.dst);
273 kfree(ac); 253 kfree(ac);
274 } 254 }
275 } 255 }
276 256
277 /* 257 /*
278 * device anycast group inc (add if not f 258 * device anycast group inc (add if not found)
279 */ 259 */
280 int ipv6_dev_ac_inc(struct net_device *dev, st 260 int ipv6_dev_ac_inc(struct net_device *dev, struct in6_addr *addr)
281 { 261 {
282 struct ifacaddr6 *aca; 262 struct ifacaddr6 *aca;
283 struct inet6_dev *idev; 263 struct inet6_dev *idev;
284 struct rt6_info *rt; 264 struct rt6_info *rt;
285 int err; 265 int err;
286 266
287 idev = in6_dev_get(dev); 267 idev = in6_dev_get(dev);
288 268
289 if (idev == NULL) 269 if (idev == NULL)
290 return -EINVAL; 270 return -EINVAL;
291 271
292 write_lock_bh(&idev->lock); 272 write_lock_bh(&idev->lock);
293 if (idev->dead) { 273 if (idev->dead) {
294 err = -ENODEV; 274 err = -ENODEV;
295 goto out; 275 goto out;
296 } 276 }
297 277
298 for (aca = idev->ac_list; aca; aca = a 278 for (aca = idev->ac_list; aca; aca = aca->aca_next) {
299 if (ipv6_addr_equal(&aca->aca_ 279 if (ipv6_addr_equal(&aca->aca_addr, addr)) {
300 aca->aca_users++; 280 aca->aca_users++;
301 err = 0; 281 err = 0;
302 goto out; 282 goto out;
303 } 283 }
304 } 284 }
305 285
306 /* 286 /*
307 * not found: create a new one. 287 * not found: create a new one.
308 */ 288 */
309 289
310 aca = kzalloc(sizeof(struct ifacaddr6) 290 aca = kzalloc(sizeof(struct ifacaddr6), GFP_ATOMIC);
311 291
312 if (aca == NULL) { 292 if (aca == NULL) {
313 err = -ENOMEM; 293 err = -ENOMEM;
314 goto out; 294 goto out;
315 } 295 }
316 296
317 rt = addrconf_dst_alloc(idev, addr, 1) 297 rt = addrconf_dst_alloc(idev, addr, 1);
318 if (IS_ERR(rt)) { 298 if (IS_ERR(rt)) {
319 kfree(aca); 299 kfree(aca);
320 err = PTR_ERR(rt); 300 err = PTR_ERR(rt);
321 goto out; 301 goto out;
322 } 302 }
323 303
324 ipv6_addr_copy(&aca->aca_addr, addr); 304 ipv6_addr_copy(&aca->aca_addr, addr);
325 aca->aca_idev = idev; 305 aca->aca_idev = idev;
326 aca->aca_rt = rt; 306 aca->aca_rt = rt;
327 aca->aca_users = 1; 307 aca->aca_users = 1;
328 /* aca_tstamp should be updated upon c 308 /* aca_tstamp should be updated upon changes */
329 aca->aca_cstamp = aca->aca_tstamp = ji 309 aca->aca_cstamp = aca->aca_tstamp = jiffies;
330 atomic_set(&aca->aca_refcnt, 2); 310 atomic_set(&aca->aca_refcnt, 2);
331 spin_lock_init(&aca->aca_lock); 311 spin_lock_init(&aca->aca_lock);
332 312
333 aca->aca_next = idev->ac_list; 313 aca->aca_next = idev->ac_list;
334 idev->ac_list = aca; 314 idev->ac_list = aca;
335 write_unlock_bh(&idev->lock); 315 write_unlock_bh(&idev->lock);
336 316
337 ip6_ins_rt(rt); 317 ip6_ins_rt(rt);
338 318
339 addrconf_join_solict(dev, &aca->aca_ad 319 addrconf_join_solict(dev, &aca->aca_addr);
340 320
341 aca_put(aca); 321 aca_put(aca);
342 return 0; 322 return 0;
343 out: 323 out:
344 write_unlock_bh(&idev->lock); 324 write_unlock_bh(&idev->lock);
345 in6_dev_put(idev); 325 in6_dev_put(idev);
346 return err; 326 return err;
347 } 327 }
348 328
349 /* 329 /*
350 * device anycast group decrement 330 * device anycast group decrement
351 */ 331 */
352 int __ipv6_dev_ac_dec(struct inet6_dev *idev, 332 int __ipv6_dev_ac_dec(struct inet6_dev *idev, struct in6_addr *addr)
353 { 333 {
354 struct ifacaddr6 *aca, *prev_aca; 334 struct ifacaddr6 *aca, *prev_aca;
355 335
356 write_lock_bh(&idev->lock); 336 write_lock_bh(&idev->lock);
357 prev_aca = NULL; 337 prev_aca = NULL;
358 for (aca = idev->ac_list; aca; aca = a 338 for (aca = idev->ac_list; aca; aca = aca->aca_next) {
359 if (ipv6_addr_equal(&aca->aca_ 339 if (ipv6_addr_equal(&aca->aca_addr, addr))
360 break; 340 break;
361 prev_aca = aca; 341 prev_aca = aca;
362 } 342 }
363 if (!aca) { 343 if (!aca) {
364 write_unlock_bh(&idev->lock); 344 write_unlock_bh(&idev->lock);
365 return -ENOENT; 345 return -ENOENT;
366 } 346 }
367 if (--aca->aca_users > 0) { 347 if (--aca->aca_users > 0) {
368 write_unlock_bh(&idev->lock); 348 write_unlock_bh(&idev->lock);
369 return 0; 349 return 0;
370 } 350 }
371 if (prev_aca) 351 if (prev_aca)
372 prev_aca->aca_next = aca->aca_ 352 prev_aca->aca_next = aca->aca_next;
373 else 353 else
374 idev->ac_list = aca->aca_next; 354 idev->ac_list = aca->aca_next;
375 write_unlock_bh(&idev->lock); 355 write_unlock_bh(&idev->lock);
376 addrconf_leave_solict(idev, &aca->aca_ 356 addrconf_leave_solict(idev, &aca->aca_addr);
377 357
378 dst_hold(&aca->aca_rt->u.dst); 358 dst_hold(&aca->aca_rt->u.dst);
379 ip6_del_rt(aca->aca_rt); 359 ip6_del_rt(aca->aca_rt);
380 360
381 aca_put(aca); 361 aca_put(aca);
382 return 0; 362 return 0;
383 } 363 }
384 364
385 static int ipv6_dev_ac_dec(struct net_device * 365 static int ipv6_dev_ac_dec(struct net_device *dev, struct in6_addr *addr)
386 { 366 {
387 int ret; 367 int ret;
388 struct inet6_dev *idev = in6_dev_get(d 368 struct inet6_dev *idev = in6_dev_get(dev);
389 if (idev == NULL) 369 if (idev == NULL)
390 return -ENODEV; 370 return -ENODEV;
391 ret = __ipv6_dev_ac_dec(idev, addr); 371 ret = __ipv6_dev_ac_dec(idev, addr);
392 in6_dev_put(idev); 372 in6_dev_put(idev);
393 return ret; 373 return ret;
394 } 374 }
395 375
396 /* 376 /*
397 * check if the interface has this anycas 377 * check if the interface has this anycast address
398 */ 378 */
399 static int ipv6_chk_acast_dev(struct net_devic 379 static int ipv6_chk_acast_dev(struct net_device *dev, struct in6_addr *addr)
400 { 380 {
401 struct inet6_dev *idev; 381 struct inet6_dev *idev;
402 struct ifacaddr6 *aca; 382 struct ifacaddr6 *aca;
403 383
404 idev = in6_dev_get(dev); 384 idev = in6_dev_get(dev);
405 if (idev) { 385 if (idev) {
406 read_lock_bh(&idev->lock); 386 read_lock_bh(&idev->lock);
407 for (aca = idev->ac_list; aca; 387 for (aca = idev->ac_list; aca; aca = aca->aca_next)
408 if (ipv6_addr_equal(&a 388 if (ipv6_addr_equal(&aca->aca_addr, addr))
409 break; 389 break;
410 read_unlock_bh(&idev->lock); 390 read_unlock_bh(&idev->lock);
411 in6_dev_put(idev); 391 in6_dev_put(idev);
412 return aca != NULL; 392 return aca != NULL;
413 } 393 }
414 return 0; 394 return 0;
415 } 395 }
416 396
417 /* 397 /*
418 * check if given interface (or any, if d 398 * check if given interface (or any, if dev==0) has this anycast address
419 */ 399 */
420 int ipv6_chk_acast_addr(struct net_device *dev !! 400 int ipv6_chk_acast_addr(struct net *net, struct net_device *dev,
>> 401 struct in6_addr *addr)
421 { 402 {
422 int found = 0; 403 int found = 0;
423 404
424 if (dev) 405 if (dev)
425 return ipv6_chk_acast_dev(dev, 406 return ipv6_chk_acast_dev(dev, addr);
426 read_lock(&dev_base_lock); 407 read_lock(&dev_base_lock);
427 for_each_netdev(&init_net, dev) !! 408 for_each_netdev(net, dev)
428 if (ipv6_chk_acast_dev(dev, ad 409 if (ipv6_chk_acast_dev(dev, addr)) {
429 found = 1; 410 found = 1;
430 break; 411 break;
431 } 412 }
432 read_unlock(&dev_base_lock); 413 read_unlock(&dev_base_lock);
433 return found; 414 return found;
434 } 415 }
435 416
436 417
437 #ifdef CONFIG_PROC_FS 418 #ifdef CONFIG_PROC_FS
438 struct ac6_iter_state { 419 struct ac6_iter_state {
>> 420 struct seq_net_private p;
439 struct net_device *dev; 421 struct net_device *dev;
440 struct inet6_dev *idev; 422 struct inet6_dev *idev;
441 }; 423 };
442 424
443 #define ac6_seq_private(seq) ((struct ac6_i 425 #define ac6_seq_private(seq) ((struct ac6_iter_state *)(seq)->private)
444 426
445 static inline struct ifacaddr6 *ac6_get_first( 427 static inline struct ifacaddr6 *ac6_get_first(struct seq_file *seq)
446 { 428 {
447 struct ifacaddr6 *im = NULL; 429 struct ifacaddr6 *im = NULL;
448 struct ac6_iter_state *state = ac6_seq 430 struct ac6_iter_state *state = ac6_seq_private(seq);
>> 431 struct net *net = seq_file_net(seq);
449 432
450 state->idev = NULL; 433 state->idev = NULL;
451 for_each_netdev(&init_net, state->dev) !! 434 for_each_netdev(net, state->dev) {
452 struct inet6_dev *idev; 435 struct inet6_dev *idev;
453 idev = in6_dev_get(state->dev) 436 idev = in6_dev_get(state->dev);
454 if (!idev) 437 if (!idev)
455 continue; 438 continue;
456 read_lock_bh(&idev->lock); 439 read_lock_bh(&idev->lock);
457 im = idev->ac_list; 440 im = idev->ac_list;
458 if (im) { 441 if (im) {
459 state->idev = idev; 442 state->idev = idev;
460 break; 443 break;
461 } 444 }
462 read_unlock_bh(&idev->lock); 445 read_unlock_bh(&idev->lock);
463 in6_dev_put(idev); 446 in6_dev_put(idev);
464 } 447 }
465 return im; 448 return im;
466 } 449 }
467 450
468 static struct ifacaddr6 *ac6_get_next(struct s 451 static struct ifacaddr6 *ac6_get_next(struct seq_file *seq, struct ifacaddr6 *im)
469 { 452 {
470 struct ac6_iter_state *state = ac6_seq 453 struct ac6_iter_state *state = ac6_seq_private(seq);
471 454
472 im = im->aca_next; 455 im = im->aca_next;
473 while (!im) { 456 while (!im) {
474 if (likely(state->idev != NULL 457 if (likely(state->idev != NULL)) {
475 read_unlock_bh(&state- 458 read_unlock_bh(&state->idev->lock);
476 in6_dev_put(state->ide 459 in6_dev_put(state->idev);
477 } 460 }
478 state->dev = next_net_device(s 461 state->dev = next_net_device(state->dev);
479 if (!state->dev) { 462 if (!state->dev) {
480 state->idev = NULL; 463 state->idev = NULL;
481 break; 464 break;
482 } 465 }
483 state->idev = in6_dev_get(stat 466 state->idev = in6_dev_get(state->dev);
484 if (!state->idev) 467 if (!state->idev)
485 continue; 468 continue;
486 read_lock_bh(&state->idev->loc 469 read_lock_bh(&state->idev->lock);
487 im = state->idev->ac_list; 470 im = state->idev->ac_list;
488 } 471 }
489 return im; 472 return im;
490 } 473 }
491 474
492 static struct ifacaddr6 *ac6_get_idx(struct se 475 static struct ifacaddr6 *ac6_get_idx(struct seq_file *seq, loff_t pos)
493 { 476 {
494 struct ifacaddr6 *im = ac6_get_first(s 477 struct ifacaddr6 *im = ac6_get_first(seq);
495 if (im) 478 if (im)
496 while (pos && (im = ac6_get_ne 479 while (pos && (im = ac6_get_next(seq, im)) != NULL)
497 --pos; 480 --pos;
498 return pos ? NULL : im; 481 return pos ? NULL : im;
499 } 482 }
500 483
501 static void *ac6_seq_start(struct seq_file *se 484 static void *ac6_seq_start(struct seq_file *seq, loff_t *pos)
502 __acquires(dev_base_lock) 485 __acquires(dev_base_lock)
503 { 486 {
504 read_lock(&dev_base_lock); 487 read_lock(&dev_base_lock);
505 return ac6_get_idx(seq, *pos); 488 return ac6_get_idx(seq, *pos);
506 } 489 }
507 490
508 static void *ac6_seq_next(struct seq_file *seq 491 static void *ac6_seq_next(struct seq_file *seq, void *v, loff_t *pos)
509 { 492 {
510 struct ifacaddr6 *im; 493 struct ifacaddr6 *im;
511 im = ac6_get_next(seq, v); 494 im = ac6_get_next(seq, v);
512 ++*pos; 495 ++*pos;
513 return im; 496 return im;
514 } 497 }
515 498
516 static void ac6_seq_stop(struct seq_file *seq, 499 static void ac6_seq_stop(struct seq_file *seq, void *v)
517 __releases(dev_base_lock) 500 __releases(dev_base_lock)
518 { 501 {
519 struct ac6_iter_state *state = ac6_seq 502 struct ac6_iter_state *state = ac6_seq_private(seq);
520 if (likely(state->idev != NULL)) { 503 if (likely(state->idev != NULL)) {
521 read_unlock_bh(&state->idev->l 504 read_unlock_bh(&state->idev->lock);
522 in6_dev_put(state->idev); 505 in6_dev_put(state->idev);
523 } 506 }
524 read_unlock(&dev_base_lock); 507 read_unlock(&dev_base_lock);
525 } 508 }
526 509
527 static int ac6_seq_show(struct seq_file *seq, 510 static int ac6_seq_show(struct seq_file *seq, void *v)
528 { 511 {
529 struct ifacaddr6 *im = (struct ifacadd 512 struct ifacaddr6 *im = (struct ifacaddr6 *)v;
530 struct ac6_iter_state *state = ac6_seq 513 struct ac6_iter_state *state = ac6_seq_private(seq);
531 514
532 seq_printf(seq, !! 515 seq_printf(seq, "%-4d %-15s %pi6 %5d\n",
533 "%-4d %-15s " NIP6_SEQFMT " <<
534 state->dev->ifindex, state- 516 state->dev->ifindex, state->dev->name,
535 NIP6(im->aca_addr), !! 517 &im->aca_addr, im->aca_users);
536 im->aca_users); <<
537 return 0; 518 return 0;
538 } 519 }
539 520
540 static const struct seq_operations ac6_seq_ops 521 static const struct seq_operations ac6_seq_ops = {
541 .start = ac6_seq_start, 522 .start = ac6_seq_start,
542 .next = ac6_seq_next, 523 .next = ac6_seq_next,
543 .stop = ac6_seq_stop, 524 .stop = ac6_seq_stop,
544 .show = ac6_seq_show, 525 .show = ac6_seq_show,
545 }; 526 };
546 527
547 static int ac6_seq_open(struct inode *inode, s 528 static int ac6_seq_open(struct inode *inode, struct file *file)
548 { 529 {
549 return seq_open_private(file, &ac6_seq !! 530 return seq_open_net(inode, file, &ac6_seq_ops,
550 sizeof(struct ac6_iter !! 531 sizeof(struct ac6_iter_state));
551 } 532 }
552 533
553 static const struct file_operations ac6_seq_fo 534 static const struct file_operations ac6_seq_fops = {
554 .owner = THIS_MODULE, 535 .owner = THIS_MODULE,
555 .open = ac6_seq_open, 536 .open = ac6_seq_open,
556 .read = seq_read, 537 .read = seq_read,
557 .llseek = seq_lseek, 538 .llseek = seq_lseek,
558 .release = seq_release_pr !! 539 .release = seq_release_net,
559 }; 540 };
560 541
561 int __init ac6_proc_init(void) !! 542 int ac6_proc_init(struct net *net)
562 { 543 {
563 if (!proc_net_fops_create(&init_net, " !! 544 if (!proc_net_fops_create(net, "anycast6", S_IRUGO, &ac6_seq_fops))
564 return -ENOMEM; 545 return -ENOMEM;
565 546
566 return 0; 547 return 0;
567 } 548 }
568 549
569 void ac6_proc_exit(void) !! 550 void ac6_proc_exit(struct net *net)
570 { 551 {
571 proc_net_remove(&init_net, "anycast6") !! 552 proc_net_remove(net, "anycast6");
572 } 553 }
573 #endif 554 #endif
574 555
575 556
|
This page was automatically generated by the
LXR engine.
|