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: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/sock.h b/include/net/sock.h
index 5589312..f09c0c4 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -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)

diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c
index 7bb9ef3..3b2366a 100644 (file)
--- a/net/ieee802154/socket.c
+++ b/net/ieee802154/socket.c
@@ -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;
 }

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index bb446e6..3910bb0 100644 (file)
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -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;
 }

diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 41efca8..04683ad 100644 (file)
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -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;

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 4c57532..1a19d17 100644 (file)
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -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;
 }

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 46943a1..a1ffdb4 100644 (file)
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -3102,9 +3102,7 @@ static int packet_release(struct socket *sock)
        sk_del_node_init_rcu(sk);
        mutex_unlock(&net->packet.sklist_lock);
 
-       preempt_disable();
        sock_prot_inuse_add(net, sk->sk_prot, -1);
-       preempt_enable();
 
        spin_lock(&po->bind_lock);
        unregister_prot_hook(sk, false);
@@ -3368,9 +3366,7 @@ static int packet_create(struct net *net, struct socket *sock, int protocol,
        sk_add_node_tail_rcu(sk, &net->packet.sklist);
        mutex_unlock(&net->packet.sklist_lock);
 
-       preempt_disable();
        sock_prot_inuse_add(net, &packet_proto, 1);
-       preempt_enable();
 
        return 0;
 out2:

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 3339125..055a6d3 100644 (file)
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -5068,12 +5068,9 @@ static int sctp_init_sock(struct sock *sk)
 
        SCTP_DBG_OBJCNT_INC(sock);
 
-       local_bh_disable();
        sk_sockets_allocated_inc(sk);
        sock_prot_inuse_add(net, sk->sk_prot, 1);
 
-       local_bh_enable();
-
        return 0;
 }
 
@@ -5099,10 +5096,8 @@ static void sctp_destroy_sock(struct sock *sk)
                list_del(&sp->auto_asconf_list);
        }
        sctp_endpoint_free(sp->ep);
-       local_bh_disable();
        sk_sockets_allocated_dec(sk);
        sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
-       local_bh_enable();
 }
 
 /* Triggered when there are no references on the socket anymore */

diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 59284da..ff5cd0c 100644 (file)
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -89,8 +89,8 @@ int smc_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;
 }

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 78e08e8..54e5553 100644 (file)
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -522,9 +522,7 @@ static void unix_sock_destructor(struct sock *sk)
                unix_release_addr(u->addr);
 
        atomic_long_dec(&unix_nr_socks);
-       local_bh_disable();
        sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
-       local_bh_enable();
 #ifdef UNIX_REFCNT_DEBUG
        pr_debug("UNIX %p is destroyed, %ld are still alive.\n", sk,
                atomic_long_read(&unix_nr_socks));
@@ -889,9 +887,7 @@ static struct sock *unix_create1(struct net *net, struct socket *sock, int kern,
        memset(&u->scm_stat, 0, sizeof(struct scm_stat));
        unix_insert_socket(unix_sockets_unbound(sk), sk);
 
-       local_bh_disable();
        sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
-       local_bh_enable();
 
        return sk;
 

diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
index f16074e..28ef3f4 100644 (file)
--- a/net/xdp/xsk.c
+++ b/net/xdp/xsk.c
@@ -794,9 +794,7 @@ static int xsk_release(struct socket *sock)
        sk_del_node_init_rcu(sk);
        mutex_unlock(&net->xdp.lock);
 
-       local_bh_disable();
        sock_prot_inuse_add(net, sk->sk_prot, -1);
-       local_bh_enable();
 
        xsk_delete_from_maps(xs);
        mutex_lock(&xs->mutex);
@@ -1396,9 +1394,7 @@ static int xsk_create(struct net *net, struct socket *sock, int protocol,
        sk_add_node_rcu(sk, &net->xdp.list);
        mutex_unlock(&net->xdp.lock);
 
-       local_bh_disable();
        sock_prot_inuse_add(net, &xsk_proto, 1);
-       local_bh_enable();
 
        return 0;
 }