Compare commits
No commits in common. "c8" and "a9-beta" have entirely different histories.
|
@ -1,2 +0,0 @@
|
|||
17331a86759beba4b6635ed530ce23b0b73c0744 SOURCES/dpdk-21.11.tar.xz
|
||||
3cc45b133677fbff08e89e65a2120be52ebb27a5 SOURCES/pyelftools-0.27.tar.gz
|
|
@ -1,2 +0,0 @@
|
|||
SOURCES/dpdk-21.11.tar.xz
|
||||
SOURCES/pyelftools-0.27.tar.gz
|
|
@ -0,0 +1,135 @@
|
|||
From 3812e23f6b19d7e1e850094d1a5a04b7403d194f Mon Sep 17 00:00:00 2001
|
||||
From: David Marchand <david.marchand@redhat.com>
|
||||
Date: Tue, 13 Dec 2022 10:18:37 +0100
|
||||
Subject: [PATCH] net/i40e: revert link status check on device start
|
||||
|
||||
[ upstream commit a8ca8edf8c076c765c6d142ab4664a1f61414233 ]
|
||||
|
||||
The mentioned changes broke existing applications when the link status
|
||||
of i40e ports is down at the time the port is started.
|
||||
Revert those changes, the original issue will need a different fix.
|
||||
|
||||
Fixes: a4ba77367923 ("net/i40e: enable maximum frame size at port level")
|
||||
Fixes: 2184f7cdeeaa ("net/i40e: fix max frame size config at port level")
|
||||
Fixes: 719469f13b11 ("net/i40e: fix jumbo frame Rx with X722")
|
||||
|
||||
Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=2173794
|
||||
Signed-off-by: David Marchand <david.marchand@redhat.com>
|
||||
Acked-by: Simei Su <simei.su@intel.com>
|
||||
---
|
||||
drivers/net/i40e/i40e_ethdev.c | 50 +++++-----------------------------
|
||||
1 file changed, 7 insertions(+), 43 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
|
||||
index 7726a89d99..a982e42264 100644
|
||||
--- a/drivers/net/i40e/i40e_ethdev.c
|
||||
+++ b/drivers/net/i40e/i40e_ethdev.c
|
||||
@@ -387,7 +387,6 @@ static int i40e_set_default_mac_addr(struct rte_eth_dev *dev,
|
||||
struct rte_ether_addr *mac_addr);
|
||||
|
||||
static int i40e_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);
|
||||
-static void i40e_set_mac_max_frame(struct rte_eth_dev *dev, uint16_t size);
|
||||
|
||||
static int i40e_ethertype_filter_convert(
|
||||
const struct rte_eth_ethertype_filter *input,
|
||||
@@ -1711,6 +1710,11 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)
|
||||
*/
|
||||
i40e_add_tx_flow_control_drop_filter(pf);
|
||||
|
||||
+ /* Set the max frame size to 0x2600 by default,
|
||||
+ * in case other drivers changed the default value.
|
||||
+ */
|
||||
+ i40e_aq_set_mac_config(hw, I40E_FRAME_SIZE_MAX, TRUE, false, 0, NULL);
|
||||
+
|
||||
/* initialize RSS rule list */
|
||||
TAILQ_INIT(&pf->rss_config_list);
|
||||
|
||||
@@ -2328,7 +2332,6 @@ i40e_dev_start(struct rte_eth_dev *dev)
|
||||
uint32_t intr_vector = 0;
|
||||
struct i40e_vsi *vsi;
|
||||
uint16_t nb_rxq, nb_txq;
|
||||
- uint16_t max_frame_size;
|
||||
|
||||
hw->adapter_stopped = 0;
|
||||
|
||||
@@ -2467,9 +2470,6 @@ i40e_dev_start(struct rte_eth_dev *dev)
|
||||
"please call hierarchy_commit() "
|
||||
"before starting the port");
|
||||
|
||||
- max_frame_size = dev->data->mtu + I40E_ETH_OVERHEAD;
|
||||
- i40e_set_mac_max_frame(dev, max_frame_size);
|
||||
-
|
||||
return I40E_SUCCESS;
|
||||
|
||||
tx_err:
|
||||
@@ -2809,9 +2809,6 @@ i40e_dev_set_link_down(struct rte_eth_dev *dev)
|
||||
return i40e_phy_conf_link(hw, abilities, speed, false);
|
||||
}
|
||||
|
||||
-#define CHECK_INTERVAL 100 /* 100ms */
|
||||
-#define MAX_REPEAT_TIME 10 /* 1s (10 * 100ms) in total */
|
||||
-
|
||||
static __rte_always_inline void
|
||||
update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link)
|
||||
{
|
||||
@@ -2878,6 +2875,8 @@ static __rte_always_inline void
|
||||
update_link_aq(struct i40e_hw *hw, struct rte_eth_link *link,
|
||||
bool enable_lse, int wait_to_complete)
|
||||
{
|
||||
+#define CHECK_INTERVAL 100 /* 100ms */
|
||||
+#define MAX_REPEAT_TIME 10 /* 1s (10 * 100ms) in total */
|
||||
uint32_t rep_cnt = MAX_REPEAT_TIME;
|
||||
struct i40e_link_status link_status;
|
||||
int status;
|
||||
@@ -6738,7 +6737,6 @@ i40e_dev_handle_aq_msg(struct rte_eth_dev *dev)
|
||||
if (!ret)
|
||||
rte_eth_dev_callback_process(dev,
|
||||
RTE_ETH_EVENT_INTR_LSC, NULL);
|
||||
-
|
||||
break;
|
||||
default:
|
||||
PMD_DRV_LOG(DEBUG, "Request %u is not supported yet",
|
||||
@@ -12123,40 +12121,6 @@ i40e_cloud_filter_qinq_create(struct i40e_pf *pf)
|
||||
return ret;
|
||||
}
|
||||
|
||||
-static void
|
||||
-i40e_set_mac_max_frame(struct rte_eth_dev *dev, uint16_t size)
|
||||
-{
|
||||
- struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
|
||||
- uint32_t rep_cnt = MAX_REPEAT_TIME;
|
||||
- struct rte_eth_link link;
|
||||
- enum i40e_status_code status;
|
||||
- bool can_be_set = true;
|
||||
-
|
||||
- /*
|
||||
- * I40E_MEDIA_TYPE_BASET link up can be ignored
|
||||
- * I40E_MEDIA_TYPE_BASET link down that hw->phy.media_type
|
||||
- * is I40E_MEDIA_TYPE_UNKNOWN
|
||||
- */
|
||||
- if (hw->phy.media_type != I40E_MEDIA_TYPE_BASET &&
|
||||
- hw->phy.media_type != I40E_MEDIA_TYPE_UNKNOWN) {
|
||||
- do {
|
||||
- update_link_reg(hw, &link);
|
||||
- if (link.link_status)
|
||||
- break;
|
||||
- rte_delay_ms(CHECK_INTERVAL);
|
||||
- } while (--rep_cnt);
|
||||
- can_be_set = !!link.link_status;
|
||||
- }
|
||||
-
|
||||
- if (can_be_set) {
|
||||
- status = i40e_aq_set_mac_config(hw, size, TRUE, 0, false, NULL);
|
||||
- if (status != I40E_SUCCESS)
|
||||
- PMD_DRV_LOG(ERR, "Failed to set max frame size at port level");
|
||||
- } else {
|
||||
- PMD_DRV_LOG(ERR, "Set max frame size at port level not applicable on link down");
|
||||
- }
|
||||
-}
|
||||
-
|
||||
RTE_LOG_REGISTER_SUFFIX(i40e_logtype_init, init, NOTICE);
|
||||
RTE_LOG_REGISTER_SUFFIX(i40e_logtype_driver, driver, NOTICE);
|
||||
#ifdef RTE_ETHDEV_DEBUG_RX
|
||||
--
|
||||
2.39.2
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
Binary file not shown.
Binary file not shown.
165
SPECS/dpdk.spec
165
SPECS/dpdk.spec
|
@ -8,14 +8,19 @@
|
|||
#% define date 20191128
|
||||
#% define shortcommit0 %(c=%{commit0}; echo ${c:0:7})
|
||||
|
||||
%define ver 21.11
|
||||
%define rel 3
|
||||
%define ver 22.11
|
||||
%define rel 4
|
||||
|
||||
%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
|
||||
|
@ -26,9 +31,9 @@ Source: http://fast.dpdk.org/rel/dpdk-%{ver}.tar.xz
|
|||
# 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
|
||||
# Patches were taken from:
|
||||
# https://gitlab.com/redhat/centos-stream/rpms/dpdk/-/commit/54f868467a9f7c98a6101ce2b796b0ba7710648c
|
||||
Patch1: 0001-net-i40e-revert-link-status-check-on-device-start.patch
|
||||
|
||||
Summary: Set of libraries and drivers for fast packet processing
|
||||
|
||||
|
@ -57,90 +62,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 +97,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 +127,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,6 +150,7 @@ ENABLED_DRIVERS=(
|
|||
|
||||
%ifarch x86_64
|
||||
ENABLED_DRIVERS+=(
|
||||
baseband/acc
|
||||
bus/auxiliary
|
||||
bus/vmbus
|
||||
common/iavf
|
||||
|
@ -227,13 +175,15 @@ 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:
|
||||
# As of 22.11, following libraries can be disabled:
|
||||
# optional_libs = [
|
||||
# 'bitratestats',
|
||||
# 'cfgfile',
|
||||
# 'flow_classify',
|
||||
# 'gpudev',
|
||||
# 'gro',
|
||||
# 'gso',
|
||||
|
@ -241,17 +191,27 @@ done
|
|||
# 'jobstats',
|
||||
# 'latencystats',
|
||||
# 'metrics',
|
||||
# 'node',
|
||||
# 'pdump',
|
||||
# 'pipeline',
|
||||
# 'port',
|
||||
# 'power',
|
||||
# 'table',
|
||||
# 'vhost',
|
||||
# ]
|
||||
# If doing any updates, this must be aligned with:
|
||||
# https://access.redhat.com/articles/3538141
|
||||
DISABLED_LIBS=(
|
||||
cfgfile
|
||||
flow_classify
|
||||
gpudev
|
||||
kni
|
||||
jobstats
|
||||
node
|
||||
pipeline
|
||||
port
|
||||
power
|
||||
table
|
||||
)
|
||||
|
||||
for lib in "${DISABLED_LIBS[@]}"; do
|
||||
|
@ -262,6 +222,7 @@ done
|
|||
--default-library=shared \
|
||||
-Ddisable_libs="$disable_libs" \
|
||||
-Ddrivers_install_subdir=dpdk-pmds \
|
||||
-Denable_apps="$enable_apps" \
|
||||
-Denable_docs=true \
|
||||
-Denable_drivers="$enable_drivers" \
|
||||
-Dplatform=generic \
|
||||
|
@ -271,32 +232,24 @@ done
|
|||
|
||||
# Check drivers and libraries
|
||||
for driver in "${ENABLED_DRIVERS[@]}"; do
|
||||
config_token=RTE_$(echo $driver | tr [a-z/] [A-Z_])
|
||||
! grep -q $config_token */rte_build_config.h || continue
|
||||
config_token="RTE_$(echo "$driver" | tr [a-z/] [A-Z_])"
|
||||
! 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
|
||||
config_token=RTE_LIB_$(echo $lib | tr [a-z/] [A-Z_])
|
||||
grep -q $config_token */rte_build_config.h || continue
|
||||
config_token="RTE_LIB_$(echo "$lib" | tr [a-z/] [A-Z_])"
|
||||
grep -Fqw "$config_token" */rte_build_config.h || continue
|
||||
echo "!!! Found $lib in rte_build_config.h. !!!"
|
||||
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 %{docdir}/html/objects.inv
|
||||
rm -rf %{docdir}/html/.doctrees
|
||||
|
@ -305,6 +258,7 @@ rm -rf %{docdir}/html/.doctrees
|
|||
# BSD
|
||||
%doc README MAINTAINERS
|
||||
%{_bindir}/dpdk-testpmd
|
||||
%{_bindir}/dpdk-test-bbdev
|
||||
%dir %{pmddir}
|
||||
%{_libdir}/*.so.*
|
||||
%{pmddir}/*.so.*
|
||||
|
@ -341,14 +295,31 @@ rm -rf %{docdir}/html/.doctrees
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
* Wed Oct 04 2023 Eduard Abdullin <eabdullin@almalinux.org> - 22.11-4
|
||||
- Fix MTU regression for net/i40e
|
||||
|
||||
* Wed Oct 26 2022 Timothy Redaelli <tredaelli@redhat.com> - 21.11-2
|
||||
- Backport fixes for CVE-2022-2132 (#2107171)
|
||||
* Thu Mar 23 2023 Timothy Redaelli <tredaelli@redhat.com> - 22.11-3
|
||||
- Add support to load compressed firmware (#2179024)
|
||||
|
||||
* Fri Mar 03 2023 Maxime Coquelin <maxime.coquelin@redhat.com> - 22.11-2
|
||||
- Add ACC100/ACC200 and related test-bbdev application (#2106526, #2138398)
|
||||
|
||||
* Mon Jan 23 2023 Timothy Redaelli <tredaelli@redhat.com> - 22.11-1
|
||||
- Rebase to 22.11 (#2129066)
|
||||
|
||||
* Mon Sep 12 2022 Timothy Redaelli <tredaelli@redhat.com> - 21.11.2-1
|
||||
- Rebase to 21.11.2 (#2126159)
|
||||
- Includes fixes for CVE-2022-2132 (#2107173) and CVE-2022-28199 (#2123616)
|
||||
|
||||
* Wed Jul 13 2022 Timothy Redaelli <tredaelli@redhat.com> - 21.11.1-1
|
||||
- Rebase to 21.11.1 (#2106856)
|
||||
- Includes fix for CVE-2021-3839 (#2026642)
|
||||
|
||||
* 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
|
||||
- Fix gating since on DPDK 20.11 testpmd is called dpdk-testpmd
|
||||
|
|
Loading…
Reference in New Issue