Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: Revert "ipv4: get rid of ip_ra_lock"

This reverts commit ba3f571d5dde. The commit was made
after 1215e51edad1 "ipv4: fix a deadlock in ip_ra_control",
and killed ip_ra_lock, which became useless after rtnl_lock()
made used to destroy every raw ipv4 socket. This scales
very bad, and next patch in series reverts 1215e51edad1.
ip_ra_lock will be used again.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Kirill Tkhai and committed by
David S. Miller
76d3e153 f2d254fa

+10 -2
+10 -2
net/ipv4/ip_sockglue.c
··· 334 334 sent to multicast group to reach destination designated router. 335 335 */ 336 336 struct ip_ra_chain __rcu *ip_ra_chain; 337 + static DEFINE_SPINLOCK(ip_ra_lock); 337 338 338 339 339 340 static void ip_ra_destroy_rcu(struct rcu_head *head) ··· 356 355 357 356 new_ra = on ? kmalloc(sizeof(*new_ra), GFP_KERNEL) : NULL; 358 357 358 + spin_lock_bh(&ip_ra_lock); 359 359 for (rap = &ip_ra_chain; 360 - (ra = rtnl_dereference(*rap)) != NULL; 360 + (ra = rcu_dereference_protected(*rap, 361 + lockdep_is_held(&ip_ra_lock))) != NULL; 361 362 rap = &ra->next) { 362 363 if (ra->sk == sk) { 363 364 if (on) { 365 + spin_unlock_bh(&ip_ra_lock); 364 366 kfree(new_ra); 365 367 return -EADDRINUSE; 366 368 } 367 369 /* dont let ip_call_ra_chain() use sk again */ 368 370 ra->sk = NULL; 369 371 RCU_INIT_POINTER(*rap, ra->next); 372 + spin_unlock_bh(&ip_ra_lock); 370 373 371 374 if (ra->destructor) 372 375 ra->destructor(sk); ··· 384 379 return 0; 385 380 } 386 381 } 387 - if (!new_ra) 382 + if (!new_ra) { 383 + spin_unlock_bh(&ip_ra_lock); 388 384 return -ENOBUFS; 385 + } 389 386 new_ra->sk = sk; 390 387 new_ra->destructor = destructor; 391 388 392 389 RCU_INIT_POINTER(new_ra->next, ra); 393 390 rcu_assign_pointer(*rap, new_ra); 394 391 sock_hold(sk); 392 + spin_unlock_bh(&ip_ra_lock); 395 393 396 394 return 0; 397 395 }