git: 60c9798db74d - stable/13 - net tests: basic test case for bpf(4)'s ability to set vlan pcp
Kristof Provost
kp at FreeBSD.org
Mon Aug 2 15:04:08 UTC 2021
The branch stable/13 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=60c9798db74d0b04dcbb4162d155ecd6b38c0e52
commit 60c9798db74d0b04dcbb4162d155ecd6b38c0e52
Author: Kristof Provost <kp at FreeBSD.org>
AuthorDate: 2021-07-22 12:50:27 +0000
Commit: Kristof Provost <kp at FreeBSD.org>
CommitDate: 2021-08-02 14:50:32 +0000
net tests: basic test case for bpf(4)'s ability to set vlan pcp
Use dhclient with its 'vlan-pcp' option to set a VLAN PCP value and
verify that it actually gets set.
MFC after: 1 week
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D31276
(cherry picked from commit 3e87f800f01b6d2cbe49924a01038379889d8b3b)
---
tests/sys/net/Makefile | 3 ++
tests/sys/net/dhclient_pcp.conf | 1 +
tests/sys/net/if_vlan.sh | 47 +++++++++++++++++++++++
tests/sys/net/pcp.py | 74 +++++++++++++++++++++++++++++++++++++
tests/sys/netpfil/common/sniffer.py | 12 ++++--
5 files changed, 134 insertions(+), 3 deletions(-)
diff --git a/tests/sys/net/Makefile b/tests/sys/net/Makefile
index 40b3a5e5fff6..4771040816b7 100644
--- a/tests/sys/net/Makefile
+++ b/tests/sys/net/Makefile
@@ -21,8 +21,11 @@ TESTS_SUBDIRS+= routing
TEST_METADATA+= is_exclusive=true
${PACKAGE}FILES+= \
+ dhclient_pcp.conf \
+ pcp.py \
stp.py
+${PACKAGE}FILESMODE_pcp.py= 0555
${PACKAGE}FILESMODE_stp.py= 0555
MAN=
diff --git a/tests/sys/net/dhclient_pcp.conf b/tests/sys/net/dhclient_pcp.conf
new file mode 100644
index 000000000000..fbd86e5bd0f8
--- /dev/null
+++ b/tests/sys/net/dhclient_pcp.conf
@@ -0,0 +1 @@
+vlan-pcp 6;
diff --git a/tests/sys/net/if_vlan.sh b/tests/sys/net/if_vlan.sh
index 2edcb16eab88..517206cb55c7 100755
--- a/tests/sys/net/if_vlan.sh
+++ b/tests/sys/net/if_vlan.sh
@@ -210,6 +210,52 @@ qinq_dot_cleanup()
vnet_cleanup
}
+atf_test_case "bpf_pcp" "cleanup"
+bpf_pcp_head()
+{
+ atf_set descr 'Set VLAN PCP through BPF'
+ atf_set require.config 'allow_sysctl_side_effects'
+ atf_set require.user root
+ atf_set require.progs scapy
+}
+
+bpf_pcp_body()
+{
+ vnet_init
+
+ epair=$(vnet_mkepair)
+
+ ifconfig ${epair}a up
+
+ vnet_mkjail alcatraz ${epair}b
+ vlan=$(jexec alcatraz ifconfig vlan create)
+ jexec alcatraz ifconfig ${vlan} vlan 42 vlandev ${epair}b
+ jexec alcatraz ifconfig ${vlan} up
+ jexec alcatraz ifconfig ${epair}b up
+
+ sysctl net.link.vlan.mtag_pcp=1
+
+ jexec alcatraz dhclient ${vlan} &
+ atf_check -s exit:1 -o ignore -e ignore $(atf_get_srcdir)/pcp.py \
+ --expect-pcp 6 \
+ --recvif ${epair}a
+
+ jexec alcatraz killall dhclient
+ sleep 1
+
+ jexec alcatraz dhclient -c $(atf_get_srcdir)/dhclient_pcp.conf ${vlan} &
+ atf_check -s exit:0 -o ignore -e ignore $(atf_get_srcdir)/pcp.py \
+ --expect-pcp 6 \
+ --recvif ${epair}a
+}
+
+bpf_pcp_cleanup()
+{
+ sysctl net.link.vlan.mtag_pcp=0
+ jexec alcatraz killall dhclient
+ vnet_cleanup
+}
+
atf_init_test_cases()
{
atf_add_test_case "basic"
@@ -217,4 +263,5 @@ atf_init_test_cases()
atf_add_test_case "qinq_deep"
atf_add_test_case "qinq_legacy"
atf_add_test_case "qinq_dot"
+ atf_add_test_case "bpf_pcp"
}
diff --git a/tests/sys/net/pcp.py b/tests/sys/net/pcp.py
new file mode 100644
index 000000000000..cea88faaf438
--- /dev/null
+++ b/tests/sys/net/pcp.py
@@ -0,0 +1,74 @@
+#!/usr/bin/env python3
+#
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2021 Rubicon Communications, LLC (Netgate).
+#
+# 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 sys
+import os
+curdir = os.path.dirname(os.path.realpath(__file__))
+netpfil_common = curdir + "/../netpfil/common"
+sys.path.append(netpfil_common)
+from sniffer import Sniffer
+
+def check_pcp(args, packet):
+ vlan = packet.getlayer(sp.Dot1Q)
+
+ if vlan is None:
+ return False
+
+ if not packet.getlayer(sp.BOOTP):
+ return False
+
+ if vlan.prio == int(args.expect_pcp[0]):
+ return True
+
+ return False
+
+def main():
+ parser = argparse.ArgumentParser("pcp.py",
+ description="PCP test tool")
+ parser.add_argument('--recvif', nargs=1,
+ required=True,
+ help='The interface where to look for packets to check')
+ parser.add_argument('--expect-pcp', nargs=1,
+ help='The expected PCP value on VLAN packets')
+
+ args = parser.parse_args()
+
+ sniffer = Sniffer(args, check_pcp, recvif=args.recvif[0], timeout=20)
+
+ sniffer.join()
+
+ if sniffer.foundCorrectPacket:
+ sys.exit(0)
+
+ sys.exit(1)
+
+if __name__ == '__main__':
+ main()
diff --git a/tests/sys/netpfil/common/sniffer.py b/tests/sys/netpfil/common/sniffer.py
index 200ac750dd7f..a7ebfc122573 100644
--- a/tests/sys/netpfil/common/sniffer.py
+++ b/tests/sys/netpfil/common/sniffer.py
@@ -28,12 +28,14 @@
import threading
import scapy.all as sp
+import sys
class Sniffer(threading.Thread):
- def __init__(self, args, check_function, recvif=None):
+ def __init__(self, args, check_function, recvif=None, timeout=3):
threading.Thread.__init__(self)
self._args = args
+ self._timeout = timeout
if recvif is not None:
self._recvif = recvif
else:
@@ -50,5 +52,9 @@ class Sniffer(threading.Thread):
return ret
def run(self):
- self.packets = sp.sniff(iface=self._recvif,
- stop_filter=self._checkPacket, timeout=3)
+ self.packets = []
+ try:
+ self.packets = sp.sniff(iface=self._recvif,
+ stop_filter=self._checkPacket, timeout=self._timeout)
+ except Exception as e:
+ print(e, file=sys.stderr)
More information about the dev-commits-src-branches
mailing list