From nobody Thu May 2 02:02:47 2024 Received: from sender11-of-o51.zoho.eu (sender11-of-o51.zoho.eu [31.186.226.237]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 505F27B for ; Fri, 23 Sep 2022 00:16:16 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1663892173; cv=none; d=zohomail.eu; s=zohoarc; b=STt6InJTs/c9VPY4+Tss+rV3DCk4AEiH9hTidHtJVHgQWUe+CFWcE09gR0aP6ttNore+EQq/tNn758n9ll14fwE0PIcMYJd9W0af8a0xCdQLTP5tiDlSGv0zyEJrz0R53Tm93XgnUEz/3oa78XolSvsxUM+n28tNfXuU0KmKNDQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1663892173; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=GwxF1WLyg0q2mQXpu8TM0HK3cD2x7dTs3DdVAMnDKnc=; b=EJzO21nPdjkQzNuFky7kwMYgb6ssRQOxt1wLPxHzAhGjb1tPiPpCMGAprsnd3geZ6z+EnLVif9R0q2e+n8nwtp7lF4lGgnjP/CWNjE6REanV1K+7pOl2O8x+sZg9J0daNNEC0k/wfn8fk96WTBeHE3mYDgfPnO5nAxzmSR9hHKM= ARC-Authentication-Results: i=1; mx.zohomail.eu; dkim=pass header.i=shytyi.net; spf=pass smtp.mailfrom=dmytro@shytyi.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1663892173; s=hs; d=shytyi.net; i=dmytro@shytyi.net; h=From:From:To:To:Cc:Cc:Message-ID:Subject:Subject:Date:Date:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Content-Type:Message-Id:Reply-To; bh=GwxF1WLyg0q2mQXpu8TM0HK3cD2x7dTs3DdVAMnDKnc=; b=S5lNhv+DScClz7CIWQt3R8Y6wXVXw53Q3CRkAVbKIgrWJX4fTU7tzbEH0S6/9OmP 0Pwzk/5CHlLt1chMededT1q6UPkDyk4FdptDEy7CZzIowN0+jtPMUQDXe9TRbgUC1Ea oD9RC51rwqkO0DZUvPNZWQK4mG1+qjNoICb+mT7E= Received: from doris.localdomain (243.34.22.93.rev.sfr.net [93.22.34.243]) by mx.zoho.eu with SMTPS id 1663892137266236.01115238738953; Fri, 23 Sep 2022 02:15:37 +0200 (CEST) From: Dmytro Shytyi To: mptcp@lists.linux.dev Cc: Dmytro Shytyi Message-ID: <20220923001530.9722-2-dmytro@shytyi.net> Subject: [RFC PATCH mptcp-next v10 1/3] mptcp: add mptcp_setsockopt_fastopen Date: Fri, 23 Sep 2022 02:15:28 +0200 X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220923001530.9722-1-dmytro@shytyi.net> References: <20220923001530.9722-1-dmytro@shytyi.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Content-Type: text/plain; charset="utf-8" Add set MPTFO socket option for MPTCP. This option is needed for the listen socket to accept MPTFO. Signed-off-by: Dmytro Shytyi --- net/mptcp/Makefile | 2 +- net/mptcp/fastopen.c | 32 ++++++++++++++++++++++++++++++++ net/mptcp/protocol.h | 5 +++++ net/mptcp/sockopt.c | 3 +++ 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 net/mptcp/fastopen.c diff --git a/net/mptcp/Makefile b/net/mptcp/Makefile index 8a7f68efa35f..c42ad8609876 100644 --- a/net/mptcp/Makefile +++ b/net/mptcp/Makefile @@ -2,7 +2,7 @@ obj-$(CONFIG_MPTCP) +=3D mptcp.o =20 mptcp-y :=3D protocol.o subflow.o options.o token.o crypto.o ctrl.o pm.o d= iag.o \ - mib.o pm_netlink.o sockopt.o pm_userspace.o sched.o + mib.o pm_netlink.o sockopt.o pm_userspace.o sched.o fastopen.o =20 obj-$(CONFIG_SYN_COOKIES) +=3D syncookies.o obj-$(CONFIG_INET_MPTCP_DIAG) +=3D mptcp_diag.o diff --git a/net/mptcp/fastopen.c b/net/mptcp/fastopen.c new file mode 100644 index 000000000000..9ef49a2d2ea2 --- /dev/null +++ b/net/mptcp/fastopen.c @@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0 + * MPTCP Fast Open Mechanism. Copyright (c) 2021-2022, Dmytro SHYTYI + */ + +#include "protocol.h" + +int mptcp_setsockopt_sol_tcp_fastopen(struct mptcp_sock *msk, sockptr_t op= tval, + unsigned int optlen) +{ + struct sock *sk =3D (struct sock *)msk; + struct net *net =3D sock_net(sk); + int val; + int ret; + + ret =3D 0; + + if (copy_from_sockptr(&val, optval, sizeof(val))) + return -EFAULT; + + lock_sock(sk); + + if (val >=3D 0 && ((1 << sk->sk_state) & (TCPF_CLOSE | TCPF_LISTEN))) { + tcp_fastopen_init_key_once(net); + fastopen_queue_tune(sk, val); + } else { + ret =3D -EINVAL; + } + + release_sock(sk); + + return ret; +} diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 93c535440a5c..522647804aed 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -838,6 +838,11 @@ void mptcp_event_addr_announced(const struct sock *ssk= , const struct mptcp_addr_ void mptcp_event_addr_removed(const struct mptcp_sock *msk, u8 id); bool mptcp_userspace_pm_active(const struct mptcp_sock *msk); =20 +// Fast Open Mechanism functions begin +int mptcp_setsockopt_sol_tcp_fastopen(struct mptcp_sock *msk, sockptr_t op= tval, + unsigned int optlen); +// Fast Open Mechanism functions end + static inline bool mptcp_pm_should_add_signal(struct mptcp_sock *msk) { return READ_ONCE(msk->pm.addr_signal) & diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 423d3826ca1e..f62f0d63b8e6 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -559,6 +559,7 @@ static bool mptcp_supported_sockopt(int level, int optn= ame) case TCP_NOTSENT_LOWAT: case TCP_TX_DELAY: case TCP_INQ: + case TCP_FASTOPEN: return true; } =20 @@ -796,6 +797,8 @@ static int mptcp_setsockopt_sol_tcp(struct mptcp_sock *= msk, int optname, return mptcp_setsockopt_sol_tcp_nodelay(msk, optval, optlen); case TCP_DEFER_ACCEPT: return mptcp_setsockopt_sol_tcp_defer(msk, optval, optlen); + case TCP_FASTOPEN: + return mptcp_setsockopt_sol_tcp_fastopen(msk, optval, optlen); } =20 return -EOPNOTSUPP; --=20 2.25.1 From nobody Thu May 2 02:02:47 2024 Received: from sender11-of-o51.zoho.eu (sender11-of-o51.zoho.eu [31.186.226.237]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CBCC9161 for ; Fri, 23 Sep 2022 00:15:42 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1663892140; cv=none; d=zohomail.eu; s=zohoarc; b=Snkj9/lO3Yc+vOQIxFQrRbZD2xzF8jWds5/8hORr+/iFQMpHfZtF/Ku5z+9eYXXb+Fg42IyhuDxkyWoQ5s5aT1b83N2VapSpLXNOEZIZj91albacAnHwpdPLXCI2zbYf54A7IvlZIXZFSy2VeR/BNr8/vmv67aXvTFWlcVGpc8o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1663892140; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=6VGZAIh7EpespE4LV/c9Ktfb0qqji+pevbFFH90CpKE=; b=hNZyiutAYzKMbRswAuS5SR1OKRuMidenrxZ21A3PCyuBPwVWs7wgobGeTUMJ6XdcwbPCC88Z7zUbZuRBV4xDHKVq2prE22d2WIXeUM0ak3qEqZ7hCc7TayoisQli2hXxE1EHkXmWuKs3DpSgODN0N/Q9yh3hNP18CuDEUIQgJvo= ARC-Authentication-Results: i=1; mx.zohomail.eu; dkim=pass header.i=shytyi.net; spf=pass smtp.mailfrom=dmytro@shytyi.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1663892140; s=hs; d=shytyi.net; i=dmytro@shytyi.net; h=From:From:To:To:Cc:Cc:Message-ID:Subject:Subject:Date:Date:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Content-Type:Message-Id:Reply-To; bh=6VGZAIh7EpespE4LV/c9Ktfb0qqji+pevbFFH90CpKE=; b=HoNFVgXVOHoV6CPepF0PjIbpeaxC3kVdAgjQd69ihrOGiLLIHUl2JDIYbDVa4NQP IAtFy+3RHxG7Mbqu05dwhyQFZ1ikfdzSjxvBiS81IdK5wrufhBZrckyQqy9ldBwIU6B hruEjNwV7+oD8nGeIPEWur2wxZPfwPLDPafqeUhg= Received: from doris.localdomain (243.34.22.93.rev.sfr.net [93.22.34.243]) by mx.zoho.eu with SMTPS id 1663892137481265.0249531625059; Fri, 23 Sep 2022 02:15:37 +0200 (CEST) From: Dmytro Shytyi To: mptcp@lists.linux.dev Cc: Dmytro Shytyi Message-ID: <20220923001530.9722-3-dmytro@shytyi.net> Subject: [RFC PATCH mptcp-next v10 2/3] mptcp: add mptcp_stream_connect to *.h Date: Fri, 23 Sep 2022 02:15:29 +0200 X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220923001530.9722-1-dmytro@shytyi.net> References: <20220923001530.9722-1-dmytro@shytyi.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Content-Type: text/plain; charset="utf-8" In the following patches we will call mptcp_stream_connect() from function tcp_sendmsg_fastopen() in file "net/ipv4/tcp.c", thus make such symbol visible. Signed-off-by: Dmytro Shytyi --- net/mptcp/protocol.c | 4 ++-- net/mptcp/protocol.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 7d4e197ec567..c39ed726c1c0 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3543,8 +3543,8 @@ static void mptcp_subflow_early_fallback(struct mptcp= _sock *msk, __mptcp_do_fallback(msk); } =20 -static int mptcp_stream_connect(struct socket *sock, struct sockaddr *uadd= r, - int addr_len, int flags) +int mptcp_stream_connect(struct socket *sock, struct sockaddr *uaddr, + int addr_len, int flags) { struct mptcp_sock *msk =3D mptcp_sk(sock->sk); struct mptcp_subflow_context *subflow; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 522647804aed..57596cdfb1f9 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -837,6 +837,7 @@ void mptcp_event(enum mptcp_event_type type, const stru= ct mptcp_sock *msk, void mptcp_event_addr_announced(const struct sock *ssk, const struct mptcp= _addr_info *info); void mptcp_event_addr_removed(const struct mptcp_sock *msk, u8 id); bool mptcp_userspace_pm_active(const struct mptcp_sock *msk); +int mptcp_stream_connect(struct socket *sock, struct sockaddr *uaddr, int = addr_len, int flags); =20 // Fast Open Mechanism functions begin int mptcp_setsockopt_sol_tcp_fastopen(struct mptcp_sock *msk, sockptr_t op= tval, --=20 2.25.1 From nobody Thu May 2 02:02:47 2024 Received: from sender11-of-o51.zoho.eu (sender11-of-o51.zoho.eu [31.186.226.237]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CDDD3163 for ; Fri, 23 Sep 2022 00:15:42 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1663892139; cv=none; d=zohomail.eu; s=zohoarc; b=bNSbJQIcc6dpBr38XhmrKv7gnEWh5uN6ocMa4FkBjoZWDB0gD7nHUWMFUZWyd7Gh7RZsRmsgXBbjsaYNoM31mhG9kXu78NCyLnncr6XflSIP3v3MIUQj1SbPU9AoMTtwe+Jt4BitTTy71mgfkB5CnhmKCfGxeDOxyO/VEcTCe/s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1663892139; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=BfR3OUSey9xHNxb6aFhvyGXbC7GjHBDTe9GUoFmtDc4=; b=C0kUf+A1fLWFnkcQ9AAvinhIr+Yh58YCqoQLstmeLlo0PtBA0x6p+MrM+6Yx41IiiH1+MVhERPIS+A0FkL8zYrjal/zrgoTs2THkhchgAl6RTIP1+g9kv3Qqgm3kgEWwgdEDotC39XJ2qGMxuyHbpqfS4CplHyaJuGjApxdwwbg= ARC-Authentication-Results: i=1; mx.zohomail.eu; dkim=pass header.i=shytyi.net; spf=pass smtp.mailfrom=dmytro@shytyi.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1663892139; s=hs; d=shytyi.net; i=dmytro@shytyi.net; h=From:From:To:To:Cc:Cc:Message-ID:Subject:Subject:Date:Date:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Content-Type:Message-Id:Reply-To; bh=BfR3OUSey9xHNxb6aFhvyGXbC7GjHBDTe9GUoFmtDc4=; b=KzQZxRcy3/dX0SDK/utZlGwJAg34T9UzXrQo6++1lLkQfq2GOoR/ROKZ3QNYpY4C wBTyzBN467QrS9ryVMFAoshaVPiU+7DChFyQOEXrLO/jxYrBTA/4DcaSOVaKOqA8pHc h9t7wMbtJOSZk3/VgnG4YTbH6Mnp8peFCD8hAtyA= Received: from doris.localdomain (243.34.22.93.rev.sfr.net [93.22.34.243]) by mx.zoho.eu with SMTPS id 1663892137693945.3126227448099; Fri, 23 Sep 2022 02:15:37 +0200 (CEST) From: Dmytro Shytyi To: mptcp@lists.linux.dev Cc: Dmytro Shytyi Message-ID: <20220923001530.9722-4-dmytro@shytyi.net> Subject: [RFC PATCH mptcp-next v10 3/3] mptcp: reuse tcp_sendmsg_fastopen() Date: Fri, 23 Sep 2022 02:15:30 +0200 X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220923001530.9722-1-dmytro@shytyi.net> References: <20220923001530.9722-1-dmytro@shytyi.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Content-Type: text/plain; charset="utf-8" In the following patches we will reuse modified tcp_sendmsg_fastopen(). We call it from mptcp_sendmsg().=20 Signed-off-by: Dmytro Shytyi --- include/net/tcp.h | 3 +++ net/ipv4/tcp.c | 23 ++++++++++++++++++----- net/mptcp/protocol.c | 18 ++++++++++++++++-- 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 27e8d378c70a..97cb014ddcab 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1755,6 +1755,9 @@ struct sock *tcp_try_fastopen(struct sock *sk, struct= sk_buff *skb, struct request_sock *req, struct tcp_fastopen_cookie *foc, const struct dst_entry *dst); +int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg, + int *copied, size_t size, + struct ubuf_info *uarg); void tcp_fastopen_init_key_once(struct net *net); bool tcp_fastopen_cookie_check(struct sock *sk, u16 *mss, struct tcp_fastopen_cookie *cookie); diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 5702ca9b952d..e86925b3814a 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -280,6 +280,8 @@ #include #include =20 +#include "../mptcp/protocol.h" + /* Track pending CMSGs. */ enum { TCP_CMSG_INQ =3D 1, @@ -1162,9 +1164,9 @@ void tcp_free_fastopen_req(struct tcp_sock *tp) } } =20 -static int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg, - int *copied, size_t size, - struct ubuf_info *uarg) +int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg, + int *copied, size_t size, + struct ubuf_info *uarg) { struct tcp_sock *tp =3D tcp_sk(sk); struct inet_sock *inet =3D inet_sk(sk); @@ -1197,8 +1199,19 @@ static int tcp_sendmsg_fastopen(struct sock *sk, str= uct msghdr *msg, } } flags =3D (msg->msg_flags & MSG_DONTWAIT) ? O_NONBLOCK : 0; - err =3D __inet_stream_connect(sk->sk_socket, uaddr, - msg->msg_namelen, flags, 1); + if (!sk_is_mptcp(sk)) { + err =3D __inet_stream_connect(sk->sk_socket, uaddr, + msg->msg_namelen, flags, 1); + } else { + struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(sk); + + release_sock(sk); + release_sock(subflow->conn); + err =3D mptcp_stream_connect(sk->sk_socket, uaddr, + msg->msg_namelen, msg->msg_flags); + lock_sock(subflow->conn); + lock_sock(sk); + } /* fastopen_req could already be freed in __inet_stream_connect * if the connection times out or gets rst */ diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index c39ed726c1c0..8a5f79de3ab9 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1668,14 +1668,28 @@ static int mptcp_sendmsg(struct sock *sk, struct ms= ghdr *msg, size_t len) { struct mptcp_sock *msk =3D mptcp_sk(sk); struct page_frag *pfrag; + struct socket *ssock; size_t copied =3D 0; int ret =3D 0; long timeo; =20 /* we don't support FASTOPEN yet */ - if (msg->msg_flags & MSG_FASTOPEN) - return -EOPNOTSUPP; + if (msg->msg_flags & MSG_FASTOPEN) { + lock_sock(sk); + + ssock =3D __mptcp_nmpc_socket(msk); + + lock_sock(ssock->sk); =20 + if (ssock) { + int copied_syn_fastopen =3D 0; + + ret =3D tcp_sendmsg_fastopen(ssock->sk, msg, &copied_syn_fastopen, len,= NULL); + copied +=3D copied_syn_fastopen; + } + release_sock(ssock->sk); + release_sock(sk); + } /* silently ignore everything else */ msg->msg_flags &=3D MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL; =20 --=20 2.25.1