@@ -35,8 +35,7 @@ VERBOSE=0
3535PAUSE=no
3636PAUSE_ON_FAIL=no
3737
38- # Kselftest framework requirement - SKIP code is 4.
39- ksft_skip=4
38+ source lib.sh
4039
4140# set global exit status, but never reset nonzero one.
4241check_err ()
@@ -517,9 +516,8 @@ kci_test_encap_fou()
517516# test various encap methods, use netns to avoid unwanted interference
518517kci_test_encap ()
519518{
520- testns=" testns"
521519 local ret=0
522- run_cmd ip netns add " $ testns"
520+ setup_ns testns
523521 if [ $? -ne 0 ]; then
524522 end_test " SKIP encap tests: cannot add net namespace $testns "
525523 return $ksft_skip
@@ -574,6 +572,10 @@ kci_test_macsec_offload()
574572 return $ksft_skip
575573 fi
576574
575+ if ! mount | grep -q debugfs; then
576+ mount -t debugfs none /sys/kernel/debug/ & > /dev/null
577+ fi
578+
577579 # setup netdevsim since dummydev doesn't have offload support
578580 if [ ! -w /sys/bus/netdevsim/new_device ] ; then
579581 run_cmd modprobe -q netdevsim
@@ -738,6 +740,10 @@ kci_test_ipsec_offload()
738740 sysfsnet=/sys/bus/netdevsim/devices/netdevsim0/net/
739741 probed=false
740742
743+ if ! mount | grep -q debugfs; then
744+ mount -t debugfs none /sys/kernel/debug/ & > /dev/null
745+ fi
746+
741747 # setup netdevsim since dummydev doesn't have offload support
742748 if [ ! -w /sys/bus/netdevsim/new_device ] ; then
743749 run_cmd modprobe -q netdevsim
@@ -836,11 +842,10 @@ EOF
836842
837843kci_test_gretap ()
838844{
839- testns=" testns"
840845 DEV_NS=gretap00
841846 local ret=0
842847
843- run_cmd ip netns add " $ testns"
848+ setup_ns testns
844849 if [ $? -ne 0 ]; then
845850 end_test " SKIP gretap tests: cannot add net namespace $testns "
846851 return $ksft_skip
@@ -878,11 +883,10 @@ kci_test_gretap()
878883
879884kci_test_ip6gretap ()
880885{
881- testns=" testns"
882886 DEV_NS=ip6gretap00
883887 local ret=0
884888
885- run_cmd ip netns add " $ testns"
889+ setup_ns testns
886890 if [ $? -ne 0 ]; then
887891 end_test " SKIP ip6gretap tests: cannot add net namespace $testns "
888892 return $ksft_skip
@@ -920,15 +924,14 @@ kci_test_ip6gretap()
920924
921925kci_test_erspan ()
922926{
923- testns=" testns"
924927 DEV_NS=erspan00
925928 local ret=0
926929 run_cmd_grep " ^Usage:" ip link help erspan
927930 if [ $? -ne 0 ]; then
928931 end_test " SKIP: erspan: iproute2 too old"
929932 return $ksft_skip
930933 fi
931- run_cmd ip netns add " $ testns"
934+ setup_ns testns
932935 if [ $? -ne 0 ]; then
933936 end_test " SKIP erspan tests: cannot add net namespace $testns "
934937 return $ksft_skip
@@ -970,15 +973,14 @@ kci_test_erspan()
970973
971974kci_test_ip6erspan ()
972975{
973- testns=" testns"
974976 DEV_NS=ip6erspan00
975977 local ret=0
976978 run_cmd_grep " ^Usage:" ip link help ip6erspan
977979 if [ $? -ne 0 ]; then
978980 end_test " SKIP: ip6erspan: iproute2 too old"
979981 return $ksft_skip
980982 fi
981- run_cmd ip netns add " $ testns"
983+ setup_ns testns
982984 if [ $? -ne 0 ]; then
983985 end_test " SKIP ip6erspan tests: cannot add net namespace $testns "
984986 return $ksft_skip
@@ -1022,8 +1024,6 @@ kci_test_ip6erspan()
10221024
10231025kci_test_fdb_get ()
10241026{
1025- IP=" ip -netns testns"
1026- BRIDGE=" bridge -netns testns"
10271027 brdev=" test-br0"
10281028 vxlandev=" vxlan10"
10291029 test_mac=de:ad:be:ef:13:37
@@ -1037,11 +1037,13 @@ kci_test_fdb_get()
10371037 return $ksft_skip
10381038 fi
10391039
1040- run_cmd ip netns add testns
1040+ setup_ns testns
10411041 if [ $? -ne 0 ]; then
10421042 end_test " SKIP fdb get tests: cannot add net namespace $testns "
10431043 return $ksft_skip
10441044 fi
1045+ IP=" ip -netns $testns "
1046+ BRIDGE=" bridge -netns $testns "
10451047 run_cmd $IP link add " $vxlandev " type vxlan id 10 local $localip \
10461048 dstport 4789
10471049 run_cmd $IP link add name " $brdev " type bridge
@@ -1052,7 +1054,7 @@ kci_test_fdb_get()
10521054 run_cmd_grep " dev $vxlandev master $brdev " $BRIDGE fdb get $test_mac br " $brdev "
10531055 run_cmd_grep " dev $vxlandev dst $dstip " $BRIDGE fdb get $test_mac dev " $vxlandev " self
10541056
1055- ip netns del testns & > /dev/null
1057+ ip netns del $ testns & > /dev/null
10561058
10571059 if [ $ret -ne 0 ]; then
10581060 end_test " FAIL: bridge fdb get"
0 commit comments