Module Name: src
Committed By: jruoho
Date: Thu Jun 25 18:30:42 UTC 2020
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/sbin/ifconfig: Makefile t_tap.sh
Added Files:
src/tests/sbin/ifconfig: t_bridge.sh
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.853 -r1.854 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.4 -r1.5 src/tests/sbin/ifconfig/Makefile \
src/tests/sbin/ifconfig/t_tap.sh
cvs rdiff -u -r0 -r1.1 src/tests/sbin/ifconfig/t_bridge.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.853 src/distrib/sets/lists/tests/mi:1.854
--- src/distrib/sets/lists/tests/mi:1.853 Thu Jun 25 17:08:33 2020
+++ src/distrib/sets/lists/tests/mi Thu Jun 25 18:30:42 2020
@@ -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
Index: src/tests/sbin/ifconfig/Makefile
diff -u src/tests/sbin/ifconfig/Makefile:1.4 src/tests/sbin/ifconfig/Makefile:1.5
--- src/tests/sbin/ifconfig/Makefile:1.4 Thu Jun 25 15:41:40 2020
+++ src/tests/sbin/ifconfig/Makefile Thu Jun 25 18:30:42 2020
@@ -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 <bsd.own.mk>
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 <bsd.test.mk>
Index: src/tests/sbin/ifconfig/t_tap.sh
diff -u src/tests/sbin/ifconfig/t_tap.sh:1.4 src/tests/sbin/ifconfig/t_tap.sh:1.5
--- src/tests/sbin/ifconfig/t_tap.sh:1.4 Thu Jun 25 16:57:00 2020
+++ src/tests/sbin/ifconfig/t_tap.sh Thu Jun 25 18:30:42 2020
@@ -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
Added files:
Index: src/tests/sbin/ifconfig/t_bridge.sh
diff -u /dev/null src/tests/sbin/ifconfig/t_bridge.sh:1.1
--- /dev/null Thu Jun 25 18:30:42 2020
+++ src/tests/sbin/ifconfig/t_bridge.sh Thu Jun 25 18:30:42 2020
@@ -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
+}
