OSDN Git Service

mptcp: setsockopt: add SO_MARK support
authorFlorian Westphal <fw@strlen.de>
Thu, 15 Apr 2021 23:44:58 +0000 (16:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 16 Apr 2021 22:23:10 +0000 (15:23 -0700)
Value is synced to all subflows.

Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/mptcp/sockopt.c

index ee5d587..1ad6092 100644 (file)
@@ -95,6 +95,12 @@ static void mptcp_sol_socket_sync_intval(struct mptcp_sock *msk, int optname, in
                        ssk->sk_userlocks |= SOCK_RCVBUF_LOCK;
                        WRITE_ONCE(ssk->sk_rcvbuf, sk->sk_rcvbuf);
                        break;
+               case SO_MARK:
+                       if (READ_ONCE(ssk->sk_mark) != sk->sk_mark) {
+                               ssk->sk_mark = sk->sk_mark;
+                               sk_dst_reset(ssk);
+                       }
+                       break;
                }
 
                subflow->setsockopt_seq = msk->setsockopt_seq;
@@ -132,6 +138,7 @@ static int mptcp_setsockopt_sol_socket_int(struct mptcp_sock *msk, int optname,
        case SO_KEEPALIVE:
                mptcp_sol_socket_sync_intval(msk, optname, val);
                return 0;
+       case SO_MARK:
        case SO_PRIORITY:
        case SO_SNDBUF:
        case SO_SNDBUFFORCE:
@@ -222,6 +229,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);