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]: 289e9f6baa7c ("tests: Add a simple DPDK rte_flow test framework.")
[2]: 9cabdd268c7e ("tests: Rework DPDK offload tests to use a simpler interface
argument.")
[3]: 02c5b24e0ded ("dpdk: Disable initial device probe.")
Fixes: 9cabdd268c7e ("tests: Rework DPDK offload tests to use a simpler
interface argument.")
Signed-off-by: Eli Britstein <[email protected]>
---
tests/system-dpdk-macros.at | 8 ++++----
tests/system-dpdk-offloads-macros.at | 16 +---------------
tests/system-dpdk.at | 2 +-
3 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/tests/system-dpdk-macros.at b/tests/system-dpdk-macros.at
index 716d8a357..cfb2c79fc 100644
--- a/tests/system-dpdk-macros.at
+++ b/tests/system-dpdk-macros.at
@@ -30,10 +30,10 @@ m4_define([OVS_DPDK_PRE_PHY_SKIP],
#
m4_define([OVS_DPDK_START],
[dnl start ovs dpdk
- OVS_DPDK_START_OVSDB($3)
+ OVS_DPDK_START_OVSDB($2)
dnl Enable DPDK functionality
AT_CHECK([ovs-vsctl --no-wait set Open_vSwitch .
other_config:dpdk-init=true])
- OVS_DPDK_START_VSWITCHD([$1], [$2])
+ OVS_DPDK_START_VSWITCHD([$1])
])
@@ -65,10 +65,10 @@ m4_define([OVS_DPDK_START_OVSDB],
#
m4_define([OVS_DPDK_START_VSWITCHD],
[dnl Change DPDK drivers log levels so that tests only catch errors
- AT_CHECK([ovs-vsctl --no-wait set Open_vSwitch .
other_config:dpdk-extra="--log-level=pmd.*:error $1"])
+ AT_CHECK([ovs-vsctl --no-wait set Open_vSwitch .
other_config:dpdk-extra="--log-level=pmd.*:error"])
dnl Start ovs-vswitchd.
- AT_CHECK([ovs-vswitchd $2 --detach --no-chdir --pidfile --log-file -vvconn
-vofproto_dpif -vunixctl], [0], [stdout], [stderr])
+ AT_CHECK([ovs-vswitchd $1 --detach --no-chdir --pidfile --log-file -vvconn
-vofproto_dpif -vunixctl], [0], [stdout], [stderr])
AT_CAPTURE_FILE([ovs-vswitchd.log])
on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
])
diff --git a/tests/system-dpdk-offloads-macros.at
b/tests/system-dpdk-offloads-macros.at
index 5aa19112a..f165ee890 100644
--- a/tests/system-dpdk-offloads-macros.at
+++ b/tests/system-dpdk-offloads-macros.at
@@ -68,21 +68,7 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START],
[
OVS_DPDK_OFFLOAD_PRE_CHECK()
OVS_WAIT_WHILE([ip link show ovs-netdev])
- ALLOW_LIST=$(echo "$OVS_DPDK_VF_PCI_ADDRS" | awk '{
- for (i=1; i<=NF; i++) {
- split($i, parts, ",");
- addr = parts[1];
- if (addr != "" && !seen[addr]) {
- seen[addr] = 1;
- if (result == "")
- result = "--allow " addr;
- else
- result = result " --allow " addr;
- }
- }
- print result;
- }')
- OVS_DPDK_START([$ALLOW_LIST], [--disable-system],
+ OVS_DPDK_START([--disable-system],
[-- set Open_vSwitch . other_config:hw-offload=true $3])
dnl Add bridges, ports, etc.
OVS_WAIT_WHILE([ip link show br0])
diff --git a/tests/system-dpdk.at b/tests/system-dpdk.at
index c5f18e71c..34df1f676 100644
--- a/tests/system-dpdk.at
+++ b/tests/system-dpdk.at
@@ -1016,7 +1016,7 @@ OVS_DPDK_PRE_CHECK()
dnl This test uses 2 IPv6 VxLAN encapsulations (140 bytes of tunnel headers)
dnl to ensure that the headroom can't fit those headers.
AT_SKIP_IF([test $DPDK_MBUF_HEADROOM -ge 140])
-OVS_DPDK_START([--no-pci])
+OVS_DPDK_START()
ADD_BR([br0])
ADD_BR([br1])
--
2.34.1
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
