Commit b3cb764a authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: drop nopreempt requirement on sock_prot_inuse_add() 



This is distracting really, let's make this simpler,
because many callers had to take care of this
by themselves, even if on x86 this adds more
code than really needed.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4199bae1

include/net/sock.h

+2 −2
Original line number Diff line number Diff line
@@ -1434,11 +1434,11 @@ struct prot_inuse { 
	int all;

	int val[PROTO_INUSE_NR];

};

/* Called with local bh disabled */



static inline void sock_prot_inuse_add(const struct net *net,

				       const struct proto *prot, int val)

{

	__this_cpu_add(net->core.prot_inuse->val[prot->inuse_idx], val);

	this_cpu_add(net->core.prot_inuse->val[prot->inuse_idx], val);

}



static inline void sock_inuse_add(const struct net *net, int val)

net/ieee802154/socket.c

+2 −2
Original line number Diff line number Diff line
@@ -174,8 +174,8 @@ static int raw_hash(struct sock *sk) 
{

	write_lock_bh(&raw_lock);

	sk_add_node(sk, &raw_head);

	sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);

	write_unlock_bh(&raw_lock);

	sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);



	return 0;

}
@@ -453,8 +453,8 @@ static int dgram_hash(struct sock *sk) 
{

	write_lock_bh(&dgram_lock);

	sk_add_node(sk, &dgram_head);

	sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);

	write_unlock_bh(&dgram_lock);

	sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);



	return 0;

}

net/ipv4/raw.c

+1 −1
Original line number Diff line number Diff line
@@ -99,8 +99,8 @@ int raw_hash_sk(struct sock *sk) 


	write_lock_bh(&h->lock);

	sk_add_node(sk, head);

	sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);

	write_unlock_bh(&h->lock);

	sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);



	return 0;

}

net/ipv6/ipv6_sockglue.c

+4 −4
Original line number Diff line number Diff line
@@ -471,10 +471,10 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, 


			if (sk->sk_protocol == IPPROTO_TCP) {

				struct inet_connection_sock *icsk = inet_csk(sk);

				local_bh_disable();



				sock_prot_inuse_add(net, sk->sk_prot, -1);

				sock_prot_inuse_add(net, &tcp_prot, 1);

				local_bh_enable();



				sk->sk_prot = &tcp_prot;

				icsk->icsk_af_ops = &ipv4_specific;

				sk->sk_socket->ops = &inet_stream_ops;
@@ -485,10 +485,10 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, 


				if (sk->sk_protocol == IPPROTO_UDPLITE)

					prot = &udplite_prot;

				local_bh_disable();



				sock_prot_inuse_add(net, sk->sk_prot, -1);

				sock_prot_inuse_add(net, prot, 1);

				local_bh_enable();



				sk->sk_prot = prot;

				sk->sk_socket->ops = &inet_dgram_ops;

				sk->sk_family = PF_INET;

net/netlink/af_netlink.c

+0 −4
Original line number Diff line number Diff line
@@ -707,9 +707,7 @@ static int netlink_create(struct net *net, struct socket *sock, int protocol, 
	if (err < 0)

		goto out_module;



	local_bh_disable();

	sock_prot_inuse_add(net, &netlink_proto, 1);

	local_bh_enable();



	nlk = nlk_sk(sock->sk);

	nlk->module = module;
@@ -809,9 +807,7 @@ static int netlink_release(struct socket *sock) 
		netlink_table_ungrab();

	}



	local_bh_disable();

	sock_prot_inuse_add(sock_net(sk), &netlink_proto, -1);

	local_bh_enable();

	call_rcu(&nlk->rcu, deferred_put_nlk_sk);

	return 0;

}