!65 [sync] PR-59: lwip_sock变量调整

From: @openeuler-sync-bot 
Reviewed-by: @jiangheng12 
Signed-off-by: @jiangheng12

0026-del-redundant-wait_close-and-move-epoll_events-pos.patch

@@ -0,0 +1,30 @@
+From ab62f970793c257c712c357a6976b9aca2e63b98 Mon Sep 17 00:00:00 2001
+From: wu-changsheng <wuchangsheng2@huawei.com>
+Date: Tue, 26 Jul 2022 17:36:29 +0800
+Subject: [PATCH] del redundant wait_close and move epoll_events pos
+
+---
+ src/include/lwipsock.h | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/include/lwipsock.h b/src/include/lwipsock.h
+index 500292d..16e0dd3 100644
+--- a/src/include/lwipsock.h
++++ b/src/include/lwipsock.h
+@@ -98,12 +98,11 @@ struct lwip_sock {
+   struct list_node recv_list __rte_cache_aligned;
+   struct list_node event_list __rte_cache_aligned;
+   struct list_node send_list __rte_cache_aligned;
++  uint32_t epoll_events; /* registered events, EPOLLONESHOT write frequently */
+   char pad __rte_cache_aligned;
+ 
+-  uint32_t epoll_events; /* registered events */
+   struct wakeup_poll *wakeup;
+   epoll_data_t ep_data;
+-  bool wait_close;
+   struct lwip_sock *listen_next; /* listenfd list */
+   struct protocol_stack *stack;
+   struct rte_ring *recv_ring;
+-- 
+2.23.0
+

lwip.spec

@@ -4,7 +4,7 @@
 Summary: lwip is a small independent implementation of the TCP/IP protocol suite
 Name:    lwip
 Version: 2.1.3
-Release: 13
+Release: 14
 License: BSD
 URL:     http://savannah.nongnu.org/projects/lwip/
 Source0: http://download.savannah.nongnu.org/releases/lwip/%{name}-%{version}.tar.gz
@@ -37,6 +37,7 @@ Patch9021:  0022-notify-app-that-sock-state-changes-to-CLOSE_WAIT.patch
 Patch9022:  0023-refactor-event-and-checksum-offload-support.patch
 Patch9023:  0024-refactor-pkt-read-send-performance.patch
 Patch9024:  0025-Replace-gettid-with-syscall-SYS_gettid.patch
+Patch9025:  0026-del-redundant-wait_close-and-move-epoll_events-pos.patch
 
 BuildRequires: gcc-c++ dos2unix dpdk-devel
 
@@ -65,6 +66,10 @@ cd %{_builddir}/%{name}-%{version}/src
 %{_libdir}/liblwip.a
 
 %changelog
+* Tue Jul 26 2022 wuchangsheng<wuchangsheng2@huawei.com> - 2.1.3-14
+- del redundant wait_close in lwip_sock
+  move epoll_events into cache aligned area
+
 * Tue Jul 12 2022 Honggang Li <honggangli@163.com> - 2.1.3-13
 - Replace gettid() with syscall()