packages/lwip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!266 [sync] PR-261: use pbuf lock when aggregate pbuf

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @jiangheng12 
Signed-off-by: @jiangheng12
This commit is contained in:
openeuler-ci-bot 2023-03-21 11:15:00 +00:00 committed by Gitee
commit 1a78597104
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
0055-add-pbuf-lock-when-aggregate-pbuf.patch Normal file
View File

@ -0,0 +1,46 @@
From a9906aabda21b9d2912377352ef0058eb4fb76e0 Mon Sep 17 00:00:00 2001
From: jiangheng <jiangheng14@huawei.com>
Date: Mon, 13 Mar 2023 10:00:12 +0800
Subject: [PATCH] add pbuf lock when aggregate pbuf
---
src/include/lwip/pbuf.h | 3 ++-
src/include/lwipsock.h | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/include/lwip/pbuf.h b/src/include/lwip/pbuf.h
index a2e8e01..8807a49 100644
--- a/src/include/lwip/pbuf.h
+++ b/src/include/lwip/pbuf.h
@@ -231,9 +231,10 @@ struct pbuf {
u64_t l4_len:8;
u8_t header_off;
u8_t rexmit;
- u8_t in_write;
+ volatile u8_t allow_in;
u8_t head;
struct pbuf *last;
+ pthread_spinlock_t pbuf_lock;
#endif /* GAZELLE_ENABLE CHECKSUM_OFFLOAD_SWITCH */
/** In case the user needs to store data custom data on a pbuf */
diff --git a/src/include/lwipsock.h b/src/include/lwipsock.h
index 810e98f..7e16ec8 100644
--- a/src/include/lwipsock.h
+++ b/src/include/lwipsock.h
@@ -104,11 +104,10 @@ struct lwip_sock {
char pad1 __rte_cache_aligned;
/* app and stack thread all use */
- uint32_t in_send; /* avoid sock too much send rpc msg*/
+ uint32_t call_num; /* avoid sock too much send rpc msg*/
char pad2 __rte_cache_aligned;
/* stack thread all use */
struct list_node recv_list;
- struct list_node send_list;
struct pbuf *send_lastdata;
struct pbuf *send_pre_del;
sem_t snd_ring_sem;
--
2.29.0.windows.1

7
lwip.spec
View File

@ -4,7 +4,7 @@
Summary: lwip is a small independent implementation of the TCP/IP protocol suite
Name: lwip
Version: 2.1.3
Release: 45
Release: 46
License: BSD
URL: http://savannah.nongnu.org/projects/lwip/
Source0: http://download.savannah.nongnu.org/releases/lwip/%{name}-%{version}.zip
@ -66,6 +66,7 @@ Patch9050: 0051-lwip-add-need_tso_send.patch
Patch9051: 0052-lwip_fnctl-only-support-F_SETFL-F_GETFL.patch
Patch9052: 0053-cleancode-improve-lwipopts.h-readability.patch
Patch9053: 0054-reduce-cpu-usage-when-send.patch
Patch9054: 0055-add-pbuf-lock-when-aggregate-pbuf.patch
BuildRequires: gcc-c++ dos2unix dpdk-devel
@ -136,6 +137,7 @@ find %{_builddir}/%{name}-%{version} -type f -exec dos2unix -q {} \;
%patch9051 -p1
%patch9052 -p1
%patch9053 -p1
%patch9054 -p1
%build
cd %{_builddir}/%{name}-%{version}/src
@ -151,6 +153,9 @@ cd %{_builddir}/%{name}-%{version}/src
%{_libdir}/liblwip.a
%changelog
* Mon Mar 13 2023 jiangheng <jiangheng14@huawei.com> - 2.1.3-46
- use pbuf lock when aggregate pbuf
* Fri Mar 10 2023 jiangheng <jiangheng14@huawei.com> - 2.1.3-45
- reduce cpu usage when send