[PATCH mptcp-next] Squash-to: "mptcp: use fastclose on more edge scenarios"

[PATCH mptcp-next] Squash-to: "mptcp: use fastclose on more edge scenarios"

[Paolo Abeni]

The orginal commit applied fastclose too aggressivly.
Specifically, we don't need a fastclose after the completion of
the data_fin handshakr for an orphaned socket.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
paired pktdrill update:
https://github.com/multipath-tcp/packetdrill/pull/88
---
 net/mptcp/protocol.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 0eeb8115c9d0..c99eb4ce948e 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -2607,12 +2607,15 @@ static void mptcp_worker(struct work_struct *work)
 	 * closed, but we need the msk around to reply to incoming DATA_FIN,
 	 * even if it is orphaned and in FIN_WAIT2 state
 	 */
-	if (sock_flag(sk, SOCK_DEAD) &&
-	    (mptcp_check_close_timeout(sk) || sk->sk_state == TCP_CLOSE)) {
-		inet_sk_state_store(sk, TCP_CLOSE);
-		mptcp_do_fastclose(sk);
-		__mptcp_destroy_sock(sk);
-		goto unlock;
+	if (sock_flag(sk, SOCK_DEAD)) {
+		if (mptcp_check_close_timeout(sk)) {
+			inet_sk_state_store(sk, TCP_CLOSE);
+			mptcp_do_fastclose(sk);
+		}
+		if (sk->sk_state == TCP_CLOSE) {
+			__mptcp_destroy_sock(sk);
+			goto unlock;
+		}
 	}
 
 	if (test_and_clear_bit(MPTCP_WORK_CLOSE_SUBFLOW, &msk->flags))
-- 
2.37.3

Re: Squash-to: "mptcp: use fastclose on more edge scenarios": Tests Results

[MPTCP CI]

Hi Paolo,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: normal:
  - Unstable: 4 failed test(s): packetdrill_dss packetdrill_fastopen packetdrill_syscalls selftest_mptcp_join 🔴:
  - Task: https://cirrus-ci.com/task/4988002983215104
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/4988002983215104/summary/summary.txt

- KVM Validation: debug:
  - Unstable: 3 failed test(s): packetdrill_dss packetdrill_fastopen packetdrill_syscalls 🔴:
  - Task: https://cirrus-ci.com/task/6113902890057728
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/6113902890057728/summary/summary.txt

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/9ff9f4f21e18


If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:

    $ cd [kernel source code]
    $ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
        --pull always mptcp/mptcp-upstream-virtme-docker:latest \
        auto-debug

For more details:

    https://github.com/multipath-tcp/mptcp-upstream-virtme-docker


Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)

Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (Tessares)

Re: [PATCH mptcp-next] Squash-to: "mptcp: use fastclose on more edge scenarios"

[Matthieu Baerts]

Hi Paolo,

On 26/09/2022 15:26, Paolo Abeni wrote:
> The orginal commit applied fastclose too aggressivly.
> Specifically, we don't need a fastclose after the completion of
> the data_fin handshakr for an orphaned socket.

Thank you for the fix!

Now in our tree:

New patches for t/upstream:
- 3fa214dd96ae: "squashed" in "mptcp: use fastclose on more edge scenarios"
- Results: a24eaf661ebf..e839b37d59fd (export)


Tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220926T171410


Cheers,
Matt

PS: I also merged the Packetdrill PR and closed the ticket #303 ;)
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net