From nobody Sun May 3 11:03:45 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 4g7hjF3HB4z6cQBd for ; Sun, 03 May 2026 11:03:45 +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 4g7hjF2dF6z3cMm for ; Sun, 03 May 2026 11:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777806225; 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=FKEHje/cSBruIqBHAQJ/nHis9V+OxevXNXO5DNGdjuY=; b=GtKXGWTO1RkdFxa/POAjN2FR9ZI3jHdsQy8OETGNLk4FyMGZBQFNyb+QtAlOyMRNOlhuhy KZ7ZHZfCUHqiTFfPTllAZVJ2VWtHC3BFpQ0ejwv5rMV/jIUdD0Od63wQiQDXaNAn7+0zvK 2bWYC2nLjN9b3q0uTK4dul+MalYWeTNjcB2pBwClazEyE9yw9UTKgR7vt5/fp75Ws1Szvx qNbpYxaYQBkyl8zelXHoLDBguzrPQ3F3zPp05WG5El6ownDWINXV/wzheR2J4CEeJrYpi8 t4b3M8JFaL+xC46vKYeUaMbIMXWPQD8Z7rJJKnC5S6Fu71216dhhfafZXXQ4Qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777806225; a=rsa-sha256; cv=none; b=sMtoQtS8WFBlZWSGJlLXoarhYiNRF3Q0ZqjeJ+zqaLYcm481VITfhX3+ssNMBrvEPfAZJM 2qRx0x2baHVzWn/ZWXBJqdil1T/ebhcIr9N/LAOzT5GzUIMxHOo+rw4/bFHeAjZkWC6Yat mldPHnGorOLHDQlmTFcZ+qfYqT88t6WWaROqcNp4BrY5xylex2iLG2jmgMvkhihcntuQ6L VJzbnPB5PDqywOs+22jlJMU63oyQMIW8DyAStuWVMjU14EEbaXpJKOoGq70NNehHX/1kC0 rABMPUIy4FaHb3MpQjFXaWCnOK+2Ic7Qdl6rejp7kJrFYDq6PoLJrLR80YmmCA== 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=1777806225; 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=FKEHje/cSBruIqBHAQJ/nHis9V+OxevXNXO5DNGdjuY=; b=Ed4BKf2cAff7PCAD+zJvywVuNwOxzuT8hFN6v5T8JFcMKHIg0acLxQgUGQCLAqrE0+Sp4f TRUXS8aD0aDaPpLtlaU8zQIfFvgMchvoNjdD7PZzm4ZqQusa3QIau0kmZiKN2k9I4d0LHk 3055BlUfIiMudJMqIk6yYuXRmWab8qWNzh5C3xD8qubBV6RJinJujkxwJqmbftyxXF/DE7 vOqXH3C+eYUDrs7SmCFDkUxrGZE+3iQBvFEAvsSOxCosVmGDq1PAX6xkKVI5AJruLy1ZIr eEV3Qu+wiIpsdIM/Q+uPIbb+/K/n5M36sTrs8Iudc5hMbJ/ax7T6tvigXVBibg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g7hjF2BklzTsW for ; Sun, 03 May 2026 11:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30e95 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 03 May 2026 11:03:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 9137c66c2ea6 - main - tests/carp: Rework unicast_v4 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 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/main X-Git-Reftype: branch X-Git-Commit: 9137c66c2ea6cc09e3a6f8a042ecdc5a62e0f39e Auto-Submitted: auto-generated Date: Sun, 03 May 2026 11:03:45 +0000 Message-Id: <69f72b91.30e95.10e55bd5@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=9137c66c2ea6cc09e3a6f8a042ecdc5a62e0f39e commit 9137c66c2ea6cc09e3a6f8a042ecdc5a62e0f39e Author: Zhenlei Huang AuthorDate: 2026-05-03 11:02:15 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-03 11:02:15 +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. 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 --- 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 e0ef2fd97583..7b484a21d8cf 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 }