From patchwork Wed Mar 17 16:38:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 1454861 X-Patchwork-Delegate: pabeni@redhat.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.01.org (client-ip=2001:19d0:306:5::1; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Received: from ml01.01.org (ml01.01.org [IPv6:2001:19d0:306:5::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F0wpZ4fW8z9sVb for ; Thu, 18 Mar 2021 03:39:02 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id CC89D100EB320; Wed, 17 Mar 2021 09:39:00 -0700 (PDT) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a0a:51c0:0:12e:520::1; helo=chamillionaire.breakpoint.cc; envelope-from=fw@breakpoint.cc; receiver= Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [IPv6:2a0a:51c0:0:12e:520::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id CC9FA100EB85D for ; Wed, 17 Mar 2021 09:38:59 -0700 (PDT) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1lMZCE-0002Jx-9R; Wed, 17 Mar 2021 17:38:58 +0100 From: Florian Westphal To: Cc: Florian Westphal Date: Wed, 17 Mar 2021 17:38:24 +0100 Message-Id: <20210317163828.27406-6-fw@strlen.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210317163828.27406-1-fw@strlen.de> References: <20210317163828.27406-1-fw@strlen.de> MIME-Version: 1.0 Message-ID-Hash: AHWHK5Z2F6GCEPCNKRUW3LCCN3CMYVMM X-Message-ID-Hash: AHWHK5Z2F6GCEPCNKRUW3LCCN3CMYVMM X-MailFrom: fw@breakpoint.cc X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [PATCH mptcp-next 5/9] mptcp: setsockopt: add SO_MARK support List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Value is synced to all subflows. Signed-off-by: Florian Westphal --- net/mptcp/sockopt.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index a78e51ead3ae..face38d5e149 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -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); }