From nobody Wed Apr 02 19:44:26 2025 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 4ZSb0p63gpz5rWN9; Wed, 02 Apr 2025 19:44:26 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZSb0p3jbmz3Px6; Wed, 02 Apr 2025 19:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743623066; 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=hHm7zryA1OvB9sv8ni1ec4u741X6ecUexQNcm5T2mNc=; b=FPRpT2nU5MOBl4oCABT9yJKfhxtF0a6uw790vTCGiHvYdD+1bRCxIkQAGIcUDISvaVmmx2 ituAumjhZjJppmcJC90772A7jQ7E1ky8lqgIRFMyrRTAIDPvViXO8E4ieaK1zQ96GffbDk gv6p8Tm6JgMO1S6AMjZ3gY2fIglWTUoIjCEmTUVbsUkpAdcUMnibYjpy9UxhH/mTsv2KEY raRiv/VDXFosy7JQPii5EySKErB/P9DFI09EoY0QZJZ7zIJVE+Fe1RnUwMFstNnVAkBPV3 sO6OCgCvQGmMQ9lGlgiQGPP4gII/jl+WjSdeYGgb0KntWpBG2NLIjVTLfN8Iew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743623066; a=rsa-sha256; cv=none; b=bG7sIYISgRpH5jEVGYc8u7TkeDJb5wthUuVucPuDtQnum7JPBsEa70uYC00gBnRorP/iJL qNRjm4xJW68RtzJsGN9MtQ5gg/y+UUFOtO+82nPUmambln4bNN4KJbXjFPCGIBcqxV+RED RAOr5CXl0Y2R1BbHthJQj96F8lM4b0DSR8iOHTG138ArQnMiWK0v4j/ViDGDuy/7kj1yjV AsVN0yqCX9tRf6avX5jaTxnBaHJvvxPylaEGbOi9cKvyvt/rx3QW7eLBYcjtUXk9JLlknA A/fJDgX2n4d0U4szv32Q18sJ99ZNha0KG34ZXfG1iFianVcE1g3Lj4s7J2sJEA== 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=1743623066; 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=hHm7zryA1OvB9sv8ni1ec4u741X6ecUexQNcm5T2mNc=; b=Yh783VGv150H6j8eLlYXMq8rfwWARzv4oczTYRffyZa6D0dT3KHfCzXZIX2Hu8AaHx2Jx8 R6vKa7cbe9aRd9ht9gZZmMNTXPNMBdaQ8JJI1r+/Nz9ISUqdfGJJMGgUZK79FIavt7w7sC pjkly/9ELsxL6lY/0vsMc9cD7VANC29LXYE/chCoHsNeTxwP54qjjf1zFpXVZdFnzPcUPP Q1vdhAhoE6uFiJCsPgws4n7kJ26j9AS0LRUmHcjs3rXfI8lmi3T7PkVSdUn1Nwq0JvD0io AQM3slo0jXU4hEfdLPXb6HrSrsaBqKByBGP4h95TvmcArqKDBmTe6HNFXXzAyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZSb0p38nWzTsY; Wed, 02 Apr 2025 19:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 532JiQbG066510; Wed, 2 Apr 2025 19:44:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 532JiQwC066507; Wed, 2 Apr 2025 19:44:26 GMT (envelope-from git) Date: Wed, 2 Apr 2025 19:44:26 GMT Message-Id: <202504021944.532JiQwC066507@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 61c010f3b35e - main - tests/netinet: enable test against kern/189088 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61c010f3b35e867166a2be5906a71b9cbcedf7db Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=61c010f3b35e867166a2be5906a71b9cbcedf7db commit 61c010f3b35e867166a2be5906a71b9cbcedf7db Author: Gleb Smirnoff AuthorDate: 2025-04-02 19:44:14 +0000 Commit: Gleb Smirnoff CommitDate: 2025-04-02 19:44:14 +0000 tests/netinet: enable test against kern/189088 This test was created together with the bug, however after fixing commit 9fdbf7eef5c0 it was not enabled. Also, the test has a mistake: the second netstat check would fail cause it would see the route remaining from the first run. Workaround that by running the second run in a separate pair of fibs to the first one. --- tests/sys/netinet/fibs_test.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/sys/netinet/fibs_test.sh b/tests/sys/netinet/fibs_test.sh index b58a45b26f3e..5fe8f7d87641 100644 --- a/tests/sys/netinet/fibs_test.sh +++ b/tests/sys/netinet/fibs_test.sh @@ -352,14 +352,13 @@ same_ip_multiple_ifaces_head() } same_ip_multiple_ifaces_body() { - atf_expect_fail "kern/189088 Assigning the same IP to multiple interfaces in different FIBs creates a host route for only one" ADDR="192.0.2.2" MASK0="24" MASK1="32" # Unlike most of the tests in this file, this is applicable regardless # of net.add_addr_allfibs - get_fibs 2 + get_fibs 4 # Setup the interfaces, then remove one alias. It should not panic. setup_tap ${FIB0} inet ${ADDR} ${MASK0} @@ -371,13 +370,13 @@ same_ip_multiple_ifaces_body() setfib ${FIB1} netstat -rn -f inet # Do it again, in the opposite order. It should not panic. - setup_tap ${FIB0} inet ${ADDR} ${MASK0} + setup_tap ${FIB2} inet ${ADDR} ${MASK0} TAP0=${TAP} - setup_tap ${FIB1} inet ${ADDR} ${MASK1} + setup_tap ${FIB3} inet ${ADDR} ${MASK1} TAP1=${TAP} ifconfig ${TAP0} -alias ${ADDR} atf_check -o not-match:"^${ADDR}[[:space:]]" \ - setfib ${FIB0} netstat -rn -f inet + setfib ${FIB2} netstat -rn -f inet } same_ip_multiple_ifaces_cleanup() {