mptcp.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
From: Yonglong Li <liyonglong@chinatelecom.cn>
To: Geliang Tang <geliangtang@gmail.com>
Cc: mptcp@lists.linux.dev,
	Mat Martineau <mathew.j.martineau@linux.intel.com>,
	qitiepeng@chinatelecom.cn
Subject: Re: [PATCH v4 3/4] mptcp: build ADD_ADDR/echo-ADD_ADDR option according pm.add_signal
Date: Mon, 21 Jun 2021 15:49:51 +0800	[thread overview]
Message-ID: <a81f19a0-bbc7-b032-f757-ec7b8b16ee2f@chinatelecom.cn> (raw)
In-Reply-To: <CA+WQbwuVygGQhZ+Dnx9hEr3j7YH4AU_7+Jvr4XW9jJgdmhoVTQ@mail.gmail.com>



On 2021/6/21 15:39, Geliang Tang wrote:
> Yonglong Li <liyonglong@chinatelecom.cn> 于2021年6月21日周一 下午3:16写道:
>>
>>
>>
>> On 2021/6/21 14:42, Geliang Tang wrote:
>>> Hi Yonglong,
>>>
>>> Yonglong Li <liyonglong@chinatelecom.cn> 于2021年6月21日周一 上午11:52写道:
>>>>
>>>>
>>>> On 2021/6/18 19:20, Geliang Tang wrote:
>>>>> Hi Yonglong,
>>>>>
>>>>> Thanks for v4!
>>>>>
>>>>> Yonglong Li <liyonglong@chinatelecom.cn> 于2021年6月18日周五 下午4:19写道:
>>>>>> according MPTCP_ADD_ADDR_SIGNAL and MPTCP_ADD_ADDR_ECHO flag build
>>>>>> ADD_ADDR/echo-ADD_ADDR option
>>>>>>
>>>>>> add a suboptions type OPTION_MPTCP_ADD_ECHO to mark as echo option
>>>>>>
>>>>>> Signed-off-by: Yonglong Li <liyonglong@chinatelecom.cn>
>>>>>> ---
>>>>>>  net/mptcp/options.c  | 124 +++++++++++++++++++++++++++++++--------------------
>>>>>>  net/mptcp/pm.c       |  30 ++++---------
>>>>>>  net/mptcp/protocol.h |  13 +++---
>>>>>>  3 files changed, 92 insertions(+), 75 deletions(-)
>>>>>>
>>>>>> diff --git a/net/mptcp/options.c b/net/mptcp/options.c
>>>>>> index 1aec016..43e3241 100644
>>>>>> --- a/net/mptcp/options.c
>>>>>> +++ b/net/mptcp/options.c
>>>>>> @@ -655,41 +655,64 @@ static bool mptcp_established_options_add_addr(struct sock *sk, struct sk_buff *
>>>>>>         struct mptcp_sock *msk = mptcp_sk(subflow->conn);
>>>>>>         bool drop_other_suboptions = false;
>>>>>>         unsigned int opt_size = *size;
>>>>>> -       bool echo;
>>>>>> -       bool port;
>>>>>> +       struct mptcp_addr_info remote;
>>>>>> +       struct mptcp_addr_info local;
>>>>>> +       u8 add_addr, flags = 0xff;
>>>>>>         int len;
>>>>>>
>>>>>> -       if ((mptcp_pm_should_add_signal_ipv6(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;
>>>>>> -               opts->ext_copy.use_ack = 0;
>>>>>> -               opts->ext_copy.use_map = 0;
>>>>>> -               remaining += opt_size;
>>>>>> -               drop_other_suboptions = true;
>>>>>> -       }
>>>>>> -
>>>>>> -       if (!mptcp_pm_should_add_signal(msk) ||
>>>>>> -           !(mptcp_pm_add_addr_signal(msk, remaining, &opts->addr, &echo, &port)))
>>>>>> -               return false;
>>>>>> -
>>>>>> -       len = mptcp_add_addr_len(opts->addr.family, echo, port);
>>>>>> -       if (remaining < len)
>>>>>> +       if (!mptcp_pm_should_add_signal(msk))
>>>>>>                 return false;
>>>>>>
>>>>>> -       *size = len;
>>>>>> -       if (drop_other_suboptions)
>>>>>> -               *size -= opt_size;
>>>>>> -       opts->suboptions |= OPTION_MPTCP_ADD_ADDR;
>>>>>> -       if (!echo) {
>>>>>> +       *size = 0;
>>>>>> +       mptcp_pm_add_addr_signal(msk, &local, &remote, &add_addr);
>>>>>> +       if (mptcp_pm_should_add_signal_echo(msk)) {
>>>>>> +               if (skb && skb_is_tcp_pure_ack(skb)) {
>>>>> '''
>>>>>> +                       pr_debug("drop other suboptions");
>>>>>> +                       opts->suboptions = 0;
>>>>>> +                       opts->ext_copy.use_ack = 0;
>>>>>> +                       opts->ext_copy.use_map = 0;
>>>>>> +                       remaining += opt_size;
>>>>>> +                       drop_other_suboptions = true;
>>>>> '''
>>>>>
>>>>>> +               }
>>>>>> +               len = mptcp_add_addr_len(remote.family, true, !!remote.port);
>>>>>> +               if (remaining < len)
>>>>>> +                       return false;
>>>>>> +               remaining -= len;
>>>>>> +               *size += len;
>>>>>> +               opts->remote = remote;
>>>>>> +               flags = (u8)~BIT(MPTCP_ADD_ADDR_ECHO);
>>>>>> +               opts->suboptions |= OPTION_MPTCP_ADD_ECHO;
>>>>>> +               pr_debug("addr_id=%d, echo=1, port=%d addr_signal:%x",
>>>>>> +                        opts->remote.id, ntohs(opts->remote.port), add_addr);
>>>>>> +       } else if (mptcp_pm_should_add_signal_addr(msk)) {
>>>>>> +               if ((local.family == AF_INET6 || local.port) && skb &&
>>>>>> +                   skb_is_tcp_pure_ack(skb)) {
>>>>> '''
>>>>>> +                       pr_debug("drop other suboptions");
>>>>>> +                       opts->suboptions = 0;
>>>>>> +                       opts->ext_copy.use_ack = 0;
>>>>>> +                       opts->ext_copy.use_map = 0;
>>>>>> +                       remaining += opt_size;
>>>>>> +                       drop_other_suboptions = true;
>>>>> '''
>>>>>
>>>>> I think this "drop other suboptions" trunk here is still duplicated. Can
>>>>> we just use one "drop other suboptions" trunk only?
>>>>>
>>>>> Thanks.
>>>>> -Geliang
>>>>>
>>>> Hi Geliang, Thanks for you replay.
>>>>
>>>> The commit "07f8252fe0e3c2b6320eeff18bdc5b7fb8845cb3" Davide said "echo-ed ADD_ADDR
>>>> carried 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."
>>>> ADD_ADDR option can add with DSS if the addr is IPv4. So I think it is more clear
>>>> to decide "drop other suboptions" in two trunk.
>>> Could we change it like this:
>>>
>>> '''
>>> diff --git a/net/mptcp/options.c b/net/mptcp/options.c
>>> index e77b5d532fb8..8b4cb0581a49 100644
>>> --- a/net/mptcp/options.c
>>> +++ b/net/mptcp/options.c
>>> @@ -673,15 +673,20 @@ static bool
>>> mptcp_established_options_add_addr(struct sock *sk, struct sk_buff *
>>>
>>>         *size = 0;
>>>         mptcp_pm_add_addr_signal(msk, &local, &remote, &add_addr);
>>> +
>>> +       if ((mptcp_pm_should_add_signal_echo(msk) ||
>>> +           (mptcp_pm_should_add_signal_addr(msk) &&
>>> +           (local.family == AF_INET6 || local.port))) &&
>>> +           skb && skb_is_tcp_pure_ack(skb)) {
>>> +               pr_debug("drop other suboptions");
>>> +               opts->suboptions = 0;
>>> +               opts->ext_copy.use_ack = 0;
>>> +               opts->ext_copy.use_map = 0;
>>> +               remaining += opt_size;
>>> +               drop_other_suboptions = true;
>>> +       }
>>> +
>>>         if (mptcp_pm_should_add_signal_echo(msk)) {
>>> -               if (skb && skb_is_tcp_pure_ack(skb)) {
>>> -                       pr_debug("drop other suboptions");
>>> -                       opts->suboptions = 0;
>>> -                       opts->ext_copy.use_ack = 0;
>>> -                       opts->ext_copy.use_map = 0;
>>> -                       remaining += opt_size;
>>> -                       drop_other_suboptions = true;
>>> -               }
>>>                 len = mptcp_add_addr_len(remote.family, true, !!remote.port);
>>>                 if (remaining < len)
>>>                         return false;
>>> @@ -693,15 +698,6 @@ static bool
>>> mptcp_established_options_add_addr(struct sock *sk, struct sk_buff *
>>>                 pr_debug("addr_id=%d, echo=1, port=%d addr_signal:%x",
>>>                          opts->remote.id, ntohs(opts->remote.port), add_addr);
>>>         } else if (mptcp_pm_should_add_signal_addr(msk)) {
>>> -               if ((local.family == AF_INET6 || local.port) && skb &&
>>> -                   skb_is_tcp_pure_ack(skb)) {
>>> -                       pr_debug("drop other suboptions");
>>> -                       opts->suboptions = 0;
>>> -                       opts->ext_copy.use_ack = 0;
>>> -                       opts->ext_copy.use_map = 0;
>>> -                       remaining += opt_size;
>>> -                       drop_other_suboptions = true;
>>> -               }
>>>                 len = mptcp_add_addr_len(local.family, false, !!local.port);
>>>                 if (remaining < len)
>>>                         return false;
>>> '''
>>> WDYT?
>> Thanks for your advice.
>>
>> Because MPTCP_ADD_ADDR_ECHO and MPTCP_ADD_ADDR_SIGNAL can be set at the same time. So as your advice we should
>> change like this(still I think it not clear than before):
>>
>>         mptcp_pm_add_addr_signal(msk, &local, &remote, &add_addr);
>> +       if ((mptcp_pm_should_add_signal_echo(msk) ||
>> +           (!mptcp_pm_should_add_signal_echo(msk) &&
>> +           mptcp_pm_should_add_signal_addr(msk) &&
>> +           (local.family == AF_INET6 || local.port))) &&
>> +           skb && skb_is_tcp_pure_ack(skb)) {
>> +               pr_debug("drop other suboptions");
>> +               opts->suboptions = 0;
>> +               opts->ext_copy.use_ack = 0;
>> +               opts->ext_copy.use_map = 0;
>> +               remaining += opt_size;
>> +               drop_other_suboptions = true;
>> +       }
>> +
>>         if (mptcp_pm_should_add_signal_echo(msk)) {
>> -               if (skb && skb_is_tcp_pure_ack(skb)) {
>>
>>
>>>
>>>>>
>>>>>> +               }
>>>>>> +               len = mptcp_add_addr_len(local.family, false, !!local.port);
>>>>>> +               if (remaining < len)
>>>>>> +                       return false;
>>> And here, I think "remaining -= len;" is missing.
>>>
>>> Thanks,
>>> -Geliang
>>>
>> "remaining" is not being used in the flowing code. So "remaining -=len;" is not necessary. But you remindme that the "remaining -= len;" can be removed in the first trunk.
> 
> I think we should keep this 'remaining -= len;', remaining can be used
> in tcp_established_options.
> 
Thanks for your review.
I think "remaining" will not use in tcp_established_options. "size" is used by tcp_established_options.

>>
>> I will send v5 as your advice.
>>
> 

  reply	other threads:[~2021-06-21  7:50 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-18  8:18 [PATCH v4 0/4] mptcp: fix conflicts when using pm.add_signal in ADD_ADDR/echo and RM_ADDR process Yonglong Li
2021-06-18  8:18 ` [PATCH v4 1/4] mptcp: fix ADD_ADDR and RM_ADDR maybe flush addr_signal each other Yonglong Li
2021-06-18  8:18 ` [PATCH v4 2/4] mptcp: make MPTCP_ADD_ADDR_SIGNAL and MPTCP_ADD_ADDR_ECHO separate Yonglong Li
2021-06-18  8:18 ` [PATCH v4 3/4] mptcp: build ADD_ADDR/echo-ADD_ADDR option according pm.add_signal Yonglong Li
2021-06-18 11:20   ` Geliang Tang
2021-06-21  3:51     ` Yonglong Li
2021-06-21  6:42       ` Geliang Tang
2021-06-21  7:15         ` Yonglong Li
2021-06-21  7:39           ` Geliang Tang
2021-06-21  7:49             ` Yonglong Li [this message]
2021-06-21  8:06               ` Geliang Tang
2021-06-21  7:42   ` Geliang Tang
2021-06-21  7:51     ` Yonglong Li
2021-06-21  8:29   ` Geliang Tang
2021-06-18  8:18 ` [PATCH v4 4/4] mptcp: remove MPTCP_ADD_ADDR_IPV6 and MPTCP_ADD_ADDR_PORT Yonglong Li

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=a81f19a0-bbc7-b032-f757-ec7b8b16ee2f@chinatelecom.cn \
    --to=liyonglong@chinatelecom.cn \
    --cc=geliangtang@gmail.com \
    --cc=mathew.j.martineau@linux.intel.com \
    --cc=mptcp@lists.linux.dev \
    --cc=qitiepeng@chinatelecom.cn \
    --subject='Re: [PATCH v4 3/4] mptcp: build ADD_ADDR/echo-ADD_ADDR option according pm.add_signal' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).