v2:
 - keep the order of the applied patches. Drop the revert patches in v1.

v1:
Resend all my queued patches in the patchwork. The sequence of 4 applied
patches is adjusted and rebased. No code modified.

Geliang Tang (12):
  mptcp: add the mibs for MP_FASTCLOSE
  selftests: mptcp: add the MP_FASTCLOSE mibs check
  mptcp: add the mibs for MP_RST
  selftests: mptcp: add the MP_RST mibs check
  selftests: mptcp: add extra_args in do_transfer
  selftests: mptcp: reuse linkfail to make given size files
  selftests: mptcp: add fastclose testcase
  Squash to "mptcp: infinite mapping receiving"
  Squash to "selftests: mptcp: add infinite map mibs check"
  selftests: mptcp: add more arguments for chk_join_nr
  selftests: mptcp: add the MP_FAIL testcases
  selftests: mptcp: update output info of chk_rm_nr

 net/mptcp/mib.c                               |   4 +
 net/mptcp/mib.h                               |   4 +
 net/mptcp/options.c                           |   5 +
 net/mptcp/subflow.c                           |   1 +
 tools/testing/selftests/net/mptcp/config      |   8 +
 .../testing/selftests/net/mptcp/mptcp_join.sh | 336 +++++++++++++++---
 6 files changed, 307 insertions(+), 51 deletions(-)

-- 
2.34.1

Hi Geliang, Mat,

On 20/02/2022 03:59, Geliang Tang wrote:
> v2:
>  - keep the order of the applied patches. Drop the revert patches in v1.
> 
> v1:
> Resend all my queued patches in the patchwork. The sequence of 4 applied
> patches is adjusted and rebased. No code modified.
> 
> Geliang Tang (12):
>   mptcp: add the mibs for MP_FASTCLOSE
>   selftests: mptcp: add the MP_FASTCLOSE mibs check
>   mptcp: add the mibs for MP_RST
>   selftests: mptcp: add the MP_RST mibs check
>   selftests: mptcp: add extra_args in do_transfer
>   selftests: mptcp: reuse linkfail to make given size files
>   selftests: mptcp: add fastclose testcase
>   Squash to "mptcp: infinite mapping receiving"
>   Squash to "selftests: mptcp: add infinite map mibs check"
>   selftests: mptcp: add more arguments for chk_join_nr
>   selftests: mptcp: add the MP_FAIL testcases
>   selftests: mptcp: update output info of chk_rm_nr

Thank you for this patches and the reviews!

Now applied in our tree (feat. for net-next):

* Before the "infinite mapping support" series:

- ca9cbbff446b: mptcp: add the mibs for MP_FASTCLOSE
- e9d3d6700269: selftests: mptcp: add the MP_FASTCLOSE mibs check
- 7b6ed57c70dc: mptcp: add the mibs for MP_RST
- b1dd7c48a10f: selftests: mptcp: add the MP_RST mibs check
- 481e87d3e23b: selftests: mptcp: add extra_args in do_transfer
- 6609f1c808dd: selftests: mptcp: reuse linkfail to make given size files
- 28ac700c6369: selftests: mptcp: add fastclose testcase
- bd4f93690fa6: conflict in t/selftests-mptcp-add-infinite-map-mibs-check
- 4e668db2d842: conflict in
t/selftests-mptcp-Add-tests-for-userspace-PM-type
- 519eb3313dc7: conflict in
t/selftests-mptcp-adjust-output-alignment-for-more-tests
- 5b26053898fa: conflict in
t/selftests-mptcp-add-implicit-endpoint-test-case
- Results: d7649a6f4e25..dd86303a6117

* In the "infinite mapping support" series:

- a901b62afb52: "squashed" patch 08/12 in "mptcp: infinite mapping
receiving"
- ed1ec3a2223c: "squashed" (with conflicts) patch 09/12 in "selftests:
mptcp: add infinite map mibs check"
- Results: dd86303a6117..2198a66cca7d

* After the "infinite mapping support" series:

- 0954244ea41e: selftests: mptcp: add more arguments for chk_join_nr
- 0c0217635548: selftests: mptcp: add the MP_FAIL testcases
- f2b1c0bab9a7: selftests: mptcp: update output info of chk_rm_nr
- 66fe2565137c: conflict in
t/selftests-mptcp-Add-tests-for-userspace-PM-type
- 725730b4cb61: conflict in t/mptcp-more-careful-RM_ADDR-generation
- ea63fb2b5f25: conflict in
t/selftests-mptcp-add-implicit-endpoint-test-case
- Results: 2198a66cca7d..5d3058e05cc9

* Extra fix:

- 649d88fdc3c5: tg: fix wrong conflict resolution
- 4ec880a22963: conflict in
t/selftests-mptcp-add-more-arguments-for-chk_join_nr
- Results: 5d3058e05cc9..067a741aa5fb

Hopefully everything has been applied as expected! Do not hesitate to
double-check!


Builds and tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220223T205717
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export


Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

On Wed, Feb 23, 2022 at 10:01:27PM +0100, Matthieu Baerts wrote:
> Hi Geliang, Mat,
> 
> On 20/02/2022 03:59, Geliang Tang wrote:
> > v2:
> >  - keep the order of the applied patches. Drop the revert patches in v1.
> > 
> > v1:
> > Resend all my queued patches in the patchwork. The sequence of 4 applied
> > patches is adjusted and rebased. No code modified.
> > 
> > Geliang Tang (12):
> >   mptcp: add the mibs for MP_FASTCLOSE
> >   selftests: mptcp: add the MP_FASTCLOSE mibs check
> >   mptcp: add the mibs for MP_RST
> >   selftests: mptcp: add the MP_RST mibs check
> >   selftests: mptcp: add extra_args in do_transfer
> >   selftests: mptcp: reuse linkfail to make given size files
> >   selftests: mptcp: add fastclose testcase
> >   Squash to "mptcp: infinite mapping receiving"
> >   Squash to "selftests: mptcp: add infinite map mibs check"
> >   selftests: mptcp: add more arguments for chk_join_nr
> >   selftests: mptcp: add the MP_FAIL testcases
> >   selftests: mptcp: update output info of chk_rm_nr
> 
> Thank you for this patches and the reviews!
> 
> Now applied in our tree (feat. for net-next):
> 
> * Before the "infinite mapping support" series:
> 
> - ca9cbbff446b: mptcp: add the mibs for MP_FASTCLOSE
> - e9d3d6700269: selftests: mptcp: add the MP_FASTCLOSE mibs check
> - 7b6ed57c70dc: mptcp: add the mibs for MP_RST
> - b1dd7c48a10f: selftests: mptcp: add the MP_RST mibs check
> - 481e87d3e23b: selftests: mptcp: add extra_args in do_transfer
> - 6609f1c808dd: selftests: mptcp: reuse linkfail to make given size files
> - 28ac700c6369: selftests: mptcp: add fastclose testcase
> - bd4f93690fa6: conflict in t/selftests-mptcp-add-infinite-map-mibs-check
> - 4e668db2d842: conflict in
> t/selftests-mptcp-Add-tests-for-userspace-PM-type
> - 519eb3313dc7: conflict in
> t/selftests-mptcp-adjust-output-alignment-for-more-tests
> - 5b26053898fa: conflict in
> t/selftests-mptcp-add-implicit-endpoint-test-case
> - Results: d7649a6f4e25..dd86303a6117
> 
> * In the "infinite mapping support" series:
> 
> - a901b62afb52: "squashed" patch 08/12 in "mptcp: infinite mapping
> receiving"
> - ed1ec3a2223c: "squashed" (with conflicts) patch 09/12 in "selftests:
> mptcp: add infinite map mibs check"
> - Results: dd86303a6117..2198a66cca7d
> 
> * After the "infinite mapping support" series:
> 
> - 0954244ea41e: selftests: mptcp: add more arguments for chk_join_nr
> - 0c0217635548: selftests: mptcp: add the MP_FAIL testcases
> - f2b1c0bab9a7: selftests: mptcp: update output info of chk_rm_nr
> - 66fe2565137c: conflict in
> t/selftests-mptcp-Add-tests-for-userspace-PM-type
> - 725730b4cb61: conflict in t/mptcp-more-careful-RM_ADDR-generation
> - ea63fb2b5f25: conflict in
> t/selftests-mptcp-add-implicit-endpoint-test-case
> - Results: 2198a66cca7d..5d3058e05cc9
> 
> * Extra fix:
> 
> - 649d88fdc3c5: tg: fix wrong conflict resolution
> - 4ec880a22963: conflict in
> t/selftests-mptcp-add-more-arguments-for-chk_join_nr
> - Results: 5d3058e05cc9..067a741aa5fb
> 
> Hopefully everything has been applied as expected! Do not hesitate to
> double-check!


Hi Matt,

Thank you so much for applying all these patches. I have two extra
requests about the order of these patches here.

1. Move the commit "selftests: mptcp: adjust output alignment for more
tests" before "mptcp: add the mibs for MP_FASTCLOSE". Otherwise, it'll
break the output alignment. Since 'nr_blank' is defined in the former,
and used in the fastclose series.

2. Move the commit "selftests: mptcp: add infinite map mibs check" before
"selftests: mptcp: add invert check in check_transfer". Since the former
is more related to the previous commit "mptcp: add mib for infinite map
sending" than the latter.

No conflicts occurred. And the order of them all is like this:

pick 257287531bbc selftests: mptcp: adjust output alignment for more tests
pick e27d928aa4ec mptcp: add the mibs for MP_FASTCLOSE
pick ea66162e3f4f selftests: mptcp: add the MP_FASTCLOSE mibs check
pick f7e2120cec1b mptcp: add the mibs for MP_RST
pick babc72fe71a7 selftests: mptcp: add the MP_RST mibs check
pick 426f25b59edc selftests: mptcp: add extra_args in do_transfer
pick 8a48a2ceaa22 selftests: mptcp: reuse linkfail to make given size files
pick fc578f540a07 selftests: mptcp: add fastclose testcase
pick e02ad48fb24a mptcp: don't send RST for single subflow
pick f6e7701ed3f0 mptcp: add the fallback check
pick 2ec8e7687a0a mptcp: track and update contiguous data status
pick d2599198de2a mptcp: infinite mapping sending
pick ba54e60a32f6 mptcp: infinite mapping receiving
pick 8c2c5497dbf1 mptcp: add mib for infinite map sending
pick 01d891dec821 selftests: mptcp: add infinite map mibs check
pick 1cfaf9761bef selftests: mptcp: add invert check in check_transfer
pick c9217d510f58 selftests: mptcp: add more arguments for chk_join_nr
pick 99eb057ec657 selftests: mptcp: add the MP_FAIL testcases
pick abe3bb655cff selftests: mptcp: update output info of chk_rm_nr
pick 87210766b6ff mptcp: dump infinite_map field in mptcp_dump_mpext
pick 9363e0880eed mptcp: add tracepoint in mptcp_sendmsg_frag

Thanks,
-Geliang

> 
> 
> Builds and tests are now in progress:
> 
> https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220223T205717
> https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export
> 
> 
> Cheers,
> Matt
> -- 
> Tessares | Belgium | Hybrid Access Solutions
> www.tessares.net
> 

Hi Geliang,

On 23/02/2022 23:56, Geliang Tang wrote:
> Hi Matt,
> 
> Thank you so much for applying all these patches. I have two extra
> requests about the order of these patches here.
> 
> 1. Move the commit "selftests: mptcp: adjust output alignment for more
> tests" before "mptcp: add the mibs for MP_FASTCLOSE". Otherwise, it'll
> break the output alignment. Since 'nr_blank' is defined in the former,
> and used in the fastclose series.

Good point. With TopGit, it is not as easy as moving commits with a 'git
rebase -i', just easier to have something wrong when doing these
manipulation. But that's not impossible and at the end, I'm used to.

- bd41af654d7f: selftests: mptcp: adjust output alignment for more tests
- Results: 4bbd9add0797..369cbca2200f → empty: good!

> 2. Move the commit "selftests: mptcp: add infinite map mibs check" before
> "selftests: mptcp: add invert check in check_transfer". Since the former
> is more related to the previous commit "mptcp: add mib for infinite map
> sending" than the latter.

- 259143ec3e7f: selftests: mptcp: add infinite map mibs check
- Results: 369cbca2200f..287a6bb7ec08 → empty: good!

> No conflicts occurred. And the order of them all is like this:

Same, no conflicts. Should be better now!

Builds and tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220224T133344
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

Matthieu Baerts <matthieu.baerts@tessares.net> 于2022年2月24日周四 21:36写道：
>
> Hi Geliang,
>
> On 23/02/2022 23:56, Geliang Tang wrote:
> > Hi Matt,
> >
> > Thank you so much for applying all these patches. I have two extra
> > requests about the order of these patches here.
> >
> > 1. Move the commit "selftests: mptcp: adjust output alignment for more
> > tests" before "mptcp: add the mibs for MP_FASTCLOSE". Otherwise, it'll
> > break the output alignment. Since 'nr_blank' is defined in the former,
> > and used in the fastclose series.
>
> Good point. With TopGit, it is not as easy as moving commits with a 'git
> rebase -i', just easier to have something wrong when doing these
> manipulation. But that's not impossible and at the end, I'm used to.
>
> - bd41af654d7f: selftests: mptcp: adjust output alignment for more tests
> - Results: 4bbd9add0797..369cbca2200f → empty: good!
>
> > 2. Move the commit "selftests: mptcp: add infinite map mibs check" before
> > "selftests: mptcp: add invert check in check_transfer". Since the former
> > is more related to the previous commit "mptcp: add mib for infinite map
> > sending" than the latter.
>
> - 259143ec3e7f: selftests: mptcp: add infinite map mibs check
> - Results: 369cbca2200f..287a6bb7ec08 → empty: good!
>
> > No conflicts occurred. And the order of them all is like this:
>
> Same, no conflicts. Should be better now!

Great! Thanks.

>
> Builds and tests are now in progress:
>
> https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220224T133344
> https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export
>
> Cheers,
> Matt
> --
> Tessares | Belgium | Hybrid Access Solutions
> www.tessares.net
>