From 0fc1ee00510ee02f6fcd36bc410db92bf475c068 Mon Sep 17 00:00:00 2001 From: kircher Date: Tue, 15 Nov 2022 16:53:32 +0800 Subject: [PATCH] fix pdump and mutil NIC init fail (cherry picked from commit 534076dac60acff14b4f1e9fd68418b6c3702406) --- 0140-fix-pdump-and-mutil-NIC-init-fail.patch | 57 ++++++++++++++++++++ gazelle.spec | 6 ++- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 0140-fix-pdump-and-mutil-NIC-init-fail.patch diff --git a/0140-fix-pdump-and-mutil-NIC-init-fail.patch b/0140-fix-pdump-and-mutil-NIC-init-fail.patch new file mode 100644 index 0000000..6421b2e --- /dev/null +++ b/0140-fix-pdump-and-mutil-NIC-init-fail.patch @@ -0,0 +1,57 @@ +From 846fc6abbb693183d042ab91f9450f4fa4cef345 Mon Sep 17 00:00:00 2001 +From: kircher +Date: Mon, 14 Nov 2022 19:17:00 +0800 +Subject: [PATCH] fix pdump and mutil NIC init fail + +--- + src/lstack/Makefile | 3 ++- + src/ltran/ltran_monitor.c | 5 +++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/lstack/Makefile b/src/lstack/Makefile +index 1560d0c..908897d 100644 +--- a/src/lstack/Makefile ++++ b/src/lstack/Makefile +@@ -81,7 +81,8 @@ LIBRTE_LIB = $(DPDK_LIB_PATH)/librte_pci.so \ + $(DPDK_LIB_PATH)/librte_bus_vdev.so \ + $(DPDK_LIB_PATH)/librte_net.so \ + $(DPDK_LIB_PATH)/librte_ethdev.so \ +- $(DPDK_LIB_PATH)/librte_pdump.so ++ $(DPDK_LIB_PATH)/librte_pdump.so \ ++ $(DPDK_LIB_PATH)/librte_pmd_pcap.so + + + DEP_LIBS = $(LWIP_LIB) $(LIBRTE_LIB) +diff --git a/src/ltran/ltran_monitor.c b/src/ltran/ltran_monitor.c +index d535726..bd047fc 100644 +--- a/src/ltran/ltran_monitor.c ++++ b/src/ltran/ltran_monitor.c +@@ -32,6 +32,7 @@ + #include "gazelle_dfx_msg.h" + #include "gazelle_base_func.h" + #include "ltran_monitor.h" ++#include "ltran_param.h" + + #define GAZELLE_LISTEN_BACKLOG 5 + +@@ -180,7 +181,7 @@ static int32_t gazelle_ctl_init(void) + LTRAN_ERR("dir not exist and create fail. ret=%d.\n", ret); + return GAZELLE_ERR; + } +- ret = unix_server_create(GAZELLE_DFX_SOCK_PATHNAME, &listenfd); ++ ret = unix_server_create(get_ltran_config()->dfx_socket_filename, &listenfd); + if (ret != GAZELLE_OK) { + LTRAN_ERR("unix_server_create failed. ret=%d.\n", ret); + return GAZELLE_ERR; +@@ -199,7 +200,7 @@ static int32_t gazelle_ctl_init(void) + return GAZELLE_ERR; + } + +- ret = unix_server_create(GAZELLE_REG_SOCK_PATHNAME, &listenfd); ++ ret = unix_server_create(get_ltran_config()->unix_socket_filename, &listenfd); + if (ret != GAZELLE_OK) { + LTRAN_ERR("unix_server_create failed. ret=%d.\n", ret); + sockfd_data_free(event_dfx.data.ptr); +-- +2.33.0 + diff --git a/gazelle.spec b/gazelle.spec index ea3d8f6..39f298a 100644 --- a/gazelle.spec +++ b/gazelle.spec @@ -2,7 +2,7 @@ Name: gazelle Version: 1.0.1 -Release: 24 +Release: 25 Summary: gazelle is a high performance user-mode stack License: MulanPSL-2.0 URL: https://gitee.com/openeuler/gazelle @@ -154,6 +154,7 @@ Patch9136: 0136-add-mutil-NIC-support-in-gazelle.patch Patch9137: 0137-remove-filename_check-in-gazellectl-to-fix-build-err.patch Patch9138: 0138-cancel-kernel-sock-epoll-ctl-when-lwip-sock-connect.patch Patch9139: 0139-modify-readv-and-writev-first-buf-is-null.patch +Patch9140: 0140-fix-pdump-and-mutil-NIC-init-fail.patch %description %{name} is a high performance user-mode stack. @@ -194,6 +195,9 @@ install -Dpm 0640 %{_builddir}/%{name}-%{version}/src/ltran/ltran.conf %{b %config(noreplace) %{conf_path}/ltran.conf %changelog +* Tue Nov 15 2022 kircher - 1.0.1-25 +- fix pdump and mutil NIC init fail + * Mon Nov 14 2022 wuchangsheng - 1.0.1-24 - support muti nic and fix bugs