No major changes since v2, see individual patches for details.

This adds TCP_INQ for mptcp and extends the selftest infra.
Patch 3 adds ioctls to retrieve amount of in-sequence bytes
ready to for read() (older version of TCP_INQ) and counters for
unsent and unacked byte count.

Last patch is new in v2, its a more specific TCP_INQ test case.
See individual patches for changes since v1.

Florian Westphal (4):
  mptcp: add TCP_INQ cmsg support
  selftests: mptcp: add TCP_INQ support
  mptcp: add SIOCINQ, OUTQ and OUTQNSD ioctls
  selftests: mptcp: add inq test case

 net/mptcp/protocol.c                          |  89 ++-
 net/mptcp/protocol.h                          |   1 +
 net/mptcp/sockopt.c                           |  37 ++
 tools/testing/selftests/net/mptcp/.gitignore  |   1 +
 tools/testing/selftests/net/mptcp/Makefile    |   2 +-
 .../selftests/net/mptcp/mptcp_connect.c       |  58 +-
 tools/testing/selftests/net/mptcp/mptcp_inq.c | 603 ++++++++++++++++++
 .../selftests/net/mptcp/mptcp_sockopt.sh      |  44 +-
 8 files changed, 830 insertions(+), 5 deletions(-)
 create mode 100644 tools/testing/selftests/net/mptcp/mptcp_inq.c

-- 
2.32.0

On Tue, 16 Nov 2021, Florian Westphal wrote:

> No major changes since v2, see individual patches for details.
>
> This adds TCP_INQ for mptcp and extends the selftest infra.
> Patch 3 adds ioctls to retrieve amount of in-sequence bytes
> ready to for read() (older version of TCP_INQ) and counters for
> unsent and unacked byte count.
>
> Last patch is new in v2, its a more specific TCP_INQ test case.
> See individual patches for changes since v1.
>
> Florian Westphal (4):
>  mptcp: add TCP_INQ cmsg support
>  selftests: mptcp: add TCP_INQ support
>  mptcp: add SIOCINQ, OUTQ and OUTQNSD ioctls
>  selftests: mptcp: add inq test case
>
> net/mptcp/protocol.c                          |  89 ++-
> net/mptcp/protocol.h                          |   1 +
> net/mptcp/sockopt.c                           |  37 ++
> tools/testing/selftests/net/mptcp/.gitignore  |   1 +
> tools/testing/selftests/net/mptcp/Makefile    |   2 +-
> .../selftests/net/mptcp/mptcp_connect.c       |  58 +-
> tools/testing/selftests/net/mptcp/mptcp_inq.c | 603 ++++++++++++++++++
> .../selftests/net/mptcp/mptcp_sockopt.sh      |  44 +-
> 8 files changed, 830 insertions(+), 5 deletions(-)
> create mode 100644 tools/testing/selftests/net/mptcp/mptcp_inq.c
>
> -- 
> 2.32.0
>

Thanks for the revisions Florian. Looks good to me (with the one comment 
about the unused variable warnings in patch 4 to address before 
upstreaming).

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

--
Mat Martineau
Intel

Hi Florian, Mat,

On 16/11/2021 14:48, Florian Westphal wrote:
> No major changes since v2, see individual patches for details.
> 
> This adds TCP_INQ for mptcp and extends the selftest infra.
> Patch 3 adds ioctls to retrieve amount of in-sequence bytes
> ready to for read() (older version of TCP_INQ) and counters for
> unsent and unacked byte count.
> 
> Last patch is new in v2, its a more specific TCP_INQ test case.
> See individual patches for changes since v1.

Thank you for the patches, the reviews and the reply to my question
about the ChangeLog!

Now in our tree (features for next) with Mat's RvB tag (and without some
warnings from checkpatch in the .c files of the selftests, nothing
important)

- 2633e427d5c5: mptcp: add TCP_INQ cmsg support

- 18b1970dd676: selftests: mptcp: add TCP_INQ support

- b85f910f78d7: mptcp: add SIOCINQ, OUTQ and OUTQNSD ioctls

- 75e2fd074427: selftests: mptcp: add inq test case

- Results: 3bb02e3cfe5d..3ebf8b8d1426

Builds and tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20211119T160804
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 19/11/2021 17:09, Matthieu Baerts wrote:
> Hi Florian, Mat,
> 
> On 16/11/2021 14:48, Florian Westphal wrote:
>> No major changes since v2, see individual patches for details.
>>
>> This adds TCP_INQ for mptcp and extends the selftest infra.
>> Patch 3 adds ioctls to retrieve amount of in-sequence bytes
>> ready to for read() (older version of TCP_INQ) and counters for
>> unsent and unacked byte count.
>>
>> Last patch is new in v2, its a more specific TCP_INQ test case.
>> See individual patches for changes since v1.
> 
> Thank you for the patches, the reviews and the reply to my question
> about the ChangeLog!
> 
> Now in our tree (features for next) with Mat's RvB tag (and without some
> warnings from checkpatch in the .c files of the selftests, nothing
> important)

and without "int queued, on = 1;" line in the selftests.

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