From nobody Tue Mar 31 15:58:41 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 4flXpp0rwTz6WF3x for ; Tue, 31 Mar 2026 15:58: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4flXpn6MB2z3glv for ; Tue, 31 Mar 2026 15:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774972721; 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=qN9CF6MWMKsB/VP0FshwUo6d3dzH9ADEleWCi/yU02U=; b=h22LU5FzW5nD08VS0fH6ziE1aqJdaJF6d8BJq4Jtuym5fR8I4W/bTzsPKKw/0zAx8SgnvZ yOBFX4CSXnPDbp+BIXLCajWcu3q1G7Ds86OpTLDzcgQCKkjp/SNyoDS5F7u1aGk93q5JCg CrrqsTfP1SO4n8FBhSC3riQh0Bs3lg+zjRK2eCoZ8JoY23+ljkmPxDDXerql8U6tEYzVrl 3ze4VRSwnIAkPMAL7TYfTsSOHRvJrF3oVJYr/8B8C1toGuUiV10oeLipj9D14ufsili/lV ZoFDxDMsfMGTo9xSSLZwlwXaUbI6BeQE0dnj/k0bcyitoc72t7nlYA9nvJOyiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774972721; a=rsa-sha256; cv=none; b=BRq0tMuFc6WGlq4D65m5iDmzEniAPnP/tGNlDOF+D2YcJ9hazJ9krlt/q6EetUTbjO4+Ml kfY/lLyNzm0Wz1ZNJuYbQsvxsQI+hehPVna5BsXSWMgUAeJ8PWJaOLZntj8tWDnwV6TfIa JZFazKYcYDAk0eI+FM1yL38r05echwKg/0nbzHoEiVFIEhWajz4SBFOxxVM/G0MpRxJwum 7WJMUL5IgRsgSKfGZfI9fdlCRRDMkjDewhA9ILHBHIeT5oA2NsYorskBzHawKYDFVtTC9J 8FhC86XmmRtjGGoAji7aUhA8PGvXk9PZD6Vpqp6f5KQXsNZKKN5j54sUdTe+sw== 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=1774972721; 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=qN9CF6MWMKsB/VP0FshwUo6d3dzH9ADEleWCi/yU02U=; b=N+F44pQB+3AJNPT/YNNLrBOyz13/4fXzTBMrX1QSef4nmSa9zLHCI8HOAExreoMRaaEn/E w5zSkHypM0H5mw86YAzJy+GU35Sz+Bqu5u52EuygbRuWq2ct2bWCw2gxxuqCPOa6He62lK ZtYxQ39OUNmkWEiFJxKFZSCHt5GZ4rfxGm1HI0rWr9dwJAgZ8J8KZZcKjPk1u7LzLJFDbM jYFSVESP4WEJbY1R1Q95UzgIJTfHzjtgPq+a0CUfYtszmkowXktqDFLkW9VIyi1CJjZqSk h5XGMFgK9S8++hujuGgFN+PB0z1TxWMXBPlMhwwqf8wGq8IHyn9oeZ8FKSKSVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flXpn5Cr7zcHQ for ; Tue, 31 Mar 2026 15:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a345 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 31 Mar 2026 15:58:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: aefe776d6246 - stable/15 - atf_python/vnet: Make it possible to set the FIB of vnet interfaces 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 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/15 X-Git-Reftype: branch X-Git-Commit: aefe776d62462abd96a77bfbf7110fe7748912aa Auto-Submitted: auto-generated Date: Tue, 31 Mar 2026 15:58:41 +0000 Message-Id: <69cbef31.3a345.56f1e63b@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=aefe776d62462abd96a77bfbf7110fe7748912aa commit aefe776d62462abd96a77bfbf7110fe7748912aa Author: Mark Johnston AuthorDate: 2026-02-13 15:50:39 +0000 Commit: Mark Johnston CommitDate: 2026-03-31 15:57:27 +0000 atf_python/vnet: Make it possible to set the FIB of vnet interfaces Reviewed by: zlei, ngie MFC after: 1 week Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54972 (cherry picked from commit a8b8feced998c8c74f9a572f069bcb689cabd09d) --- tests/atf_python/sys/net/vnet.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/atf_python/sys/net/vnet.py b/tests/atf_python/sys/net/vnet.py index a6e620b49d59..029813fbc587 100644 --- a/tests/atf_python/sys/net/vnet.py +++ b/tests/atf_python/sys/net/vnet.py @@ -57,6 +57,7 @@ class VnetInterface(object): self.addr_map: Dict[str, Dict] = {"inet6": {}, "inet": {}} self.prefixes4: List[List[str]] = [] self.prefixes6: List[List[str]] = [] + self.fib: int if iface_name.startswith("lo"): self.iftype = self.IFT_LOOP else: @@ -106,7 +107,7 @@ class VnetInterface(object): run_cmd("/sbin/ifconfig {} -txcsum -txcsum6".format(name)) if2 = cls(alias_name, name[:-1] + "b") if1.epairb = if2 - ret.append(if2); + ret.append(if2) return ret def set_mtu(self, mtu): @@ -141,6 +142,10 @@ class VnetInterface(object): cmd = "/sbin/ifconfig {} up".format(self.name) self.run_cmd(cmd) + def setfib(self, fib: int): + cmd = "/sbin/ifconfig {} fib {}".format(self.name, fib) + self.run_cmd(cmd) + def enable_ipv6(self): cmd = "/usr/sbin/ndp -i {} -- -disabled".format(self.name) self.run_cmd(cmd) @@ -375,6 +380,9 @@ class VnetTestTemplate(BaseTest): prefixes6 = topo[iface.alias].get("prefixes6", []) prefixes4 = topo[iface.alias].get("prefixes4", []) mtu = topo[iface.alias].get("mtu", 0) + if "fib" in topo[iface.alias]: + fib = topo[iface.alias]["fib"] + iface.setfib(fib[idx]) if prefixes6 or prefixes4: ipv6_ifaces.append(iface) iface.turn_up() @@ -423,16 +431,22 @@ class VnetTestTemplate(BaseTest): for obj_name, obj_data in topo.items(): if obj_name.startswith("vnet"): vnet_ifaces = [] + maxfib = 0 for iface_alias in obj_data["ifaces"]: # epair creates 2 interfaces, grab first _available_ # and map it to the VNET being created idx = len(iface_map[iface_alias].vnet_aliases) iface_map[iface_alias].vnet_aliases.append(obj_name) vnet_ifaces.append(iface_map[iface_alias].ifaces[idx]) + fib = topo[iface_alias].get("fib", (0, 0)) + maxfib = max(maxfib, fib[idx]) opts = [] if "opts" in obj_data: opts = obj_data["opts"] vnet = vnet_factory.create_vnet(obj_name, vnet_ifaces, opts) + if maxfib != 0: + # Make sure the VNET has enough FIBs. + vnet.run_vnet_cmd("/sbin/sysctl net.fibs={}".format(maxfib + 1)) vnet_map[obj_name] = vnet # Allow reference to VNETs as attributes setattr(self, obj_name, vnet)