From nobody Tue Jun 30 13:35:47 2026 X-Original-To: dev-commits-src-branches@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 4gqPKw2YXzz6kChH for ; Tue, 30 Jun 2026 13:35:48 +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 4gqPKw05r0z3K8V for ; Tue, 30 Jun 2026 13:35:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782826548; 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=HeIjYyyRk61vobydd1gcSiZFeDNM/XHXtux6CYtC8oY=; b=Cc9JLiRRBM8skfkIk7mGaVAQ8v/0sgLxYbzKkJ8CeaKvxM/ueyM7bm6bdKHbPqFgLTRO47 2aVmoLA2cxSTivBhfGFUYJSHNA/ssLiD50prNPNVYnCUsvULtZMi1IVRy/dEQlQPcu0rUC /j/hwDGr4nbzvkjiPwTZF1Kycg8iB8lZkHIPJuwYl7hI7h74El7Jt3Ge4XLEVbfms3xY8H bbRBcvLQxlNB8y2biX2CC4T48nQrSOZuDepgs2ovJQkbhr6/rxZ8gYs6lQcZquFC5dFQjJ 9D+QXrLk7JRuadiXwF8Cl2ZuWBoGjcAEdegN36rpHR2DjX7kKeBzF8/iVnDcIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782826548; a=rsa-sha256; cv=none; b=X29WhJgH/DyAxOQBbGTZCyh9v5285m7nV7tAYOc+4p17e0Op2EPgoW76vvzuA32o3QhZvU wRZgSnrrBmF10wyNmrF0Tl6LaYMV2GynVzOQqiEwRWluT+mX0BTktch58ghI1B62LXjsks 63X04Mqr6BUdIhd42W1aVk/0/MEqtIfKGnQNl/2icyivyObAHF4Q89AHm2ghxdxrMjU89i lWlDzL5jAFGA+KN8GEX149G9TS+Z2dWgjFgtiPO9FcuhLJfG+SEk8SZ+aVGvJc+5v0oDE4 BtBUWGiZOPxggSS9Vy5APTD/CDmTc/0L+SJnWPx2W730tyy6AHuF2Vo1oDe6dw== 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=1782826548; 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=HeIjYyyRk61vobydd1gcSiZFeDNM/XHXtux6CYtC8oY=; b=nfKXxVCCffsAcxX5Jev9sLONjLf0DaN0DdjtSBFk5H8GXrcYL9YPPpVsZGSbg2cU+cfPFN T1x4SPKaB3nFx5htHO8Kjg8hMaWaelni2u8VyTyIq8B4Sm6auXewpXVbEqeAbJaJAKkHeL 9gOtxHm4FoJK1BlSrk7kGl8asdet5jZUIXZtw+Y6/a6wJ4wnXIIIm5AneqMTOIAQ/w6Zea Sv+9Wo6IKE1WJwTiDaO4nhnFa8G2uqg0Dp/h4MgDi10+gCdDejBrOcKwbH4VW1z7kqKfkY 4LIDsxlYgS8P7Z2o2QDYgpt1LRQfzC3WK2CmMTTiiMHUK3GQWQJjY1I1t3R4UA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqPKv646zzmVH for ; Tue, 30 Jun 2026 13:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 262b4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 13:35:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: 6aac5dd48dc6 - stable/15 - tests/test_rtsock_l3: fix flaky temporal route addition tests List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 6aac5dd48dc6e085765fe297d907a5cfb072c574 Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 13:35:47 +0000 Message-Id: <6a43c633.262b4.581d13ca@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=6aac5dd48dc6e085765fe297d907a5cfb072c574 commit 6aac5dd48dc6e085765fe297d907a5cfb072c574 Author: Siva Mahadevan AuthorDate: 2026-06-18 15:33:00 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-30 13:14:12 +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 (cherry picked from commit 9e2d8ec2df414a8019d9c31a9a09a5cc728b4c19) --- 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); }