Skip to content

Commit 75293d1

Browse files
elibritsteinchaudron
authored andcommitted
tests: Remove ALLOW_LIST argument.
The allow list from OVS_DPDK_VF_PCI_ADDRS introduced in [1] added the PF's PCI address 6 times. Commit [2] doesn't have this environment variable anymore which made it empty. That was a problem until [3] was applied since DPDK auto-probed all PCI devices, including ones that can cause errors in the log (virtio for example) and fail the test. Commit [3] automatically disables DPDK auto probe, silently resolving this issue. There is no need to pass any allow-list anymore. Remove it. [1]: 289e9f6 ("tests: Add a simple DPDK rte_flow test framework.") [2]: 9cabdd2 ("tests: Rework DPDK offload tests to use a simpler interface argument.") [3]: 02c5b24 ("dpdk: Disable initial device probe.") Fixes: 9cabdd2 ("tests: Rework DPDK offload tests to use a simpler interface argument.") Signed-off-by: Eli Britstein <elibr@nvidia.com> Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
1 parent 8519890 commit 75293d1

3 files changed

Lines changed: 7 additions & 21 deletions

File tree

tests/system-dpdk-macros.at

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ m4_define([OVS_DPDK_PRE_PHY_SKIP],
3030
#
3131
m4_define([OVS_DPDK_START],
3232
[dnl start ovs dpdk
33-
OVS_DPDK_START_OVSDB($3)
33+
OVS_DPDK_START_OVSDB($2)
3434
dnl Enable DPDK functionality
3535
AT_CHECK([ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-init=true])
36-
OVS_DPDK_START_VSWITCHD([$1], [$2])
36+
OVS_DPDK_START_VSWITCHD([$1])
3737
])
3838

3939

@@ -65,10 +65,10 @@ m4_define([OVS_DPDK_START_OVSDB],
6565
#
6666
m4_define([OVS_DPDK_START_VSWITCHD],
6767
[dnl Change DPDK drivers log levels so that tests only catch errors
68-
AT_CHECK([ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-extra="--log-level=pmd.*:error $1"])
68+
AT_CHECK([ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-extra="--log-level=pmd.*:error"])
6969

7070
dnl Start ovs-vswitchd.
71-
AT_CHECK([ovs-vswitchd $2 --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl], [0], [stdout], [stderr])
71+
AT_CHECK([ovs-vswitchd $1 --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl], [0], [stdout], [stderr])
7272
AT_CAPTURE_FILE([ovs-vswitchd.log])
7373
on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
7474
])
@@ -139,7 +139,7 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START],
139139
OVS_DPDK_PRE_CHECK()
140140
OVS_WAIT_WHILE([ip link show ovs-netdev])
141141
dnl For functional tests, no need for DPDK PCI probing.
142-
OVS_DPDK_START([], [--disable-system], [$3])
142+
OVS_DPDK_START([--disable-system], [$3])
143143
dnl Add bridges, ports, etc.
144144
OVS_WAIT_WHILE([ip link show br0])
145145
AT_CHECK([ovs-vsctl -- _ADD_BR([br0]) -- $1 m4_if([$2], [], [], [| uuidfilt])], [0], [$2])

tests/system-dpdk-offloads-macros.at

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,7 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START],
6868
[
6969
OVS_DPDK_OFFLOAD_PRE_CHECK()
7070
OVS_WAIT_WHILE([ip link show ovs-netdev])
71-
ALLOW_LIST=$(echo "$OVS_DPDK_VF_PCI_ADDRS" | awk '{
72-
for (i=1; i<=NF; i++) {
73-
split($i, parts, ",");
74-
addr = parts[1];
75-
if (addr != "" && !seen[addr]) {
76-
seen[addr] = 1;
77-
if (result == "")
78-
result = "--allow " addr;
79-
else
80-
result = result " --allow " addr;
81-
}
82-
}
83-
print result;
84-
}')
85-
OVS_DPDK_START([$ALLOW_LIST], [--disable-system],
71+
OVS_DPDK_START([--disable-system],
8672
[-- set Open_vSwitch . other_config:hw-offload=true $3])
8773
dnl Add bridges, ports, etc.
8874
OVS_WAIT_WHILE([ip link show br0])

tests/system-dpdk.at

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ OVS_DPDK_PRE_CHECK()
10161016
dnl This test uses 2 IPv6 VxLAN encapsulations (140 bytes of tunnel headers)
10171017
dnl to ensure that the headroom can't fit those headers.
10181018
AT_SKIP_IF([test $DPDK_MBUF_HEADROOM -ge 140])
1019-
OVS_DPDK_START([--no-pci])
1019+
OVS_DPDK_START()
10201020

10211021
ADD_BR([br0])
10221022
ADD_BR([br1])

0 commit comments

Comments
 (0)