Skip to content

Commit dda5e1e

Browse files
committed
Merge branch 'selftests-fib_tests-fixes-for-multipath-list-receive-tests'
Ido Schimmel says: ==================== selftests: fib_tests: Fixes for multipath list receive tests Fix two issues in recently added FIB multipath list receive tests. ==================== Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 8702cf1 + aa13e52 commit dda5e1e

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

tools/testing/selftests/net/fib_tests.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2437,6 +2437,9 @@ ipv4_mpath_list_test()
24372437
run_cmd "ip -n ns2 route add 203.0.113.0/24
24382438
nexthop via 172.16.201.2 nexthop via 172.16.202.2"
24392439
run_cmd "ip netns exec ns2 sysctl -qw net.ipv4.fib_multipath_hash_policy=1"
2440+
run_cmd "ip netns exec ns2 sysctl -qw net.ipv4.conf.veth2.rp_filter=0"
2441+
run_cmd "ip netns exec ns2 sysctl -qw net.ipv4.conf.all.rp_filter=0"
2442+
run_cmd "ip netns exec ns2 sysctl -qw net.ipv4.conf.default.rp_filter=0"
24402443
set +e
24412444

24422445
local dmac=$(ip -n ns2 -j link show dev veth2 | jq -r '.[]["address"]')
@@ -2449,7 +2452,7 @@ ipv4_mpath_list_test()
24492452
# words, the FIB lookup tracepoint needs to be triggered for every
24502453
# packet.
24512454
local t0_rx_pkts=$(link_stats_get ns2 veth2 rx packets)
2452-
run_cmd "perf stat -e fib:fib_table_lookup --filter 'err == 0' -j -o $tmp_file -- $cmd"
2455+
run_cmd "perf stat -a -e fib:fib_table_lookup --filter 'err == 0' -j -o $tmp_file -- $cmd"
24532456
local t1_rx_pkts=$(link_stats_get ns2 veth2 rx packets)
24542457
local diff=$(echo $t1_rx_pkts - $t0_rx_pkts | bc -l)
24552458
list_rcv_eval $tmp_file $diff
@@ -2494,7 +2497,7 @@ ipv6_mpath_list_test()
24942497
# words, the FIB lookup tracepoint needs to be triggered for every
24952498
# packet.
24962499
local t0_rx_pkts=$(link_stats_get ns2 veth2 rx packets)
2497-
run_cmd "perf stat -e fib6:fib6_table_lookup --filter 'err == 0' -j -o $tmp_file -- $cmd"
2500+
run_cmd "perf stat -a -e fib6:fib6_table_lookup --filter 'err == 0' -j -o $tmp_file -- $cmd"
24982501
local t1_rx_pkts=$(link_stats_get ns2 veth2 rx packets)
24992502
local diff=$(echo $t1_rx_pkts - $t0_rx_pkts | bc -l)
25002503
list_rcv_eval $tmp_file $diff

0 commit comments

Comments
 (0)