From 35b34ed4aaed40213ee53a550d4e5ea8b2dd1516 Mon Sep 17 00:00:00 2001
From: Matias Elo <matias.elo@nokia.com>
Date: Fri, 27 Sep 2024 14:02:06 +0300
Subject: [PATCH] linux-gen: dpdk: add support for dpdk v23.11

List DPDK v23.11 as supported and include it in the CI.

Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Janne Peltonen <janne.peltonen@nokia.com>
---
 .github/workflows/ci-pipeline-arm64.yml | 11 +++++++++++
 .github/workflows/ci-pipeline.yml       |  9 +++++++++
 DEPENDENCIES                            |  4 ++--
 platform/linux-generic/pktio/dpdk.c     |  1 +
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-pipeline-arm64.yml b/.github/workflows/ci-pipeline-arm64.yml
index c049de9589..acc3203f0c 100644
--- a/.github/workflows/ci-pipeline-arm64.yml
+++ b/.github/workflows/ci-pipeline-arm64.yml
@@ -323,3 +323,14 @@ jobs:
                -e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-graviton3-dpdk_21.11 /odp/scripts/ci/check.sh
       - if: ${{ failure() }}
         uses: ./.github/actions/run-failure-log
+
+  Run_dpdk-23_11:
+    if: ${{ github.repository == 'OpenDataPlane/odp' }}
+    runs-on: ah-ubuntu_22_04-c7g_2x-50
+    steps:
+      - uses: OpenDataPlane/action-clean-up@main
+      - uses: actions/checkout@v4
+      - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}"
+               -e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-graviton3-dpdk_23.11 /odp/scripts/ci/check.sh
+      - if: ${{ failure() }}
+        uses: ./.github/actions/run-failure-log
diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
index efe5bf50a5..89578d206a 100644
--- a/.github/workflows/ci-pipeline.yml
+++ b/.github/workflows/ci-pipeline.yml
@@ -396,6 +396,15 @@ jobs:
       - if: ${{ failure() }}
         uses: ./.github/actions/run-failure-log
 
+  Run_dpdk-23_11:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+      - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}"
+               -e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-dpdk_23.11 /odp/scripts/ci/check.sh
+      - if: ${{ failure() }}
+        uses: ./.github/actions/run-failure-log
+
   Run_sanitizer:
     runs-on: ubuntu-20.04
     env:
diff --git a/DEPENDENCIES b/DEPENDENCIES
index 18c77d0c7e..c007f843d1 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -155,8 +155,8 @@ Prerequisites for building the OpenDataPlane (ODP) API
 
 3.5 DPDK packet I/O support (optional)
 
-   Use DPDK for ODP packet I/O. Currently supported DPDK versions are v21.11
-   and v22.11 (recommended).
+   Use DPDK for ODP packet I/O. Currently supported DPDK versions are v21.11,
+   v22.11 (recommended), and v23.11.
 
    Note: only packet I/O is accelerated with DPDK. See
         https://github.com/OpenDataPlane/odp-dpdk.git
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index 1727f749e5..3608102166 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -58,6 +58,7 @@
 
 #include <ctype.h>
 #include <errno.h>
+#include <pthread.h>
 #include <sched.h>
 #include <stdint.h>
 #include <unistd.h>