From nobody Sat May 09 18:52:42 2026 X-Original-To: dev-commits-src-all@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 4gCZqZ5Gywz6cMMC for ; Sat, 09 May 2026 18:52:42 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCZqZ1NbDz3VJ5 for ; Sat, 09 May 2026 18:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778352762; 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=jqUqWiMXzOUFGjCLAZI05QlmwXaUGP1ue77eMZ6D2Ek=; b=hZVytHq+sCmbWj19J0VcDqiXEcPSJIB5riHyVq7p0nsPyb3S2ZWweKnERWQ3kz7P70jwRk JbTE8uWWoKdBNDvDIFKAd6tF++YioffBlubW95Gyy4N7GQ1Kxp7hN0O0XglVSbgDYwpSjw EHhZTiYZ2IASxsv0ExaoZMXzdQzkjXb5k2WwFdcR3BZWW+4p7FutIcO2V8CAKTkWleT7NP QouwCAS7zQ/OiNa8iSVxJj9klak4bDNmcpALWy6ntwY/rd3G+QfeDYqBQ+KG793gtRhNHY aPM9ZK9nd5EkKuinxHPMA9cHNvupPt7/X2Imcb27bIOBd79XI0od/qwpqG4hlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778352762; a=rsa-sha256; cv=none; b=iI+T6XzSVvDN6+M3aQgU2pAm+XUB/N94/xvj/PHZyaoHGxerKMPHYKJ13jDaRw1rRmpimL CgTBAxvfcfdnn/6271K8q2zlnXfgUsm9DbBwgeh+uyT0+Xbh0H5WmqXYujcVVOqOpJUIg1 nLnV/JI5G3Aw2rxncj3fIah93hwCCWNW7gFcEmLKJbTlNcNNsYSvd3+oK2tjDRjHkU8Xt2 OveVVLmOYN5EvpqkpfKVsL/GRbTbFQ4xum3VuEqhkjyPKCSmp7XC4NLQkgAtXrACKb60iy eqQ5x+fz3/PnhcHdZlw1LH6n9dK+/OWrg3sXaYY/VQ3gYldB1/SkIy5QsWGp/Q== 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=1778352762; 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=jqUqWiMXzOUFGjCLAZI05QlmwXaUGP1ue77eMZ6D2Ek=; b=N2zUAv7AxfPPJveIi4pCKu8f+75RKBhkhLezbilb/wZ9asPRsMlIhbmd81BnlGuaD3sPP/ 3+KMZt748T8Q8UG+3LO7nqeNLykHvgmAACAhhhFAXOId8FnFi5Eh2PvS/YADr/FCZd6cjB bM4m3yp7ozFZ8a8/ufG99YxnOlQV5DDLt4T+hdyWlE0cgi1Keg24dQyXIM8RGbcozulA5B 4dSwX9tMX+1OI4RG4br9jB4drG5KU92OX9FMdvhQdtwgtjSl/dva12Qh/a8ZVz/9AVtQJ4 NivBRdd12g17bdsxXWAkNYiR8YRJYLBXORCgopLa7hrTf8c9DMBuB7gMp21JMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCZqZ0nJvz19mg for ; Sat, 09 May 2026 18:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 462d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 18:52:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 107ef0c29503 - stable/15 - tests/carp: Rework unicast_v4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 107ef0c29503e5be2b81d22930ec0c675efba140 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 18:52:42 +0000 Message-Id: <69ff827a.462d9.2decc0ef@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=107ef0c29503e5be2b81d22930ec0c675efba140 commit 107ef0c29503e5be2b81d22930ec0c675efba140 Author: Zhenlei Huang AuthorDate: 2026-05-03 11:02:15 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-09 18:51:12 +0000 tests/carp: Rework unicast_v4 For unicast tests, it is sufficient to use wait_for_carp() to verify the setup is sane. Additional sanity checks are not necessarily required but can serve purpose for redundancy. For some unclear reason routed(8) is advertising route to carp BACKUP. That makes the test flaky. Also routed(8) is marked deprecated and may be removed from base in the future. Let's just add static route entry manually for additional sanity checks. Other noticeable changes: 1. Add atf_check to configuration steps to prevent potential failure on setup. That helps diagnosing on failure. 2. Shorten the names of jails to improve readability. 3. Prefer `[ifconfig|route|sysctl] -j` over `jexec [ifconfig|route|sysctl]` to make the lines shorter. MFC note: At the time writing, routed(8) does not know carp addresses and does not distinguish carp addresses in MASTER|BACKUP|INIT state, hence insists advertising the wrong addresses. PR: 294817 Reviewed by: glebius (previous version), pouria, markj Fixes: 93fbdef51a13 tests: carp: Update test case unicast_v4 to catch PR 284872 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56761 (cherry picked from commit 9137c66c2ea6cc09e3a6f8a042ecdc5a62e0f39e) --- tests/sys/netinet/carp.sh | 80 ++++++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 36 deletions(-) diff --git a/tests/sys/netinet/carp.sh b/tests/sys/netinet/carp.sh index 90ed9d6f9baf..e6521d0a0708 100755 --- a/tests/sys/netinet/carp.sh +++ b/tests/sys/netinet/carp.sh @@ -169,58 +169,66 @@ unicast_v4_body() epair_one=$(vnet_mkepair) epair_two=$(vnet_mkepair) - vnet_mkjail carp_uni_v4_one ${epair_one}a ${epair_two}a - vnet_mkjail carp_uni_v4_two ${epair_one}b - vnet_mkjail carp_uni_v4_three ${epair_two}b + j="carp_uni_v4_" - jexec carp_uni_v4_one sysctl net.inet.ip.forwarding=1 - jexec carp_uni_v4_one ifconfig ${epair_one}a inet 198.51.100.1/25 - jexec carp_uni_v4_one ifconfig ${epair_two}a inet 198.51.100.129/25 + # The router + vnet_mkjail ${j}one ${epair_one}a ${epair_two}a + # The hosts + vnet_mkjail ${j}two ${epair_one}b + vnet_mkjail ${j}three ${epair_two}b - jexec carp_uni_v4_two sysctl net.inet.ip.forwarding=1 - jexec carp_uni_v4_two ifconfig ${epair_one}b 198.51.100.2/25 up - jexec carp_uni_v4_two route add 198.51.100.224 198.51.100.1 - # A peer address x.x.x.224 to catch PR 284872 - jexec carp_uni_v4_two ifconfig ${epair_one}b add vhid 1 \ - peer 198.51.100.224 192.0.2.1/32 + atf_check -o ignore sysctl -j ${j}one net.inet.ip.forwarding=1 + atf_check ifconfig -j ${j}one ${epair_one}a inet 198.51.100.1/25 + atf_check ifconfig -j ${j}one ${epair_two}a inet 198.51.100.129/25 - sleep 0.2 - jexec carp_uni_v4_three sysctl net.inet.ip.forwarding=1 - jexec carp_uni_v4_three ifconfig ${epair_two}b 198.51.100.224/25 up - jexec carp_uni_v4_three route add 198.51.100.2 198.51.100.129 - jexec carp_uni_v4_three ifconfig ${epair_two}b add vhid 1 \ - peer 198.51.100.2 192.0.2.1/32 + atf_check ifconfig -j ${j}two ${epair_one}b 198.51.100.2/25 up + atf_check -o ignore route -j ${j}two -n add default 198.51.100.1 + atf_check ifconfig -j ${j}three ${epair_two}b 198.51.100.224/25 up + atf_check -o ignore route -j ${j}three -n add default 198.51.100.129 + + sleep 0.1 # Sanity check - atf_check -s exit:0 -o ignore jexec carp_uni_v4_two \ + atf_check -o ignore jexec ${j}one \ + ping -c 1 198.51.100.2 + atf_check -o ignore jexec ${j}one \ + ping -c 1 198.51.100.224 + atf_check -o ignore jexec ${j}two \ ping -c 1 198.51.100.224 - wait_for_carp carp_uni_v4_two ${epair_one}b \ - carp_uni_v4_three ${epair_two}b + # A peer address x.x.x.224 to catch PR 284872 + atf_check ifconfig -j ${j}two ${epair_one}b add vhid 1 \ + peer 198.51.100.224 192.0.2.1/32 + sleep 0.2 + atf_check ifconfig -j ${j}three ${epair_two}b add vhid 1 \ + peer 198.51.100.2 192.0.2.1/32 - # Setup RIPv2 route daemon - jexec carp_uni_v4_two routed -s -Pripv2 - jexec carp_uni_v4_three routed -s -Pripv2 - jexec carp_uni_v4_one routed -Pripv2 + wait_for_carp ${j}two ${epair_one}b \ + ${j}three ${epair_two}b - # XXX Wait for route propagation - sleep 3 + if is_master ${j}two ${epair_one}b ; then + atf_check -o ignore \ + route -j ${j}one -n add 192.0.2.1 198.51.100.2 + fi - atf_check -s exit:0 -o ignore jexec carp_uni_v4_one \ - ping -c 3 192.0.2.1 + if is_master ${j}three ${epair_two}b ; then + atf_check -o ignore \ + route -j ${j}one -n add 192.0.2.1 198.51.100.224 + fi + + # Not necessarily required, but just in case + atf_check -o ignore jexec ${j}one \ + ping -c 1 192.0.2.1 # Check that we remain in unicast when tweaking settings - atf_check -s exit:0 -o ignore \ - jexec carp_uni_v4_two ifconfig ${epair_one}b vhid 1 advskew 2 - atf_check -s exit:0 -o match:"peer 198.51.100.224" \ - jexec carp_uni_v4_two ifconfig ${epair_one}b + atf_check -o ignore \ + ifconfig -j ${j}two ${epair_one}b vhid 1 advskew 2 + atf_check -o match:"peer 198.51.100.224" \ + ifconfig -j ${j}two ${epair_one}b } unicast_v4_cleanup() { - jexec carp_uni_v4_one killall routed - jexec carp_uni_v4_two killall routed - jexec carp_uni_v4_three killall routed vnet_cleanup }