Commit a5ef058d authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

net: introduce and use custom sockopt socket flag 



We will soon introduce custom setsockopt for UDP sockets, too.
Instead of doing even more complex arbitrary checks inside
sock_use_custom_sol_socket(), add a new socket flag and set it
for the relevant socket types (currently only MPTCP).

Reviewed-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ea5ed0f0

include/linux/net.h

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ struct net; 
#define SOCK_NOSPACE		2

#define SOCK_PASSCRED		3

#define SOCK_PASSSEC		4

#define SOCK_CUSTOM_SOCKOPT	5



#ifndef ARCH_HAS_SOCKET_TYPES

/**

net/mptcp/protocol.c

+4 −0
Original line number Diff line number Diff line
@@ -2708,6 +2708,8 @@ static int mptcp_init_sock(struct sock *sk) 
	if (ret)

		return ret;



	set_bit(SOCK_CUSTOM_SOCKOPT, &sk->sk_socket->flags);



	/* fetch the ca name; do it outside __mptcp_init_sock(), so that clone will

	 * propagate the correct value

	 */
@@ -3684,6 +3686,8 @@ static int mptcp_stream_accept(struct socket *sock, struct socket *newsock, 
		struct mptcp_subflow_context *subflow;

		struct sock *newsk = newsock->sk;



		set_bit(SOCK_CUSTOM_SOCKOPT, &newsock->flags);



		lock_sock(newsk);



		/* PM/worker can now acquire the first subflow socket

net/socket.c

+1 −7
Original line number Diff line number Diff line
@@ -2199,13 +2199,7 @@ SYSCALL_DEFINE4(recv, int, fd, void __user *, ubuf, size_t, size, 


static bool sock_use_custom_sol_socket(const struct socket *sock)

{

	const struct sock *sk = sock->sk;



	/* Use sock->ops->setsockopt() for MPTCP */

	return IS_ENABLED(CONFIG_MPTCP) &&

	       sk->sk_protocol == IPPROTO_MPTCP &&

	       sk->sk_type == SOCK_STREAM &&

	       (sk->sk_family == AF_INET || sk->sk_family == AF_INET6);

	return test_bit(SOCK_CUSTOM_SOCKOPT, &sock->flags);

}



/*