From patchwork Wed Mar 17 16:38:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 1454863 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 4F0wpl4Qg6z9sVt for ; Thu, 18 Mar 2021 03:39:11 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id E0CB0100EB858; Wed, 17 Mar 2021 09:39:09 -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 1C8D3100EB854 for ; Wed, 17 Mar 2021 09:39:08 -0700 (PDT) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1lMZCM-0002LB-LV; Wed, 17 Mar 2021 17:39:06 +0100 From: Florian Westphal To: Cc: Florian Westphal Date: Wed, 17 Mar 2021 17:38:26 +0100 Message-Id: <20210317163828.27406-8-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: 3NPNU47IKJG6TE6YD7MGKWDQYM42X3O6 X-Message-ID-Hash: 3NPNU47IKJG6TE6YD7MGKWDQYM42X3O6 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 7/9] mptcp: setsockopt: SO_DEBUG and no-op options List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Handle SO_DEBUG and set it on all subflows. Ignore those values not implemented on TCP sockets. Signed-off-by: Florian Westphal --- net/mptcp/sockopt.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index e2cc6e11e777..3ba31f4a73e3 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -35,6 +35,32 @@ static int mptcp_get_int_option(struct mptcp_sock *msk, sockptr_t optval, unsign return 0; } +static int mptcp_so_debug(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_DEBUG, + 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 = lock_sock_fast(ssk); + + sock_valbool_flag(ssk, SOCK_DBG, !!val); + unlock_sock_fast(ssk, slow); + } + + release_sock(sk); + return 0; +} + static int mptcp_so_mark(struct mptcp_sock *msk, int val) { sockptr_t optval = KERNEL_SOCKPTR(&val); @@ -169,6 +195,8 @@ static int mptcp_setsockopt_sol_socket_int(struct mptcp_sock *msk, int optname, return ret; switch (optname) { + case SO_DEBUG: + return mptcp_so_debug(msk, val); case SO_MARK: return mptcp_so_mark(msk, val); case SO_KEEPALIVE: @@ -268,9 +296,21 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_sock *msk, int optname, case SO_RCVBUFFORCE: case SO_MARK: case SO_INCOMING_CPU: + case SO_DEBUG: return mptcp_setsockopt_sol_socket_int(msk, optname, optval, optlen); case SO_LINGER: return mptcp_setsockopt_sol_socket_linger(msk, optval, optlen); + case SO_NO_CHECK: + case SO_DONTROUTE: + case SO_BROADCAST: + case SO_BSDCOMPAT: + case SO_PASSCRED: + case SO_PASSSEC: + case SO_RXQ_OVFL: + case SO_WIFI_STATUS: + case SO_NOFCS: + case SO_SELECT_ERR_QUEUE: + return 0; } return sock_setsockopt(sk->sk_socket, SOL_SOCKET, optname, optval, optlen); @@ -602,6 +642,7 @@ static void sync_socket_options(struct mptcp_sock *msk, struct sock *ssk) sk_dst_reset(ssk); } + sock_valbool_flag(ssk, SOCK_DBG, sock_flag(sk, SOCK_DBG)); unlock_sock_fast(ssk, slow); }