Commit 6c9a0a0f authored by Yangbo Lu's avatar Yangbo Lu Committed by David S. Miller
Browse files

mptcp: setsockopt: convert to mptcp_setsockopt_sol_socket_timestamping() 



Split timestamping handling into a new function
mptcp_setsockopt_sol_socket_timestamping().
This is preparation for extending SO_TIMESTAMPING
for PHC binding, since optval will no longer be
integer.

Signed-off-by: default avatarYangbo Lu <yangbo.lu@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 895487a3

net/mptcp/sockopt.c

+40 −17
Original line number Diff line number Diff line
@@ -157,19 +157,7 @@ static int mptcp_setsockopt_sol_socket_tstamp(struct mptcp_sock *msk, int optnam 
		struct sock *ssk = mptcp_subflow_tcp_sock(subflow);

		bool slow = lock_sock_fast(ssk);



		switch (optname) {

		case SO_TIMESTAMP_OLD:

		case SO_TIMESTAMP_NEW:

		case SO_TIMESTAMPNS_OLD:

		case SO_TIMESTAMPNS_NEW:

		sock_set_timestamp(sk, optname, !!val);

			break;

		case SO_TIMESTAMPING_NEW:

		case SO_TIMESTAMPING_OLD:

			sock_set_timestamping(sk, optname, val);

			break;

		}



		unlock_sock_fast(ssk, slow);

	}
@@ -178,7 +166,8 @@ static int mptcp_setsockopt_sol_socket_tstamp(struct mptcp_sock *msk, int optnam 
}



static int mptcp_setsockopt_sol_socket_int(struct mptcp_sock *msk, int optname,

					   sockptr_t optval, unsigned int optlen)

					   sockptr_t optval,

					   unsigned int optlen)

{

	int val, ret;
@@ -205,14 +194,45 @@ static int mptcp_setsockopt_sol_socket_int(struct mptcp_sock *msk, int optname, 
	case SO_TIMESTAMP_NEW:

	case SO_TIMESTAMPNS_OLD:

	case SO_TIMESTAMPNS_NEW:

	case SO_TIMESTAMPING_OLD:

	case SO_TIMESTAMPING_NEW:

		return mptcp_setsockopt_sol_socket_tstamp(msk, optname, val);

	}



	return -ENOPROTOOPT;

}



static int mptcp_setsockopt_sol_socket_timestamping(struct mptcp_sock *msk,

						    int optname,

						    sockptr_t optval,

						    unsigned int optlen)

{

	struct mptcp_subflow_context *subflow;

	struct sock *sk = (struct sock *)msk;

	int val, ret;



	ret = mptcp_get_int_option(msk, optval, optlen, &val);

	if (ret)

		return ret;



	ret = sock_setsockopt(sk->sk_socket, SOL_SOCKET, optname,

			      KERNEL_SOCKPTR(&val), sizeof(val));

	if (ret)

		return ret;



	lock_sock(sk);



	mptcp_for_each_subflow(msk, subflow) {

		struct sock *ssk = mptcp_subflow_tcp_sock(subflow);

		bool slow = lock_sock_fast(ssk);



		sock_set_timestamping(sk, optname, val);

		unlock_sock_fast(ssk, slow);

	}



	release_sock(sk);



	return 0;

}



static int mptcp_setsockopt_sol_socket_linger(struct mptcp_sock *msk, sockptr_t optval,

					      unsigned int optlen)

{
@@ -299,9 +319,12 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_sock *msk, int optname, 
	case SO_TIMESTAMP_NEW:

	case SO_TIMESTAMPNS_OLD:

	case SO_TIMESTAMPNS_NEW:

		return mptcp_setsockopt_sol_socket_int(msk, optname, optval,

						       optlen);

	case SO_TIMESTAMPING_OLD:

	case SO_TIMESTAMPING_NEW:

		return mptcp_setsockopt_sol_socket_int(msk, optname, optval, optlen);

		return mptcp_setsockopt_sol_socket_timestamping(msk, optname,

								optval, optlen);

	case SO_LINGER:

		return mptcp_setsockopt_sol_socket_linger(msk, optval, optlen);

	case SO_RCVLOWAT: