@@ -35,6 +35,37 @@ static int mptcp_get_int_option(struct mptcp_sock *msk, sockptr_t optval, unsign
return 0;
}
+static int mptcp_so_mark(struct mptcp_sock *msk, int val)
+{
+ sockptr_t optval = KERNEL_SOCKPTR(&val);
+ struct mptcp_subflow_context *subflow;
+ struct sock *sk = (struct sock *)msk;
+ int ret;
+
+ ret = sock_setsockopt(sk->sk_socket, SOL_SOCKET, SO_MARK,
+ optval, 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;
+
+ if (READ_ONCE(ssk->sk_mark) == sk->sk_mark)
+ continue;
+
+ slow = lock_sock_fast(ssk);
+ ssk->sk_mark = sk->sk_mark;
+ sk_dst_reset(ssk);
+ unlock_sock_fast(ssk, slow);
+ }
+
+ release_sock(sk);
+ return 0;
+}
+
static void mptcp_so_keepalive(struct mptcp_sock *msk, int val)
{
struct mptcp_subflow_context *subflow;
@@ -121,6 +152,8 @@ static int mptcp_setsockopt_sol_socket_int(struct mptcp_sock *msk, int optname,
return ret;
switch (optname) {
+ case SO_MARK:
+ return mptcp_so_mark(msk, val);
case SO_KEEPALIVE:
mptcp_so_keepalive(msk, val);
return 0;
@@ -213,6 +246,7 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_sock *msk, int optname,
case SO_SNDBUFFORCE:
case SO_RCVBUF:
case SO_RCVBUFFORCE:
+ case SO_MARK:
return mptcp_setsockopt_sol_socket_int(msk, optname, optval, optlen);
case SO_LINGER:
return mptcp_setsockopt_sol_socket_linger(msk, optval, optlen);
@@ -540,6 +574,12 @@ static void sync_socket_options(struct mptcp_sock *msk, struct sock *ssk)
} else {
sock_reset_flag(ssk, SOCK_LINGER);
}
+
+ if (sk->sk_mark != ssk->sk_mark) {
+ ssk->sk_mark = sk->sk_mark;
+ sk_dst_reset(ssk);
+ }
+
unlock_sock_fast(ssk, slow);
}
Value is synced to all subflows. Signed-off-by: Florian Westphal <fw@strlen.de> --- net/mptcp/sockopt.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)