diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index 5238c2b..d4d3440 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -1,5 +1,5 @@ diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh -index 3e5136fd4e..ea51dec8ee 100755 +index 3e5136fd4e..ed5fbbb05b 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -201,7 +201,7 @@ fi @@ -7,7 +7,7 @@ index 3e5136fd4e..ea51dec8ee 100755 if [ "$DPDK" ] || [ "$DPDK_SHARED" ]; then if [ -z "$DPDK_VER" ]; then - DPDK_VER="20.11" -+ DPDK_VER="20.11.4" ++ DPDK_VER="20.11.6" fi install_dpdk $DPDK_VER if [ "$CC" = "clang" ]; then @@ -21,17 +21,19 @@ index 3e5136fd4e..ea51dec8ee 100755 # testsuite.log is necessary for debugging. cat */_build/sub/tests/testsuite.log diff --git a/.ci/linux-prepare.sh b/.ci/linux-prepare.sh -index 69a40011f4..0152168794 100755 +index 69a40011f4..7f33680b40 100755 --- a/.ci/linux-prepare.sh +++ b/.ci/linux-prepare.sh -@@ -21,7 +21,6 @@ make -j4 HAVE_LLVM= HAVE_SQLITE= install +@@ -21,8 +21,7 @@ make -j4 HAVE_LLVM= HAVE_SQLITE= install cd .. pip3 install --disable-pip-version-check --user flake8 hacking -pip3 install --user --upgrade docutils - pip3 install --user 'meson==0.47.1' +-pip3 install --user 'meson==0.47.1' ++pip3 install --user 'meson==0.48.1' if [ "$M32" ]; then + # Installing 32-bit libraries. diff --git a/.cirrus.yml b/.cirrus.yml index 2caf36b85c..b4ce3cde16 100644 --- a/.cirrus.yml @@ -128,7 +130,7 @@ index ea3475f356..2b0ad9554f 100644 else install-man-rst: diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst -index 6a5e4141f1..4c8b97de65 100644 +index 6a5e4141f1..25574fba4a 100644 --- a/Documentation/faq/releases.rst +++ b/Documentation/faq/releases.rst @@ -204,9 +204,9 @@ Q: What DPDK version does each Open vSwitch release work with? @@ -138,14 +140,14 @@ index 6a5e4141f1..4c8b97de65 100644 - 2.13.x 19.11.2 - 2.14.x 19.11.2 - 2.15.x 20.11.0 -+ 2.13.x 19.11.10 -+ 2.14.x 19.11.10 -+ 2.15.x 20.11.4 ++ 2.13.x 19.11.13 ++ 2.14.x 19.11.13 ++ 2.15.x 20.11.6 ============ ======== Q: Are all the DPDK releases that OVS versions work with maintained? diff --git a/Documentation/intro/install/dpdk.rst b/Documentation/intro/install/dpdk.rst -index 3a24e54f97..f5edfa756b 100644 +index 3a24e54f97..bd34ffde6b 100644 --- a/Documentation/intro/install/dpdk.rst +++ b/Documentation/intro/install/dpdk.rst @@ -42,7 +42,7 @@ Build requirements @@ -153,7 +155,7 @@ index 3a24e54f97..f5edfa756b 100644 vSwitch with DPDK will require the following: -- DPDK 20.11 -+- DPDK 20.11.4 ++- DPDK 20.11.6 - A `DPDK supported NIC`_ @@ -164,9 +166,9 @@ index 3a24e54f97..f5edfa756b 100644 - $ wget https://fast.dpdk.org/rel/dpdk-20.11.tar.xz - $ tar xf dpdk-20.11.tar.xz - $ export DPDK_DIR=/usr/src/dpdk-20.11 -+ $ wget https://fast.dpdk.org/rel/dpdk-20.11.4.tar.xz -+ $ tar xf dpdk-20.11.4.tar.xz -+ $ export DPDK_DIR=/usr/src/dpdk-stable-20.11.4 ++ $ wget https://fast.dpdk.org/rel/dpdk-20.11.6.tar.xz ++ $ tar xf dpdk-20.11.6.tar.xz ++ $ export DPDK_DIR=/usr/src/dpdk-stable-20.11.6 $ cd $DPDK_DIR #. Configure and install DPDK using Meson @@ -667,12 +669,28 @@ index 0000000000..cdded4f906 +.. _bcc : https://github.com/iovisor/bcc +.. _Trace Compass : https://www.eclipse.org/tracecompass/ diff --git a/NEWS b/NEWS -index bc901efdb1..f46c851daa 100644 +index bc901efdb1..1caf9b1e63 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,56 @@ +@@ -1,3 +1,72 @@ +v2.15.6 - xx xxx xxxx +--------------------- ++ - DPDK: ++ * OVS validated with DPDK 20.11.6. ++ DPDK 20.11.6 requires a meson version of 0.48.1 or higher. ++ A bug was introduced in DPDK 20.11.5 by the commit ++ 33f2e3756186 ("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 pushed to the DPDK 20.11 branch. ++ 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 20.11.4 until the release of DPDK 20.11.7. ++ It should be noted that DPDK 20.11.4 does not benefit from the numerous ++ bug fixes addressed since its release. ++ If a user wishes to benefit from these fixes it is recommended to use ++ DPDK 20.11.6. + +v2.15.5 - 15 Jun 2022 +--------------------- diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index 3611bde..973598e 100644 --- a/SPECS/openvswitch2.15.spec +++ b/SPECS/openvswitch2.15.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.15.0 -Release: 122%{?dist} +Release: 123%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -702,6 +702,12 @@ exit 0 %endif %changelog +* Mon Oct 03 2022 Open vSwitch CI - 2.15.0-123 +- Merging upstream branch-2.15 [RH git: 73cc21866f] + Commit list: + 30b846ab1b dpdk: Use DPDK 20.11.6 release. + + * Wed Sep 21 2022 Timothy Redaelli - 2.15.0-122 - vhost: fix virtqueue use after free on NUMA reallocation [RH git: ce74a8c364] [ upstream commit 0b2a2ca35037d6a5168f0832c11d9858b8ae946a ]