Commit 535ac9a5 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller

selftests: mlxsw: Use permanent neighbours instead of reachable ones

The nexthop objects tests configure dummy reachable neighbours so that
the nexthops will have a MAC address and be programmed to the device.

Since these are dummy reachable neighbours, they can be transitioned by
the kernel to a failed state if they are around for too long. This can
happen, for example, if the "TIMEOUT" variable is configured with a too
high value.

Make the tests more robust by configuring the neighbours as permanent,
so that the tests do not depend on the configured timeout value.
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Reviewed-by: default avatarPetr Machata <petrm@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b8bfafe4
...@@ -779,7 +779,7 @@ nexthop_obj_offload_test() ...@@ -779,7 +779,7 @@ nexthop_obj_offload_test()
setup_wait setup_wait
ip nexthop add id 1 via 192.0.2.2 dev $swp1 ip nexthop add id 1 via 192.0.2.2 dev $swp1
ip neigh replace 192.0.2.2 lladdr 00:11:22:33:44:55 nud reachable \ ip neigh replace 192.0.2.2 lladdr 00:11:22:33:44:55 nud perm \
dev $swp1 dev $swp1
busywait "$TIMEOUT" wait_for_offload \ busywait "$TIMEOUT" wait_for_offload \
...@@ -791,7 +791,7 @@ nexthop_obj_offload_test() ...@@ -791,7 +791,7 @@ nexthop_obj_offload_test()
ip nexthop show id 1 ip nexthop show id 1
check_err $? "nexthop marked as offloaded after setting neigh to failed state" check_err $? "nexthop marked as offloaded after setting neigh to failed state"
ip neigh replace 192.0.2.2 lladdr 00:11:22:33:44:55 nud reachable \ ip neigh replace 192.0.2.2 lladdr 00:11:22:33:44:55 nud perm \
dev $swp1 dev $swp1
busywait "$TIMEOUT" wait_for_offload \ busywait "$TIMEOUT" wait_for_offload \
ip nexthop show id 1 ip nexthop show id 1
...@@ -828,11 +828,11 @@ nexthop_obj_group_offload_test() ...@@ -828,11 +828,11 @@ nexthop_obj_group_offload_test()
ip nexthop add id 1 via 192.0.2.2 dev $swp1 ip nexthop add id 1 via 192.0.2.2 dev $swp1
ip nexthop add id 2 via 2001:db8:1::2 dev $swp1 ip nexthop add id 2 via 2001:db8:1::2 dev $swp1
ip nexthop add id 10 group 1/2 ip nexthop add id 10 group 1/2
ip neigh replace 192.0.2.2 lladdr 00:11:22:33:44:55 nud reachable \ ip neigh replace 192.0.2.2 lladdr 00:11:22:33:44:55 nud perm \
dev $swp1 dev $swp1
ip neigh replace 192.0.2.3 lladdr 00:11:22:33:44:55 nud reachable \ ip neigh replace 192.0.2.3 lladdr 00:11:22:33:44:55 nud perm \
dev $swp1 dev $swp1
ip neigh replace 2001:db8:1::2 lladdr 00:11:22:33:44:55 nud reachable \ ip neigh replace 2001:db8:1::2 lladdr 00:11:22:33:44:55 nud perm \
dev $swp1 dev $swp1
busywait "$TIMEOUT" wait_for_offload \ busywait "$TIMEOUT" wait_for_offload \
...@@ -888,11 +888,11 @@ nexthop_obj_bucket_offload_test() ...@@ -888,11 +888,11 @@ nexthop_obj_bucket_offload_test()
ip nexthop add id 1 via 192.0.2.2 dev $swp1 ip nexthop add id 1 via 192.0.2.2 dev $swp1
ip nexthop add id 2 via 2001:db8:1::2 dev $swp1 ip nexthop add id 2 via 2001:db8:1::2 dev $swp1
ip nexthop add id 10 group 1/2 type resilient buckets 32 idle_timer 0 ip nexthop add id 10 group 1/2 type resilient buckets 32 idle_timer 0
ip neigh replace 192.0.2.2 lladdr 00:11:22:33:44:55 nud reachable \ ip neigh replace 192.0.2.2 lladdr 00:11:22:33:44:55 nud perm \
dev $swp1 dev $swp1
ip neigh replace 192.0.2.3 lladdr 00:11:22:33:44:55 nud reachable \ ip neigh replace 192.0.2.3 lladdr 00:11:22:33:44:55 nud perm \
dev $swp1 dev $swp1
ip neigh replace 2001:db8:1::2 lladdr 00:11:22:33:44:55 nud reachable \ ip neigh replace 2001:db8:1::2 lladdr 00:11:22:33:44:55 nud perm \
dev $swp1 dev $swp1
busywait "$TIMEOUT" wait_for_offload \ busywait "$TIMEOUT" wait_for_offload \
...@@ -921,7 +921,7 @@ nexthop_obj_bucket_offload_test() ...@@ -921,7 +921,7 @@ nexthop_obj_bucket_offload_test()
check_err $? "nexthop bucket not marked as offloaded after revalidating nexthop" check_err $? "nexthop bucket not marked as offloaded after revalidating nexthop"
# Revalidate nexthop id 2 by changing its neighbour # Revalidate nexthop id 2 by changing its neighbour
ip neigh replace 2001:db8:1::2 lladdr 00:11:22:33:44:55 nud reachable \ ip neigh replace 2001:db8:1::2 lladdr 00:11:22:33:44:55 nud perm \
dev $swp1 dev $swp1
busywait "$TIMEOUT" wait_for_offload \ busywait "$TIMEOUT" wait_for_offload \
ip nexthop bucket show nhid 2 ip nexthop bucket show nhid 2
...@@ -971,9 +971,9 @@ nexthop_obj_route_offload_test() ...@@ -971,9 +971,9 @@ nexthop_obj_route_offload_test()
setup_wait setup_wait
ip nexthop add id 1 via 192.0.2.2 dev $swp1 ip nexthop add id 1 via 192.0.2.2 dev $swp1
ip neigh replace 192.0.2.2 lladdr 00:11:22:33:44:55 nud reachable \ ip neigh replace 192.0.2.2 lladdr 00:11:22:33:44:55 nud perm \
dev $swp1 dev $swp1
ip neigh replace 192.0.2.3 lladdr 00:11:22:33:44:55 nud reachable \ ip neigh replace 192.0.2.3 lladdr 00:11:22:33:44:55 nud perm \
dev $swp1 dev $swp1
ip route replace 198.51.100.0/24 nhid 1 ip route replace 198.51.100.0/24 nhid 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment