From nobody Wed Jun 24 15:06:41 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4glldY596Mz6jLNN for ; Wed, 24 Jun 2026 15:06:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glldY4cgcz46MD for ; Wed, 24 Jun 2026 15:06:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782313601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OhwYHGRlG8urcMFcwA+TSchrf6bER5qfgzhB55o+wHM=; b=QR4kZkX4M+rqJpI2aUA3mx5HYxJQPKGGlXAkC6FFY0/sDDnse61xXeF1FSO70ToJv9dOvP 9rI3iNcxaVKE7Rf7OWsFcN2wsWTtBLXiQRsZr+Iim+3T4X6CfLsK2PL2Ghc95koKSelVyQ xrVLuJMcqe8JXtERMXCTaUxCn3IRiv7UdPApn+CV9eRwQdz+EDDJW4FRrX9Sg4fTSOMKqR brH+6rXLt+TeMgfF+hL0y6kmApwGXfMCFiL/MKGwGoDjsuuiyxarRYqh0ZiQP7E1MgIw04 xLmW4n8CUjFuj/GzCyH9Hk9nbdSKgCjWP1sN3MXjShXmZWWt9Eg+u7989Cvk5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782313601; a=rsa-sha256; cv=none; b=vmKJAl6ZY+Qwmw2Lvpkwipwg/R/+jzB75osVjrrxmZ+Wz9foG3/abSMJaEUmnokQNz+GE9 Y0fcQF5vXOyAxgGO0DG5CIIe9zT/cTLE1lY5I346JnVYPwTlczcxpuFGgEuFcB4AWOmYgl qSOlabsQ6gDy09N0SnSZNpbQ7L3SrPzr1IGHly/7zw9SXyl/0q32cUkea8BMUuXlCGqRE/ KXyZZiwMc4IXCpwsa+zHBUEXrkVkKqwqA5P+9KWh6h7CubBLKRZmqu3iVVkl1UgvTOH98V O+4FAChr9ZJJCrAI1giAAxA1fHCZElE1cJVIJ7Odz4YFW0XJ1MoqqBxyGkimHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782313601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OhwYHGRlG8urcMFcwA+TSchrf6bER5qfgzhB55o+wHM=; b=CTc4u7GzSP5sYPWrla2Wd0pwwxV/Aye/do/fa+bqbF2XcWMWpbA1qkkwAGMTWw515QlIrP MOowrc15mPwmM/mnhvWFpdxYwVWcdRDesNCwGgKnWzXUSAbYfX5CVfV1yfdOuoo+pdelcA PS2cLqpDsNm27tJqrcAnLQkzGNk3Anr8iKfarsHLbXlXxGHhgRSCyWJF/72ffJfGFhrw0U 1i23LsVbxKxKivQbxaOvPEWOLwDrPTCHygyDBJ5DstaWM+kQCCe107y4Nm0vKv7C/d0GMu bzq06NMJA6rfu3x5WV2CGx1j47aQph8UNpFQ24fG32+aN/qb6KAcpSwRzLF7VQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glldY2sPHz8kd for ; Wed, 24 Jun 2026 15:06:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d8f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Jun 2026 15:06:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Siva Mahadevan Subject: git: 9e2d8ec2df41 - main - tests/test_rtsock_l3: fix flaky temporal route addition tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e2d8ec2df414a8019d9c31a9a09a5cc728b4c19 Auto-Submitted: auto-generated Date: Wed, 24 Jun 2026 15:06:41 +0000 Message-Id: <6a3bf281.1d8f5.28207ec@gitrepo.freebsd.org> The branch main has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=9e2d8ec2df414a8019d9c31a9a09a5cc728b4c19 commit 9e2d8ec2df414a8019d9c31a9a09a5cc728b4c19 Author: Siva Mahadevan AuthorDate: 2026-06-18 15:33:00 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-24 15:05:11 +0000 tests/test_rtsock_l3: fix flaky temporal route addition tests If RTM_DELETE arrives before RTM_ADD, the test will skip the first reply and then timeout after attempting to read another message from the rtsock_fd. See the CI test failure[0] for more details. [0] https://ci.freebsd.org/job/FreeBSD-main-riscv64-test/16628/testReport/sys.net.routing/test_rtsock_l3/rtm_add_v6_temporal1_success/ Reviewed by: pouria Fixes: e02d3fe70c7247027c85d60179c331618554ba34 MFC after: 3 days Sponsored by: The FreeBSD Foundation --- tests/sys/net/routing/test_rtsock_l3.c | 46 +++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/tests/sys/net/routing/test_rtsock_l3.c b/tests/sys/net/routing/test_rtsock_l3.c index cdfc63d604bf..acd0828c4f38 100644 --- a/tests/sys/net/routing/test_rtsock_l3.c +++ b/tests/sys/net/routing/test_rtsock_l3.c @@ -973,6 +973,9 @@ ATF_TC_HEAD(rtm_add_v4_temporal1_success, tc) ATF_TC_BODY(rtm_add_v4_temporal1_success, tc) { DECLARE_TEST_VARS; + char buffer2[2048]; + struct rt_msghdr *rtm2 = (struct rt_msghdr *)buffer2; + int seq; c = presetup_ipv4(tc); @@ -984,6 +987,7 @@ ATF_TC_BODY(rtm_add_v4_temporal1_success, tc) prepare_route_message(rtm, RTM_ADD, (struct sockaddr *)&net4, (struct sockaddr *)&mask4, (struct sockaddr *)&gw4); + seq = rtm->rtm_seq; /* Set expire time to now */ struct timeval tv; @@ -992,17 +996,24 @@ ATF_TC_BODY(rtm_add_v4_temporal1_success, tc) rtm->rtm_inits |= RTV_EXPIRE; rtsock_send_rtm(c->rtsock_fd, rtm); - rtm = rtsock_read_rtm_reply(c->rtsock_fd, buffer, sizeof(buffer), rtm->rtm_seq); + + rtsock_read_rtm(c->rtsock_fd, buffer, sizeof(buffer)); ATF_REQUIRE_MSG(rtm != NULL, "unable to get rtsock reply for RTM_ADD"); - RTSOCK_ATF_REQUIRE_MSG(rtm, rtm->rtm_inits & RTV_EXPIRE, "RTV_EXPIRE not set"); + if (rtm->rtm_type == RTM_DELETE) { + /* The messages arrived swapped, so swap them back when verifying. */ + rtm = (struct rt_msghdr *)buffer2; + rtm2 = (struct rt_msghdr *)buffer; + } + rtsock_read_rtm(c->rtsock_fd, buffer2, sizeof(buffer2)); - /* The next should be route deletion */ - rtm = rtsock_read_rtm(c->rtsock_fd, buffer, sizeof(buffer)); + RTSOCK_ATF_REQUIRE_MSG(rtm, rtm->rtm_pid == getpid() && rtm->rtm_seq == seq, + "Unmatched rtsock reply for RTM_ADD"); + RTSOCK_ATF_REQUIRE_MSG(rtm, rtm->rtm_inits & RTV_EXPIRE, "RTV_EXPIRE not set"); - verify_route_message(rtm, RTM_DELETE, (struct sockaddr *)&net4, + verify_route_message(rtm2, RTM_DELETE, (struct sockaddr *)&net4, (struct sockaddr *)&mask4, (struct sockaddr *)&gw4); - verify_route_message_extra(rtm, c->ifindex, + verify_route_message_extra(rtm2, c->ifindex, RTF_DONE | RTF_GATEWAY | RTF_STATIC); } @@ -1020,6 +1031,9 @@ ATF_TC_HEAD(rtm_add_v6_temporal1_success, tc) ATF_TC_BODY(rtm_add_v6_temporal1_success, tc) { DECLARE_TEST_VARS; + char buffer2[2048]; + struct rt_msghdr *rtm2 = (struct rt_msghdr *)buffer2; + int seq; c = presetup_ipv6(tc); @@ -1031,6 +1045,7 @@ ATF_TC_BODY(rtm_add_v6_temporal1_success, tc) prepare_route_message(rtm, RTM_ADD, (struct sockaddr *)&net6, (struct sockaddr *)&mask6, (struct sockaddr *)&gw6); + seq = rtm->rtm_seq; /* Set expire time to now */ struct timeval tv; @@ -1039,17 +1054,24 @@ ATF_TC_BODY(rtm_add_v6_temporal1_success, tc) rtm->rtm_inits |= RTV_EXPIRE; rtsock_send_rtm(c->rtsock_fd, rtm); - rtm = rtsock_read_rtm_reply(c->rtsock_fd, buffer, sizeof(buffer), rtm->rtm_seq); + + rtsock_read_rtm(c->rtsock_fd, buffer, sizeof(buffer)); ATF_REQUIRE_MSG(rtm != NULL, "unable to get rtsock reply for RTM_ADD"); - RTSOCK_ATF_REQUIRE_MSG(rtm, rtm->rtm_inits & RTV_EXPIRE, "RTV_EXPIRE not set"); + if (rtm->rtm_type == RTM_DELETE) { + /* The messages arrived swapped, so swap them back when verifying. */ + rtm = (struct rt_msghdr *)buffer2; + rtm2 = (struct rt_msghdr *)buffer; + } + rtsock_read_rtm(c->rtsock_fd, buffer2, sizeof(buffer2)); - /* The next should be route deletion */ - rtm = rtsock_read_rtm(c->rtsock_fd, buffer, sizeof(buffer)); + RTSOCK_ATF_REQUIRE_MSG(rtm, rtm->rtm_pid == getpid() && rtm->rtm_seq == seq, + "Unmatched rtsock reply for RTM_ADD"); + RTSOCK_ATF_REQUIRE_MSG(rtm, rtm->rtm_inits & RTV_EXPIRE, "RTV_EXPIRE not set"); - verify_route_message(rtm, RTM_DELETE, (struct sockaddr *)&net6, + verify_route_message(rtm2, RTM_DELETE, (struct sockaddr *)&net6, (struct sockaddr *)&mask6, (struct sockaddr *)&gw6); - verify_route_message_extra(rtm, c->ifindex, + verify_route_message_extra(rtm2, c->ifindex, RTF_DONE | RTF_GATEWAY | RTF_STATIC); }