From nobody Tue Mar 31 15:58:40 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 4flXpm6tyCz6WDw4 for ; Tue, 31 Mar 2026 15:58:40 +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 4flXpm5F1Tz3gdH for ; Tue, 31 Mar 2026 15:58:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774972720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cCJHOwDxqZdAwMTl/gsyjzzA8g64SpcfbVW8/I6D8OA=; b=lqIDnDQBxO76N93Q/630hhJNYFZERSDjbH4Eit0cPtVeZPYvXEZN7TVrqn4bLEkxQ46ADT jKTa/jQ1CJLZvQXSo9eD74vVhF3mZPgOtHiBLrUDj31ismVUduqOx8Y/1xs5I/0XJm8HR1 FxQCrwFb4Oghz1gyfb03g8DdvkQklTu1KWAUzqQVztsH6rbbwxtRi6oLIJgPuchT6J/3oE RLxDTVtb1GjbE1QBWgmKAymz2J+VrLyzjDVFRtJny0xCOhfXRLnQ+zfqho26MlrmZOaNmY id7iTfJxMTvqzqNxgIruLqZS4QnGCe/gtY6p5h24GgEY+mbO1fqSYZKKk8ILvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774972720; a=rsa-sha256; cv=none; b=ePfKrxMmfhv+6d87Gz6+mYlauRi3vpQdsoJuf1Vo+PbbcsFag5icsLmFXOkNT5P5+E4ptE 89NkGuio8CnODu2dAzxi3IpwbP5D6Ob7iQ8f49yBk7wX83PCwKgX2riQBjpu4e7EXn46qs iyPQjo2sTerKfsx5MLHDmjD9blh/v/RpWgqUqhqbZ62ncYj4Ubn9E7IqpbsiE7Ax7N5b+9 WzdoohF/mpZ4+xiUG/HXgX5XAR1Zx96EhzkVNheMaBVNFm18tcRNIqwYU5YWZnO2zktQRg XZLIaw8TiClQ7xFOyXeTOrfbpPbc2YUnaqz0GbUmfXPRNbo5sYi1sg4j+dC20w== 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=1774972720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cCJHOwDxqZdAwMTl/gsyjzzA8g64SpcfbVW8/I6D8OA=; b=bDIpuk1oGQXZbNmylDE02Y9LDoEc77COtc5eU3UMwsnJZFy+mBIUjpyKLqd+E3DgXy6P7i fhTCiAzV64GxafGzBL1E1l9REdrS+N2llAos7PaXLCGP9A0ifnn4loSfqIlDgv2F2tfEYj keffYOGVVYddDsgqf+SDuzTOmyX5z8G5IdVhcM+0lvsjP/YAkA/OmToB58Mq0TcLkAHNfK 6t8Gkaq5fZuj0tGSlWYQO6GfqDE9KBj7n6DEEwyVDelI0NyiJhtrmSwSEMWVb8mTmHlyiB DTlhyaFSflH51YcXkLZzVC9YkBTwCLXN5m3S4ccy+DPXUVFNeWtl/SOvNR5f0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flXpm4VjNzcLG for ; Tue, 31 Mar 2026 15:58:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a838 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 31 Mar 2026 15:58:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Kristof Provost From: Mark Johnston Subject: git: 44f5154a97da - stable/15 - atf_python: support setting interface mtu 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: 44f5154a97daf5fe08648be26e24000bce95b554 Auto-Submitted: auto-generated Date: Tue, 31 Mar 2026 15:58:40 +0000 Message-Id: <69cbef30.3a838.67aa4d0b@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=44f5154a97daf5fe08648be26e24000bce95b554 commit 44f5154a97daf5fe08648be26e24000bce95b554 Author: Kristof Provost AuthorDate: 2025-12-21 10:28:29 +0000 Commit: Mark Johnston CommitDate: 2026-03-31 15:57:27 +0000 atf_python: support setting interface mtu Teach the vnet support code to set interface MTU. Some tests make use of this, so have the framework handle it. Adapt a few pf tests to use this. Reviewed by: melifaro Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D54333 (cherry picked from commit 4f35a84b32412f5cf54e08cd97cd6eee407fb30e) --- tests/atf_python/sys/net/vnet.py | 6 ++++++ tests/sys/netpfil/pf/frag6.py | 3 +-- tests/sys/netpfil/pf/icmp.py | 8 +------- tests/sys/netpfil/pf/nat66.py | 7 +------ 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/tests/atf_python/sys/net/vnet.py b/tests/atf_python/sys/net/vnet.py index 3d431685836a..a6e620b49d59 100644 --- a/tests/atf_python/sys/net/vnet.py +++ b/tests/atf_python/sys/net/vnet.py @@ -109,6 +109,9 @@ class VnetInterface(object): ret.append(if2); return ret + def set_mtu(self, mtu): + run_cmd("/sbin/ifconfig {} mtu {}".format(self.name, mtu)) + def setup_addr(self, _addr: str): addr = ipaddress.ip_interface(_addr) if addr.version == 6: @@ -371,6 +374,7 @@ class VnetTestTemplate(BaseTest): idx = iface_map.vnet_aliases.index(vnet.alias) prefixes6 = topo[iface.alias].get("prefixes6", []) prefixes4 = topo[iface.alias].get("prefixes4", []) + mtu = topo[iface.alias].get("mtu", 0) if prefixes6 or prefixes4: ipv6_ifaces.append(iface) iface.turn_up() @@ -379,6 +383,8 @@ class VnetTestTemplate(BaseTest): for prefix in prefixes6 + prefixes4: if prefix[idx]: iface.setup_addr(prefix[idx]) + if mtu != 0: + iface.set_mtu(mtu) for iface in ipv6_ifaces: while iface.has_tentative(): time.sleep(0.1) diff --git a/tests/sys/netpfil/pf/frag6.py b/tests/sys/netpfil/pf/frag6.py index 26ae7af7c90c..ca2d231edccb 100644 --- a/tests/sys/netpfil/pf/frag6.py +++ b/tests/sys/netpfil/pf/frag6.py @@ -226,7 +226,7 @@ class TestFrag6_RouteTo(VnetTestTemplate): "vnet2": {"ifaces": ["if1", "if2"]}, "vnet3": {"ifaces": ["if2"]}, "if1": {"prefixes6": [("2001:db8::1/64", "2001:db8::2/64")]}, - "if2": {"prefixes6": [("2001:db8:1::1/64", "2001:db8:1::2/64")]}, + "if2": {"prefixes6": [("2001:db8:1::1/64", "2001:db8:1::2/64")], "mtu": 1300}, } def vnet2_handler(self, vnet): @@ -238,7 +238,6 @@ class TestFrag6_RouteTo(VnetTestTemplate): "pass in route-to (%s 2001:db8:1::2) from 2001:db8::1 to 2001:db8:666::1" % if2name, ]) - ToolsHelper.print_output("/sbin/ifconfig %s mtu 1300" % if2name) ToolsHelper.print_output("/sbin/sysctl net.inet6.ip6.forwarding=1") def vnet3_handler(self, vnet): diff --git a/tests/sys/netpfil/pf/icmp.py b/tests/sys/netpfil/pf/icmp.py index c5e945d60e99..93daf33e5201 100644 --- a/tests/sys/netpfil/pf/icmp.py +++ b/tests/sys/netpfil/pf/icmp.py @@ -43,13 +43,10 @@ class TestICMP(VnetTestTemplate): "vnet2": {"ifaces": ["if1", "if2"]}, "vnet3": {"ifaces": ["if2"]}, "if1": {"prefixes4": [("192.0.2.2/24", "192.0.2.1/24")]}, - "if2": {"prefixes4": [("198.51.100.1/24", "198.51.100.2/24")]}, + "if2": {"prefixes4": [("198.51.100.1/24", "198.51.100.2/24")], "mtu": 1492}, } def vnet2_handler(self, vnet): - ifname = vnet.iface_alias_map["if1"].name - if2name = vnet.iface_alias_map["if2"].name - ToolsHelper.print_output("/sbin/pfctl -e") ToolsHelper.pf_rules([ "set reassemble yes", @@ -61,8 +58,6 @@ class TestICMP(VnetTestTemplate): ToolsHelper.print_output("/sbin/sysctl net.inet.ip.forwarding=1") ToolsHelper.print_output("/sbin/pfctl -x loud") - ToolsHelper.print_output("/sbin/ifconfig %s mtu 1492" % if2name) - def vnet3_handler(self, vnet): # Import in the correct vnet, so at to not confuse Scapy import scapy.all as sp @@ -70,7 +65,6 @@ class TestICMP(VnetTestTemplate): ifname = vnet.iface_alias_map["if2"].name ToolsHelper.print_output("/sbin/route add default 198.51.100.1") ToolsHelper.print_output("/sbin/ifconfig %s inet alias 198.51.100.3/24" % ifname) - ToolsHelper.print_output("/sbin/ifconfig %s mtu 1492" % ifname) def checkfn(packet): icmp = packet.getlayer(sp.ICMP) diff --git a/tests/sys/netpfil/pf/nat66.py b/tests/sys/netpfil/pf/nat66.py index 16b4ef3dd02b..339895b253ae 100644 --- a/tests/sys/netpfil/pf/nat66.py +++ b/tests/sys/netpfil/pf/nat66.py @@ -39,13 +39,11 @@ class TestNAT66(VnetTestTemplate): "vnet1": {"ifaces": ["if1"]}, "vnet2": {"ifaces": ["if1", "if2"]}, "vnet3": {"ifaces": ["if2"]}, - "if1": {"prefixes6": [("2001:db8::2/64", "2001:db8::1/64")]}, + "if1": {"prefixes6": [("2001:db8::2/64", "2001:db8::1/64")], "mtu": 9000}, "if2": {"prefixes6": [("2001:db8:1::1/64", "2001:db8:1::2/64")]}, } def vnet2_handler(self, vnet): - ifname = vnet.iface_alias_map["if1"].name - ToolsHelper.print_output("/sbin/ifconfig %s mtu 9000" % ifname) outifname = vnet.iface_alias_map["if2"].name ToolsHelper.print_output("/sbin/pfctl -e") @@ -130,8 +128,6 @@ class TestNAT66(VnetTestTemplate): @pytest.mark.require_progs(["scapy"]) def test_npt_icmp(self): cl_vnet = self.vnet_map["vnet1"] - ifname = cl_vnet.iface_alias_map["if1"].name - ToolsHelper.print_output("/sbin/ifconfig %s mtu 9000" % ifname) ToolsHelper.print_output("/sbin/route add -6 2001:db8:1::/64 2001:db8::1") @@ -160,7 +156,6 @@ class TestNAT66(VnetTestTemplate): def test_npt_route_to_icmp(self): cl_vnet = self.vnet_map["vnet1"] ifname = cl_vnet.iface_alias_map["if1"].name - ToolsHelper.print_output("/sbin/ifconfig %s mtu 9000" % ifname) ToolsHelper.print_output("/sbin/ifconfig %s inet6 alias 2001:db8::3/64" % ifname) ToolsHelper.print_output("/sbin/route add -6 2001:db8:1::/64 2001:db8::1")