net/ipx: push down BKL into a ipx_dgram_ops
Making the BKL usage explicit in ipx makes it more obvious where it is used, reduces code size and helps getting rid of the BKL in common code. I did not analyse how to kill lock_kernel from ipx entirely, this will involve either proving that it's not needed, or replacing with a proper mutex or spinlock, after finding out which data structures are protected by the lock. Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Cc: David S. Miller <davem@davemloft.net> Cc: Stephen Hemminger <shemminger@vyatta.com> Cc: netdev@vger.kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: David S. Miller <davem@davemloft.net>wifi-calibration
Arnd Bergmann
David S. Miller
parent
ecced8ba87
commit
83927ba069
|
|
@ -1298,6 +1298,7 @@ static int ipx_setsockopt(struct socket *sock, int level, int optname,
|
|||
int opt;
|
||||
int rc = -EINVAL;
|
||||
|
||||
lock_kernel();
|
||||
if (optlen != sizeof(int))
|
||||
goto out;
|
||||
|
||||
|
|
@ -1312,6 +1313,7 @@ static int ipx_setsockopt(struct socket *sock, int level, int optname,
|
|||
ipx_sk(sk)->type = opt;
|
||||
rc = 0;
|
||||
out:
|
||||
unlock_kernel();
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
|
@ -1323,6 +1325,7 @@ static int ipx_getsockopt(struct socket *sock, int level, int optname,
|
|||
int len;
|
||||
int rc = -ENOPROTOOPT;
|
||||
|
||||
lock_kernel();
|
||||
if (!(level == SOL_IPX && optname == IPX_TYPE))
|
||||
goto out;
|
||||
|
||||
|
|
@ -1343,6 +1346,7 @@ static int ipx_getsockopt(struct socket *sock, int level, int optname,
|
|||
|
||||
rc = 0;
|
||||
out:
|
||||
unlock_kernel();
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
|
@ -1391,6 +1395,7 @@ static int ipx_release(struct socket *sock)
|
|||
if (!sk)
|
||||
goto out;
|
||||
|
||||
lock_kernel();
|
||||
if (!sock_flag(sk, SOCK_DEAD))
|
||||
sk->sk_state_change(sk);
|
||||
|
||||
|
|
@ -1398,6 +1403,7 @@ static int ipx_release(struct socket *sock)
|
|||
sock->sk = NULL;
|
||||
sk_refcnt_debug_release(sk);
|
||||
ipx_destroy_socket(sk);
|
||||
unlock_kernel();
|
||||
out:
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1425,7 +1431,8 @@ static __be16 ipx_first_free_socketnum(struct ipx_interface *intrfc)
|
|||
return htons(socketNum);
|
||||
}
|
||||
|
||||
static int ipx_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
|
||||
static int __ipx_bind(struct socket *sock,
|
||||
struct sockaddr *uaddr, int addr_len)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
struct ipx_sock *ipxs = ipx_sk(sk);
|
||||
|
|
@ -1520,6 +1527,17 @@ out:
|
|||
return rc;
|
||||
}
|
||||
|
||||
static int ipx_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
|
||||
{
|
||||
int rc;
|
||||
|
||||
lock_kernel();
|
||||
rc = __ipx_bind(sock, uaddr, addr_len);
|
||||
unlock_kernel();
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
static int ipx_connect(struct socket *sock, struct sockaddr *uaddr,
|
||||
int addr_len, int flags)
|
||||
{
|
||||
|
|
@ -1532,6 +1550,7 @@ static int ipx_connect(struct socket *sock, struct sockaddr *uaddr,
|
|||
sk->sk_state = TCP_CLOSE;
|
||||
sock->state = SS_UNCONNECTED;
|
||||
|
||||
lock_kernel();
|
||||
if (addr_len != sizeof(*addr))
|
||||
goto out;
|
||||
addr = (struct sockaddr_ipx *)uaddr;
|
||||
|
|
@ -1551,7 +1570,7 @@ static int ipx_connect(struct socket *sock, struct sockaddr *uaddr,
|
|||
IPX_NODE_LEN);
|
||||
#endif /* CONFIG_IPX_INTERN */
|
||||
|
||||
rc = ipx_bind(sock, (struct sockaddr *)&uaddr,
|
||||
rc = __ipx_bind(sock, (struct sockaddr *)&uaddr,
|
||||
sizeof(struct sockaddr_ipx));
|
||||
if (rc)
|
||||
goto out;
|
||||
|
|
@ -1578,6 +1597,7 @@ static int ipx_connect(struct socket *sock, struct sockaddr *uaddr,
|
|||
ipxrtr_put(rt);
|
||||
rc = 0;
|
||||
out:
|
||||
unlock_kernel();
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
|
@ -1593,6 +1613,7 @@ static int ipx_getname(struct socket *sock, struct sockaddr *uaddr,
|
|||
|
||||
*uaddr_len = sizeof(struct sockaddr_ipx);
|
||||
|
||||
lock_kernel();
|
||||
if (peer) {
|
||||
rc = -ENOTCONN;
|
||||
if (sk->sk_state != TCP_ESTABLISHED)
|
||||
|
|
@ -1627,6 +1648,19 @@ static int ipx_getname(struct socket *sock, struct sockaddr *uaddr,
|
|||
|
||||
rc = 0;
|
||||
out:
|
||||
unlock_kernel();
|
||||
return rc;
|
||||
}
|
||||
|
||||
static unsigned int ipx_datagram_poll(struct file *file, struct socket *sock,
|
||||
poll_table *wait)
|
||||
{
|
||||
int rc;
|
||||
|
||||
lock_kernel();
|
||||
rc = datagram_poll(file, sock, wait);
|
||||
unlock_kernel();
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
|
@ -1701,6 +1735,7 @@ static int ipx_sendmsg(struct kiocb *iocb, struct socket *sock,
|
|||
int rc = -EINVAL;
|
||||
int flags = msg->msg_flags;
|
||||
|
||||
lock_kernel();
|
||||
/* Socket gets bound below anyway */
|
||||
/* if (sk->sk_zapped)
|
||||
return -EIO; */ /* Socket not bound */
|
||||
|
|
@ -1724,7 +1759,7 @@ static int ipx_sendmsg(struct kiocb *iocb, struct socket *sock,
|
|||
memcpy(uaddr.sipx_node, ipxs->intrfc->if_node,
|
||||
IPX_NODE_LEN);
|
||||
#endif
|
||||
rc = ipx_bind(sock, (struct sockaddr *)&uaddr,
|
||||
rc = __ipx_bind(sock, (struct sockaddr *)&uaddr,
|
||||
sizeof(struct sockaddr_ipx));
|
||||
if (rc)
|
||||
goto out;
|
||||
|
|
@ -1752,6 +1787,7 @@ static int ipx_sendmsg(struct kiocb *iocb, struct socket *sock,
|
|||
if (rc >= 0)
|
||||
rc = len;
|
||||
out:
|
||||
unlock_kernel();
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
|
@ -1766,6 +1802,7 @@ static int ipx_recvmsg(struct kiocb *iocb, struct socket *sock,
|
|||
struct sk_buff *skb;
|
||||
int copied, rc;
|
||||
|
||||
lock_kernel();
|
||||
/* put the autobinding in */
|
||||
if (!ipxs->port) {
|
||||
struct sockaddr_ipx uaddr;
|
||||
|
|
@ -1780,7 +1817,7 @@ static int ipx_recvmsg(struct kiocb *iocb, struct socket *sock,
|
|||
memcpy(uaddr.sipx_node, ipxs->intrfc->if_node, IPX_NODE_LEN);
|
||||
#endif /* CONFIG_IPX_INTERN */
|
||||
|
||||
rc = ipx_bind(sock, (struct sockaddr *)&uaddr,
|
||||
rc = __ipx_bind(sock, (struct sockaddr *)&uaddr,
|
||||
sizeof(struct sockaddr_ipx));
|
||||
if (rc)
|
||||
goto out;
|
||||
|
|
@ -1824,6 +1861,7 @@ static int ipx_recvmsg(struct kiocb *iocb, struct socket *sock,
|
|||
out_free:
|
||||
skb_free_datagram(sk, skb);
|
||||
out:
|
||||
unlock_kernel();
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
|
@ -1835,6 +1873,7 @@ static int ipx_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
|
|||
struct sock *sk = sock->sk;
|
||||
void __user *argp = (void __user *)arg;
|
||||
|
||||
lock_kernel();
|
||||
switch (cmd) {
|
||||
case TIOCOUTQ:
|
||||
amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk);
|
||||
|
|
@ -1897,6 +1936,7 @@ static int ipx_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
|
|||
rc = -ENOIOCTLCMD;
|
||||
break;
|
||||
}
|
||||
unlock_kernel();
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
|
@ -1934,7 +1974,7 @@ static const struct net_proto_family ipx_family_ops = {
|
|||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
||||
static const struct proto_ops SOCKOPS_WRAPPED(ipx_dgram_ops) = {
|
||||
static const struct proto_ops ipx_dgram_ops = {
|
||||
.family = PF_IPX,
|
||||
.owner = THIS_MODULE,
|
||||
.release = ipx_release,
|
||||
|
|
@ -1943,7 +1983,7 @@ static const struct proto_ops SOCKOPS_WRAPPED(ipx_dgram_ops) = {
|
|||
.socketpair = sock_no_socketpair,
|
||||
.accept = sock_no_accept,
|
||||
.getname = ipx_getname,
|
||||
.poll = datagram_poll,
|
||||
.poll = ipx_datagram_poll,
|
||||
.ioctl = ipx_ioctl,
|
||||
#ifdef CONFIG_COMPAT
|
||||
.compat_ioctl = ipx_compat_ioctl,
|
||||
|
|
@ -1958,8 +1998,6 @@ static const struct proto_ops SOCKOPS_WRAPPED(ipx_dgram_ops) = {
|
|||
.sendpage = sock_no_sendpage,
|
||||
};
|
||||
|
||||
SOCKOPS_WRAP(ipx_dgram, PF_IPX);
|
||||
|
||||
static struct packet_type ipx_8023_packet_type __read_mostly = {
|
||||
.type = cpu_to_be16(ETH_P_802_3),
|
||||
.func = ipx_rcv,
|
||||
|
|
|
|||
Loading…
Reference in New Issue