From nobody Fri Apr 26 05:06:21 2024 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4AF657491 for ; Mon, 14 Nov 2022 16:46:38 +0000 (UTC) Received: by mail-ej1-f49.google.com with SMTP id f27so29841462eje.1 for ; Mon, 14 Nov 2022 08:46:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aRkaRWa68s+KfYUixfZ8VbXXfSdcHjHt5h/6roHd4ZI=; b=dj0keSH82ZrUXCEr20kUKMFs/qzFXCcxFzUGu6MLUumlMQ1VjD1GWLcSjB5WvR9bHi z1U7mMbT1OHO854eBfxxhEr21EM003ihOZkf2WVcoOMIWoarxNHJybrnyDNPO4vTkLky 0mJfQXbvCwOI2Anrakzm+6cmaXhGjLOBsgcyTKhgFnruFlx4OQxg0pTalOIgujYvw6hT cTG8lSS0ST3J5dZCq+jkRXkDl3alF33FyLJMiTJeZgGDIF2ydXHjXucsGoxDAFVvfOze ggGQl/2Yc2u2SGOxsIObN7/eW3eTgAisZhhVXGpvmxFRXLsM8ZbqGDvStRL5d/KaclJy qJ0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aRkaRWa68s+KfYUixfZ8VbXXfSdcHjHt5h/6roHd4ZI=; b=vXofEfew5NELMVoh6uDm9vQSi+euOUWUJEww8li0K18Weblr4VUdc1EXWy2I2wJq6G frib8HXOAFEaEqkLAfbyX5tlmhpE1qslVqkOlUxBPf9MfdsfPWENTCNSOSg7LHZhfjup CI1HSrlU79VW5gqBhCmJURP0TlnzMRu3vehmvz02aGOd7UyPWHKlzlBzPmeFNVYngpd6 LOvKt8yaNkgae/dve2rufwYxImgVWQOHMhf+ZN50lhl/4Gt3hk73me/lD8VS06s65n3I AOoCwLcNYW+Bl95HrOhCjj59U9TjUQzulSLu40v7t/RZ66bNZVmbuSsBDthLjn4SnwuV PjSg== X-Gm-Message-State: ANoB5pnbDG//n59WwBW8x+ouXba7kaxhKZoe8SjQXOJCsfrB6UE1+U5l ycvZgD5MwBCRtmcXg/tWt2xr9LTZLIDWAQ== X-Google-Smtp-Source: AA0mqf5gnoLanoNR5cCC//CgNZ/7MnxWTtQ3e29xoTRZasgZQHfx0nVDNeYEUdl6zbaE5v/f2hlxfA== X-Received: by 2002:a17:906:2305:b0:78e:975:f0b4 with SMTP id l5-20020a170906230500b0078e0975f0b4mr10776257eja.641.1668444396755; Mon, 14 Nov 2022 08:46:36 -0800 (PST) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id qq18-20020a17090720d200b00773f3ccd989sm4377877ejb.68.2022.11.14.08.46.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 08:46:36 -0800 (PST) From: Matthieu Baerts To: mptcp@lists.linux.dev Cc: Matthieu Baerts Subject: [PATCH mptcp-next 1/5] Squash-to: "mptcp: implement delayed seq generation for passive fastopen" Date: Mon, 14 Nov 2022 17:45:57 +0100 Message-Id: <20221114164601.861295-2-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221114164601.861295-1-matthieu.baerts@tessares.net> References: <20221114164601.861295-1-matthieu.baerts@tessares.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2304; i=matthieu.baerts@tessares.net; h=from:subject; bh=Ygbh73xM7sA/FfzSwGszFyY8KY4zusxoYdFnK14EZ80=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBjcnAxxQdMeDncK80BEj0Orw8Eb+AMITe7I+Se0aSY g0hGrwSJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCY3JwMQAKCRD2t4JPQmmgc9udD/ 0ZGlze1gHHPEdYsi1bjQXa8PDHt1TDcpvMrwt3mvacXO7di6XpVGbhwfZOk3JwDJeZDAmNHvIwoPZW QsgTl86CMve8KZ1iqT0JNtmkti2T7OcKlgRCeuvoU6k7HtWoF4NGODnOP3YA8NN9AI8cusIV2DfgJR NTJ2RbHwrJ+OGyxpeaB17a4eIj0EuFec/ZpbSea2PsKUlY/U9NlDj6iSItWqX4TA1GCgZLmaPAj8Iw CYgcQ17psdWTWeR4Rcu4WIhksBJdN5kEvQbvvWk9ZoG5j1AgxQ3F/JsFSQQqzF3OA3xFQTdJcpbrwa S4CsjC5n1CsmJdgFCLPTzNHV4n5LCBx+173E9v34GYFXCNesaJPK75+mWFMNBYBEriVK5fkB6D5BEZ r3pis+imhNLsWu335NuYAs0nuCdqS0TyBrcbOz4XhKDA46Mk4GGlM/Ei2IhlPHXayPwA+zXemVsOK6 sOrF4bZdxTOgckNLWep8b9gSL8dFP+kQq88hbwHi+qJdQ5lpxysNM87YbCdcWpoqdx5reYo8f8tdQg FeTgBrzb7/hgvHsqFiR4MM1JYDpgiDkAbVpWdNZViXmjwmpyiYPIs4APV8gX1LcA1fTyOBQ4HDkl36 g2lDS8SYUgrr/TZpwymQZC3Xic/5cmTjFR3Gz0BU9JtExRBDHERFu9bHUxZw== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" mptcp: fastopen: uniform function names Functions are usually prefixed with mptcp__(...), e.g. mptcp_fastopen_(...). Do the same here with the new fastopen functions. Signed-off-by: Matthieu Baerts --- net/mptcp/fastopen.c | 2 +- net/mptcp/protocol.h | 2 +- net/mptcp/subflow.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/mptcp/fastopen.c b/net/mptcp/fastopen.c index e1fe919c00c2..d3f1ce7b45ac 100644 --- a/net/mptcp/fastopen.c +++ b/net/mptcp/fastopen.c @@ -51,7 +51,7 @@ void subflow_fastopen_send_synack_set_params(struct mptcp= _subflow_context *subfl mptcp_data_unlock(sk); } =20 -void mptcp_gen_msk_ackseq_fastopen(struct mptcp_sock *msk, struct mptcp_su= bflow_context *subflow, +void mptcp_fastopen_gen_msk_ackseq(struct mptcp_sock *msk, struct mptcp_su= bflow_context *subflow, const struct mptcp_options_received *mp_opt) { struct sock *sk =3D (struct sock *)msk; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 0f1e26e55c01..96a3386c908a 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -848,7 +848,7 @@ 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 -void mptcp_gen_msk_ackseq_fastopen(struct mptcp_sock *msk, struct mptcp_su= bflow_context *subflow, +void mptcp_fastopen_gen_msk_ackseq(struct mptcp_sock *msk, struct mptcp_su= bflow_context *subflow, const 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, diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 9c6f6c9a1f9a..b613046fea11 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -687,7 +687,7 @@ void mptcp_subflow_fully_established(struct mptcp_subfl= ow_context *subflow, WRITE_ONCE(msk->fully_established, true); =20 if (subflow->is_mptfo) - mptcp_gen_msk_ackseq_fastopen(msk, subflow, mp_opt); + mptcp_fastopen_gen_msk_ackseq(msk, subflow, mp_opt); } =20 static struct sock *subflow_syn_recv_sock(const struct sock *sk, --=20 2.37.2 From nobody Fri Apr 26 05:06:21 2024 Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1B82B7492 for ; Mon, 14 Nov 2022 16:46:39 +0000 (UTC) Received: by mail-ed1-f53.google.com with SMTP id v17so18174984edc.8 for ; Mon, 14 Nov 2022 08:46:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=T8b+5KrA1R/MgLD/C/AGDL4AFeC5kudabeE4Snh7zg4=; b=kYK/33zLMJiFEgwMCiOmylJQnMmmRPUUwyykI4Axwn7eBnrGiWtXVOnNTBX6pqYC3V 31bWR19eW7GAu4wvTMDjHl/9vCdquK45fS8xdLJvhsOCAP+rhY9h+MRJdyxHeSLxCOXW mQ2swXFC++nYhOUaqXeqWtEPi1/LLlMzI58OHpoYRRsM4ueTN4EPbOeeRdBaeIFL2CxM u/5pGapM742jjQQaw9a92EZYXjV29icbY1CiLx5irLj9fjvFCNLDtSCrSy3lD5re6hAa 3VMcm9S2YWVkPMsL+47CQtvjamu5BRYFOZEuEosC1tU2gK7L64m14OUdOOQi49UR6Piv wNhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T8b+5KrA1R/MgLD/C/AGDL4AFeC5kudabeE4Snh7zg4=; b=QUya3Hr87uleGNqy2RMxpHZqum5chWt2Mx/HVOgeA1U62io9+uhDgys5H8wHHW5UVB n3B0FLT4h6ccKgzQKxLUSUM35S4uOY7Nzh3bQiogbY+YCuBWJvIAo+nwngnzyWX618NQ UCS76y7GkubaQE5QqFkPPavkzsA0qhmfFSqZMGu2jj0cew5ajzG40CaGqOWyYsCg+PIe 2QWO3LvrfzKE1H66g9qc3p1tRFy/XzBGi/S/CCeYT1Gz0wvR8thxEty62sZsfhrgMKXk rlF66umUascVCJ/ErtABpiFRR1M/lRwTVxk3K6YmgYJyk8nPyoGWSECeftPmdJGiZO1W +52g== X-Gm-Message-State: ANoB5pnO0XTTHd5Sr/VgOMhD7SoJMlr/3RKDiubq5gpLMWPK7w/Tj8Og 0hHmR1BYI++51IsyVzB+KLkZwb9fG+OX+A== X-Google-Smtp-Source: AA0mqf6gSY6ZfCM2EMZUfT6MqQEUYDpDQtFv5sGl8NF9/CSlEeX1ba+h+j03mJ2VAlSJ0zfom5sepw== X-Received: by 2002:a05:6402:2294:b0:464:fa1:9dc3 with SMTP id cw20-20020a056402229400b004640fa19dc3mr12256283edb.343.1668444397774; Mon, 14 Nov 2022 08:46:37 -0800 (PST) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id qq18-20020a17090720d200b00773f3ccd989sm4377877ejb.68.2022.11.14.08.46.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 08:46:37 -0800 (PST) From: Matthieu Baerts To: mptcp@lists.linux.dev Cc: Matthieu Baerts Subject: [PATCH mptcp-next 2/5] Squash-to (part 1): "mptcp: add subflow_v(4,6)_send_synack()" Date: Mon, 14 Nov 2022 17:45:58 +0100 Message-Id: <20221114164601.861295-3-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221114164601.861295-1-matthieu.baerts@tessares.net> References: <20221114164601.861295-1-matthieu.baerts@tessares.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2829; i=matthieu.baerts@tessares.net; h=from:subject; bh=n8kf2CYknGmeJTsXUbPls/AENlOulO/s0VViOitur7o=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBjcnAxSbuEs9I1rTqHlLthEH+xP8STMIPO8LLOmpFM sYSg18eJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCY3JwMQAKCRD2t4JPQmmgcykgEA DHuzMT6wwVUU2ql7FxDpoBBE/67KzT1xl6FSO/6Y6/r/UuHoPZszWuAfcPKJdQMjwRbfLUtvCRUlku pUMqzmZZ3ro87FsJM9SlCTuca1bO8PzOKNALx8UjmiYajskAJM0gOBkGEA7Jsiq6N2QUpDz7Xcy94b YbXrK0JwYykcVNJFjT9EDY1YF+1bX6giGj2FV6l5va35glffXmfh0WiSEw9e7W9kGlcpWVR2Tt7852 gxsR7JR1s6bqQ9v0WFFEVkOavnI7+rfImAzezm0x0Wol9E265QK/CpyL6WtTUyj+xhWGZJNex9pCcm KlFZ6BG58IEIL9dOUXmcQMlHv/pMGmBwVz9E9F5vQIrzrv3Q1y7O2BKqdPqdBSf3DDwxRMm0ospPvR uAcKJkOCBkBlFR4vijysC/X1cSqzWvA7p4zZodu1wWqPO5ItEpOjHnTNCThGcccHCc2YYZFVtg95a/ PDCiOVlLcz4jfmRESlzWfnuf6ele8S6TtYzcfx/ImhG/RxuWARvKUqQN1cI8K/tJbmQSvXim9tV9e4 BIZy0OiQ5Ecs7RlCF5OSm7gDSDppzVp+fBEV3MOXMW6Y6Ad65hqw+0n/c2rd+i5evpkPY3mc1njQ+0 CqubDAZaeZUIKpRC5MnNHxINkWpzc8BlbHqWWPLhLYLkRbFeYOKYL7qf0CSQ== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" mptcp: fastopen: uniform function names (part 2) Functions are usually prefixed with mptcp__(...), e.g. mptcp_fastopen_(...). Do the same here with the new fastopen functions. While at it, also remove the 'send' from the function name as we don't send anything, we only prepare it for the send. Best to avoid confusions. Signed-off-by: Matthieu Baerts --- net/mptcp/fastopen.c | 4 ++-- net/mptcp/protocol.h | 4 ++-- net/mptcp/subflow.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/mptcp/fastopen.c b/net/mptcp/fastopen.c index d3f1ce7b45ac..4a85e1110328 100644 --- a/net/mptcp/fastopen.c +++ b/net/mptcp/fastopen.c @@ -6,8 +6,8 @@ =20 #include "protocol.h" =20 -void subflow_fastopen_send_synack_set_params(struct mptcp_subflow_context = *subflow, - struct request_sock *req) +void mptcp_fastopen_subflow_synack_set_params(struct mptcp_subflow_context= *subflow, + struct request_sock *req) { struct sock *ssk =3D subflow->tcp_sock; struct sock *sk =3D subflow->conn; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 96a3386c908a..ad204ef88bc3 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -851,8 +851,8 @@ bool mptcp_userspace_pm_active(const struct mptcp_sock = *msk); void mptcp_fastopen_gen_msk_ackseq(struct mptcp_sock *msk, struct mptcp_su= bflow_context *subflow, const 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); +void mptcp_fastopen_subflow_synack_set_params(struct mptcp_subflow_context= *subflow, + struct request_sock *req); =20 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 b613046fea11..255023b78924 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -322,7 +322,7 @@ static int subflow_v4_send_synack(const struct sock *sk= , struct dst_entry *dst, ireq->tstamp_ok =3D 0; =20 if (synack_type =3D=3D TCP_SYNACK_FASTOPEN) - subflow_fastopen_send_synack_set_params(subflow, req); + mptcp_fastopen_subflow_synack_set_params(subflow, req); =20 return tcp_request_sock_ipv4_ops.send_synack(sk, dst, fl, req, foc, synac= k_type, syn_skb); } @@ -343,7 +343,7 @@ static int subflow_v6_send_synack(const struct sock *sk= , struct dst_entry *dst, ireq->tstamp_ok =3D 0; =20 if (synack_type =3D=3D TCP_SYNACK_FASTOPEN) - subflow_fastopen_send_synack_set_params(subflow, req); + mptcp_fastopen_subflow_synack_set_params(subflow, req); =20 return tcp_request_sock_ipv6_ops.send_synack(sk, dst, fl, req, foc, synac= k_type, syn_skb); } --=20 2.37.2 From nobody Fri Apr 26 05:06:21 2024 Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EEA7F748D for ; Mon, 14 Nov 2022 16:46:40 +0000 (UTC) Received: by mail-ej1-f42.google.com with SMTP id m22so29723885eji.10 for ; Mon, 14 Nov 2022 08:46:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6zkmm5yo+LEUNzh4RgPaxcXQpJfatkpD1ywiiDs8uNk=; b=DXFRZnChPdZlHqz6eZjuLV9X3d0C9bzYaWg8SPXDq4ma2J8JdZWuG7fZ3kKGw/PCjb 6GsuCIdEfBaplgrUDmIhuW8/AbVf1WhdwVT9fc9KhBEUH+fbXyUXsequQ3GUxXC1iZKY FIuMbWOOA1PYrCsCYZmT2P7bkpyvTnxD0eXwHRMGzVZxK2eMDpbd9toNJFMabiMSVSdQ d5jA5Z2daDR8Z2OEC79+brMR/9BpnOX8NlAWI47l1Iok2gYL5IijM/xf42So6lFB2I+t 7ATEfVES2zKOnbhemdRQv9yoFYAPWr/pm4l5/Gd5Rb5bid6biAc3RtUUYhDsE/+8aWiG Tdjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6zkmm5yo+LEUNzh4RgPaxcXQpJfatkpD1ywiiDs8uNk=; b=ftr4d/CJCeonl1AFFfhHdLb2Tx7zRnK4xVQRLen1OK0GKsy5GthciPeY71GAiv/iQs CTSe35Jp+mxD10mHlFJyuwfLBupUq0BJ0lcd5ofcLPOB8LBZbmW95g0m2UrqGKVZi2Fx FUem7nK0NwIAJz3dd/JT4qbrmXXy846lvUqRbos/VZcNfpTlxpgI4maJVp7rRloRtPOo zHV3PqSsUb3GpYQx3aeV69ycuAhakYqDSCK8T8+sd3UiOnRum9ocVjkQOcjSzcY+gFcn aX0KrRYIGUsDNlo3y9O2X/1uDLmEh8EjD5Vi9iwiiIdVU7o+0AJczQ/Llypnir8l9Wwp uhGg== X-Gm-Message-State: ANoB5pna3JISvq7Rc5lx8Kr94GLuMu/lwiwSKka2a5E/4EdrKFER86KQ pbWCBOAs3dPmvaVnmEqiAEIOkfOQSxc1Qw== X-Google-Smtp-Source: AA0mqf4+rtmsVPV4eOo6t+PshURfYg0/2zu6NKKgrq1/h08oLGrJ8XqZqi7AbJCApquJrvhrQSR1Aw== X-Received: by 2002:a17:906:54cf:b0:78a:d075:98d8 with SMTP id c15-20020a17090654cf00b0078ad07598d8mr10917645ejp.324.1668444398682; Mon, 14 Nov 2022 08:46:38 -0800 (PST) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id qq18-20020a17090720d200b00773f3ccd989sm4377877ejb.68.2022.11.14.08.46.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 08:46:38 -0800 (PST) From: Matthieu Baerts To: mptcp@lists.linux.dev Cc: Matthieu Baerts Subject: [PATCH mptcp-next 3/5] Squash-to (part 2): "mptcp: add subflow_v(4,6)_send_synack()" Date: Mon, 14 Nov 2022 17:45:59 +0100 Message-Id: <20221114164601.861295-4-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221114164601.861295-1-matthieu.baerts@tessares.net> References: <20221114164601.861295-1-matthieu.baerts@tessares.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1527; i=matthieu.baerts@tessares.net; h=from:subject; bh=euLpY50T179Wa622ZzutZ0itzbhv/F18nUK4JxDC6wY=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBjcnAxbg2NP+GB51QpHkwnHHrPHw3Sozbb8y+J+lCS 0czBnIaJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCY3JwMQAKCRD2t4JPQmmgc08cEA DJxdm/lc/wL5HgHXfIOwUjvqGgcJW0icM2iU3SDJpJdgEFJB3FEOokNvSOS92EzYpAcNk2GaE6MBp3 426QQUX2G8tgV+oAY+cDTZSDthA0ncx86MdhX7jsZwjXmtJ+kzB0JJUra8Zh9FzHLFADSAY8RlYw1S KoTIMhdQZU+EcBi3T5qp5TIuM0ebBd/F7yGkivSFlB11qZrGyovemIROQCZS/9ujOu+M4ABai7e7IY 8qYawdU2BM4tKbPQVslVsGAOzj44ouRJsQnYhNNtrepdiVqoq+AiL8V38VwxwUvWG5cHTh7LBJu7wY L9M0UB75ktKT7pRTKGsy1ZbxBsdmPhRJd4H+nKC8r7CnMkL0/7x3gsKvKdYDz6xwkyxdMeQIxa+5wj 2EVszYflw1oGLHgwh7mDFd6ng/G/DhOZk84Jr42unv7v9yZRRqgTNGpzTPhYiS0hbMg5Ayzpcy2vDO DWQZsHnf2bTV5l1Lvixxb9NY5FZkGpImnjUtFoZ9z60PitFulqxtgOVZpC0YyAadEh65p9A1EbyOeA x37dFmdE1d8GdlNMqtZtBTwHx91KAq0K7VQq/sXcDHzJjcxS2Pd6G9HqgxZOruPEPLFE6GJ6s6HPaV W8EudwrxnhUFC+cR6dVS6ZbdAPBldZZntW+Y2gvRBi9lQROZXW9FqQACO42Q== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" mptcp: move mptcp_set_owner_r() signature with others from protocol.c Because this function is not specific to fastopen functions. I added it at the end of the list there because there is no real order. Maybe we should order them differently to reduce conflicts in case of backports? Anyway, that would not be don't in this patch. Signed-off-by: Matthieu Baerts --- net/mptcp/protocol.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index ad204ef88bc3..20c0cf9fe453 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -633,6 +633,7 @@ void mptcp_sock_graft(struct sock *sk, struct socket *p= arent); struct socket *__mptcp_nmpc_socket(const struct mptcp_sock *msk); bool __mptcp_close(struct sock *sk, long timeout); void mptcp_cancel_work(struct sock *sk); +void mptcp_set_owner_r(struct sk_buff *skb, struct sock *sk); =20 bool mptcp_addresses_equal(const struct mptcp_addr_info *a, const struct mptcp_addr_info *b, bool use_port); @@ -850,7 +851,6 @@ bool mptcp_userspace_pm_active(const struct mptcp_sock = *msk); =20 void mptcp_fastopen_gen_msk_ackseq(struct mptcp_sock *msk, struct mptcp_su= bflow_context *subflow, const struct mptcp_options_received *mp_opt); -void mptcp_set_owner_r(struct sk_buff *skb, struct sock *sk); void mptcp_fastopen_subflow_synack_set_params(struct mptcp_subflow_context= *subflow, struct request_sock *req); =20 --=20 2.37.2 From nobody Fri Apr 26 05:06:21 2024 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9AAA47494 for ; Mon, 14 Nov 2022 16:46:41 +0000 (UTC) Received: by mail-ej1-f48.google.com with SMTP id f5so29807944ejc.5 for ; Mon, 14 Nov 2022 08:46:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZHX4+gdlsJi/TnSJ+BMespZ142cMkBysPDTUnskaRiY=; b=xPj9VMwck65gslV1Ej2RHnTjwZR/kjnnwiuCs8F5uzUDzTnNGSbFWAbkw19wvCy7qV MGTXEfSL6ATjT3HTCE+2y2p8iuO7QOdUG9rZbvimUAf5a9WAJSZdAwuKcOFMdY38etOq /UDVMWXbVvHvV8iOOcIAfoeB6TSJXjCQ9eENM8Q98upS0uU4WnSa5fhhoJ2MQ9ws3AXH WoRLyCyDvkjqUpodXxJJB3uxfwdY6gCK1xcT+vxQUweLokkXh1tiwc8Z84YfXHFanQOt L0QrUPttcZQmP5CVdeD3iB9OqOYq8ApAnUud5+etTgwqOnDMJbSzwpZCzJwVOJIQ6aDE UQpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZHX4+gdlsJi/TnSJ+BMespZ142cMkBysPDTUnskaRiY=; b=QOXlG8Q1IqTVKCspeSmQuMOmtA3gWaukawWhW9Gc2I6+0EFFYNQtMbujWb5DUeobTK 2DoSCTP32GYzSEsBFPZ+1ZtgJd4P2J0yx6zasol6g42RYHZJp/ATf1XHpcWomcm+KG2o kUlDvb9IK8obIvTlNWVX0I6rHLH83Q2le8N7/bulUxr3pwz213e4JAxVUSpbaO6Mn4FH ZSPh4Y2MKxOWCU2q6GPne1Md37syzSvrip16+E19mVhp0wk60ydvaGTc1bfxAZ9E25PA xA5JY8nf1r1Hkal2rFHqPEBZNfsMXlevbtCyWy5RXQGB2r+FsMfEkqZCB5DgqI1hS0Ir MQQw== X-Gm-Message-State: ANoB5pnUsd3FJG9EjxovG+R+9qkR/EHbDyJA2hFJyilx7rQYcFVmMzY7 /Wgct2Ekm6kg79h50ZLm//mbEldCOLiXZg== X-Google-Smtp-Source: AA0mqf4/ZwtSDnCzUyU+xb6eYA5ob4IHW1UPOm6QQOt8zJsFwzZP1kiEwfGAqzBMrLLkswu8D9snWw== X-Received: by 2002:a17:906:e245:b0:78d:bc9f:33da with SMTP id gq5-20020a170906e24500b0078dbc9f33damr10741947ejb.80.1668444399682; Mon, 14 Nov 2022 08:46:39 -0800 (PST) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id qq18-20020a17090720d200b00773f3ccd989sm4377877ejb.68.2022.11.14.08.46.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 08:46:39 -0800 (PST) From: Matthieu Baerts To: mptcp@lists.linux.dev Cc: Matthieu Baerts Subject: [PATCH mptcp-next 4/5] Squash-to (part 3): "mptcp: add subflow_v(4,6)_send_synack()" Date: Mon, 14 Nov 2022 17:46:00 +0100 Message-Id: <20221114164601.861295-5-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221114164601.861295-1-matthieu.baerts@tessares.net> References: <20221114164601.861295-1-matthieu.baerts@tessares.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=898; i=matthieu.baerts@tessares.net; h=from:subject; bh=UbjdJ1yOCyxrxwDoyiHxqe56zSM3kMXoX21HQQUK3Ag=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBjcnAxsE3qxOe4+rQ2+MoUFTzDjczJgmQxF4HP9qKw pfiPADOJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCY3JwMQAKCRD2t4JPQmmgc755D/ 4xPRUEUW5I+64dKI6Q30C7r82VJBgdnkC8R6dWmbAS1FzYk0mhBmqQ/E0ew0GUFhhTxdHxVNF7w3lf FUy01UHq0QCfxlEdrJpuBPmC8yJ+F7d8Z5WtrLGUPAO1XYHUbXUbgE4w8+bV6cU1bRLalDIvwqdvpQ qaoTdlKgLHQ7ol2Up7k9ysZkwzCv2IcmFWRYbdzJPfiQfOv2X+pspeEQsG4kWL9CcN/8ZbKce4ppHt jT6NMR22qk0Pkape/sP59yHFtQ7R1iRCgbsxURcUYtAW7kF9zQ/B5Xc/wgo3T4ed6sFkyoNKfhO8WA rQvIj6zsQqPtfhFvGvmg2aVJHUv/A+fpzRJSFp8iKdg8Qrw/ySpm5C/qjgYL0dwJNox7/4mF3BEmho 0cCTsD+n7Ws9w6KLe1ApNe9IwK7nmcNBrP56Ed76+GAZ8XAaFpRPYHOCrYPUMMl8VB5x9eNguoR0cD CAho2Wn/zFptZaA7bKxI0635WU5B7XywvYoUAQVBnuWN2wBJ9J1OtgPaAo5vJXCQuuCBnIBw9ni6Zs lIyNVWOml1S0UKTBjxVqVNIqSPPjjd0O7wtvmTDsnd3BsFkoJIE/RotsS0A3vAqKO2OEbOfRfE6y2Z pKKJ7PZTeFGQypklu38S2Mj3Ww+SJalIm7qIpj4ilRHVfYtUFPwSEUPZz06w== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" mptcp: fix warning reported by checkpatch (with --codespell): fastopen.c:30: 'belown' may be misspelled - perhaps 'belong'? (while at it...) Signed-off-by: Matthieu Baerts --- net/mptcp/fastopen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mptcp/fastopen.c b/net/mptcp/fastopen.c index 4a85e1110328..a3ec92c1e1fe 100644 --- a/net/mptcp/fastopen.c +++ b/net/mptcp/fastopen.c @@ -27,7 +27,7 @@ void mptcp_fastopen_subflow_synack_set_params(struct mptc= p_subflow_context *subf skb_ext_reset(skb); skb_orphan(skb); =20 - /* We copy the fastopen data, but that don't belown to the mptcp sequence + /* We copy the fastopen data, but that don't belong to the mptcp sequence * space, need to offset it in the subflow sequence, see mptcp_subflow_ge= t_map_offset() */ tp->copied_seq +=3D skb->len; --=20 2.37.2 From nobody Fri Apr 26 05:06:21 2024 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACE537492 for ; Mon, 14 Nov 2022 16:46:42 +0000 (UTC) Received: by mail-ej1-f43.google.com with SMTP id y14so29789766ejd.9 for ; Mon, 14 Nov 2022 08:46:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oJAkMZmPTXd81mYjHRUWlG7lWbfI6wrWe3E8hF+LyqA=; b=ALrg11XwoUoLFXRcSUadjGPbCMuRX97qlqGJch/od7TyAiWLwRGEBopn0qfkmd2avs 8HQpwhmXwbNFG/JJBnJRR2/XnILTlxbkCY6HWVLLXCPyslQ+zXBegYd7m1lrzdXRUp6B KRGgVeqybbhtAKXm64EJiSEomLNJxvsk5FTygMTFQsJ2TrYBagx8meyHnglaRC6ZkdmQ BtuDseollBLoajqHB6Mncr6hIsm6MGSKObVb/eSxoF2Mig+Z/F/CY/R6w3Mu1VqgOv9k UyEMEHisq9R6TZKwTqpKr2S3GZUoojMLuJkz7xtIVuwVRBSgpEBKEFzh1ppgeCuEfZAP FE4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oJAkMZmPTXd81mYjHRUWlG7lWbfI6wrWe3E8hF+LyqA=; b=qLvlPj2rbiGX2oLi8ysGtowJqhBvTvV0uaW1y6HK9QWu+B1IIcV2OIi7Srd7imnfnZ QFKlNpCQdRbeo7WBxqI1C/29EBoRxQ9xRZWoBD+H9n8ijVtq8Q3F86FOv8q0yIdbIu3N UWaYtD7bI6Resw7BNprDc/BPkylN617OFIoJpR8CBqxZc9m3tjftirJacQ51Qo5PTTHA brQDBFtZd5Oo3IveZRta2YBcuta5LO3BQv6LCuAxtnKVVP6qVQTm7DbOCU8fX8SylbNf q8RvqUQLKme4LANoXPihYpS8Fjn+jIiHnzL9m2A4XFgvefrGHLkc9ECQQfjojqQR8m0u btRg== X-Gm-Message-State: ANoB5pkH4vslzCC08jAbUtBymg+gk6ptxdgBQKTgGQxH09OlCSQ/rxdy 73Os6pk4yAUsgcIg8f/FV5cyVMkxhSEjGQ== X-Google-Smtp-Source: AA0mqf5fuH88DJSE3RM6nLmvDq1T+TD+0XuE1ZfEs4Nr0RmfoMmlXXE4F/NQVmSjWVX8aBOLzfJN4Q== X-Received: by 2002:a17:906:71d8:b0:7ad:b45c:dbe1 with SMTP id i24-20020a17090671d800b007adb45cdbe1mr10988205ejk.726.1668444400510; Mon, 14 Nov 2022 08:46:40 -0800 (PST) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id qq18-20020a17090720d200b00773f3ccd989sm4377877ejb.68.2022.11.14.08.46.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 08:46:40 -0800 (PST) From: Matthieu Baerts To: mptcp@lists.linux.dev Cc: Matthieu Baerts Subject: [PATCH mptcp-next 5/5] Squash-to: "selftests: mptcp: mptfo Initiator/Listener" Date: Mon, 14 Nov 2022 17:46:01 +0100 Message-Id: <20221114164601.861295-6-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221114164601.861295-1-matthieu.baerts@tessares.net> References: <20221114164601.861295-1-matthieu.baerts@tessares.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=782; i=matthieu.baerts@tessares.net; h=from:subject; bh=C4MOV1v4d8mrKObij1JhZkoEZ4glmkOlt1ohhxb4w2E=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBjcnAx5C6/CS9eSkcT3EgREzTmToJzsEu1IfDpru7C cRIR+eCJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCY3JwMQAKCRD2t4JPQmmgc9itEA DVi59BUHzdsK0EvD9A+qJPKl/YJQed+W+3TuQk1wDcd92Sm7oT5V8hudusUQ40An53zlLfWxYjN3uh 3PUeY9UMUi5toP1CmsG5QXLnsW+xd43+SdybxBHFx87wV48FIJ8d3F9RvoeWuRHRiGyB7WWoP3THbn hycrZD38h8GCh6k6y2qurk0KiJw7XxSzKK/2gONzTb1pDPjItKj/pF5bWLxJoaGG03yDHJDNJBzsZL 4OdJhCCcEcGaFlj1Lx9JsHWFUmcKRELH4KUc3lNHKdGY7UkjaOH5WcU6dgw8ouGsSiaGCx6tk9Le8g rLrT88wWQq7UrFKnRwyaaKnWCFEHaPQCSjrJX/6ygDT0KOHBpNxC10dZvkVEa6SUAFwRimgnScjHej Ae7X+YTBJkU8rQh0pKIXQ/vTEalkMrWxE6MDuJXVVoKRRdBg0M7PdCvbavQwR5OlmOtYeLd9JIhM7j tqpMD4UlnHfJV0hzKUpkoaFTmOsPvKeq/JBz96X2dGTklpb0H6kRS9St+dlbe28zXBt5XLdKbNlSt9 OoELkpKamCcD+/d/S1g0wnY5zOxstFmqt96OwIDjxAojS5FVLTjvYh7rXNLmxiOiEGSpgVrVC8ckWl UVhKgunmIiYN4D/j0Redvd3aJXkWb8U7Ybdd6uzK/QtOf7TRD0GXK4P7ec0Q== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" mptcp: fix warning reported by checkpatch: mptcp_connect.c:398: Blank lines aren't necessary after an open brace '{' (while at it...) Signed-off-by: Matthieu Baerts --- tools/testing/selftests/net/mptcp/mptcp_connect.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/test= ing/selftests/net/mptcp/mptcp_connect.c index c8bd109c991f..8a8266957bc5 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -399,7 +399,6 @@ static int sock_connect_mptcp(const char * const remote= addr, close(sock); sock =3D -1; } else { - perror("connect()"); close(sock); sock =3D -1; --=20 2.37.2