Update OVS CLI and relevant documentation to use DPDK 20.11.6.

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 [1] has been posted and pushed to the DPDK 20.11 branch.
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.

[1] 
https://patches.dpdk.org/project/dpdk/patch/[email protected]/

Signed-off-by: Michael Phelan <[email protected]>

---
v3:
  - Update recommende meson version.
  - Refactor commit message.

v2:
  - Update recommended DPDK version for older OvS versions in Documentation.

---
---
 .ci/linux-build.sh                   |  2 +-
 .ci/linux-prepare.sh                 |  2 +-
 Documentation/faq/releases.rst       |  6 +++---
 Documentation/intro/install/dpdk.rst |  8 ++++----
 NEWS                                 | 16 ++++++++++++++++
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
index ea51dec8e..ed5fbbb05 100755
--- a/.ci/linux-build.sh
+++ b/.ci/linux-build.sh
@@ -201,7 +201,7 @@ fi
 
 if [ "$DPDK" ] || [ "$DPDK_SHARED" ]; then
     if [ -z "$DPDK_VER" ]; then
-        DPDK_VER="20.11.4"
+        DPDK_VER="20.11.6"
     fi
     install_dpdk $DPDK_VER
     if [ "$CC" = "clang" ]; then
diff --git a/.ci/linux-prepare.sh b/.ci/linux-prepare.sh
index 015216879..7f33680b4 100755
--- a/.ci/linux-prepare.sh
+++ b/.ci/linux-prepare.sh
@@ -21,7 +21,7 @@ make -j4 HAVE_LLVM= HAVE_SQLITE= install
 cd ..
 
 pip3 install --disable-pip-version-check --user flake8 hacking
-pip3 install --user  'meson==0.47.1'
+pip3 install --user  'meson==0.48.1'
 
 if [ "$M32" ]; then
     # Installing 32-bit libraries.
diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst
index 4c8b97de6..25574fba4 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?
     2.10.x       17.11.10
     2.11.x       18.11.9
     2.12.x       18.11.9
-    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 f5edfa756..bd34ffde6 100644
--- a/Documentation/intro/install/dpdk.rst
+++ b/Documentation/intro/install/dpdk.rst
@@ -42,7 +42,7 @@ Build requirements
 In addition to the requirements described in :doc:`general`, building Open
 vSwitch with DPDK will require the following:
 
-- DPDK 20.11.4
+- DPDK 20.11.6
 
 - A `DPDK supported NIC`_
 
@@ -73,9 +73,9 @@ Install DPDK
 #. Download the `DPDK sources`_, extract the file and set ``DPDK_DIR``::
 
        $ cd /usr/src/
-       $ 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
diff --git a/NEWS b/NEWS
index f58c2c9e4..4c264c090 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,21 @@
 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/[email protected]/.
+       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
 ---------------------
-- 
2.25.1

_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to