From: Davide Caratti <dcaratti@redhat.com>
To: mptcp@lists.linux.dev
Cc: Matthieu Baerts <matthieu.baerts@tessares.net>
Subject: Re: [PATCH net-next] mptcp: drop all sub-options except ADD_ADDR when the echo bit is set
Date: Fri, 26 Mar 2021 14:57:22 +0100 [thread overview]
Message-ID: <1f0281f6f7c57b3ff142e3322fc32a1873e01d07.camel@redhat.com> (raw)
In-Reply-To: <aeb4b7f3044e2f869ae026f950eb70c4398dad63.1616761454.git.dcaratti@redhat.com>
On Fri, 2021-03-26 at 13:28 +0100, Davide Caratti wrote:
> Current Linux carries echo-ed ADD_ADDR over pure TCP ACKs, so there is no
> need to add a DSS element that would fit only ADD_ADDR with IPv4 address.
> Drop the DSS from echo-ed ADD_ADDR, regardless of the IP version.
>
> Signed-off-by: Davide Caratti <dcaratti@redhat.com>
please note: testing this commit with current packetdrill will fail,
because the expected format of outbound echoed ADD_ADDR will fail.
In parallel with this "harmonization" of IPv4 / IPv6 echo-ed ADD_ADDRs
the kernel, I'm working on packetdrill to fix the support for IPv6 in
ADD_ADDR [1]. Non-echoed ADD_ADDRs are still "non-harmonized", so you
will notice the DSS sub-option on IPv4 and no other sub-option except
ADD_ADDR on IPv6.
So, server scripts using ADD_ADDR will still need 2 separate files for
IPv4 and IPv6, while it will be possible to run the same client script
on IPv4 and IPv6.
@matthieu, just writing few notes here as probably the CI you are
running will be "glitching" because of these changes. Sorry for the
inconvenience :]
--
davide
[1] https://github.com/multipath-tcp/packetdrill/pull/49
> ---
> net/mptcp/options.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/net/mptcp/options.c b/net/mptcp/options.c
> index c7eb61d0564c..d51c3ad54d9a 100644
> --- a/net/mptcp/options.c
> +++ b/net/mptcp/options.c
> @@ -624,7 +624,8 @@ static bool mptcp_established_options_add_addr(struct sock *sk, struct sk_buff *
> int len;
>
>
>
>
> if ((mptcp_pm_should_add_signal_ipv6(msk) ||
> - mptcp_pm_should_add_signal_port(msk)) &&
> + mptcp_pm_should_add_signal_port(msk) ||
> + mptcp_pm_should_add_signal_echo(msk)) &&
> skb && skb_is_tcp_pure_ack(skb)) {
> pr_debug("drop other suboptions");
> opts->suboptions = 0;
next prev parent reply other threads:[~2021-03-26 13:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-26 12:28 [PATCH net-next] mptcp: drop all sub-options except ADD_ADDR when the echo bit is set Davide Caratti
2021-03-26 13:57 ` Davide Caratti [this message]
2021-03-26 18:39 ` Mat Martineau
2021-03-30 13:43 ` Matthieu Baerts
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1f0281f6f7c57b3ff142e3322fc32a1873e01d07.camel@redhat.com \
--to=dcaratti@redhat.com \
--cc=matthieu.baerts@tessares.net \
--cc=mptcp@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.