From patchwork Tue Sep 27 22:53:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmytro Shytyi X-Patchwork-Id: 12991461 X-Patchwork-Delegate: pabeni@redhat.com 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 1760B4C93 for ; Tue, 27 Sep 2022 22:54:24 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1664319260; cv=none; d=zohomail.eu; s=zohoarc; b=cXZFQfpwcu3Tk6aFavaI0pJSbDQGGW4H4wjUabfwiDAahtWnqVQhdjeoonc0s3hLK5GDdqecON4yA8uYF1o7OG/O9TPrYgygcHPJQZILjvH6wHjaVTqpgPvdC1TR+7QUNykvwS6kkZ097nCuYAsaQ+7iSVMal7l4nG2XyzTrArg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1664319260; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=NGUkgo3dSkuX/JOnRGP5gFdJh+kJcyaNwwKpsyK1Jsw=; b=YkCiLG+9bbwvkTfqD6MBDkArIahn8aCcpfIZcgKBhiV8TCGTd57AyyPtclUjKsuc3Om9Od+jVS/QkIa1cJv8dyxvqAoYjWJET8gqzOmSzoiGekFuav4esI5BWR/5C8wLie5oo7JWPbM1NF6MGGt7aMZzHsct4WEaKDVgSA52Kfw= 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=1664319260; 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=NGUkgo3dSkuX/JOnRGP5gFdJh+kJcyaNwwKpsyK1Jsw=; b=E1oWoLg7fBR0vqriI6MGSc3brq8YjrEK2uOv0199iC/+ppAxkRJhJeMfWFr43W+P GjahmSLOUsbuzFyeF6W6dPNhykzCGQMH1e09I8Dmd44Nih7dVnYITvgRL1ix8UHnaEc ILO/3yz20MVWvqmNBOg+dyiaF+8mHSosXPZpqjUY= Received: from localhost.localdomain (243.34.22.93.rev.sfr.net [93.22.34.243]) by mx.zoho.eu with SMTPS id 1664319257546271.51229475042123; Wed, 28 Sep 2022 00:54:17 +0200 (CEST) From: Dmytro Shytyi To: mptcp@lists.linux.dev Cc: Dmytro Shytyi Message-ID: <20220927225341.14165-4-dmytro@shytyi.net> Subject: [RFC PATCH mptcp-next v12 3/7] mptcp: add subflow_v(4,6)_send_synack() Date: Tue, 27 Sep 2022 22:53:37 +0000 X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220927225341.14165-1-dmytro@shytyi.net> References: <20220927225341.14165-1-dmytro@shytyi.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ZohoMailClient: External In this patch we add skb to the msk, dequeue it from sk, remove TSs and do skb mapping. Signed-off-by: Dmytro Shytyi --- net/ipv4/tcp_fastopen.c | 19 ++++++++++++------ net/mptcp/fastopen.c | 43 +++++++++++++++++++++++++++++++++++++++++ net/mptcp/protocol.c | 2 +- net/mptcp/protocol.h | 3 +++ net/mptcp/subflow.c | 42 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 102 insertions(+), 7 deletions(-) diff --git a/net/ipv4/tcp_fastopen.c b/net/ipv4/tcp_fastopen.c index 45cc7f1ca296..d6b1380525ea 100644 --- a/net/ipv4/tcp_fastopen.c +++ b/net/ipv4/tcp_fastopen.c @@ -356,13 +356,20 @@ struct sock *tcp_try_fastopen(struct sock *sk, struct sk_buff *skb, if (foc->len == 0) /* Client requests a cookie */ NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPFASTOPENCOOKIEREQD); - if (!((tcp_fastopen & TFO_SERVER_ENABLE) && - (syn_data || foc->len >= 0) && - tcp_fastopen_queue_check(sk))) { - foc->len = -1; - return NULL; + if (sk_is_mptcp(sk)) { + if (((syn_data || foc->len >= 0) && + tcp_fastopen_queue_check(sk))) { + foc->len = -1; + return NULL; + } + } else { + if (!((tcp_fastopen & TFO_SERVER_ENABLE) && + (syn_data || foc->len >= 0) && + tcp_fastopen_queue_check(sk))) { + foc->len = -1; + return NULL; + } } - if (tcp_fastopen_no_cookie(sk, dst, TFO_SERVER_COOKIE_NOT_REQD)) goto fastopen; diff --git a/net/mptcp/fastopen.c b/net/mptcp/fastopen.c index d6fb45e6be4f..1d824a4d9606 100644 --- a/net/mptcp/fastopen.c +++ b/net/mptcp/fastopen.c @@ -17,3 +17,46 @@ void mptcp_gen_msk_ackseq_fastopen(struct mptcp_sock *msk, struct mptcp_subflow_ pr_debug("ack_seq=%llu sndr_key=%llu", msk->ack_seq, mp_opt.sndr_key); atomic64_set(&msk->rcv_wnd_sent, ack_seq); } + +void subflow_fastopen_send_synack_set_params(struct mptcp_subflow_context *subflow, + struct request_sock *req) +{ + struct tcp_request_sock *tcp_r_sock = tcp_rsk(req); + struct sock *ssk = subflow->tcp_sock; + struct sock *sk = subflow->conn; + struct mptcp_sock *msk; + struct sk_buff *skb; + struct tcp_sock *tp; + + msk = mptcp_sk(sk); + tp = tcp_sk(ssk); + + /* */ + msk->is_mptfo = 1; + + skb = skb_peek(&ssk->sk_receive_queue); + + /* */ + __skb_unlink(skb, &ssk->sk_receive_queue); + skb_ext_reset(skb); + skb_orphan(skb); + + /* */ + tp->copied_seq += tp->rcv_nxt - tcp_r_sock->rcv_isn - 1; + subflow->map_seq = mptcp_subflow_get_mapped_dsn(subflow); + subflow->ssn_offset = tp->copied_seq - 1; + + /* */ + mptcp_data_lock(sk); + + /* */ + mptcp_set_owner_r(skb, sk); + __skb_queue_tail(&msk->receive_queue, skb); + atomic64_set(&msk->rcv_wnd_sent, mptcp_subflow_get_mapped_dsn(subflow)); + + /* */ + (sk)->sk_data_ready(sk); + + /* */ + mptcp_data_unlock(sk); +} diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 0db50712bad7..7e63b414011c 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -206,7 +206,7 @@ static void mptcp_rfree(struct sk_buff *skb) mptcp_rmem_uncharge(sk, len); } -static void mptcp_set_owner_r(struct sk_buff *skb, struct sock *sk) +void mptcp_set_owner_r(struct sk_buff *skb, struct sock *sk) { skb_orphan(skb); skb->sk = sk; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index a9708a2eb2bc..9c46e802a73a 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -842,6 +842,9 @@ bool mptcp_userspace_pm_active(const struct mptcp_sock *msk); // Fast Open Mechanism functions begin void mptcp_gen_msk_ackseq_fastopen(struct mptcp_sock *msk, struct mptcp_subflow_context *subflow, struct mptcp_options_received mp_opt); +void mptcp_set_owner_r(struct sk_buff *skb, struct sock *sk); +void subflow_fastopen_send_synack_set_params(struct mptcp_subflow_context *subflow, + struct request_sock *req); // Fast Open Mechanism functions end static inline bool mptcp_pm_should_add_signal(struct mptcp_sock *msk) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 07dd23d0fe04..c48143bff114 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -307,6 +307,46 @@ static struct dst_entry *subflow_v4_route_req(const struct sock *sk, return NULL; } +static int subflow_v4_send_synack(const struct sock *sk, struct dst_entry *dst, + struct flowi *fl, + struct request_sock *req, + struct tcp_fastopen_cookie *foc, + enum tcp_synack_type synack_type, + struct sk_buff *syn_skb) +{ + struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk); + struct inet_request_sock *ireq = inet_rsk(req); + + /* */ + if (foc) + ireq->tstamp_ok = 0; + + if (synack_type == TCP_SYNACK_FASTOPEN) + subflow_fastopen_send_synack_set_params(subflow, req); + + return tcp_request_sock_ipv4_ops.send_synack(sk, dst, fl, req, foc, synack_type, syn_skb); +} + +static int subflow_v6_send_synack(const struct sock *sk, struct dst_entry *dst, + struct flowi *fl, + struct request_sock *req, + struct tcp_fastopen_cookie *foc, + enum tcp_synack_type synack_type, + struct sk_buff *syn_skb) +{ + struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk); + struct inet_request_sock *ireq = inet_rsk(req); + + /* */ + if (foc) + ireq->tstamp_ok = 0; + + if (synack_type == TCP_SYNACK_FASTOPEN) + subflow_fastopen_send_synack_set_params(subflow, req); + + return tcp_request_sock_ipv6_ops.send_synack(sk, dst, fl, req, foc, synack_type, syn_skb); +} + #if IS_ENABLED(CONFIG_MPTCP_IPV6) static struct dst_entry *subflow_v6_route_req(const struct sock *sk, struct sk_buff *skb, @@ -1920,6 +1960,7 @@ void __init mptcp_subflow_init(void) subflow_request_sock_ipv4_ops = tcp_request_sock_ipv4_ops; subflow_request_sock_ipv4_ops.route_req = subflow_v4_route_req; + subflow_request_sock_ipv4_ops.send_synack = subflow_v4_send_synack; subflow_specific = ipv4_specific; subflow_specific.conn_request = subflow_v4_conn_request; @@ -1933,6 +1974,7 @@ void __init mptcp_subflow_init(void) #if IS_ENABLED(CONFIG_MPTCP_IPV6) subflow_request_sock_ipv6_ops = tcp_request_sock_ipv6_ops; subflow_request_sock_ipv6_ops.route_req = subflow_v6_route_req; + subflow_request_sock_ipv6_ops.send_synack = subflow_v6_send_synack; subflow_v6_specific = ipv6_specific; subflow_v6_specific.conn_request = subflow_v6_conn_request;