From nobody Wed Jun 24 19:22:31 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5A48D1DC9B5 for ; Thu, 23 Apr 2026 06:35:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776926121; cv=none; b=MfnFi/Q7Morfudrur518t6e5ZQx8DdWOuqcFYb0UMH9SPdOXcNUgBt4dKeAdeAG8PoFZOwFDPhthrWQofxlGiPgl9zcOLuUipblJv85XRd/pmHuMeRXTA8msyaQSqI4v3ZNj1tiXDNXSTSYRIxJm/fqpTWey9RSt6JYLpSYXlVE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776926121; c=relaxed/simple; bh=fByAMZzWgvnfXRFuH3lT99tlGAl0B4kYTI+9/p3oMeI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uURvx/gVoqSW+Y2g5E0HAP1VGW+9+5ZdOWJJS39FD3pqqMbSWekXpM9fm2/NhAP/UpnHcr/1v7nyGHhH3RkLE+ArqfuoZh/7dYH2BKZkTT8wDN4MMw5HbrS4w/jmdWvy3GTVWOBMMkNkFydyfSWoNa808lk12VPEKaAdkTz5lkw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HRk8Ykjo; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HRk8Ykjo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4234C2BCAF; Thu, 23 Apr 2026 06:34:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776926121; bh=fByAMZzWgvnfXRFuH3lT99tlGAl0B4kYTI+9/p3oMeI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HRk8YkjoNYEzbBRidgBmgoCOf88B6sFvSO+/YA1R1a2gWAs3DAuViI+7glz9gWuUa OXzMo2O3IGaFmrYNtSZ9gySsWYJZvpcMMCQ6oReeixcps0ge0BbhbvXBRl8JrxfQz5 oRxB1YkDDcFgiPp4AS0PYIIYrZGj2MgfZ0ee1Lm7+HWeSQKKHqerctWjHbwQnaT2er 2hTY5PgERmqQwKkYT0/gQQa4tbmMdArWMA0UiFRMjvAiqhbV3zE/0YyLSd8vtn45Fr ZXvYU50ETqgfQ2gIegkJo/vL9cgsIIG6PeaO4ABM9WWWznseNyM24Ip7je0qA1Z75v uVkojkyrJ9wVw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [PATCH mptcp-next v16 14/16] selftests: tls: wait close in shutdown_reuse for mptcp Date: Thu, 23 Apr 2026 14:33:07 +0800 Message-ID: <051e6ecc9e8a192f23ece64e052897effddb1fa8.1776924682.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.51.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang In shutdown_reuse tests, add a delay after shutdown to wait for MPTCP sockets to reach TCP_CLOSE state before reuse via bind(), avoiding the following errors: # RUN tls.12_aes_gcm_mptcp.shutdown_reuse ... # tls.c:1790:shutdown_reuse:Expected ret (-1) =3D=3D 0 (0) # shutdown_reuse: Test failed # FAIL tls.12_aes_gcm_mptcp.shutdown_reuse not ok 14 tls.12_aes_gcm_mptcp.shutdown_reuse # RUN tls.13_aes_gcm_mptcp.shutdown_reuse ... # tls.c:1790:shutdown_reuse:Expected ret (-1) =3D=3D 0 (0) # shutdown_reuse: Test failed # FAIL tls.13_aes_gcm_mptcp.shutdown_reuse not ok 15 tls.13_aes_gcm_mptcp.shutdown_reuse # RUN tls.12_chacha_mptcp.shutdown_reuse ... # OK tls.12_chacha_mptcp.shutdown_reuse ok 16 tls.12_chacha_mptcp.shutdown_reuse # RUN tls.13_chacha_mptcp.shutdown_reuse ... # OK tls.13_chacha_mptcp.shutdown_reuse ok 17 tls.13_chacha_mptcp.shutdown_reuse # RUN tls.13_sm4_gcm_mptcp.shutdown_reuse ... # tls.c:1790:shutdown_reuse:Expected ret (-1) =3D=3D 0 (0) # shutdown_reuse: Test failed # FAIL tls.13_sm4_gcm_mptcp.shutdown_reuse not ok 18 tls.13_sm4_gcm_mptcp.shutdown_reuse This TCP_CLOSE check is just for MPTCP, because it should not slow down plain TCP tests. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- tools/testing/selftests/net/tls.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/ne= t/tls.c index bf8ecfdfdd18..8bedc2cde763 100644 --- a/tools/testing/selftests/net/tls.c +++ b/tools/testing/selftests/net/tls.c @@ -30,6 +30,10 @@ #define IPPROTO_MPTCP 262 #endif =20 +#ifndef TCP_CLOSE +#define TCP_CLOSE 7 +#endif + static int fips_enabled; =20 struct tls_crypto_info_keys { @@ -1698,6 +1702,25 @@ TEST_F(tls, shutdown_unsent) shutdown(self->cfd, SHUT_RDWR); } =20 +static bool wait_for_tcp_close(struct __test_metadata *_metadata, + int fd, int max) +{ + struct tcp_info info; + socklen_t len; + int i, ret; + + for (i =3D 0; i < max; i++) { + len =3D sizeof(info); + ret =3D getsockopt(fd, IPPROTO_TCP, TCP_INFO, &info, &len); + ASSERT_EQ(ret, 0); + if (info.tcpi_state =3D=3D TCP_CLOSE) + return true; + usleep(1000); + } + + return false; +} + TEST_F(tls, shutdown_reuse) { struct sockaddr_in addr; @@ -1707,6 +1730,9 @@ TEST_F(tls, shutdown_reuse) shutdown(self->cfd, SHUT_RDWR); close(self->cfd); =20 + if (variant->mptcp) + EXPECT_TRUE(wait_for_tcp_close(_metadata, self->fd, 1000)); + addr.sin_family =3D AF_INET; addr.sin_addr.s_addr =3D htonl(INADDR_ANY); addr.sin_port =3D 0; --=20 2.51.0