From 5217297ddd6861435c32ddc1a6d926174037e9cb Mon Sep 17 00:00:00 2001 From: wu-changsheng Date: Tue, 26 Jul 2022 17:51:45 +0800 Subject: [PATCH] del-redundant-wait_close-and-move-epoll_events-pos (cherry picked from commit 027f1ec8f223358b1dafb48918f434d6e48f8c10) --- ...wait_close-and-move-epoll_events-pos.patch | 30 +++++++++++++++++++ lwip.spec | 8 ++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0025-del-redundant-wait_close-and-move-epoll_events-pos.patch diff --git a/0025-del-redundant-wait_close-and-move-epoll_events-pos.patch b/0025-del-redundant-wait_close-and-move-epoll_events-pos.patch new file mode 100644 index 0000000..e965d31 --- /dev/null +++ b/0025-del-redundant-wait_close-and-move-epoll_events-pos.patch @@ -0,0 +1,30 @@ +From ce10beab87dafafea4f54bb98892615461b8e7ef Mon Sep 17 00:00:00 2001 +From: wu-changsheng +Date: Tue, 26 Jul 2022 17:49:36 +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 c10ae83..c6702fc 100644 +--- a/src/include/lwipsock.h ++++ b/src/include/lwipsock.h +@@ -99,12 +99,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 + diff --git a/lwip.spec b/lwip.spec index 660c8bd..6067100 100644 --- a/lwip.spec +++ b/lwip.spec @@ -4,7 +4,7 @@ Summary: lwip is a small independent implementation of the TCP/IP protocol suite Name: lwip Version: 2.1.2 -Release: 4 +Release: 5 License: BSD URL: http://savannah.nongnu.org/projects/lwip/ Source0: http://download.savannah.nongnu.org/releases/lwip/%{name}-%{version}.zip @@ -38,6 +38,7 @@ Patch9021: 0021-refactor-event-if-ring-is-full-the-node-is-added-to-.patch Patch9022: 0022-notify-app-that-sock-state-changes-to-CLOSE_WAIT.patch Patch9023: 0023-refactor-event-and-checksum-offload-support.patch Patch9024: 0024-refactor-pkt-read-send-performance.patch +Patch9025: 0025-del-redundant-wait_close-and-move-epoll_events-pos.patch BuildRequires: gcc-c++ dos2unix dpdk-devel @@ -80,6 +81,7 @@ find %{_builddir}/%{name}-%{version} -type f -exec dos2unix -q {} \; %patch9022 -p1 %patch9023 -p1 %patch9024 -p1 +%patch9025 -p1 %build cd %{_builddir}/%{name}-%{version}/src @@ -95,6 +97,10 @@ cd %{_builddir}/%{name}-%{version}/src %{_libdir}/liblwip.a %changelog +* Tue Jul 26 2022 wuchangsheng - 2.1.2-5 +- del redundant wait_close in lwip_sock + move epoll_events into cache aligned area + * Fri Jul 8 2022 xiusailong - 2.1.2-4 - refactor pkt read send performance -- Gitee