SLFO-pool/dpdk
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main dpdk revision 0e68e3e07069a2b1fa7bd399738a79a4

Browse Source
This commit is contained in:
Adrian Schröter
2025-04-03 11:03:45 +02:00
parent f8b09b8054
commit 067a93e62e
3 changed files with 70 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
0001-always_inline-fix.patch Normal file
View File

@@ -0,0 +1,35 @@
From a9ae58b265d580a1b7048e0686a626d7b2538d18 Mon Sep 17 00:00:00 2001
From: Clemens Famulla-Conrad <cfamullaconrad@suse.de>
Date: Tue, 1 Apr 2025 10:05:47 +0200
Subject: [PATCH] rte_trace: rte_trace_feature_is_enabled as makro
---
lib/eal/include/rte_trace.h | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/lib/eal/include/rte_trace.h b/lib/eal/include/rte_trace.h
index 90af760194..df95674277 100644
--- a/lib/eal/include/rte_trace.h
+++ b/lib/eal/include/rte_trace.h
@@ -44,16 +44,11 @@ bool rte_trace_is_enabled(void);
* @return
* true if trace feature is enabled, false otherwise.
*/
-__rte_experimental
-static __rte_always_inline bool
-rte_trace_feature_is_enabled(void)
-{
#ifdef RTE_TRACE
- return true;
+#define rte_trace_feature_is_enabled() (true)
#else
- return false;
+#define rte_trace_feature_is_enabled() (false)
#endif
-}
/**
* Enumerate trace mode operation.
--
2.43.0

9
dpdk.changes
View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Apr 1 13:30:00 UTC 2025 - Clemens Famulla-Conrad <cfamullaconrad@suse.com>
- Add 0001-always_inline-fix.patch to fix issue with always_inline
in rte_trace_feature_is_enabled() and replace it with preprocessor substitution.
Remove GCC 14 build requirement for SLE15/16 again.
- Fixup: Add "Provides:" for 'thunderx' multibuild flavor. Also remove
'Provides: dpdk-any' as there are no users. [bsc#1237385]
-------------------------------------------------------------------
Mon Mar 17 09:00:00 UTC 2025 - Clemens Famulla-Conrad <cfamullaconrad@suse.com>

50
dpdk.spec
View File

@@ -49,12 +49,8 @@ Source: https://fast.dpdk.org/rel/dpdk-%{version}.tar.xz
Patch0: 0001-fix-cpu-compatibility.patch
# PATCH-FIX-UPSTREAM - https://bugs.dpdk.org/show_bug.cgi?id=1530
Patch1: 0001-examples-vm_power_manager-add-missing-header.patch
%ifarch x86_64
%if 0%{suse_version} < 1699
# Workaround for build failure related to inline error
BuildRequires: gcc14
%endif
%endif
# Fix inline error for < gcc14 (<=SLE16)
Patch2: 0001-always_inline-fix.patch
BuildRequires: %{python_module Sphinx}
BuildRequires: %{python_module pyelftools >= 0.22}
BuildRequires: %{pythons}
@@ -76,9 +72,11 @@ BuildRequires: pkgconfig(libmnl)
BuildRequires: pkgconfig(libpcap)
BuildRequires: pkgconfig(numa)
BuildRequires: pkgconfig(zlib)
Conflicts: dpdk-any
Provides: dpdk-any = %{version}
Obsoletes: dpdk-kmp-trace < %{version}
%ifarch aarch64
Provides: dpdk-thunderx = %{version}-%{release}
Obsoletes: dpdk-thunderx < %{version}-%{release}
%endif
ExclusiveArch: aarch64 x86_64 ppc64le
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400
# https://bugzilla.opensuse.org/show_bug.cgi?id=1196511
@@ -93,8 +91,10 @@ fast packet processing in the user space.
Summary: Data Plane Development Kit development files
Group: Development/Libraries/C and C++
Requires: %{lname} = %{version}
Conflicts: dpdk-any-devel
Provides: dpdk-any-devel = %{version}
%ifarch aarch64
Provides: dpdk-thunderx-devel = %{version}-%{release}
Obsoletes: dpdk-thunderx-devel < %{version}-%{release}
%endif
%description devel
This package contains the headers and other files needed for developing
@@ -104,6 +104,10 @@ applications with the Data Plane Development Kit.
Summary: Data Plane Development Kit static development files
Group: Development/Libraries/C and C++
Requires: %{name}-devel = %{version}
%ifarch aarch64
Provides: dpdk-thunderx-devel-static = %{version}-%{release}
Obsoletes: dpdk-thunderx-devel-static < %{version}-%{release}
%endif
%description devel-static
This package contains the static library files needed for developing
@@ -121,9 +125,11 @@ to use the Data Plane Development Kit.
%package doc
Summary: Data Plane Development Kit API documentation
Group: System/Libraries
Conflicts: dpdk-any-doc
Provides: dpdk-any-doc = %{version}
BuildArch: noarch
%ifarch aarch64
Provides: dpdk-thunderx-doc = %{version}-%{release}
Obsoletes: dpdk-thunderx-doc < %{version}-%{release}
%endif
%description doc
API programming documentation for the Data Plane Development Kit.
@@ -137,8 +143,10 @@ Requires: findutils
Requires: iproute
Requires: kmod
Requires: pciutils
Conflicts: dpdk-any-tools
Provides: dpdk-any-tools = %{version}
%ifarch aarch64
Provides: dpdk-thunderx-tools = %{version}-%{release}
Obsoletes: dpdk-thunderx-tools < %{version}-%{release}
%endif
%description tools
This package contains tools for setting up Data Plane Development Kit environment
@@ -149,8 +157,10 @@ This package contains tools for setting up Data Plane Development Kit environmen
Summary: Data Plane Development Kit example applications
Group: System/Libraries
BuildRequires: libvirt-devel
Conflicts: dpdk-any-examples
Provides: dpdk-any-examples = %{version}
%ifarch aarch64
Provides: dpdk-thunderx-examples = %{version}-%{release}
Obsoletes: dpdk-thunderx-examples < %{version}-%{release}
%endif
%description examples
Example applications utilizing the Data Plane Development Kit, such
@@ -164,12 +174,7 @@ as L2 and L3 forwarding.
%prep
%setup -q -n dpdk-stable-%{version}
%if 0%{?suse_version} > 1600
%autopatch -p1
%else
# grr, no fs.copyfile() in the old meson in SLE (but it has old enough kernel).
%autopatch -p1 -M 99
%endif
# Skip not supported examples
sed -i "/performance-thread/d" examples/meson.build
@@ -182,9 +187,6 @@ sed -i "/performance-thread/d" examples/meson.build
%ifarch x86_64
export CFLAGS="%{optflags} -U_FORTIFY_SOURCE -msse4"
%if 0%{suse_version} < 1699
export CC=gcc-14
%endif
%endif
examples="all"
for flavor in %{flavors_to_build}; do