From: Menglong Dong <imagedong@tencent.com>
In the 1th patch, we do some code cleanup with replease 'sock->sk'
with 'sk'. In the 2th patch, we rename 'sk' to 'ssk' in
mptcp_token_new_connect(). In the 3th patch, we add statistics for mptcp
socket in use. In the 4th patch, we init the 'sk_prot' field with
tcp_prot in build_msk. In the 5th patch, we make mptcp_connect can exit
when receive 'SIGUSR1' with '-r' flag. And in the 6th patch, we add the
testing for this commit.
With the commit e8695e504942("mptcp: don't orphan ssk in mptcp_close()"),
I belive that the testing of diag.sh can pass now. In fallback and
simultaneous close case, the msk can't release normal (sometimes?) without
that commit, and makes the testing fail. Enn...let's just see that the
CI is saying~
Changes since v8:
- fix the panic caused by mptcp token KUNIT tests by init sk->sk_prot in
build_msk()
- check the state of msk instead of ssk for listening socket
Changes since v7:
- remove the MPTCP_INUSE flag and do the statistics according to the
creation and destruction of the token in the 2th patch.
Changes since v6:
- check all processes exit in flush_pids() in the 4th patch
Changes since v5:
- introduce MPTCP_INUSE flag to store if msk is in use, as I find
that it's not correct to check is a msk is in use by
!sk_unhashed(sk) in mptcp_destroy_common(), because the token
can be release in mptcp_check_fastclose()
- add the 3th patch
- reuse __chk_nr in 4th patch
Changes since v4:
- rebase to solve merge conflict
Changes since v3:
- rename MPTCP_DESTROIED to MPTCP_DESTROYED in the 2th patch
Changes since v2:
- add testing
Changes since v1:
- split the code cleanup into the 1th patch.
- decrease the statistics for listening mptcp socket inuse with
mptcp_listen_inuse_dec()
- add MPTCP_DESTROIED flags to store if mptcp_destroy_common() was
called on the msk. For fallback case, we need to decrease the
statistics only once, and mptcp_destroy_common() can be called
more than once.
Menglong Dong (4):
mptcp: introduce 'sk' to replace 'sock->sk' in mptcp_listen()
mptcp: add statistics for mptcp socket in use
selftest: mptcp: exit from copyfd_io_poll() when receive SIGUSR1
selftest: mptcp: add test for mptcp socket in use
net/mptcp/protocol.c | 29 +++++++---
net/mptcp/token.c | 7 +++
tools/testing/selftests/net/mptcp/diag.sh | 56 +++++++++++++++++--
.../selftests/net/mptcp/mptcp_connect.c | 4 +-
4 files changed, 82 insertions(+), 14 deletions(-)
--
2.37.2