!322 [sync] PR-321: sync fix kernel scoket select path error

From: @openeuler-sync-bot 
Reviewed-by: @jiangheng12 
Signed-off-by: @jiangheng12
This commit is contained in:
openeuler-ci-bot 2023-03-20 03:16:40 +00:00 committed by Gitee
commit 495d30be42
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 32 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From 551fbc433a51eb34dd353236391f6d844866f67c Mon Sep 17 00:00:00 2001
From: jiangheng12 <jiangheng14@huawei.com>
Date: Sat, 18 Mar 2023 19:36:38 +0800
Subject: [PATCH] fix kernel scoket select path error
---
src/lstack/api/lstack_wrap.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/lstack/api/lstack_wrap.c b/src/lstack/api/lstack_wrap.c
index 9a021d7..e1b82fc 100644
--- a/src/lstack/api/lstack_wrap.c
+++ b/src/lstack/api/lstack_wrap.c
@@ -88,7 +88,9 @@ static enum KERNEL_LWIP_PATH select_path(int fd)
}
struct tcp_pcb *pcb = sock->conn->pcb.tcp;
- if (pcb != NULL && pcb->state <= ESTABLISHED) {
+ /* after lwip connect, call send immediately, pcb->state is SYN_SENT, need return PATH_LWIP */
+ /* pcb->state default value is CLOSED when call socket, need return PATH_UNKNOW */
+ if (pcb != NULL && pcb->state <= ESTABLISHED && pcb->state >= LISTEN) {
return PATH_LWIP;
}
--
2.23.0

View File

@ -2,7 +2,7 @@
Name: gazelle
Version: 1.0.1
Release: 55
Release: 56
Summary: gazelle is a high performance user-mode stack
License: MulanPSL-2.0
URL: https://gitee.com/openeuler/gazelle
@ -231,6 +231,7 @@ Patch9213: 0213-add-tuple_filter-to-diff-rss-rule-and-tuple-filter.patch
Patch9214: 0214-support-tuple-rule-add-delete.patch
Patch9215: 0215-disable-tso-without-ipv4-checksum.patch
Patch9216: 0216-refactor-mbuf-private-data.patch
Patch9217: 0217-fix-kernel-scoket-select-path-error.patch
%description
%{name} is a high performance user-mode stack.
@ -271,6 +272,9 @@ install -Dpm 0640 %{_builddir}/%{name}-%{version}/src/ltran/ltran.conf %{b
%config(noreplace) %{conf_path}/ltran.conf
%changelog
* Sat Mar 18 2023 jiangheng12 <jiangheng14@huawei.com> - 1.0.1-56
- fix kernel scoket select path error
* Fri Mar 17 UTC wu-changsheng <wuchangsheng2@huawei.com> - 1.0.1-55
- refactor mbuf private data
- disable tso without ipv4 checksum