diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch index 081bd36..6205221 100644 --- a/SOURCES/openvswitch-3.1.0.patch +++ b/SOURCES/openvswitch-3.1.0.patch @@ -2969,6 +2969,194 @@ index 3b5c66fe5..d63528e69 100644 ]) ovs-appctl time/warp 1000 +diff --git a/tests/system-dpdk-macros.at b/tests/system-dpdk-macros.at +index 53fbc1320..3920f08a5 100644 +--- a/tests/system-dpdk-macros.at ++++ b/tests/system-dpdk-macros.at +@@ -42,7 +42,7 @@ m4_define([OVS_DPDK_START], + OVS_DPDK_START_OVSDB() + dnl Enable DPDK functionality + AT_CHECK([ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-init=true]) +- OVS_DPDK_START_VSWITCHD() ++ OVS_DPDK_START_VSWITCHD($1) + ]) + + # OVS_DPDK_START_OVSDB() +@@ -72,7 +72,7 @@ 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]) ++ AT_CHECK([ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-extra="--log-level=pmd.*:error $1"]) + + dnl Start ovs-vswitchd. + AT_CHECK([ovs-vswitchd --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl], [0], [stdout], [stderr]) +diff --git a/tests/system-dpdk.at b/tests/system-dpdk.at +index cb6c6d590..0f58e8574 100644 +--- a/tests/system-dpdk.at ++++ b/tests/system-dpdk.at +@@ -32,7 +32,7 @@ dnl Check if EAL init is successful + AT_SETUP([OVS-DPDK - EAL init]) + AT_KEYWORDS([dpdk]) + OVS_DPDK_PRE_CHECK() +-OVS_DPDK_START() ++OVS_DPDK_START([--no-pci]) + AT_CHECK([grep "DPDK Enabled - initializing..." ovs-vswitchd.log], [], [stdout]) + AT_CHECK([grep "EAL" ovs-vswitchd.log], [], [stdout]) + AT_CHECK([grep "DPDK Enabled - initialized" ovs-vswitchd.log], [], [stdout]) +@@ -69,7 +69,7 @@ dnl Add vhost-user-client port + AT_SETUP([OVS-DPDK - add vhost-user-client port]) + AT_KEYWORDS([dpdk]) + OVS_DPDK_PRE_CHECK() +-OVS_DPDK_START() ++OVS_DPDK_START([--no-pci]) + + dnl Add userspace bridge and attach it to OVS + AT_CHECK([ovs-vsctl add-br br10 -- set bridge br10 datapath_type=netdev]) +@@ -98,7 +98,7 @@ AT_SETUP([OVS-DPDK - ping vhost-user ports]) + AT_KEYWORDS([dpdk]) + OVS_DPDK_PRE_CHECK() + AT_SKIP_IF([! which dpdk-testpmd >/dev/null 2>/dev/null]) +-OVS_DPDK_START() ++OVS_DPDK_START([--no-pci]) + + dnl Find number of sockets + AT_CHECK([lscpu], [], [stdout]) +@@ -174,7 +174,7 @@ AT_SETUP([OVS-DPDK - ping vhost-user-client ports]) + AT_KEYWORDS([dpdk]) + OVS_DPDK_PRE_CHECK() + AT_SKIP_IF([! which dpdk-testpmd >/dev/null 2>/dev/null]) +-OVS_DPDK_START() ++OVS_DPDK_START([--no-pci]) + + dnl Find number of sockets + AT_CHECK([lscpu], [], [stdout]) +@@ -309,7 +309,7 @@ AT_SETUP([OVS-DPDK - Ingress policing create delete vport port]) + AT_KEYWORDS([dpdk]) + + OVS_DPDK_PRE_CHECK() +-OVS_DPDK_START() ++OVS_DPDK_START([--no-pci]) + + dnl Add userspace bridge and attach it to OVS and add ingress policer + AT_CHECK([ovs-vsctl add-br br10 -- set bridge br10 datapath_type=netdev]) +@@ -352,7 +352,7 @@ AT_SETUP([OVS-DPDK - Ingress policing no policing rate]) + AT_KEYWORDS([dpdk]) + + OVS_DPDK_PRE_CHECK() +-OVS_DPDK_START() ++OVS_DPDK_START([--no-pci]) + + dnl Add userspace bridge and attach it to OVS and add ingress policer + AT_CHECK([ovs-vsctl add-br br10 -- set bridge br10 datapath_type=netdev]) +@@ -393,7 +393,7 @@ AT_SETUP([OVS-DPDK - Ingress policing no policing burst]) + AT_KEYWORDS([dpdk]) + + OVS_DPDK_PRE_CHECK() +-OVS_DPDK_START() ++OVS_DPDK_START([--no-pci]) + + dnl Add userspace bridge and attach it to OVS and add ingress policer + AT_CHECK([ovs-vsctl add-br br10 -- set bridge br10 datapath_type=netdev]) +@@ -465,7 +465,7 @@ AT_SETUP([OVS-DPDK - QoS create delete vport port]) + AT_KEYWORDS([dpdk]) + + OVS_DPDK_PRE_CHECK() +-OVS_DPDK_START() ++OVS_DPDK_START([--no-pci]) + + dnl Add userspace bridge and attach it to OVS and add egress policer + AT_CHECK([ovs-vsctl add-br br10 -- set bridge br10 datapath_type=netdev]) +@@ -506,7 +506,7 @@ AT_SETUP([OVS-DPDK - QoS no cir]) + AT_KEYWORDS([dpdk]) + + OVS_DPDK_PRE_CHECK() +-OVS_DPDK_START() ++OVS_DPDK_START([--no-pci]) + + dnl Add userspace bridge and attach it to OVS and add egress policer + AT_CHECK([ovs-vsctl add-br br10 -- set bridge br10 datapath_type=netdev]) +@@ -541,7 +541,7 @@ AT_SETUP([OVS-DPDK - QoS no cbs]) + AT_KEYWORDS([dpdk]) + + OVS_DPDK_PRE_CHECK() +-OVS_DPDK_START() ++OVS_DPDK_START([--no-pci]) + + dnl Add userspace bridge and attach it to OVS and add egress policer + AT_CHECK([ovs-vsctl add-br br10 -- set bridge br10 datapath_type=netdev]) +@@ -661,7 +661,7 @@ AT_KEYWORDS([dpdk]) + + AT_SKIP_IF([! which dpdk-testpmd >/dev/null 2>/dev/null]) + OVS_DPDK_PRE_CHECK() +-OVS_DPDK_START() ++OVS_DPDK_START([--no-pci]) + + dnl Find number of sockets + AT_CHECK([lscpu], [], [stdout]) +@@ -717,7 +717,7 @@ AT_KEYWORDS([dpdk]) + + AT_SKIP_IF([! which dpdk-testpmd >/dev/null 2>/dev/null]) + OVS_DPDK_PRE_CHECK() +-OVS_DPDK_START() ++OVS_DPDK_START([--no-pci]) + + dnl Find number of sockets + AT_CHECK([lscpu], [], [stdout]) +@@ -856,7 +856,7 @@ AT_KEYWORDS([dpdk]) + + AT_SKIP_IF([! which dpdk-testpmd >/dev/null 2>/dev/null]) + OVS_DPDK_PRE_CHECK() +-OVS_DPDK_START() ++OVS_DPDK_START([--no-pci]) + + dnl Find number of sockets + AT_CHECK([lscpu], [], [stdout]) +@@ -908,7 +908,7 @@ AT_KEYWORDS([dpdk]) + + AT_SKIP_IF([! which dpdk-testpmd >/dev/null 2>/dev/null]) + OVS_DPDK_PRE_CHECK() +-OVS_DPDK_START() ++OVS_DPDK_START([--no-pci]) + + dnl Find number of sockets + AT_CHECK([lscpu], [], [stdout]) +@@ -963,7 +963,7 @@ dnl MFEX Autovalidator + AT_SETUP([OVS-DPDK - MFEX Autovalidator]) + AT_KEYWORDS([dpdk]) + OVS_DPDK_PRE_CHECK() +-OVS_DPDK_START() ++OVS_DPDK_START([--no-pci]) + AT_CHECK([ovs-vsctl add-br br0 -- set bridge br0 datapath_type=netdev]) + AT_SKIP_IF([! ovs-appctl dpif-netdev/miniflow-parser-get | sed 1,4d | grep "True"], [], [dnl + ]) +@@ -996,7 +996,7 @@ dnl MFEX Autovalidator Fuzzy + AT_SETUP([OVS-DPDK - MFEX Autovalidator Fuzzy]) + AT_KEYWORDS([dpdk]) + OVS_DPDK_PRE_CHECK() +-OVS_DPDK_START() ++OVS_DPDK_START([--no-pci]) + AT_CHECK([ovs-vsctl add-br br0 -- set bridge br0 datapath_type=netdev]) + AT_SKIP_IF([! ovs-appctl dpif-netdev/miniflow-parser-get | sed 1,4d | grep "True"], [], [dnl + ]) +@@ -1032,7 +1032,7 @@ AT_KEYWORDS([dpdk]) + OVS_DPDK_PRE_CHECK() + AT_SKIP_IF([! $PYTHON3 -c "import scapy"], [], []) + AT_CHECK([$PYTHON3 $srcdir/mfex_fuzzy.py test_traffic.pcap 1], [], [stdout]) +-OVS_DPDK_START() ++OVS_DPDK_START([--no-pci]) + AT_CHECK([ovs-vsctl --no-wait set Open_vSwitch . other_config:pmd-cpu-mask=0x1]) + dnl Add userspace bridge and attach it to OVS + AT_CHECK([ovs-vsctl add-br br0 -- set bridge br0 datapath_type=netdev]) +@@ -1153,7 +1153,7 @@ AT_SETUP([OVS-DPDK - user configured mempool]) + AT_KEYWORDS([dpdk]) + OVS_DPDK_PRE_CHECK() + OVS_DPDK_START_OVSDB() +-OVS_DPDK_START_VSWITCHD() ++OVS_DPDK_START_VSWITCHD([--no-pci]) + + AT_CHECK([ovs-vsctl --no-wait set Open_vSwitch . other_config:shared-mempool-config=8000,6000,1500]) + AT_CHECK([ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-init=true]) diff --git a/tests/system-interface.at b/tests/system-interface.at index 784bada12..3bf339582 100644 --- a/tests/system-interface.at diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec index 6fefa4f..aba9604 100644 --- a/SPECS/openvswitch3.1.spec +++ b/SPECS/openvswitch3.1.spec @@ -63,7 +63,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.1.0 -Release: 29%{?dist} +Release: 30%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -757,6 +757,12 @@ exit 0 %endif %changelog +* Fri May 19 2023 Open vSwitch CI - 3.1.0-30 +- Merging upstream branch-3.1 [RH git: 5999e438cc] + Commit list: + ea20146882 tests: dpdk: Pass `--no-pci` to tests that do not use physical ports. + + * Thu May 11 2023 Open vSwitch CI - 3.1.0-29 - Merging upstream branch-3.1 [RH git: 21d461f54c] Commit list: