From f5fa72a2a9c8facc5a342db43c7952792838ef95 Mon Sep 17 00:00:00 2001 From: jruoho Date: Thu, 25 Jun 2020 18:30:42 +0000 Subject: [PATCH] Test creating thousands of bridge(4)'s. Unlike with tap(4) (PR kern/55417), this test succeeeds. It is even possible to have the ultimate ifconfig(8) output with more than 65,000 devices. --- distrib/sets/lists/tests/mi | 3 +- tests/sbin/ifconfig/Makefile | 4 +- tests/sbin/ifconfig/t_bridge.sh | 72 +++++++++++++++++++++++++++++++++ tests/sbin/ifconfig/t_tap.sh | 4 +- 4 files changed, 78 insertions(+), 5 deletions(-) create mode 100644 tests/sbin/ifconfig/t_bridge.sh diff --git a/distrib/sets/lists/tests/mi b/distrib/sets/lists/tests/mi index b9c576f8b24a..344e61c09e27 100644 --- a/distrib/sets/lists/tests/mi +++ b/distrib/sets/lists/tests/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.853 2020/06/25 17:08:33 jruoho Exp $ +# $NetBSD: mi,v 1.854 2020/06/25 18:30:42 jruoho Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3994,6 +3994,7 @@ ./usr/tests/sbin/ifconfig tests-sbin-tests compattestfile,atf ./usr/tests/sbin/ifconfig/Atffile tests-sbin-tests compattestfile,atf ./usr/tests/sbin/ifconfig/Kyuafile tests-sbin-tests compattestfile,atf,kyua +./usr/tests/sbin/ifconfig/t_bridge tests-sbin-tests compattestfile,atf ./usr/tests/sbin/ifconfig/t_nonexistent tests-sbin-tests compattestfile,atf ./usr/tests/sbin/ifconfig/t_repeated_scan tests-sbin-tests compattestfile,atf ./usr/tests/sbin/ifconfig/t_repeated_updown tests-sbin-tests compattestfile,atf diff --git a/tests/sbin/ifconfig/Makefile b/tests/sbin/ifconfig/Makefile index 8e7d4cad733c..f52d290e3a04 100644 --- a/tests/sbin/ifconfig/Makefile +++ b/tests/sbin/ifconfig/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2020/06/25 15:41:40 jruoho Exp $ +# $NetBSD: Makefile,v 1.5 2020/06/25 18:30:42 jruoho Exp $ .include TESTSDIR= ${TESTSBASE}/sbin/ifconfig -TESTS_SH= t_nonexistent t_repeated_scan t_repeated_updown t_tap +TESTS_SH= t_bridge t_nonexistent t_repeated_scan t_repeated_updown t_tap .include diff --git a/tests/sbin/ifconfig/t_bridge.sh b/tests/sbin/ifconfig/t_bridge.sh new file mode 100644 index 000000000000..dbc9d74c39ec --- /dev/null +++ b/tests/sbin/ifconfig/t_bridge.sh @@ -0,0 +1,72 @@ +# $NetBSD: t_bridge.sh,v 1.1 2020/06/25 18:30:42 jruoho Exp $ +# +# Copyright (c) 2020 The NetBSD Foundation, Inc. +# All rights reserved. +# +# This code is derived from software contributed to The NetBSD Foundation +# by Jukka Ruohonen. +# +# 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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. +# +bridges="/tmp/bridges" + +atf_test_case manybridges cleanup +manybridges_head() { + atf_set "require.user" "root" + atf_set "descr" "Test creating many, many bridge(4)'s" +} + +manybridges_body() { + + seq 65535 65000 > $bridges # Try to avoid stalling automated runs. + + while read bridge; do + + ifconfig "bridge$bridge" >/dev/null 2>&1 + + if [ $? -eq 0 ]; then + echo "Skipping existing bridge$bridge" + continue + fi + + ifconfig "bridge$bridge" create + echo "Created bridge$bridge" + + done < $bridges +} + +manybridges_cleanup() { + + if [ -f $bridges ]; then + + while read bridge; do + ifconfig "bridge$bridge" destroy >/dev/null 2>&1 + echo "Burnt down bridge$bridge" + done < $bridges + + rm $bridges + fi +} + +atf_init_test_cases() { + atf_add_test_case manybridges +} diff --git a/tests/sbin/ifconfig/t_tap.sh b/tests/sbin/ifconfig/t_tap.sh index be97213e3ede..4406aa924b4d 100644 --- a/tests/sbin/ifconfig/t_tap.sh +++ b/tests/sbin/ifconfig/t_tap.sh @@ -1,4 +1,4 @@ -# $NetBSD: t_tap.sh,v 1.4 2020/06/25 16:57:00 jruoho Exp $ +# $NetBSD: t_tap.sh,v 1.5 2020/06/25 18:30:42 jruoho Exp $ # # Copyright (c) 2020 The NetBSD Foundation, Inc. # All rights reserved. @@ -38,7 +38,7 @@ manytaps_head() { manytaps_body() { atf_skip "The test causes a panic (PR kern/55417)" - seq 65535 64000 > $taps + seq 65535 65000 > $taps # Try to avoid stalling automated runs. while read tap; do