From nobody Fri Nov 11 12:19:26 2022 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 4N7ySG4hSxz4dL8h; Fri, 11 Nov 2022 12:19: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N7ySG4D2Tz3sT4; Fri, 11 Nov 2022 12:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668169166; 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=bXlKGRZfT66i5OlyfHVBZzY1AIRXJUyNlXp5yk0mht8=; b=OWjMjpvRpSbiaEvzZuOpw5Xw1xkqukYXgBc3lm4QTff4v16G8ee8lJUG4PUoiq3JygTsP5 WdyGn7z3dpBasm3KTbAbK3vG3iZlaaFcaILz3EJ0DSxejWsq0FTzmuBkUMn/WlS6cK5wUc BDaW6cOw/tgLTD2Tnn8NFnJG/+wcrQO8cYs7fjj+w2MZIRbtmgsXCBJpmXJbPBhX1MIuKp l3OjYmypRlOp7mZyjog3TTHokG5+TJXfMhodG5A+177KgUKzKAxxz9SakBLiExVmlJ4ocB meFFAqt/TOF88ducQOyZ2BL5f2Zq9kyUxBfbqAldWVQMQ0wd1M6qXE9GnBGoTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668169166; 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=bXlKGRZfT66i5OlyfHVBZzY1AIRXJUyNlXp5yk0mht8=; b=cDF6T2pnkSKZdPGYxSIS2aNu2KSxYoWBAUmqyxTdv6aZEyUt6V1j4Forr+HsHZ2TTvyeKl GSlUyJkcqxesU01rYzbItUWSNzlZHjtpCnNWxhHYJl7irF3isqKarIYnn6CRgGQlAmeRQT sMV+1EPxpPjjLY1vB9p+gfENFd9mv3v3yM+FrNuYlbiOqs4cqldSXkLL4Nh1+J/p1X0Jcy qPWSx4bhJp2J20VlMnRI2jGGSCOoGSHNgIQUuIrrIg2qSR9jrriszyS1/uu9Gmr55o+KPw zIA7nGZco1hNwCz5SI7al/T8VEsO3Xk9WOTMl4AEt13mDdpT5ggAJq6BJLI8zQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668169166; a=rsa-sha256; cv=none; b=qbKK3cV8NzgEICinEXuROSblkpOTjbgQa1emUczGIylQWWtogtjJssNVx5bKltXgP8m4od OZ5P6UmjaLqFdl2EdKovYG4vmrlDk0h1lzEatbp/PW+bldiBjniEDSUXjRzBYYkJC8nLRB ZY6eSoUQvaVfKqLRukXgcW+gXlj/b9lAfn9eg7G238w7vvsbSRqeiGqGVMXD3DZAKoGXIm FI4SafwvSa/AFhAJmAFDIBnRETJjhznZ51tmFnmEi9qS7IekLQ+ibiRD3/91GGVDV+4CCw DteMqfNyYDTHOLDRxsJhBQcs4AIadW3Z35HP3LgvwdAE/fSQO/5m0gjaBh9MGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N7ySG3FMCzhnc; Fri, 11 Nov 2022 12:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2ABCJQAP051816; Fri, 11 Nov 2022 12:19:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ABCJQgU051815; Fri, 11 Nov 2022 12:19:26 GMT (envelope-from git) Date: Fri, 11 Nov 2022 12:19:26 GMT Message-Id: <202211111219.2ABCJQgU051815@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: c90b9a5ebb40 - main - netpfil tests: add dummynet fq_codel test case 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c90b9a5ebb407e21404fd66b4e6ccb427c937f6b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c90b9a5ebb407e21404fd66b4e6ccb427c937f6b commit c90b9a5ebb407e21404fd66b4e6ccb427c937f6b Author: Kristof Provost AuthorDate: 2022-11-11 10:55:59 +0000 Commit: Kristof Provost CommitDate: 2022-11-11 10:55:59 +0000 netpfil tests: add dummynet fq_codel test case fq_codel was broken due to a missing m_rcvif_serialize() in the enqueue path. Add a simple test case to ensure it at least passes traffic. Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/common/dummynet.sh | 43 ++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/tests/sys/netpfil/common/dummynet.sh b/tests/sys/netpfil/common/dummynet.sh index 609bf3daf6ad..8c3c9892edc8 100644 --- a/tests/sys/netpfil/common/dummynet.sh +++ b/tests/sys/netpfil/common/dummynet.sh @@ -163,6 +163,46 @@ pipe_v6_cleanup() firewall_cleanup $1 } +codel_head() +{ + atf_set descr 'FQ_CODEL basic test' + atf_set require.user root +} + +codel_body() +{ + fw=$1 + firewall_init $fw + dummynet_init $fw + + epair=$(vnet_mkepair) + vnet_mkjail alcatraz ${epair}b + + ifconfig ${epair}a 192.0.2.1/24 up + jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up + + # Sanity check + atf_check -s exit:0 -o ignore ping -i .1 -c 3 -s 1200 192.0.2.2 + + jexec alcatraz dnctl pipe 1 config bw 10Mb queue 100 droptail + jexec alcatraz dnctl sched 1 config pipe 1 type fq_codel target 0ms interval 0ms quantum 1514 limit 10240 flows 1024 ecn + jexec alcatraz dnctl queue 1 config pipe 1 droptail + + firewall_config alcatraz ${fw} \ + "ipfw" \ + "ipfw add 1000 queue 1 ip from any to any" \ + "pf" \ + "pass dnqueue 1" + + # single ping succeeds just fine + atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 +} + +codel_cleanup() +{ + firewall_cleanup $1 +} + queue_head() { atf_set descr 'Basic queue test' @@ -435,6 +475,9 @@ setup_tests \ pipe_v6 \ ipfw \ pf \ + codel \ + ipfw \ + pf \ queue \ ipfw \ pf \