From nobody Tue May 19 16:46:43 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 4gKgYb6cpFz6fS6d for ; Tue, 19 May 2026 16:46:43 +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 4gKgYb4PX2z3CJw for ; Tue, 19 May 2026 16:46:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779209203; 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=yp7BBpa8RGk7e1yGXWJOnmsv13KJYmzfZ9Dz/au8nqw=; b=K1YRIA0DdGfqftng6leKb1z1ydQD2IEGBiHZljwUOTVJIgaPJlObKFXMCt8sXssdTJ/XAi GkL40jyDRU6A1RACpC8LygOxbi4aP/DTx95tNtE+rtLzEx49Bk9faVRSLFJhwL5mw4VyBB pPziBauXktTKaMmU9FjuEu57UOOR+rsM6Ab6hfet3zM9u5bagf5eQ1z8OwIyLzJhmlTdyx +Z5UqnNq6poug5QXQmImC6qEhQewUznzVypcJ/5+kJYefjIi9zG+8bV71U3tHKTJ5gT+ly r0xvRCDsACgc6xRKdoSgJaE7Fa0w98Z8zhCEjQ3L8DUnKLFRDLDWByodr6GavA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779209203; a=rsa-sha256; cv=none; b=blm9TSwJeOhJnPhezbZroZjoGuygPDlHZFZm35afDvofk8HHrOlsF0bm1lu86z0kIJhyM5 8GCRhWjGrDvDFpgFhqHDMIbICbI8E9rPR9wYWRze1uXbdxsxUMrNRkZGMZwOf2e6/ba6L8 MQEQa5+jKV4aLo2aLheTe0WKJ7BiPdem8qSt2aXkgPWtiYna/NIVnVLk+j4pMnl64gfAZk bOnk/VT3gxP7HiQ6df7yQdcHh1HPR3SUgvkmZu2tlSps+cTPWOmC3/tm4kxVeIO1VTb2/D WnqynU+O6qIEyAOvpjrWVhCwvHQgcGjsTbETIPGmq+QzRWK9h8TzgL8/hGswrg== 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=1779209203; 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=yp7BBpa8RGk7e1yGXWJOnmsv13KJYmzfZ9Dz/au8nqw=; b=BTlz4lpwXDzA33oIT13qBXp1rPVMzDPfdEoEdS+3/No9wJCBQx3bwXrmE8PcbPn6/cXbGu SAn3zSZc7QunbDt1PWqA98tisPCaDwEJbI6kZ+1XHYcRRvow4W1dpRxvKSGvm4sQ+NSkol jlr4CJIl6YKUm/KNWC6LhMtPyrQTneg8MEyemD320akoUmbBVCUS4Kk38D3rvVgfB5O+fZ CAJTXJIEEvVdMrnapCvlWzGH+Vz6uYNwZiPItOmCMHgw1dr+OTo62X2weIF+Tm1J1CCVZG 7KpGcJcgxyjFk0NQiqMIKUg0jB0FdKBMtr4CgxXEqw7gxJG34qYLBa+R49+uQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKgYb3yY3z6vB for ; Tue, 19 May 2026 16:46:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d9c8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 19 May 2026 16:46:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5937f2ffe3e3 - stable/14 - tests/if_lagg: Minor improvements 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5937f2ffe3e37b8668e6b29ac817c1612cb81865 Auto-Submitted: auto-generated Date: Tue, 19 May 2026 16:46:43 +0000 Message-Id: <6a0c93f3.1d9c8.78c97ea0@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5937f2ffe3e37b8668e6b29ac817c1612cb81865 commit 5937f2ffe3e37b8668e6b29ac817c1612cb81865 Author: Mark Johnston AuthorDate: 2026-05-03 15:48:49 +0000 Commit: Mark Johnston CommitDate: 2026-05-19 16:46:28 +0000 tests/if_lagg: Minor improvements - Set require.kmods instead of relying on ifconfig to load if_lagg.ko, as this doesn't work when running within a jail. - Simplify helper functions which create tap and lagg devices. MFC after: 1 week (cherry picked from commit 47ae0135d461854b72b905ac77bf3e1f5b2868bc) --- tests/sys/net/if_lagg_test.sh | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/tests/sys/net/if_lagg_test.sh b/tests/sys/net/if_lagg_test.sh index 6b99aaedfbbf..8484470c54ee 100755 --- a/tests/sys/net/if_lagg_test.sh +++ b/tests/sys/net/if_lagg_test.sh @@ -35,6 +35,7 @@ create_head() { atf_set "descr" "Create a lagg and assign an address" atf_set "require.user" "root" + atf_set "require.kmods" if_lagg } create_body() { @@ -78,6 +79,7 @@ status_stress_head() { atf_set "descr" "Simultaneously query a lagg while also creating or destroying it." atf_set "require.user" "root" + atf_set "require.kmods" if_lagg } status_stress_body() { @@ -137,6 +139,7 @@ create_destroy_stress_head() { atf_set "descr" "Simultaneously create and destroy a lagg" atf_set "require.user" "root" + atf_set "require.kmods" if_lagg } create_destroy_stress_body() { @@ -193,6 +196,7 @@ lacp_linkstate_destroy_stress_head() { atf_set "descr" "Simultaneously destroy an LACP lagg and change its childrens link states" atf_set "require.user" "root" + atf_set "require.kmods" if_lagg } lacp_linkstate_destroy_stress_body() { @@ -256,6 +260,7 @@ up_destroy_stress_head() { atf_set "descr" "Simultaneously up and destroy a lagg" atf_set "require.user" "root" + atf_set "require.kmods" if_lagg } up_destroy_stress_body() { @@ -315,6 +320,7 @@ set_ether_head() { atf_set "descr" "Set a lagg's ethernet address" atf_set "require.user" "root" + atf_set "require.kmods" if_lagg } set_ether_body() { @@ -353,6 +359,7 @@ updown_head() { atf_set "descr" "upping or downing a lagg ups or downs its children" atf_set "require.user" "root" + atf_set "require.kmods" if_lagg } updown_body() { @@ -434,35 +441,15 @@ atf_init_test_cases() # Creates a new tap(4) interface, registers it for cleanup, and echoes it get_tap() { - local TAPN=0 - while ! ifconfig tap${TAPN} create > /dev/null 2>&1; do - if [ "$TAPN" -ge 8 ]; then - atf_skip "Could not create a tap(4) interface" - else - TAPN=$(($TAPN + 1)) - fi - done - local TAPD=tap${TAPN} - # Record the TAP device so we can clean it up later - echo ${TAPD} >> "devices_to_cleanup" - echo ${TAPD} + ifconfig tap create > tap + cat tap | tee -a devices_to_cleanup } # Creates a new lagg(4) interface, registers it for cleanup, and echoes it get_lagg() { - local LAGGN=0 - while ! ifconfig lagg${LAGGN} create > /dev/null 2>&1; do - if [ "$LAGGN" -ge 8 ]; then - atf_skip "Could not create a lagg(4) interface" - else - LAGGN=$(($LAGGN + 1)) - fi - done - local LAGGD=lagg${LAGGN} - # Record the lagg device so we can clean it up later - echo ${LAGGD} >> "devices_to_cleanup" - echo ${LAGGD} + ifconfig lagg create > lagg + cat lagg | tee -a devices_to_cleanup } cleanup_tap_and_lagg()