Commit c223c7f2 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'remove-kernel_setsockopt-v4' 



Christoph Hellwig says:

====================
remove kernel_setsockopt v4

now that only the dlm calls to sctp are left for kernel_setsockopt,
while we haven't really made much progress with the sctp setsockopt
refactoring, how about this small series that splits out a
sctp_setsockopt_bindx_kernel that takes a kernel space address array
to share more code as requested by Marcelo.  This should fit in with
whatever variant of the refator of sctp setsockopt we go with, but
just solved the immediate problem for now.

Changes since v3:
 - dropped all the merged patches, just sctp setsockopt left now
 - factor out a new sctp_setsockopt_bindx_kernel helper instead of
   duplicating a small amount of logic

Changes since v2:
 - drop the separately merged kernel_getopt_removal
 - drop the sctp patches, as there is conflicting cleanup going on
 - add an additional ACK for the rxrpc changes

Changes since v1:
 - use ->getname for sctp sockets in dlm
 - add a new ->bind_add struct proto method for dlm/sctp
 - switch the ipv6 and remaining sctp helpers to inline function so that
   the ipv6 and sctp modules are not pulled in by any module that could
   potentially use ipv6 or sctp connections
 - remove arguments to various sock_* helpers that are always used with
   the same constant arguments
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f26e9b2c 5a892ff2

fs/dlm/lowcomms.c

+5 −14
Original line number Diff line number Diff line
@@ -882,6 +882,7 @@ static void writequeue_entry_complete(struct writequeue_entry *e, int completed) 
static int sctp_bind_addrs(struct connection *con, uint16_t port)

{

	struct sockaddr_storage localaddr;

	struct sockaddr *addr = (struct sockaddr *)&localaddr;

	int i, addr_len, result = 0;



	for (i = 0; i < dlm_local_count; i++) {
@@ -889,13 +890,9 @@ static int sctp_bind_addrs(struct connection *con, uint16_t port) 
		make_sockaddr(&localaddr, port, &addr_len);



		if (!i)

			result = kernel_bind(con->sock,

					     (struct sockaddr *)&localaddr,

					     addr_len);

			result = kernel_bind(con->sock, addr, addr_len);

		else

			result = kernel_setsockopt(con->sock, SOL_SCTP,

						   SCTP_SOCKOPT_BINDX_ADD,

						   (char *)&localaddr, addr_len);

			result = sock_bind_add(con->sock->sk, addr, addr_len);



		if (result < 0) {

			log_print("Can't bind to %d addr number %d, %d.\n",
@@ -914,7 +911,6 @@ static int sctp_bind_addrs(struct connection *con, uint16_t port) 
static void sctp_connect_to_sock(struct connection *con)

{

	struct sockaddr_storage daddr;

	int one = 1;

	int result;

	int addr_len;

	struct socket *sock;
@@ -961,8 +957,7 @@ static void sctp_connect_to_sock(struct connection *con) 
	log_print("connecting to %d", con->nodeid);



	/* Turn off Nagle's algorithm */

	kernel_setsockopt(sock, SOL_SCTP, SCTP_NODELAY, (char *)&one,

			  sizeof(one));

	sctp_sock_set_nodelay(sock->sk);



	/*

	 * Make sock->ops->connect() function return in specified time,
@@ -1176,7 +1171,6 @@ static int sctp_listen_for_all(void) 
	struct socket *sock = NULL;

	int result = -EINVAL;

	struct connection *con = nodeid2con(0, GFP_NOFS);

	int one = 1;



	if (!con)

		return -ENOMEM;
@@ -1191,10 +1185,7 @@ static int sctp_listen_for_all(void) 
	}



	sock_set_rcvbuf(sock->sk, NEEDED_RMEM);

	result = kernel_setsockopt(sock, SOL_SCTP, SCTP_NODELAY, (char *)&one,

				   sizeof(one));

	if (result < 0)

		log_print("Could not set SCTP NODELAY error %d\n", result);

	sctp_sock_set_nodelay(sock->sk);



	write_lock_bh(&sock->sk->sk_callback_lock);

	/* Init con struct */

include/linux/net.h

+0 −2
Original line number Diff line number Diff line
@@ -303,8 +303,6 @@ int kernel_connect(struct socket *sock, struct sockaddr *addr, int addrlen, 
		   int flags);

int kernel_getsockname(struct socket *sock, struct sockaddr *addr);

int kernel_getpeername(struct socket *sock, struct sockaddr *addr);

int kernel_setsockopt(struct socket *sock, int level, int optname, char *optval,

		      unsigned int optlen);

int kernel_sendpage(struct socket *sock, struct page *page, int offset,

		    size_t size, int flags);

int kernel_sendpage_locked(struct sock *sk, struct page *page, int offset,

include/net/sctp/sctp.h

+7 −0
Original line number Diff line number Diff line
@@ -615,4 +615,11 @@ static inline bool sctp_newsk_ready(const struct sock *sk) 
	return sock_flag(sk, SOCK_DEAD) || sk->sk_socket;

}



static inline void sctp_sock_set_nodelay(struct sock *sk)

{

	lock_sock(sk);

	sctp_sk(sk)->nodelay = true;

	release_sock(sk);

}



#endif /* __net_sctp_h__ */

include/net/sock.h

+5 −1
Original line number Diff line number Diff line
@@ -1156,7 +1156,9 @@ struct proto { 
	int			(*sendpage)(struct sock *sk, struct page *page,

					int offset, size_t size, int flags);

	int			(*bind)(struct sock *sk,

					struct sockaddr *uaddr, int addr_len);

					struct sockaddr *addr, int addr_len);

	int			(*bind_add)(struct sock *sk,

					struct sockaddr *addr, int addr_len);



	int			(*backlog_rcv) (struct sock *sk,

						struct sk_buff *skb);
@@ -2698,4 +2700,6 @@ void sock_set_reuseaddr(struct sock *sk); 
void sock_set_reuseport(struct sock *sk);

void sock_set_sndtimeo(struct sock *sk, s64 secs);



int sock_bind_add(struct sock *sk, struct sockaddr *addr, int addr_len);



#endif	/* _SOCK_H */

net/core/sock.c

+8 −0
Original line number Diff line number Diff line
@@ -3712,3 +3712,11 @@ bool sk_busy_loop_end(void *p, unsigned long start_time) 
}

EXPORT_SYMBOL(sk_busy_loop_end);

#endif /* CONFIG_NET_RX_BUSY_POLL */



int sock_bind_add(struct sock *sk, struct sockaddr *addr, int addr_len)

{

	if (!sk->sk_prot->bind_add)

		return -EOPNOTSUPP;

	return sk->sk_prot->bind_add(sk, addr, addr_len);

}

EXPORT_SYMBOL(sock_bind_add);

CRA Git | Maintained and supported by SUSTech CRA and CCSE