From nobody Mon Aug 10 20:41:48 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 4hJmrX3jHCz6jxGj for ; Mon, 10 Aug 2026 20:41:48 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hJmrX27Z2z3SPr for ; Mon, 10 Aug 2026 20:41:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786394508; 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=LTsrz0HbxAs/WpyKdmd9LaWeuIjxWnVGKYA2Lv5czGA=; b=JuBWig4XAFp2bI+UbJJtyDAs3iEM2XFIFLn9BcK3z368zhIu9R+b2w+i4pkA2PtZhTl+iv 9wowEESHJveigtYBE2gQKPSyWZFSxdSk0mF9r24frmpdBsX4BF+i3Xcvf+o+pJbOCnutYz SV+1sfqhbEh7UcMF5yvYEuvOzaiXWnVfpmOZhsUtHnGM2b8itMhdEmTYzqhQ5MY5p/IgeH 7Flv6P6RKJR37heuWlfxlArxnAVxgy5L3+ubtTJaR6yKK8N6Uv38l9psPD2tjuXXn+Lejl p5Y/fypn9PoFXKFvj4STuv9M3x37HejlrpHXTgipMbbZCC5c9rYRVaWomwQHBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786394508; a=rsa-sha256; cv=none; b=LzpW7HLMPmsHAUKp28Fk0CW+8ZuXiC7QdoBP+j5erfWdmhMgAG4r++GGI7pW3sUfPWaV26 A27ugqcF7AuCt0vKlgMPy+njYy+iuS2Eq6IBAUUqahmWZ4xK8AOr5su37Xd5pbWCaxGD8A FDYY7TrXahHYvbA4cUaoaO4g/3t1DUyzV4OTyhKjoEUTBf877z+B7eUK20VZ09d26icP/a jzGMOwu2VLQxJkirLpnfRsI2RTa43sJsfZNglaURERgUx01v4deIsjw8seNKQ1sct1RBhE RPRa29GpIUCUpyCsn81BNqP8hV47xPZP9Py9A9qfGriPlloJul/LRhc90dHBBQ== 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=1786394508; 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=LTsrz0HbxAs/WpyKdmd9LaWeuIjxWnVGKYA2Lv5czGA=; b=WCGN3Q/6KXAlOCQFylBLnoHT4QJ6kzVEuTVk1UR5ailk77ot7l2eTNQXPpU0wpe0y4+iO4 uc8qk8DZlZ1Jx7Em9EIN+bRj+vA/ZthpErT4RD9cogEk4/c6mKVJdYdPc2EBctwpZjX9OT +MptFjx+FU75AJGn7cA3FXXmMGMwIu4TL0zqI0r5UGmSijLGY7uuF8YOiTl1jasDdR3B9N LdQjmXRmI7Hhww61biejI4TGxw72lr8vy22xn6rwkZq7t1+4wBtMafLLMKKtctbWUMLhsa BPFiYd5f3hX8ZY0obYjzB0Fkz1ECxYJgyuMG9KdxcpXD404BSZXJ81fdS9Qsjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hJmrX0yYSz9BN for ; Mon, 10 Aug 2026 20:41:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 245e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 10 Aug 2026 20:41:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: c8f38634eda3 - main - tests/netinet6: remove test that uses Jumbo Payload Option 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 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8f38634eda390b8709a6051c031ab7ee2c4503f Auto-Submitted: auto-generated Date: Mon, 10 Aug 2026 20:41:48 +0000 Message-Id: <6a7a378c.245e5.493ae3f8@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=c8f38634eda390b8709a6051c031ab7ee2c4503f commit c8f38634eda390b8709a6051c031ab7ee2c4503f Author: Gleb Smirnoff AuthorDate: 2026-08-10 20:40:39 +0000 Commit: Gleb Smirnoff CommitDate: 2026-08-10 20:41:37 +0000 tests/netinet6: remove test that uses Jumbo Payload Option This test was already marked as always skipped. Fixes: 069a67374ed9641ff1ada2aecaac1cc61a560649 Reviewed by: pouria Differential Revision: https://reviews.freebsd.org/D58114 --- ObsoleteFiles.inc | 4 + tests/sys/netinet6/frag6/Makefile | 3 - tests/sys/netinet6/frag6/frag6_01.py | 116 ------------------ tests/sys/netinet6/frag6/frag6_01.sh | 232 ----------------------------------- 4 files changed, 4 insertions(+), 351 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 79c59baf188d..24211b4ab2a9 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20260810: test removed +OLD_FILES+=usr/tests/sys/netinet6/frag6/frag6_01 +OLD_FILES+=usr/tests/sys/netinet6/frag6/frag6_01.py + # 20260707: Move sendfile_helper to tests/sys/common OLD_FILES+=usr/tests/sys/kern/sendfile_helper diff --git a/tests/sys/netinet6/frag6/Makefile b/tests/sys/netinet6/frag6/Makefile index 3fca0522e533..2efb60cb20e3 100644 --- a/tests/sys/netinet6/frag6/Makefile +++ b/tests/sys/netinet6/frag6/Makefile @@ -7,7 +7,6 @@ FILESDIR= ${TESTSDIR} # Seems kyua is not running the test cases from one file in parallel. # Otherwise we could cat the files together into one shell file. ATF_TESTS_SH= \ - frag6_01 \ frag6_02 \ frag6_03 \ frag6_04 \ @@ -32,7 +31,6 @@ TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= frag6.subr ${PACKAGE}FILES+= sniffer.py -${PACKAGE}FILES+= frag6_01.py ${PACKAGE}FILES+= frag6_02.py ${PACKAGE}FILES+= frag6_03.py ${PACKAGE}FILES+= frag6_04.py @@ -55,7 +53,6 @@ ${PACKAGE}FILES+= frag6_20.py ${PACKAGE}FILESMODE_frag6.subr= 0444 ${PACKAGE}FILESMODE_sniffer.py= 0555 -${PACKAGE}FILESMODE_frag6_01.py= 0555 ${PACKAGE}FILESMODE_frag6_02.py= 0555 ${PACKAGE}FILESMODE_frag6_03.py= 0555 ${PACKAGE}FILESMODE_frag6_04.py= 0555 diff --git a/tests/sys/netinet6/frag6/frag6_01.py b/tests/sys/netinet6/frag6/frag6_01.py deleted file mode 100644 index f51a63a01ed6..000000000000 --- a/tests/sys/netinet6/frag6/frag6_01.py +++ /dev/null @@ -1,116 +0,0 @@ -#!/usr/bin/env python -#- -# SPDX-License-Identifier: BSD-2-Clause -# -# Copyright (c) 2019 Netflix, Inc. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -# - -import argparse -import logging -logging.getLogger("scapy").setLevel(logging.CRITICAL) -import scapy.all as sp -import socket -import sys -from sniffer import Sniffer -from time import sleep - -def check_icmp6_error(args, packet): - ip6 = packet.getlayer(sp.IPv6) - if not ip6: - return False - oip6 = sp.IPv6(src=args.src[0], dst=args.to[0]) - if ip6.dst != oip6.src: - return False - icmp6 = packet.getlayer(sp.ICMPv6ParamProblem) - if not icmp6: - return False - # ICMP6_PARAMPROB_HEADER 0 - if icmp6.code != 0: - return False - # Should we check the payload as well? - # We are running in a very isolated environment and nothing else - # should trigger an ICMPv6 Param Prob so leave it. - #icmp6.display() - return True - -def main(): - parser = argparse.ArgumentParser("frag6.py", - description="IPv6 fragementation test tool") - parser.add_argument('--sendif', nargs=1, - required=True, - help='The interface through which the packet will be sent') - parser.add_argument('--recvif', nargs=1, - required=True, - help='The interface on which to check for the packet') - parser.add_argument('--src', nargs=1, - required=True, - help='The source IP address') - parser.add_argument('--to', nargs=1, - required=True, - help='The destination IP address') - parser.add_argument('--debug', - required=False, action='store_true', - help='Enable test debugging') - - args = parser.parse_args() - - - # Start sniffing on recvif - sniffer = Sniffer(args, check_icmp6_error) - - - ######################################################################## - # - # A single start fragment with zero length IPv6 header (jumbo). - # Make sure we do hit the Fragment case, which is tricky as the - # jumbogram needs to be > 64k. - # - # A: Jumbo-Fragment not allowed. - # R: ICMPv6 param problem. - # - #data = "6" * (65536 - 2 - 6 - 8 - 8) - data = "6" * 65512 - ip6f01 = sp.Ether() / \ - sp.IPv6(src=args.src[0], dst=args.to[0], plen=0) / \ - sp.IPv6ExtHdrHopByHop(options=sp.Jumbo(jumboplen=65536)) / \ - sp.IPv6ExtHdrFragment(offset=0, m=1, id=6) / \ - sp.UDP(dport=3456, sport=6543) / \ - data - if args.debug : - ip6f01.display() - sp.sendp(ip6f01, iface=args.sendif[0], verbose=False) - - # We should only need to sleep 0.10 but it seems scapy - # takes time for this one. - sleep(3) - sniffer.setEnd() - sniffer.join() - if not sniffer.foundCorrectPacket: - sys.exit(1) - - sys.exit(0) - -if __name__ == '__main__': - main() diff --git a/tests/sys/netinet6/frag6/frag6_01.sh b/tests/sys/netinet6/frag6/frag6_01.sh deleted file mode 100755 index 906a6b8059bf..000000000000 --- a/tests/sys/netinet6/frag6/frag6_01.sh +++ /dev/null @@ -1,232 +0,0 @@ -#- -# SPDX-License-Identifier: BSD-2-Clause -# -# Copyright (c) 2019 Netflix, Inc. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# - -. $(atf_get_srcdir)/frag6.subr - -atf_test_case "frag6_01" "cleanup" -frag6_01_head() { - frag6_head 1 -} - -frag6_01_check_stats() { - - local jname ifname - jname=$1 - ifname=$2 - - case "${jname}" in - "") echo "ERROR: jname is empty"; return ;; - esac - case "${ifname}" in - "") echo "ERROR: ifname is empty"; return ;; - esac - - # Defaults are: IPV6_FRAGTTL 120 slowtimo ticks. - # pfslowtimo() is run at hz/2. So this takes 60s. - # This is awefully long for a test case. - # The Python script has to wait for this already to get the ICMPv6 - # hence we do not sleep here anymore. - - nf=`jexec ${jname} sysctl -n net.inet6.ip6.frag6_nfragpackets` - case ${nf} in - 0) break ;; - *) atf_fail "VNET frag6_nfragpackets not 0 but: ${nf}" ;; - esac - nf=`sysctl -n net.inet6.ip6.frag6_nfrags` - case ${nf} in - 0) break ;; - *) atf_fail "Global frag6_nfrags not 0 but: ${nf}" ;; - esac - - # - # Check selection of global UDP stats. - # - cat < ${HOME}/filter-${jname}.txt - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 -EOF - count=`jexec ${jname} netstat -s -p udp --libxo xml,pretty | grep -E -x -c -f ${HOME}/filter-${jname}.txt` - rm -f ${HOME}/filter-${jname}.txt - case ${count} in - 9) ;; - *) jexec ${jname} netstat -s -p udp --libxo xml,pretty - atf_fail "Global UDP statistics do not match: ${count} != 9" ;; - esac - - # - # Check selection of global IPv6 stats. - # - cat < ${HOME}/filter-${jname}.txt - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 -EOF - count=`jexec ${jname} netstat -s -p ip6 --libxo xml,pretty | grep -E -x -c -f ${HOME}/filter-${jname}.txt` - rm -f ${HOME}/filter-${jname}.txt - case ${count} in - 20) ;; - *) jexec ${jname} netstat -s -p ip6 --libxo xml,pretty - atf_fail "Global IPv6 statistics do not match: ${count} != 20" ;; - esac - - # - # Check selection of global ICMPv6 stats. - # - cat < ${HOME}/filter-${jname}.txt - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 -EOF - count=`jexec ${jname} netstat -s -p icmp6 --libxo xml,pretty | grep -E -x -c -f ${HOME}/filter-${jname}.txt` - rm -f ${HOME}/filter-${jname}.txt - case ${count} in - 22) ;; - *) jexec ${jname} netstat -s -p icmp6 --libxo xml,pretty - atf_fail "Global ICMPv6 statistics do not match: ${count} != 22" ;; - esac - - # - # Check selection of interface IPv6 stats. - # XXX-BZ TODO FIXME reassembly-failed should be 1? - # - cat < ${HOME}/filter-${jname}.txt - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 -EOF - count=`jexec ${jname} netstat -s -p ip6 -I ${ifname} --libxo xml,pretty | grep -E -x -c -f ${HOME}/filter-${jname}.txt` - rm -f ${HOME}/filter-${jname}.txt - case ${count} in - 14) ;; - *) jexec ${jname} netstat -s -p ip6 -I ${ifname} --libxo xml,pretty - atf_fail "Interface IPv6 statistics do not match: ${count} != 14" ;; - esac - - # - # Check selection of interface ICMPv6 stats. - # - cat < ${HOME}/filter-${jname}.txt - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - 0 -EOF - count=`jexec ${jname} netstat -s -p icmp6 -I ${ifname} --libxo xml,pretty | grep -E -x -c -f ${HOME}/filter-${jname}.txt` - rm -f ${HOME}/filter-${jname}.txt - case ${count} in - 21) ;; - *) jexec ${jname} netstat -s -p icmp6 -I ${ifname} --libxo xml,pretty - atf_fail "Interface ICMPv6 statistics do not match: ${count} != 21" ;; - esac -} - -frag6_01_body() { - - atf_skip "Sending IPv6 Jumbograms needs 1 kernel changes and BPF fixes" - - frag6_body 1 frag6_01_check_stats -} - -frag6_01_cleanup() { - frag6_cleanup 1 -} - -atf_init_test_cases() -{ - atf_add_test_case "frag6_01" -}