From edcf2016f91fe8bf17fb662426a151455693cb14 Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Oct 04 2022 15:17:45 +0000 Subject: Import openvswitch2.13-2.13.0-203 from Fast DataPath --- diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch index c652b1a..4f61be4 100644 --- a/SOURCES/openvswitch-2.13.0.patch +++ b/SOURCES/openvswitch-2.13.0.patch @@ -1,6 +1,6 @@ diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh new file mode 100755 -index 0000000000..17ce6961fb +index 0000000000..776148cfd5 --- /dev/null +++ b/.ci/linux-build.sh @@ -0,0 +1,242 @@ @@ -188,7 +188,7 @@ index 0000000000..17ce6961fb + +if [ "$DPDK" ] || [ "$DPDK_SHARED" ]; then + if [ -z "$DPDK_VER" ]; then -+ DPDK_VER="19.11.10" ++ DPDK_VER="19.11.13" + fi + install_dpdk $DPDK_VER + # Enable pdump support in OVS. @@ -650,7 +650,7 @@ index 22976a3cd6..0052c99061 100644 else install-man-rst: diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst -index 6702c58a2b..0df2e4163e 100644 +index 6702c58a2b..73542a70b9 100644 --- a/Documentation/faq/releases.rst +++ b/Documentation/faq/releases.rst @@ -67,9 +67,10 @@ Q: What Linux kernel versions does each Open vSwitch release work with? @@ -703,7 +703,7 @@ index 6702c58a2b..0df2e4163e 100644 + 2.10.x 17.11.10 + 2.11.x 18.11.11 + 2.12.x 18.11.11 -+ 2.13.x 19.11.10 ++ 2.13.x 19.11.13 + ============ ======== Q: Are all the DPDK releases that OVS versions work with maintained? @@ -728,7 +728,7 @@ index 5a314cc60a..f2039595e7 100644 Email Subject ------------- diff --git a/Documentation/intro/install/dpdk.rst b/Documentation/intro/install/dpdk.rst -index dbf88ec43f..7acdaac06b 100644 +index dbf88ec43f..4c63856b86 100644 --- a/Documentation/intro/install/dpdk.rst +++ b/Documentation/intro/install/dpdk.rst @@ -42,7 +42,7 @@ Build requirements @@ -736,7 +736,7 @@ index dbf88ec43f..7acdaac06b 100644 vSwitch with DPDK will require the following: -- DPDK 19.11 -+- DPDK 19.11.10 ++- DPDK 19.11.13 - A `DPDK supported NIC`_ @@ -747,9 +747,9 @@ index dbf88ec43f..7acdaac06b 100644 - $ wget https://fast.dpdk.org/rel/dpdk-19.11.tar.xz - $ tar xf dpdk-19.11.tar.xz - $ export DPDK_DIR=/usr/src/dpdk-19.11 -+ $ wget https://fast.dpdk.org/rel/dpdk-19.11.10.tar.xz -+ $ tar xf dpdk-19.11.10.tar.xz -+ $ export DPDK_DIR=/usr/src/dpdk-stable-19.11.10 ++ $ wget https://fast.dpdk.org/rel/dpdk-19.11.13.tar.xz ++ $ tar xf dpdk-19.11.13.tar.xz ++ $ export DPDK_DIR=/usr/src/dpdk-stable-19.11.13 $ cd $DPDK_DIR #. (Optional) Configure DPDK as a shared library @@ -1434,12 +1434,30 @@ index b279303d18..b3b56cd50e 100644 boot.sh \ poc/builders/Vagrantfile \ diff --git a/NEWS b/NEWS -index dab94e924d..a3b745fc71 100644 +index dab94e924d..8e25539016 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,86 @@ +@@ -1,3 +1,104 @@ +v2.13.9 - xx xxx xxxx +--------------------- ++ - DPDK: ++ * OVS validated with DPDK 19.11.13. ++ DPDK 19.11.13 contains fixes for the following CVEs: ++ CVE-2022-28199 cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-28199 ++ CVE-2022-2132 cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-2132 ++ A bug was introduced in DPDK 19.11.12 by the commit ++ 1e68fe334ff0 ("vhost: fix unsafe vring addresses modifications"). ++ This bug can cause a deadlock when vIOMMU is enabled and NUMA ++ reallocation of the virtqueues happen. ++ A fix has been posted and is due to be included in the DPDK 19.11.14 release. ++ It can be found here: ++ https://patches.dpdk.org/project/dpdk/patch/20220725203206.427083-2-david.marchand@redhat.com/. ++ If a user wishes to avoid the issue then it is recommended to use ++ DPDK 19.11.11 until the release of DPDK 19.11.14. ++ It should be noted that DPDK 19.11.11 does not benefit from the numerous ++ bug and CVE fixes addressed since its release. ++ If a user wishes to benefit from these fixes it is recommended to use ++ DPDK 19.11.13. + +v2.13.8 - 15 Jun 2022 +--------------------- @@ -1524,7 +1542,7 @@ index dab94e924d..a3b745fc71 100644 v2.13.0 - 14 Feb 2020 --------------------- - OVN: -@@ -43,6 +126,9 @@ v2.13.0 - 14 Feb 2020 +@@ -43,6 +144,9 @@ v2.13.0 - 14 Feb 2020 - 'ovs-appctl dpctl/dump-flows' can now show offloaded=partial for partially offloaded flows, dp:dpdk for fully offloaded by dpdk, and type filter supports new filters: "dpdk" and "partially-offloaded". @@ -1534,7 +1552,7 @@ index dab94e924d..a3b745fc71 100644 v2.12.0 - 03 Sep 2019 --------------------- -@@ -117,9 +203,6 @@ v2.12.0 - 03 Sep 2019 +@@ -117,9 +221,6 @@ v2.12.0 - 03 Sep 2019 * Add support for conntrack zone-based timeout policy. - 'ovs-dpctl dump-flows' is no longer suitable for dumping offloaded flows. 'ovs-appctl dpctl/dump-flows' should be used instead. diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec index edb84fe..10674a6 100644 --- a/SPECS/openvswitch2.13.spec +++ b/SPECS/openvswitch2.13.spec @@ -59,7 +59,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.13.0 -Release: 202%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} +Release: 203%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -715,6 +715,12 @@ exit 0 %endif %changelog +* Tue Oct 04 2022 Open vSwitch CI - 2.13.0-203 +- Merging upstream branch-2.13 [RH git: ae3d594a45] + Commit list: + cd47660b9b dpdk: Use DPDK 19.11.13 release. + + * Tue Sep 27 2022 Timothy Redaelli - 2.13.0-202 - vhost: fix virtqueue use after free on NUMA reallocation [RH git: 9849aa79a5] [ upstream commit 0b2a2ca35037d6a5168f0832c11d9858b8ae946a ]