Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9ff3049 authored by Kirill Tkhai's avatar Kirill Tkhai Committed by David S. Miller
Browse files

net: Replace ip_ra_lock with per-net mutex 



Since ra_chain is per-net, we may use per-net mutexes
to protect them in ip_ra_control(). This improves
scalability.

Signed-off-by: default avatarKirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5796ef75

include/net/netns/ipv4.h

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ struct netns_ipv4 { 
	struct ipv4_devconf	*devconf_all;

	struct ipv4_devconf	*devconf_dflt;

	struct ip_ra_chain __rcu *ra_chain;

	struct mutex		ra_mutex;

#ifdef CONFIG_IP_MULTIPLE_TABLES

	struct fib_rules_ops	*rules_ops;

	bool			fib_has_custom_rules;

net/core/net_namespace.c

+1 −0
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ static __net_init int setup_net(struct net *net, struct user_namespace *user_ns) 
	net->user_ns = user_ns;

	idr_init(&net->netns_ids);

	spin_lock_init(&net->nsid_lock);

	mutex_init(&net->ipv4.ra_mutex);



	list_for_each_entry(ops, &pernet_list, list) {

		error = ops_init(ops, net);

net/ipv4/ip_sockglue.c

+6 −9
Original line number Diff line number Diff line
@@ -322,9 +322,6 @@ int ip_cmsg_send(struct sock *sk, struct msghdr *msg, struct ipcm_cookie *ipc, 
	return 0;

}



static DEFINE_SPINLOCK(ip_ra_lock);





static void ip_ra_destroy_rcu(struct rcu_head *head)

{

	struct ip_ra_chain *ra = container_of(head, struct ip_ra_chain, rcu);
@@ -345,21 +342,21 @@ int ip_ra_control(struct sock *sk, unsigned char on, 


	new_ra = on ? kmalloc(sizeof(*new_ra), GFP_KERNEL) : NULL;



	spin_lock_bh(&ip_ra_lock);

	mutex_lock(&net->ipv4.ra_mutex);

	for (rap = &net->ipv4.ra_chain;

	     (ra = rcu_dereference_protected(*rap,

			lockdep_is_held(&ip_ra_lock))) != NULL;

			lockdep_is_held(&net->ipv4.ra_mutex))) != NULL;

	     rap = &ra->next) {

		if (ra->sk == sk) {

			if (on) {

				spin_unlock_bh(&ip_ra_lock);

				mutex_unlock(&net->ipv4.ra_mutex);

				kfree(new_ra);

				return -EADDRINUSE;

			}

			/* dont let ip_call_ra_chain() use sk again */

			ra->sk = NULL;

			RCU_INIT_POINTER(*rap, ra->next);

			spin_unlock_bh(&ip_ra_lock);

			mutex_unlock(&net->ipv4.ra_mutex);



			if (ra->destructor)

				ra->destructor(sk);
@@ -374,7 +371,7 @@ int ip_ra_control(struct sock *sk, unsigned char on, 
		}

	}

	if (!new_ra) {

		spin_unlock_bh(&ip_ra_lock);

		mutex_unlock(&net->ipv4.ra_mutex);

		return -ENOBUFS;

	}

	new_ra->sk = sk;
@@ -383,7 +380,7 @@ int ip_ra_control(struct sock *sk, unsigned char on, 
	RCU_INIT_POINTER(new_ra->next, ra);

	rcu_assign_pointer(*rap, new_ra);

	sock_hold(sk);

	spin_unlock_bh(&ip_ra_lock);

	mutex_unlock(&net->ipv4.ra_mutex);



	return 0;

}