Rebase to 23.11

This patch aligns the current stream to c9s.

Resolves: RHEL-19584
Signed-off-by: David Marchand <david.marchand@redhat.com>

.gitignore

@@ -1,4 +1,16 @@
-SOURCES/dpdk-21.11.tar.xz
+/dpdk-stable-16.11.2.tar.xz
-SOURCES/pyelftools-0.27.tar.gz
+/dpdk-17.11.tar.xz
+/dpdk-18.11.tar.xz
+/dpdk-18.11.2.tar.xz
+/dpdk-19.11.tar.xz
+/dpdk-19.11.1.tar.xz
+/dpdk-19.11.2.tar.xz
+/dpdk-19.11.3.tar.xz
+/dpdk-20.11.tar.xz
+/dpdk-20.11.1.tar.xz
 /dpdk-21.11.tar.xz
 /pyelftools-0.27.tar.gz
+/dpdk-21.11.1.tar.xz
+/dpdk-21.11.2.tar.xz
+/dpdk-22.11.tar.xz
+/dpdk-23.11.tar.xz

0001-vhost-discard-too-small-descriptor-chains.patch

@@ -1,78 +0,0 @@
-From f167022606b5ccca27a627ae599538ce2348ef67 Mon Sep 17 00:00:00 2001
-Message-Id: <f167022606b5ccca27a627ae599538ce2348ef67.1666780268.git.tredaelli@redhat.com>
-From: Maxime Coquelin <maxime.coquelin@redhat.com>
-Date: Thu, 16 Jun 2022 11:35:56 +0200
-Subject: [PATCH 1/2] vhost: discard too small descriptor chains
-
-[ upstream commit 71bd0cc536ad6d84188d947d6f24c17400d8f623 ]
-
-This patch discards descriptor chains which are smaller
-than the Virtio-net header size, and ones that are equal.
-
-Indeed, such descriptor chains sizes mean there is no
-packet data.
-
-This patch also has the advantage of requesting the exact
-packets sizes for the mbufs.
-
-CVE-2022-2132
-Fixes: 62250c1d0978 ("vhost: extract split ring handling from Rx and Tx functions")
-Fixes: c3ff0ac70acb ("vhost: improve performance by supporting large buffer")
-Fixes: 84d5204310d7 ("vhost: support async dequeue for split ring")
-
-Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
-Acked-by: Chenbo Xia <chenbo.xia@intel.com>
-Reviewed-by: David Marchand <david.marchand@redhat.com>
----
- lib/vhost/virtio_net.c | 21 +++++++++++++++++----
- 1 file changed, 17 insertions(+), 4 deletions(-)
-
-diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c
-index 858187d1b0..991a7a2bd4 100644
---- a/lib/vhost/virtio_net.c
-+++ b/lib/vhost/virtio_net.c
-@@ -2334,10 +2334,10 @@ copy_desc_to_mbuf(struct virtio_net *dev, struct vhost_virtqueue *vq,
- 	buf_addr = buf_vec[vec_idx].buf_addr;
- 	buf_len = buf_vec[vec_idx].buf_len;
- 
--	if (unlikely(buf_len < dev->vhost_hlen && nr_vec <= 1)) {
--		error = -1;
--		goto out;
--	}
-+	/*
-+	 * The caller has checked the descriptors chain is larger than the
-+	 * header size.
-+	 */
- 
- 	if (virtio_net_with_host_offload(dev)) {
- 		if (unlikely(buf_len < sizeof(struct virtio_net_hdr))) {
-@@ -2568,6 +2568,14 @@ virtio_dev_tx_split(struct virtio_net *dev, struct vhost_virtqueue *vq,
- 
- 		update_shadow_used_ring_split(vq, head_idx, 0);
- 
-+		if (unlikely(buf_len <= dev->vhost_hlen)) {
-+			dropped += 1;
-+			i++;
-+			break;
-+		}
-+
-+		buf_len -= dev->vhost_hlen;
-+
- 		err = virtio_dev_pktmbuf_prep(dev, pkts[i], buf_len);
- 		if (unlikely(err)) {
- 			/*
-@@ -2771,6 +2779,11 @@ vhost_dequeue_single_packed(struct virtio_net *dev,
- 					 VHOST_ACCESS_RO) < 0))
- 		return -1;
- 
-+	if (unlikely(buf_len <= dev->vhost_hlen))
-+		return -1;
-+
-+	buf_len -= dev->vhost_hlen;
-+
- 	if (unlikely(virtio_dev_pktmbuf_prep(dev, pkts, buf_len))) {
- 		if (!allocerr_warned) {
- 			VHOST_LOG_DATA(ERR,
--- 
-2.37.3
-

0002-vhost-fix-header-spanned-across-more-than-two-descri.patch

@@ -1,106 +0,0 @@
-From e12d415556994d0901c317f6338ed2961185465f Mon Sep 17 00:00:00 2001
-Message-Id: <e12d415556994d0901c317f6338ed2961185465f.1666780268.git.tredaelli@redhat.com>
-In-Reply-To: <f167022606b5ccca27a627ae599538ce2348ef67.1666780268.git.tredaelli@redhat.com>
-References: <f167022606b5ccca27a627ae599538ce2348ef67.1666780268.git.tredaelli@redhat.com>
-From: Maxime Coquelin <maxime.coquelin@redhat.com>
-Date: Thu, 16 Jun 2022 14:25:07 +0200
-Subject: [PATCH 2/2] vhost: fix header spanned across more than two
- descriptors
-
-[ upstream commit dc1516e260a0df272b218392faf6db3cbf45e717 ]
-
-This patch aims at supporting the unlikely case where a
-Virtio-net header is spanned across more than two
-descriptors.
-
-CVE-2022-2132
-Fixes: fd68b4739d2c ("vhost: use buffer vectors in dequeue path")
-
-Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
-Acked-by: Chenbo Xia <chenbo.xia@intel.com>
-Reviewed-by: David Marchand <david.marchand@redhat.com>
----
- lib/vhost/virtio_net.c | 41 +++++++++++++----------------------------
- 1 file changed, 13 insertions(+), 28 deletions(-)
-
-diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c
-index 991a7a2bd4..bf4d75b4bd 100644
---- a/lib/vhost/virtio_net.c
-+++ b/lib/vhost/virtio_net.c
-@@ -2322,25 +2322,22 @@ copy_desc_to_mbuf(struct virtio_net *dev, struct vhost_virtqueue *vq,
- 	uint32_t buf_avail, buf_offset;
- 	uint64_t buf_addr, buf_len;
- 	uint32_t mbuf_avail, mbuf_offset;
-+	uint32_t hdr_remain = dev->vhost_hlen;
- 	uint32_t cpy_len;
- 	struct rte_mbuf *cur = m, *prev = m;
- 	struct virtio_net_hdr tmp_hdr;
- 	struct virtio_net_hdr *hdr = NULL;
--	/* A counter to avoid desc dead loop chain */
--	uint16_t vec_idx = 0;
-+	uint16_t vec_idx;
- 	struct batch_copy_elem *batch_copy = vq->batch_copy_elems;
- 	int error = 0;
- 
--	buf_addr = buf_vec[vec_idx].buf_addr;
--	buf_len = buf_vec[vec_idx].buf_len;
--
- 	/*
- 	 * The caller has checked the descriptors chain is larger than the
- 	 * header size.
- 	 */
- 
- 	if (virtio_net_with_host_offload(dev)) {
--		if (unlikely(buf_len < sizeof(struct virtio_net_hdr))) {
-+		if (unlikely(buf_vec[0].buf_len < sizeof(struct virtio_net_hdr))) {
- 			/*
- 			 * No luck, the virtio-net header doesn't fit
- 			 * in a contiguous virtual area.
-@@ -2348,34 +2345,22 @@ copy_desc_to_mbuf(struct virtio_net *dev, struct vhost_virtqueue *vq,
- 			copy_vnet_hdr_from_desc(&tmp_hdr, buf_vec);
- 			hdr = &tmp_hdr;
- 		} else {
--			hdr = (struct virtio_net_hdr *)((uintptr_t)buf_addr);
-+			hdr = (struct virtio_net_hdr *)((uintptr_t)buf_vec[0].buf_addr);
- 		}
- 	}
- 
--	/*
--	 * A virtio driver normally uses at least 2 desc buffers
--	 * for Tx: the first for storing the header, and others
--	 * for storing the data.
--	 */
--	if (unlikely(buf_len < dev->vhost_hlen)) {
--		buf_offset = dev->vhost_hlen - buf_len;
--		vec_idx++;
--		buf_addr = buf_vec[vec_idx].buf_addr;
--		buf_len = buf_vec[vec_idx].buf_len;
--		buf_avail  = buf_len - buf_offset;
--	} else if (buf_len == dev->vhost_hlen) {
--		if (unlikely(++vec_idx >= nr_vec))
--			goto out;
--		buf_addr = buf_vec[vec_idx].buf_addr;
--		buf_len = buf_vec[vec_idx].buf_len;
-+	for (vec_idx = 0; vec_idx < nr_vec; vec_idx++) {
-+		if (buf_vec[vec_idx].buf_len > hdr_remain)
-+			break;
- 
--		buf_offset = 0;
--		buf_avail = buf_len;
--	} else {
--		buf_offset = dev->vhost_hlen;
--		buf_avail = buf_vec[vec_idx].buf_len - dev->vhost_hlen;
-+		hdr_remain -= buf_vec[vec_idx].buf_len;
- 	}
- 
-+	buf_addr = buf_vec[vec_idx].buf_addr;
-+	buf_len = buf_vec[vec_idx].buf_len;
-+	buf_offset = hdr_remain;
-+	buf_avail = buf_vec[vec_idx].buf_len - hdr_remain;
-+
- 	PRINT_PACKET(dev,
- 			(uintptr_t)(buf_addr + buf_offset),
- 			(uint32_t)buf_avail, 0);
--- 
-2.37.3
-

dpdk.spec

@@ -8,28 +8,29 @@
 #% define date 20191128
 #% define shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
-%define ver 21.11
+%define ver 23.11
-%define rel 3
+%define rel 1
 
-%define srcname dpdk
+%define srcname dpdk%(awk -F. '{ if (NF > 2) print "-stable" }' <<<%{version})
+
+%define pyelftoolsver 0.27
 
 Name: dpdk
 Version: %{ver}
 Release: %{rel}%{?commit0:.%{date}git%{shortcommit0}}%{?dist}
+%if 0%{?fedora} || 0%{?rhel} > 8
+Epoch: 2
+%endif
 URL: http://dpdk.org
 %if 0%{?commit0:1}
-Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%{commit0}.tar.xz
+Source: https://dpdk.org/browse/dpdk/snapshot/dpdk-%{commit0}.tar.xz
 %else
-Source: http://fast.dpdk.org/rel/dpdk-%{ver}.tar.xz
+Source: https://fast.dpdk.org/rel/dpdk-%{ver}.tar.xz
 %endif
 
 # Only needed for creating snapshot tarballs, not used in build itself
 Source100: dpdk-snapshot.sh
 
-# CVE-2022-2132
-Patch1: 0001-vhost-discard-too-small-descriptor-chains.patch
-Patch2: 0002-vhost-fix-header-spanned-across-more-than-two-descri.patch
-
 Summary: Set of libraries and drivers for fast packet processing
 
 #
@@ -57,90 +58,23 @@ Conflicts: dpdk-doc < 18.11-2
 %endif
 
 BuildRequires: meson
-%if 0%{?rhel} && 0%{?rhel} < 9
-%define pyelftoolsver 0.27
 Source1: https://github.com/eliben/pyelftools/archive/refs/tags/v%{pyelftoolsver}.tar.gz#/pyelftools-%{pyelftoolsver}.tar.gz
-%else
+%if 0%{?rhel} > 8 || 0%{?fedora}
 BuildRequires: python3-pyelftools
 %endif
-BuildRequires: gcc, zlib-devel, numactl-devel
+BuildRequires: gcc, zlib-devel, numactl-devel, libarchive-devel
 BuildRequires: doxygen, python3-sphinx
 %ifarch x86_64
 BuildRequires: rdma-core-devel >= 15
 %endif
 
-# Macros taked from ninja-build and meson packages and adapted to be defined here
-# See /usr/lib/rpm/macros.d/macros.{ninja,meson}
-%if 0%{?rhel} && 0%{?rhel} < 8
-
-# RHEL-7 doesn't define _vpath_* macros yet
-%if 0%{!?_vpath_srcdir:1}
-%define _vpath_srcdir .
-%endif
-%if 0%{!?_vpath_builddir:1}
-%define _vpath_builddir %_target_platform
-%endif
-
-%define __ninja %{venvdir}/bin/ninja
-%define __ninja_common_opts -v %{?_smp_mflags}
-
-%define ninja_build \
-    %{__ninja} %{__ninja_common_opts}
-
-%define ninja_install \
-    DESTDIR=%{buildroot} %{__ninja} install %{__ninja_common_opts}
-
-%define ninja_test \
-    %{__ninja} test %{__ninja_common_opts}
-
-%define __meson %{venvdir}/bin/meson
-%define __meson_wrap_mode nodownload
-%define __meson_auto_features enabled
-
-%define meson \
-    export CFLAGS="${CFLAGS:-%__global_cflags}"       \
-    export CXXFLAGS="${CXXFLAGS:-%__global_cxxflags}" \
-    export FFLAGS="${FFLAGS:-%__global_fflags}"       \
-    export FCFLAGS="${FCFLAGS:-%__global_fcflags}"    \
-    export LDFLAGS="${LDFLAGS:-%__global_ldflags}"    \
-    %{__meson}                                    \\\
-        --buildtype=plain                         \\\
-        --prefix=%{_prefix}                       \\\
-        --libdir=%{_libdir}                       \\\
-        --libexecdir=%{_libexecdir}               \\\
-        --bindir=%{_bindir}                       \\\
-        --sbindir=%{_sbindir}                     \\\
-        --includedir=%{_includedir}               \\\
-        --datadir=%{_datadir}                     \\\
-        --mandir=%{_mandir}                       \\\
-        --infodir=%{_infodir}                     \\\
-        --localedir=%{_datadir}/locale            \\\
-        --sysconfdir=%{_sysconfdir}               \\\
-        --localstatedir=%{_localstatedir}         \\\
-        --sharedstatedir=%{_sharedstatedir}       \\\
-        --wrap-mode=%{__meson_wrap_mode}          \\\
-        --auto-features=%{__meson_auto_features}  \\\
-        %{_vpath_srcdir} %{_vpath_builddir}       \\\
-        %{nil}
-
-%define meson_build \
-    %ninja_build -C %{_vpath_builddir}
-
-%define meson_install \
-    %ninja_install -C %{_vpath_builddir}
-
-%define meson_test \
-    %ninja_test -C %{_vpath_builddir}
-
-%endif
-
 %description
 The Data Plane Development Kit is a set of libraries and drivers for
 fast packet processing in the user space.
 
 %package devel
 Summary: Data Plane Development Kit development files
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %ifarch x86_64
 Requires: rdma-core-devel
 %endif
@@ -159,7 +93,7 @@ API programming documentation for the Data Plane Development Kit.
 %if %{with tools}
 %package tools
 Summary: Tools for setting up Data Plane Development Kit environment
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kmod pciutils findutils iproute python3
 
 %description tools
@@ -189,6 +123,15 @@ as L2 and L3 forwarding.
 export PYTHONPATH=$(pwd)/pyelftools-%{pyelftoolsver}
 %endif
 
+ENABLED_APPS=(
+    test-pmd
+    test-bbdev
+)
+
+for app in "${ENABLED_APPS[@]}"; do
+    enable_apps="${enable_apps:+$enable_apps,}"$app
+done
+
 ENABLED_DRIVERS=(
     bus/pci
     bus/vdev
@@ -203,15 +146,16 @@ ENABLED_DRIVERS=(
 
 %ifarch x86_64
 ENABLED_DRIVERS+=(
+    baseband/acc
     bus/auxiliary
     bus/vmbus
     common/iavf
     common/mlx5
+    common/nfp
     net/bnxt
     net/enic
     net/iavf
     net/ice
-    net/mlx4
     net/mlx5
     net/netvsc
     net/nfp
@@ -227,41 +171,46 @@ ENABLED_DRIVERS+=(
 )
 %endif
 
-for driver in ${ENABLED_DRIVERS[@]}; do
+for driver in "${ENABLED_DRIVERS[@]}"; do
     enable_drivers="${enable_drivers:+$enable_drivers,}"$driver
 done
 
-# As of 21.11-rc3, following libraries can be disabled:
-# optional_libs = [
-#         'bitratestats',
-#         'gpudev',
-#         'gro',
-#         'gso',
-#         'kni',
-#         'jobstats',
-#         'latencystats',
-#         'metrics',
-#         'pdump',
-#         'power',
-#         'vhost',
-# ]
 # If doing any updates, this must be aligned with:
 # https://access.redhat.com/articles/3538141
-DISABLED_LIBS=(
+ENABLED_LIBS=(
-    gpudev
+    bbdev
-    kni
+    bitratestats
-    jobstats
+    bpf
-    power
+    cmdline
+    cryptodev
+    dmadev
+    gro
+    gso
+    hash
+    ip_frag
+    latencystats
+    member
+    meter
+    metrics
+    pcapng
+    pdump
+    security
+    stack
+    vhost
 )
 
-for lib in "${DISABLED_LIBS[@]}"; do
+for lib in "${ENABLED_LIBS[@]}"; do
-    disable_libs="${disable_libs:+$disable_libs,}"$lib
+    enable_libs="${enable_libs:+$enable_libs,}"$lib
 done
 
+ln -s /usr/bin/true mandb
+export PATH=$(pwd):$PATH
 %meson --includedir=include/dpdk \
        --default-library=shared \
-       -Ddisable_libs="$disable_libs" \
+       -Ddeveloper_mode=disabled \
+       -Denable_libs="$enable_libs" \
        -Ddrivers_install_subdir=dpdk-pmds \
+       -Denable_apps="$enable_apps" \
        -Denable_docs=true \
        -Denable_drivers="$enable_drivers" \
        -Dplatform=generic \
@@ -271,40 +220,34 @@ done
 
 # Check drivers and libraries
 for driver in "${ENABLED_DRIVERS[@]}"; do
-	config_token=RTE_$(echo $driver | tr [a-z/] [A-Z_])
+	config_token="RTE_$(echo "$driver" | tr [a-z/] [A-Z_])"
-	! grep -q $config_token */rte_build_config.h || continue
+	! grep -Fqw "$config_token" */rte_build_config.h || continue
 	echo "!!! Could not find $driver in rte_build_config.h, please check dependencies. !!!"
 	false
 done
-for lib in "${DISABLED_LIBS[@]}"; do
+for lib in "${ENABLED_LIBS[@]}"; do
-	config_token=RTE_LIB_$(echo $lib | tr [a-z/] [A-Z_])
+	config_token="RTE_LIB_$(echo "$lib" | tr [a-z/] [A-Z_])"
-	grep -q $config_token */rte_build_config.h || continue
+	! grep -Fqw "$config_token" */rte_build_config.h || continue
-	echo "!!! Found $lib in rte_build_config.h. !!!"
+	echo "!!! Could not find $lib in rte_build_config.h, please check dependencies. !!!"
 	false
 done
 %meson_build
 
 %install
-%if 0%{?rhel} && 0%{?rhel} < 8
-export PATH="%{venvdir}/bin:$PATH"
-%endif
-
 %meson_install
 
-rm -f %{buildroot}%{_bindir}/dpdk-dumpcap
-rm -f %{buildroot}%{_bindir}/dpdk-pdump
-rm -f %{buildroot}%{_bindir}/dpdk-proc-info
-rm -f %{buildroot}%{_bindir}/dpdk-test{,-acl,-bbdev,-cmdline,-compress-perf,-crypto-perf,-eventdev,-pipeline,-sad,-fib,-flow-perf,-regex}
 rm -f %{buildroot}%{_libdir}/*.a
-# Taked from debian/rules
+# Taken from debian/rules
-rm -f %{docdir}/html/.buildinfo
+rm -f %{buildroot}%{docdir}/html/.buildinfo
-rm -f %{docdir}/html/objects.inv
+rm -f %{buildroot}%{docdir}/html/objects.inv
-rm -rf %{docdir}/html/.doctrees
+rm -rf %{buildroot}%{docdir}/html/.doctrees
+find %{buildroot}%{_datadir}/man/ -type f -a ! -iname "*rte_*" -exec rm {} \;
 
 %files
 # BSD
 %doc README MAINTAINERS
 %{_bindir}/dpdk-testpmd
+%{_bindir}/dpdk-test-bbdev
 %dir %{pmddir}
 %{_libdir}/*.so.*
 %{pmddir}/*.so.*
@@ -329,6 +272,7 @@ rm -rf %{docdir}/html/.doctrees
 %{pmddir}/*.so
 %{_libdir}/pkgconfig/libdpdk.pc
 %{_libdir}/pkgconfig/libdpdk-libs.pc
+%{_datadir}/man
 %if %{with examples}
 %files examples
 %{_bindir}/dpdk-*
@@ -341,6 +285,9 @@ rm -rf %{docdir}/html/.doctrees
 %endif
 
 %changelog
+* Fri Dec 15 2023 David Marchand <david.marchand@redhat.com> - 23.11-1
+- Rebase to 23.11 (RHEL-19584)
+
 * Fri Dec 23 2022 Timothy Redaelli <tredaelli@redhat.com> - 21.11-3
 - Version bump just to be sure it's updated from dpdk-21.11-2.el8_7
 

sources

@@ -1,2 +1,2 @@
-SHA512 (dpdk-21.11.tar.xz) = 843282023c2f77a9b8af393d50c6dde54f09d490cd6f4a99f03d4df5df13a7d963aa86885fdf64e13f9da71e01c881d1f301dd093574a32cddd84f4b1fb58fd5
+SHA512 (dpdk-23.11.tar.xz) = e5177d658fca8df55090a92ea1a8932aac5847314fed7c686b8a36e709f34b14c05e68d6c4c433ff5371b67a39c4324b4eefab8c138f417468f57092bf269b4c
 SHA512 (pyelftools-0.27.tar.gz) = bb0a00e5500016e3d4f64be0a728e190f84b11a805f78d668b5a74716a30400e6794946f198ef4a3f3b8f64a63deb1b5a96180b09e56b7357b988b28e25fad0a

tests/tests.yml

@@ -0,0 +1,9 @@
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    tests:
+    - simple:
+        dir: .
+        run: dpdk-testpmd --help