fix the coredump when gazellectl -l

(cherry picked from commit 07e67a4cfebca73930af8bfbee124bedd2eac084)
This commit is contained in:
yangchen 2024-10-11 13:30:05 +08:00 committed by openeuler-sync-bot
parent e4bd3f7666
commit 5f1013d5be
2 changed files with 41 additions and 1 deletions

View File

@ -0,0 +1,36 @@
From 577698e8a9a44d5689a7608e7bfbe27ed6529a54 Mon Sep 17 00:00:00 2001
From: yangchen <yangchen145@huawei.com>
Date: Fri, 11 Oct 2024 10:48:03 +0800
Subject: [PATCH] fix the coredump when gazellectl -l
---
src/lstack/core/lstack_stack_stat.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/lstack/core/lstack_stack_stat.c b/src/lstack/core/lstack_stack_stat.c
index 8efa5ab..c88da8f 100644
--- a/src/lstack/core/lstack_stack_stat.c
+++ b/src/lstack/core/lstack_stack_stat.c
@@ -64,7 +64,7 @@ void time_stamp_record(int fd, struct pbuf *pbuf)
{
struct lwip_sock *sock = lwip_get_socket(fd);
- if (get_protocol_stack_group()->latency_start && sock && pbuf) {
+ if (get_protocol_stack_group()->latency_start && sock && sock->stack && pbuf) {
calculate_lstack_latency(&sock->stack->latency, pbuf, GAZELLE_LATENCY_INTO_MBOX, 0);
time_stamp_into_recvmbox(sock);
}
@@ -122,6 +122,10 @@ void calculate_lstack_latency(struct gazelle_stack_latency *stack_latency, const
}
lt = &pbuf_to_private(pbuf)->lt;
+ if (lt == NULL) {
+ return;
+ }
+
lt_type = (type / GAZELLE_LATENCY_READ_MAX) ? GAZELLE_LATENCY_WR : GAZELLE_LATENCY_RD;
if (lt->stamp != ~(lt->check) || lt->stamp < stack_latency->start_time || lt_type != lt->type) {
return;
--
2.33.0

View File

@ -2,7 +2,7 @@
Name: gazelle
Version: 1.0.2
Release: 69
Release: 70
Summary: gazelle is a high performance user-mode stack
License: MulanPSL-2.0
URL: https://gitee.com/openeuler/gazelle
@ -287,6 +287,7 @@ Patch9267: 0267-rpc-fix-rpc_sync_call-spinlock-block-when-msg-be-rec.patch
Patch9268: 0268-bugfix-fix-gazelle-init-failed-while-setup-by-non-ro.patch
Patch9269: 0269-xdp-skip-checksum-temporarily-due-to-kernel-cannot-t.patch
Patch9270: 0270-fix-dpdk_nic_is_xdp-coredump-in-ltran-mode.patch
Patch9271: 0271-fix-the-coredump-when-gazellectl-l.patch
%description
%{name} is a high performance user-mode stack.
@ -328,6 +329,9 @@ install -Dpm 0640 %{_builddir}/%{name}-%{version}/src/ltran/ltran.conf %{b
%config(noreplace) %{conf_path}/ltran.conf
%changelog
* Fri Oct 11 2024 yangchen <yangchen145@huawei.com> - 1.0.2-70
- fix the coredump when gazellectl -l
* Thu Oct 10 2024 yinbin6 <jiangheng14@huawei.com> - 1.0.2-69
- fix dpdk_nic_is_xdp coredump in ltran mode