While cooking a follow-up for "mptcp: invoke MP_FAIL response when
needed" I stumbled upon a few other MP_FAIL related issues hit my
the self-tests while mangling the above.

All the patches for for the -net tree, and should be applied in-order
around to the squashed-to patch.

v4 -> v5:
 - hopefully fix for real lockdep annotaiton in patch 6/6 (still mat)

v3 -> v4:
 - fix a couple of typos in 3/6, fix lockdep annotation in 6/6 (mat)

v2 -> v3:
 - do not schedule mp_fail timeout on closed socket in patch 3/6 (mat) 

v1 -> v2:
 - take care of UaF in mptcp_worker with new patch 6/6

Paolo Abeni (6):
  mptcp: fix error mibs accounting
  mptcp: introduce MAPPING_BAD_CSUM
  Squash-to: "mptcp: invoke MP_FAIL response when needed"
  mptcp: fix shutdown vs fallback race
  mptcp: consistent map handling on failure
  mptcp: fix race on unaccepted mptcp sockets

 net/mptcp/options.c  |   8 +--
 net/mptcp/pm.c       |   5 +-
 net/mptcp/protocol.c |  57 ++++++++++++++++----
 net/mptcp/protocol.h |  25 +++++++--
 net/mptcp/subflow.c  | 121 +++++++++++++++++++++++++++++++++++--------
 5 files changed, 172 insertions(+), 44 deletions(-)

-- 
2.35.3

On Tue, 21 Jun 2022, Paolo Abeni wrote:

> While cooking a follow-up for "mptcp: invoke MP_FAIL response when
> needed" I stumbled upon a few other MP_FAIL related issues hit my
> the self-tests while mangling the above.
>
> All the patches for for the -net tree, and should be applied in-order
> around to the squashed-to patch.
>
> v4 -> v5:
> - hopefully fix for real lockdep annotaiton in patch 6/6 (still mat)

Thanks Paolo, nested lock fix confirmed. For v5 of the series:

Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>

>
> v3 -> v4:
> - fix a couple of typos in 3/6, fix lockdep annotation in 6/6 (mat)
>
> v2 -> v3:
> - do not schedule mp_fail timeout on closed socket in patch 3/6 (mat)
>
> v1 -> v2:
> - take care of UaF in mptcp_worker with new patch 6/6
>
> Paolo Abeni (6):
>  mptcp: fix error mibs accounting
>  mptcp: introduce MAPPING_BAD_CSUM
>  Squash-to: "mptcp: invoke MP_FAIL response when needed"
>  mptcp: fix shutdown vs fallback race
>  mptcp: consistent map handling on failure
>  mptcp: fix race on unaccepted mptcp sockets
>
> net/mptcp/options.c  |   8 +--
> net/mptcp/pm.c       |   5 +-
> net/mptcp/protocol.c |  57 ++++++++++++++++----
> net/mptcp/protocol.h |  25 +++++++--
> net/mptcp/subflow.c  | 121 +++++++++++++++++++++++++++++++++++--------
> 5 files changed, 172 insertions(+), 44 deletions(-)
>
> -- 
> 2.35.3
>
>
>

--
Mat Martineau
Intel

Hi Paolo, Mat,

On 21/06/2022 19:23, Paolo Abeni wrote:
> While cooking a follow-up for "mptcp: invoke MP_FAIL response when
> needed" I stumbled upon a few other MP_FAIL related issues hit my
> the self-tests while mangling the above.
> 
> All the patches for for the -net tree, and should be applied in-order
> around to the squashed-to patch.

Thank you for the patches and the reviews!

Just applied in our tree (fixes for -net, around "mptcp: invoke MP_FAIL
response when needed" patch) with Mat's RvB tag and without typos
(spelling from codespell, double parenthesis and removed empty line)

New patches for t/upstream-net:
- 8ba09e2ea328: mptcp: fix error mibs accounting
- 3b5f3287d01b: mptcp: introduce MAPPING_BAD_CSUM

- cd89e66cbec2: "squashed" patch 3/6 in "mptcp: invoke MP_FAIL response
when needed"
- 3675d85be654: "Signed-off-by" + "Co-developed-by"
- 341e2db12838: tg:msg: update commit message

- efb55524f8bd: mptcp: fix shutdown vs fallback race
- f2084a8aaf07: mptcp: consistent map handling on failure
- 144485c43714: mptcp: fix race on unaccepted mptcp sockets

- Results: 17a4b2aeac43..7db03aa2d67f (export-net)


New patches for t/upstream:
- 8ba09e2ea328: mptcp: fix error mibs accounting
- 3b5f3287d01b: mptcp: introduce MAPPING_BAD_CSUM

- cd89e66cbec2: "squashed" patch 3/6 in "mptcp: invoke MP_FAIL response
when needed"
- 3675d85be654: "Signed-off-by" + "Co-developed-by"
- 341e2db12838: tg:msg: update commit message

- efb55524f8bd: mptcp: fix shutdown vs fallback race
- f2084a8aaf07: mptcp: consistent map handling on failure
- 144485c43714: mptcp: fix race on unaccepted mptcp sockets
- Results: 8c6a13817318..972138d95a98 (export)


Builds and tests are now in progress:

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

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220622T203506
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