From 1ea240a76b9c354c4a5fd4afb66ce6384e3604d0 Mon Sep 17 00:00:00 2001 From: yinbin Date: Wed, 17 Sep 2025 09:10:22 +0800 Subject: [PATCH] sync fix SIGFPE in gazelle init (cherry picked from commit 4086a5d56e8b93e94117b100e602f2df8d409f8d) --- ...-not-support-ring_mt_rts-mempool-ops.patch | 29 +++++++++++++++++++ 0002-fix-SIGFPE-in-gazelle-init.patch | 24 +++++++++++++++ gazelle.spec | 8 ++++- 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 0001-fix-dpdk-19.11-not-support-ring_mt_rts-mempool-ops.patch create mode 100644 0002-fix-SIGFPE-in-gazelle-init.patch diff --git a/0001-fix-dpdk-19.11-not-support-ring_mt_rts-mempool-ops.patch b/0001-fix-dpdk-19.11-not-support-ring_mt_rts-mempool-ops.patch new file mode 100644 index 0000000..61971fa --- /dev/null +++ b/0001-fix-dpdk-19.11-not-support-ring_mt_rts-mempool-ops.patch @@ -0,0 +1,29 @@ +From 13628c2832f4144d9cf1ed7b6710a59416fcd294 Mon Sep 17 00:00:00 2001 +From: yinbin +Date: Mon, 15 Sep 2025 19:53:38 +0800 +Subject: [PATCH] fix dpdk 19.11 not support ring_mt_rts mempool ops + +--- + src/lstack/include/lstack_mempool.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/lstack/include/lstack_mempool.h b/src/lstack/include/lstack_mempool.h +index 8a6d0d4..844f51d 100644 +--- a/src/lstack/include/lstack_mempool.h ++++ b/src/lstack/include/lstack_mempool.h +@@ -43,7 +43,12 @@ + #define RPCPOOL_RESERVE_NUM 512 + #define RPCPOLL_MAX_NUM (LWIP_MAX(RPCPOOL_RESERVE_NUM, MBUFPOOL_RESERVE_NUM) + MEMP_NUM_SYS_MBOX) + ++#if RTE_VERSION < RTE_VERSION_NUM(21, 11, 0, 0) ++#define MEMPOOL_OPS_NAME "ring_mp_mc" ++#else + #define MEMPOOL_OPS_NAME "ring_mt_rts" ++#endif /* RTE_VERSION < RTE_VERSION_NUM(21, 11, 0, 0) */ ++ + #define MEMPOOL_CACHE_NUM 32 + + #define BUF_CACHE_MIN_NUM 16 +-- +2.33.0 + diff --git a/0002-fix-SIGFPE-in-gazelle-init.patch b/0002-fix-SIGFPE-in-gazelle-init.patch new file mode 100644 index 0000000..511854a --- /dev/null +++ b/0002-fix-SIGFPE-in-gazelle-init.patch @@ -0,0 +1,24 @@ +From ec819b03ddf48fc4716d69f7fb50591fd9cdc81e Mon Sep 17 00:00:00 2001 +From: yinbin +Date: Tue, 16 Sep 2025 20:10:57 +0800 +Subject: [PATCH] fix SIGFPE in gazelle init + +--- + src/lstack/core/lstack_protocol_stack.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lstack/core/lstack_protocol_stack.c b/src/lstack/core/lstack_protocol_stack.c +index 8ff6981..f741d3c 100644 +--- a/src/lstack/core/lstack_protocol_stack.c ++++ b/src/lstack/core/lstack_protocol_stack.c +@@ -622,6 +622,7 @@ int stack_group_init(void) + + stack_group->stack_setup_fail = 0; + ++ sys_init(); + if (mem_thread_manager_init() != 0) { + LSTACK_LOG(ERR, LSTACK, "mem_thread_manager_init failed\n"); + return -1; +-- +2.33.0 + diff --git a/gazelle.spec b/gazelle.spec index 649d843..8816873 100644 --- a/gazelle.spec +++ b/gazelle.spec @@ -2,7 +2,7 @@ Name: gazelle Version: 1.0.3 -Release: 1 +Release: 2 Summary: gazelle is a high performance user-mode stack License: MulanPSL-2.0 URL: https://gitee.com/openeuler/gazelle @@ -19,6 +19,8 @@ BuildRequires: libarchive libarchive-devel Requires: dpdk >= 21.11-5 Requires: numactl libpcap libconfig libboundscheck iproute +Patch9001: 0001-fix-dpdk-19.11-not-support-ring_mt_rts-mempool-ops.patch +Patch9002: 0002-fix-SIGFPE-in-gazelle-init.patch %description %{name} is a high performance user-mode stack. @@ -60,6 +62,10 @@ install -Dpm 0640 %{_builddir}/%{name}-%{version}/src/ltran/ltran.conf %{b %config(noreplace) %{conf_path}/ltran.conf %changelog +* Wed Sep 17 2025 root - 1.0.3-2 +- fix SIGFPE in gazelle init +- fix dpdk 19.11 not support ring_mt_rts mempool ops + * Fri Aug 1 2025 yinbin - 1.0.3-1 - update version to 1.0.3 -- Gitee