Compare commits
No commits in common. "c8" and "imports/c9/dpdk-21.11.2-1.el9_1" have entirely different histories.
c8
...
imports/c9
@ -1,2 +1,2 @@
|
|||||||
061198752d3d8b64d33113b7c8c1e272c973403d SOURCES/dpdk-23.11.tar.xz
|
d36c9e0949cb80d890273365f0d2b627d7f6f21b SOURCES/dpdk-21.11.2.tar.xz
|
||||||
3cc45b133677fbff08e89e65a2120be52ebb27a5 SOURCES/pyelftools-0.27.tar.gz
|
3cc45b133677fbff08e89e65a2120be52ebb27a5 SOURCES/pyelftools-0.27.tar.gz
|
||||||
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,2 @@
|
|||||||
SOURCES/dpdk-23.11.tar.xz
|
SOURCES/dpdk-21.11.2.tar.xz
|
||||||
SOURCES/pyelftools-0.27.tar.gz
|
SOURCES/pyelftools-0.27.tar.gz
|
||||||
|
@ -0,0 +1,34 @@
|
|||||||
|
From 8010a15523e896ca2f2436432602210cab793f87 Mon Sep 17 00:00:00 2001
|
||||||
|
From: David Marchand <david.marchand@redhat.com>
|
||||||
|
Date: Mon, 25 Jul 2022 22:32:03 +0200
|
||||||
|
Subject: [PATCH] vhost: fix virtqueue use after free on NUMA reallocation
|
||||||
|
|
||||||
|
[ upstream commit 0b2a2ca35037d6a5168f0832c11d9858b8ae946a ]
|
||||||
|
|
||||||
|
translate_ring_addresses (via numa_realloc) may change a virtio device and
|
||||||
|
virtio queue.
|
||||||
|
The virtqueue object must be refreshed before accessing the lock.
|
||||||
|
|
||||||
|
Fixes: 04c27cb673b9 ("vhost: fix unsafe vring addresses modifications")
|
||||||
|
|
||||||
|
Signed-off-by: David Marchand <david.marchand@redhat.com>
|
||||||
|
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
|
||||||
|
---
|
||||||
|
lib/vhost/vhost_user.c | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
|
||||||
|
index df780fd7d6..2b45e35d4a 100644
|
||||||
|
--- a/lib/vhost/vhost_user.c
|
||||||
|
+++ b/lib/vhost/vhost_user.c
|
||||||
|
@@ -2575,6 +2575,7 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg,
|
||||||
|
if (is_vring_iotlb(dev, vq, imsg)) {
|
||||||
|
rte_spinlock_lock(&vq->access_lock);
|
||||||
|
*pdev = dev = translate_ring_addresses(dev, i);
|
||||||
|
+ vq = dev->virtqueue[i];
|
||||||
|
rte_spinlock_unlock(&vq->access_lock);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.37.3
|
||||||
|
|
118
SPECS/dpdk.spec
118
SPECS/dpdk.spec
@ -8,7 +8,7 @@
|
|||||||
#% define date 20191128
|
#% define date 20191128
|
||||||
#% define shortcommit0 %(c=%{commit0}; echo ${c:0:7})
|
#% define shortcommit0 %(c=%{commit0}; echo ${c:0:7})
|
||||||
|
|
||||||
%define ver 23.11
|
%define ver 21.11.2
|
||||||
%define rel 1
|
%define rel 1
|
||||||
|
|
||||||
%define srcname dpdk%(awk -F. '{ if (NF > 2) print "-stable" }' <<<%{version})
|
%define srcname dpdk%(awk -F. '{ if (NF > 2) print "-stable" }' <<<%{version})
|
||||||
@ -23,14 +23,16 @@ Epoch: 2
|
|||||||
%endif
|
%endif
|
||||||
URL: http://dpdk.org
|
URL: http://dpdk.org
|
||||||
%if 0%{?commit0:1}
|
%if 0%{?commit0:1}
|
||||||
Source: https://dpdk.org/browse/dpdk/snapshot/dpdk-%{commit0}.tar.xz
|
Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%{commit0}.tar.xz
|
||||||
%else
|
%else
|
||||||
Source: https://fast.dpdk.org/rel/dpdk-%{ver}.tar.xz
|
Source: http://fast.dpdk.org/rel/dpdk-%{ver}.tar.xz
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Only needed for creating snapshot tarballs, not used in build itself
|
# Only needed for creating snapshot tarballs, not used in build itself
|
||||||
Source100: dpdk-snapshot.sh
|
Source100: dpdk-snapshot.sh
|
||||||
|
|
||||||
|
Patch1: 0001-vhost-fix-virtqueue-use-after-free-on-NUMA-reallocat.patch
|
||||||
|
|
||||||
Summary: Set of libraries and drivers for fast packet processing
|
Summary: Set of libraries and drivers for fast packet processing
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -62,7 +64,7 @@ Source1: https://github.com/eliben/pyelftools/archive/refs/tags/v%{pyelftoolsver
|
|||||||
%if 0%{?rhel} > 8 || 0%{?fedora}
|
%if 0%{?rhel} > 8 || 0%{?fedora}
|
||||||
BuildRequires: python3-pyelftools
|
BuildRequires: python3-pyelftools
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: gcc, zlib-devel, numactl-devel, libarchive-devel
|
BuildRequires: gcc, zlib-devel, numactl-devel
|
||||||
BuildRequires: doxygen, python3-sphinx
|
BuildRequires: doxygen, python3-sphinx
|
||||||
%ifarch x86_64
|
%ifarch x86_64
|
||||||
BuildRequires: rdma-core-devel >= 15
|
BuildRequires: rdma-core-devel >= 15
|
||||||
@ -123,15 +125,6 @@ as L2 and L3 forwarding.
|
|||||||
export PYTHONPATH=$(pwd)/pyelftools-%{pyelftoolsver}
|
export PYTHONPATH=$(pwd)/pyelftools-%{pyelftoolsver}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
ENABLED_APPS=(
|
|
||||||
test-pmd
|
|
||||||
test-bbdev
|
|
||||||
)
|
|
||||||
|
|
||||||
for app in "${ENABLED_APPS[@]}"; do
|
|
||||||
enable_apps="${enable_apps:+$enable_apps,}"$app
|
|
||||||
done
|
|
||||||
|
|
||||||
ENABLED_DRIVERS=(
|
ENABLED_DRIVERS=(
|
||||||
bus/pci
|
bus/pci
|
||||||
bus/vdev
|
bus/vdev
|
||||||
@ -146,16 +139,15 @@ ENABLED_DRIVERS=(
|
|||||||
|
|
||||||
%ifarch x86_64
|
%ifarch x86_64
|
||||||
ENABLED_DRIVERS+=(
|
ENABLED_DRIVERS+=(
|
||||||
baseband/acc
|
|
||||||
bus/auxiliary
|
bus/auxiliary
|
||||||
bus/vmbus
|
bus/vmbus
|
||||||
common/iavf
|
common/iavf
|
||||||
common/mlx5
|
common/mlx5
|
||||||
common/nfp
|
|
||||||
net/bnxt
|
net/bnxt
|
||||||
net/enic
|
net/enic
|
||||||
net/iavf
|
net/iavf
|
||||||
net/ice
|
net/ice
|
||||||
|
net/mlx4
|
||||||
net/mlx5
|
net/mlx5
|
||||||
net/netvsc
|
net/netvsc
|
||||||
net/nfp
|
net/nfp
|
||||||
@ -171,46 +163,41 @@ ENABLED_DRIVERS+=(
|
|||||||
)
|
)
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
for driver in "${ENABLED_DRIVERS[@]}"; do
|
for driver in ${ENABLED_DRIVERS[@]}; do
|
||||||
enable_drivers="${enable_drivers:+$enable_drivers,}"$driver
|
enable_drivers="${enable_drivers:+$enable_drivers,}"$driver
|
||||||
done
|
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:
|
# If doing any updates, this must be aligned with:
|
||||||
# https://access.redhat.com/articles/3538141
|
# https://access.redhat.com/articles/3538141
|
||||||
ENABLED_LIBS=(
|
DISABLED_LIBS=(
|
||||||
bbdev
|
gpudev
|
||||||
bitratestats
|
kni
|
||||||
bpf
|
jobstats
|
||||||
cmdline
|
power
|
||||||
cryptodev
|
|
||||||
dmadev
|
|
||||||
gro
|
|
||||||
gso
|
|
||||||
hash
|
|
||||||
ip_frag
|
|
||||||
latencystats
|
|
||||||
member
|
|
||||||
meter
|
|
||||||
metrics
|
|
||||||
pcapng
|
|
||||||
pdump
|
|
||||||
security
|
|
||||||
stack
|
|
||||||
vhost
|
|
||||||
)
|
)
|
||||||
|
|
||||||
for lib in "${ENABLED_LIBS[@]}"; do
|
for lib in "${DISABLED_LIBS[@]}"; do
|
||||||
enable_libs="${enable_libs:+$enable_libs,}"$lib
|
disable_libs="${disable_libs:+$disable_libs,}"$lib
|
||||||
done
|
done
|
||||||
|
|
||||||
ln -s /usr/bin/true mandb
|
|
||||||
export PATH=$(pwd):$PATH
|
|
||||||
%meson --includedir=include/dpdk \
|
%meson --includedir=include/dpdk \
|
||||||
--default-library=shared \
|
--default-library=shared \
|
||||||
-Ddeveloper_mode=disabled \
|
-Ddisable_libs="$disable_libs" \
|
||||||
-Denable_libs="$enable_libs" \
|
|
||||||
-Ddrivers_install_subdir=dpdk-pmds \
|
-Ddrivers_install_subdir=dpdk-pmds \
|
||||||
-Denable_apps="$enable_apps" \
|
|
||||||
-Denable_docs=true \
|
-Denable_docs=true \
|
||||||
-Denable_drivers="$enable_drivers" \
|
-Denable_drivers="$enable_drivers" \
|
||||||
-Dplatform=generic \
|
-Dplatform=generic \
|
||||||
@ -220,15 +207,15 @@ export PATH=$(pwd):$PATH
|
|||||||
|
|
||||||
# Check drivers and libraries
|
# Check drivers and libraries
|
||||||
for driver in "${ENABLED_DRIVERS[@]}"; do
|
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 -Fqw "$config_token" */rte_build_config.h || continue
|
! grep -q $config_token */rte_build_config.h || continue
|
||||||
echo "!!! Could not find $driver in rte_build_config.h, please check dependencies. !!!"
|
echo "!!! Could not find $driver in rte_build_config.h, please check dependencies. !!!"
|
||||||
false
|
false
|
||||||
done
|
done
|
||||||
for lib in "${ENABLED_LIBS[@]}"; do
|
for lib in "${DISABLED_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 -Fqw "$config_token" */rte_build_config.h || continue
|
grep -q $config_token */rte_build_config.h || continue
|
||||||
echo "!!! Could not find $lib in rte_build_config.h, please check dependencies. !!!"
|
echo "!!! Found $lib in rte_build_config.h. !!!"
|
||||||
false
|
false
|
||||||
done
|
done
|
||||||
%meson_build
|
%meson_build
|
||||||
@ -236,18 +223,20 @@ done
|
|||||||
%install
|
%install
|
||||||
%meson_install
|
%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
|
rm -f %{buildroot}%{_libdir}/*.a
|
||||||
# Taken from debian/rules
|
# Taked from debian/rules
|
||||||
rm -f %{buildroot}%{docdir}/html/.buildinfo
|
rm -f %{docdir}/html/.buildinfo
|
||||||
rm -f %{buildroot}%{docdir}/html/objects.inv
|
rm -f %{docdir}/html/objects.inv
|
||||||
rm -rf %{buildroot}%{docdir}/html/.doctrees
|
rm -rf %{docdir}/html/.doctrees
|
||||||
find %{buildroot}%{_datadir}/man/ -type f -a ! -iname "*rte_*" -exec rm {} \;
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
# BSD
|
# BSD
|
||||||
%doc README MAINTAINERS
|
%doc README MAINTAINERS
|
||||||
%{_bindir}/dpdk-testpmd
|
%{_bindir}/dpdk-testpmd
|
||||||
%{_bindir}/dpdk-test-bbdev
|
|
||||||
%dir %{pmddir}
|
%dir %{pmddir}
|
||||||
%{_libdir}/*.so.*
|
%{_libdir}/*.so.*
|
||||||
%{pmddir}/*.so.*
|
%{pmddir}/*.so.*
|
||||||
@ -272,7 +261,6 @@ find %{buildroot}%{_datadir}/man/ -type f -a ! -iname "*rte_*" -exec rm {} \;
|
|||||||
%{pmddir}/*.so
|
%{pmddir}/*.so
|
||||||
%{_libdir}/pkgconfig/libdpdk.pc
|
%{_libdir}/pkgconfig/libdpdk.pc
|
||||||
%{_libdir}/pkgconfig/libdpdk-libs.pc
|
%{_libdir}/pkgconfig/libdpdk-libs.pc
|
||||||
%{_datadir}/man
|
|
||||||
%if %{with examples}
|
%if %{with examples}
|
||||||
%files examples
|
%files examples
|
||||||
%{_bindir}/dpdk-*
|
%{_bindir}/dpdk-*
|
||||||
@ -285,17 +273,19 @@ find %{buildroot}%{_datadir}/man/ -type f -a ! -iname "*rte_*" -exec rm {} \;
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Dec 15 2023 David Marchand <david.marchand@redhat.com> - 23.11-1
|
* Mon Sep 12 2022 Timothy Redaelli <tredaelli@redhat.com> - 21.11.2-1
|
||||||
- Rebase to 23.11 (RHEL-19584)
|
- Rebase to 21.11.2 (#2126159)
|
||||||
|
- Includes fixes for CVE-2022-2132 (#2107173) and CVE-2022-28199 (#2123616)
|
||||||
|
|
||||||
* Fri Dec 23 2022 Timothy Redaelli <tredaelli@redhat.com> - 21.11-3
|
* Wed Jul 13 2022 Timothy Redaelli <tredaelli@redhat.com> - 21.11.1-1
|
||||||
- Version bump just to be sure it's updated from dpdk-21.11-2.el8_7
|
- Rebase to 21.11.1 (#2106856)
|
||||||
|
- Includes fix for CVE-2021-3839 (#2026642)
|
||||||
* Wed Oct 26 2022 Timothy Redaelli <tredaelli@redhat.com> - 21.11-2
|
|
||||||
- Backport fixes for CVE-2022-2132 (#2107171)
|
|
||||||
|
|
||||||
* Tue Nov 23 2021 David Marchand <david.marchand@redhat.com> - 21.11-1
|
* Tue Nov 23 2021 David Marchand <david.marchand@redhat.com> - 21.11-1
|
||||||
- Rebase to 21.11 (#2029497)
|
- Rebase to 21.11 (#2030616)
|
||||||
|
|
||||||
|
* Fri Nov 19 2021 Timothy Redaelli <tredaelli@redhat.com> - 20.11.1-1
|
||||||
|
- Rebase to 20.11.1 (#2024994)
|
||||||
|
|
||||||
* Tue Feb 16 2021 Timothy Redaelli <tredaelli@redhat.com> - 20.11-3
|
* Tue Feb 16 2021 Timothy Redaelli <tredaelli@redhat.com> - 20.11-3
|
||||||
- Fix gating since on DPDK 20.11 testpmd is called dpdk-testpmd
|
- Fix gating since on DPDK 20.11 testpmd is called dpdk-testpmd
|
||||||
|
Loading…
Reference in New Issue
Block a user