Add regress tests for multicasts and dynamic vxlans

3 files changed, 171 insertions, 4 deletions

diff --git a/regress/sys/net/vxlan/Makefile b/regress/sys/net/vxlan/Makefile
index 1563d3d9790..48d9adc4777 100644
--- a/regress/sys/net/vxlan/Makefile
+++ b/regress/sys/net/vxlan/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.1 2016/10/07 02:06:57 yasuoka Exp $
+#	$OpenBSD: Makefile,v 1.2 2016/11/05 15:59:11 vgross Exp $
 
-REGRESS_TARGETS=	vxlan_1
-REGRESS_ROOT_TARGETS=	vxlan_1
+REGRESS_TARGETS=	vxlan_1 vxlan_2.inet vxlan_2.dyn
+REGRESS_ROOT_TARGETS=	vxlan_1 vxlan_2.inet vxlan_2.dyn
 
 RDOMAINS=		11 12
 IFACE_NUMS=		11 12
@@ -9,4 +9,16 @@ IFACE_NUMS=		11 12
 vxlan_1:
 	${SUDO} ksh ${.CURDIR}/$@.sh -R "${RDOMAINS}" -I "${IFACE_NUMS}"
 
+vxlan_2.inet:
+	${SUDO} ksh ${.CURDIR}/${@:R}.sh -R "40 41 42 43 44" -f inet
+
+vxlan_2.dyn:
+	env SUDO=${SUDO} DYNAMIC=1 ksh ${.CURDIR}/${@:R}.sh -R "40 41 42 43 44" -f inet
+
+vxlan_2.inet:
+	${SUDO} ksh ${.CURDIR}/${@:R}.sh -R "40 41 42 43 44" -f inet6
+
+vxlan_2.dyn6:
+	env SUDO=${SUDO} DYNAMIC=1 ksh ${.CURDIR}/${@:R}.sh -R "40 41 42 43 44" -f inet6
+
 .include <bsd.regress.mk>
diff --git a/regress/sys/net/vxlan/vxlan_2.sh b/regress/sys/net/vxlan/vxlan_2.sh
new file mode 100644
index 00000000000..5b817eea439
--- /dev/null
+++ b/regress/sys/net/vxlan/vxlan_2.sh
@@ -0,0 +1,151 @@
+#!/bin/ksh
+#	$Id: vxlan_2.sh,v 1.1 2016/11/05 15:59:11 vgross Exp $
+
+
+CAPFILE=$(mktemp -t regress_vxlan.XXXXXXX)
+
+
+CURDIR=$(cd $(dirname $0); pwd)
+
+
+cleanup() {
+	for ifname in $CLEANUP_IFS; do
+		$SUDO ifconfig $ifname down
+	done
+	for ifname in $CLEANUP_IFS; do
+		$SUDO ifconfig $ifname destroy
+	done
+	rm $CAPFILE
+}
+
+do_ping()
+{
+	local source="$1"
+	local dest="${VXLAN_NETID}${2}"
+	$PING -q -c 3 -w 1 -V "$source" "$dest" | grep -q ' 0.0% packet loss' && return
+	echo "Failed to ping $dest from vstack $source"
+	STATUS=1
+}
+
+cross_ping() {
+	local tcpdump_expr='udp src port 4789 and dst port 4789 and (ether multicast or ip multicast)'
+	local nomcast=
+	[[ $1 == nomcast ]] && nomcast=1 && shift
+	echo "cross_ping: vstacks=$@, ping=$PING, nomcast=$nomcast"
+	while [[ $# -gt 1 ]]; do
+		local source=$1 ; shift
+		:> $CAPFILE
+		if [[ -n $nomcast ]]; then
+			$SUDO tcpdump -i pair${source}0 -n -s 512 -w $CAPFILE "$tcpdump_expr" 2> /dev/null &
+			while ! [[ -s $CAPFILE ]]; do :; done
+		fi
+		for target in $@ ; do
+			do_ping $source $target
+		done
+		sleep 1
+		if [[ -n $nomcast ]]; then
+			$SUDO pkill -f "tcpdump -i pair${source}0 -n"
+			wait
+			if $SUDO tcpdump -s 512 -nr $CAPFILE | grep '.'; then
+				echo "Multicast traffic detected when pinging from rdomain $1"
+				STATUS=1
+			fi
+		fi
+	done
+}
+
+test_inet6()
+{
+	VXLAN_NETID="fd42::"
+	PING=ping6
+	for vstack in "$@"; do
+		$SUDO ifconfig "vxlan$vstack" inet6 "${VXLAN_NETID}${vstack}/64"
+	done
+	sleep 2 # sleep off DAD
+	cross_ping "$@"
+	[[ -n $DYNAMIC ]] && cross_ping ${DYNAMIC:+nomcast} "$@"
+	for vstack in "$@"; do
+		$SUDO ifconfig "vxlan$vstack" inet6 "${VXLAN_NETID}${vstack}/64" delete
+	done
+}
+
+test_inet()
+{
+	VXLAN_NETID="10.42.0."
+	PING=ping
+	for vstack in "$@"; do
+		$SUDO ifconfig "vxlan$vstack" inet "${VXLAN_NETID}${vstack}/24"
+	done
+	cross_ping "$@"
+	[[ -n $DYNAMIC ]] && cross_ping ${DYNAMIC:+nomcast} "$@"
+	for vstack in "$@"; do
+		$SUDO ifconfig "vxlan$vstack" inet "${VXLAN_NETID}${vstack}/24" delete
+	done
+}
+
+vstack_add() {
+	local vstack=$1
+	local vstack_pairname="pair${vstack}0"
+	local vstack_tunsrc="${PAIR_NETID}${vstack}"
+	[[ $AF == inet6 ]] && tundst_sufx="%${vstack_pairname}"
+
+	for ifname in "$vstack_pairname" "vxlan$vstack" "bridge$vstack"; do
+		iface_exists $ifname && abort_test "interface $ifname already exists"
+		CLEANUP_IFS="$ifname $CLEANUP_IFS"
+	done
+	$SUDO ifconfig "$vstack_pairname" rdomain "$vstack" $IFCONFIG_OPTS
+	$SUDO ifconfig "$vstack_pairname" "$AF" "${vstack_tunsrc}${PAIR_PREFX}" up
+	$SUDO ifconfig "vxlan$vstack" rdomain "$vstack" tunneldomain "$vstack" $IFCONFIG_OPTS
+	$SUDO ifconfig "vxlan$vstack" vnetid "$VNETID" tunnel "$vstack_tunsrc" "${VXLAN_TUNDST}${tundst_sufx}" up
+	[[ -n $DYNAMIC ]] && $SUDO ifconfig "bridge$vstack" rdomain "$vstack" add "vxlan$vstack" $IFCONFIG_OPTS up
+}
+
+
+. ${CURDIR}/vxlan_subr
+
+VNETID=0
+for rdom in $RDOMAINS; do
+	rdomain_is_used $rdom || abort_test "rdomain $rdom already in use"
+	[[ $rdom -ge $VNETID ]] && VNETID=$(( rdom + 1 ))
+done
+
+rdomain_is_used $VNETID || abort_test "rdomain $rdom already in use"
+iface_exists "bridge$VNETID" && abort_test "interface pair${id}1 already exists"
+$SUDO ifconfig "bridge$VNETID" rdomain "$VNETID" $IFCONFIG_OPTS up
+
+case $AF in
+	inet)
+		PAIR_NETID="10.23.0."
+		PAIR_PREFX="/24"
+		VXLAN_TUNDST="224.0.2.$VNETID"
+		;;
+	inet6)
+		PAIR_NETID="fd23::"
+		PAIR_PREFX="/64"
+		VXLAN_TUNDST="ff02::$VNETID"
+		;;
+	*)
+		echo "Unknown AF $AF !"
+		exit 1
+esac
+
+trap cleanup 0 1 2 3 15
+
+for id in $RDOMAINS; do
+	vstack_add $id
+	iface_exists "pair${id}1" && abort_test "interface pair${id}1 already exists"
+	$SUDO ifconfig "pair${id}1" rdomain $VNETID $IFCONFIG_OPTS up
+	CLEANUP_IFS="pair${id}1 $CLEANUP_IFS"
+	$SUDO ifconfig "pair${id}1" patch "pair${id}0"
+	$SUDO ifconfig "bridge$VNETID" add "pair${id}1"
+done
+
+CLEANUP_IFS="bridge$VNETID $CLEANUP_IFS"
+
+STATUS=0
+
+test_inet $RDOMAINS
+
+test_inet6 $RDOMAINS
+
+exit $STATUS
diff --git a/regress/sys/net/vxlan/vxlan_subr b/regress/sys/net/vxlan/vxlan_subr
index a45d2535f4a..a32f21f0b18 100644
--- a/regress/sys/net/vxlan/vxlan_subr
+++ b/regress/sys/net/vxlan/vxlan_subr
@@ -57,7 +57,8 @@ test()
 
 RDOMAINS=""
 IFACE_NUMS=""
-while getopts 'cvR:I:' ch "$@"; do
+AF=inet
+while getopts 'cvR:I:f:' ch "$@"; do
 	case $ch in
 	c)
 		CLEANUP=1
@@ -71,6 +72,9 @@ while getopts 'cvR:I:' ch "$@"; do
 	I)
 		IFACE_NUMS="$IFACE_NUMS $OPTARG"
 		;;
+	f)
+		AF=$OPTARG
+		;;
 	*)
 		echo "usage: $(basename $0) [-cv][-R rodmains][-I iface_nums]"
 		exit 64