@@ -35,8 +35,7 @@ VERBOSE=0
35
35
PAUSE=no
36
36
PAUSE_ON_FAIL=no
37
37
38
- # Kselftest framework requirement - SKIP code is 4.
39
- ksft_skip=4
38
+ source lib.sh
40
39
41
40
# set global exit status, but never reset nonzero one.
42
41
check_err ()
@@ -517,9 +516,8 @@ kci_test_encap_fou()
517
516
# test various encap methods, use netns to avoid unwanted interference
518
517
kci_test_encap ()
519
518
{
520
- testns=" testns"
521
519
local ret=0
522
- run_cmd ip netns add " $ testns"
520
+ setup_ns testns
523
521
if [ $? -ne 0 ]; then
524
522
end_test " SKIP encap tests: cannot add net namespace $testns "
525
523
return $ksft_skip
@@ -574,6 +572,10 @@ kci_test_macsec_offload()
574
572
return $ksft_skip
575
573
fi
576
574
575
+ if ! mount | grep -q debugfs; then
576
+ mount -t debugfs none /sys/kernel/debug/ & > /dev/null
577
+ fi
578
+
577
579
# setup netdevsim since dummydev doesn't have offload support
578
580
if [ ! -w /sys/bus/netdevsim/new_device ] ; then
579
581
run_cmd modprobe -q netdevsim
@@ -738,6 +740,10 @@ kci_test_ipsec_offload()
738
740
sysfsnet=/sys/bus/netdevsim/devices/netdevsim0/net/
739
741
probed=false
740
742
743
+ if ! mount | grep -q debugfs; then
744
+ mount -t debugfs none /sys/kernel/debug/ & > /dev/null
745
+ fi
746
+
741
747
# setup netdevsim since dummydev doesn't have offload support
742
748
if [ ! -w /sys/bus/netdevsim/new_device ] ; then
743
749
run_cmd modprobe -q netdevsim
@@ -836,11 +842,10 @@ EOF
836
842
837
843
kci_test_gretap ()
838
844
{
839
- testns=" testns"
840
845
DEV_NS=gretap00
841
846
local ret=0
842
847
843
- run_cmd ip netns add " $ testns"
848
+ setup_ns testns
844
849
if [ $? -ne 0 ]; then
845
850
end_test " SKIP gretap tests: cannot add net namespace $testns "
846
851
return $ksft_skip
@@ -878,11 +883,10 @@ kci_test_gretap()
878
883
879
884
kci_test_ip6gretap ()
880
885
{
881
- testns=" testns"
882
886
DEV_NS=ip6gretap00
883
887
local ret=0
884
888
885
- run_cmd ip netns add " $ testns"
889
+ setup_ns testns
886
890
if [ $? -ne 0 ]; then
887
891
end_test " SKIP ip6gretap tests: cannot add net namespace $testns "
888
892
return $ksft_skip
@@ -920,15 +924,14 @@ kci_test_ip6gretap()
920
924
921
925
kci_test_erspan ()
922
926
{
923
- testns=" testns"
924
927
DEV_NS=erspan00
925
928
local ret=0
926
929
run_cmd_grep " ^Usage:" ip link help erspan
927
930
if [ $? -ne 0 ]; then
928
931
end_test " SKIP: erspan: iproute2 too old"
929
932
return $ksft_skip
930
933
fi
931
- run_cmd ip netns add " $ testns"
934
+ setup_ns testns
932
935
if [ $? -ne 0 ]; then
933
936
end_test " SKIP erspan tests: cannot add net namespace $testns "
934
937
return $ksft_skip
@@ -970,15 +973,14 @@ kci_test_erspan()
970
973
971
974
kci_test_ip6erspan ()
972
975
{
973
- testns=" testns"
974
976
DEV_NS=ip6erspan00
975
977
local ret=0
976
978
run_cmd_grep " ^Usage:" ip link help ip6erspan
977
979
if [ $? -ne 0 ]; then
978
980
end_test " SKIP: ip6erspan: iproute2 too old"
979
981
return $ksft_skip
980
982
fi
981
- run_cmd ip netns add " $ testns"
983
+ setup_ns testns
982
984
if [ $? -ne 0 ]; then
983
985
end_test " SKIP ip6erspan tests: cannot add net namespace $testns "
984
986
return $ksft_skip
@@ -1022,8 +1024,6 @@ kci_test_ip6erspan()
1022
1024
1023
1025
kci_test_fdb_get ()
1024
1026
{
1025
- IP=" ip -netns testns"
1026
- BRIDGE=" bridge -netns testns"
1027
1027
brdev=" test-br0"
1028
1028
vxlandev=" vxlan10"
1029
1029
test_mac=de:ad:be:ef:13:37
@@ -1037,11 +1037,13 @@ kci_test_fdb_get()
1037
1037
return $ksft_skip
1038
1038
fi
1039
1039
1040
- run_cmd ip netns add testns
1040
+ setup_ns testns
1041
1041
if [ $? -ne 0 ]; then
1042
1042
end_test " SKIP fdb get tests: cannot add net namespace $testns "
1043
1043
return $ksft_skip
1044
1044
fi
1045
+ IP=" ip -netns $testns "
1046
+ BRIDGE=" bridge -netns $testns "
1045
1047
run_cmd $IP link add " $vxlandev " type vxlan id 10 local $localip \
1046
1048
dstport 4789
1047
1049
run_cmd $IP link add name " $brdev " type bridge
@@ -1052,7 +1054,7 @@ kci_test_fdb_get()
1052
1054
run_cmd_grep " dev $vxlandev master $brdev " $BRIDGE fdb get $test_mac br " $brdev "
1053
1055
run_cmd_grep " dev $vxlandev dst $dstip " $BRIDGE fdb get $test_mac dev " $vxlandev " self
1054
1056
1055
- ip netns del testns & > /dev/null
1057
+ ip netns del $ testns & > /dev/null
1056
1058
1057
1059
if [ $ret -ne 0 ]; then
1058
1060
end_test " FAIL: bridge fdb get"
0 commit comments