From 5ae1e859179519ad04b962406047cefbd6111704 Mon Sep 17 00:00:00 2001 From: zhuheqqq Date: Thu, 19 Sep 2024 21:16:51 +0800 Subject: [PATCH 1/3] feat: add sk_sleep to lwip_sock Signed-off-by: zhuheqqq --- 0165-add-sk_sleep-to-lwip_sock.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 0165-add-sk_sleep-to-lwip_sock.patch diff --git a/0165-add-sk_sleep-to-lwip_sock.patch b/0165-add-sk_sleep-to-lwip_sock.patch new file mode 100644 index 0000000..918cdbc --- /dev/null +++ b/0165-add-sk_sleep-to-lwip_sock.patch @@ -0,0 +1,13 @@ +diff --git a/lwip-2.2.0/src/include/lwipgz_sock.h b/lwip-2.2.0/src/include/lwipgz_sock.h +index 8add255..0ae2ed6 100644 +--- a/lwip-2.2.0/src/include/lwipgz_sock.h ++++ b/lwip-2.2.0/src/include/lwipgz_sock.h +@@ -185,7 +185,7 @@ struct lwip_sock { + epoll_data_t ep_data; + struct rte_ring *recv_ring; + struct rte_ring *send_ring; +- ++ struct sk_sleep *sk_sleep; /* wait queue */ + + /* same node send data ring */ + struct same_node_ring *same_node_rx_ring; -- Gitee From 8c61bf599a2248ebe2ac21caa7635c8eb3ecc38a Mon Sep 17 00:00:00 2001 From: zhuheqqq Date: Thu, 19 Sep 2024 21:42:40 +0800 Subject: [PATCH 2/3] feat: add sk_sleep to lwip_sock Signed-off-by: zhuheqqq --- ... 0165-feat-add-sk_sleep-to-lwip_sock.patch | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) rename 0165-add-sk_sleep-to-lwip_sock.patch => 0165-feat-add-sk_sleep-to-lwip_sock.patch (44%) diff --git a/0165-add-sk_sleep-to-lwip_sock.patch b/0165-feat-add-sk_sleep-to-lwip_sock.patch similarity index 44% rename from 0165-add-sk_sleep-to-lwip_sock.patch rename to 0165-feat-add-sk_sleep-to-lwip_sock.patch index 918cdbc..488adb1 100644 --- a/0165-add-sk_sleep-to-lwip_sock.patch +++ b/0165-feat-add-sk_sleep-to-lwip_sock.patch @@ -1,13 +1,25 @@ +From 3b93ecd27adb5af55070c2380e8fe3ee99008bbd Mon Sep 17 00:00:00 2001 +From: zhuheqqq +Date: Thu, 19 Sep 2024 21:37:44 +0800 +Subject: [PATCH] feat: add sk_sleep to lwip_sock + +Signed-off-by: zhuheqqq +--- + lwip-2.2.0/src/include/lwipgz_sock.h | 1 + + 1 file changed, 1 insertion(+) + diff --git a/lwip-2.2.0/src/include/lwipgz_sock.h b/lwip-2.2.0/src/include/lwipgz_sock.h -index 8add255..0ae2ed6 100644 +index 4f8e17b..0d6dfef 100644 --- a/lwip-2.2.0/src/include/lwipgz_sock.h +++ b/lwip-2.2.0/src/include/lwipgz_sock.h -@@ -185,7 +185,7 @@ struct lwip_sock { +@@ -185,6 +185,7 @@ struct lwip_sock { epoll_data_t ep_data; struct rte_ring *recv_ring; struct rte_ring *send_ring; -- -+ struct sk_sleep *sk_sleep; /* wait queue */ ++ struct sk_sleep *sk_sleep; /* same node send data ring */ struct same_node_ring *same_node_rx_ring; +-- +2.46.0 + -- Gitee From cce40a1d13c17be3750100046af2fd2dcc1e181f Mon Sep 17 00:00:00 2001 From: zhuheqqq Date: Fri, 20 Sep 2024 18:49:09 +0800 Subject: [PATCH 3/3] feat: add sk_sleep to lwip_sock Signed-off-by: zhuheqqq --- lwip.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lwip.spec b/lwip.spec index 190d0cf..6df0dbe 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.2.0 -Release: 54 +Release: 55 License: BSD URL: http://savannah.nongnu.org/projects/lwip/ Source0: http://download.savannah.nongnu.org/releases/lwip/%{name}-%{version}.zip @@ -176,6 +176,7 @@ Patch9160: 0161-fix-the-definition-of-IPV6_V6ONLY.patch Patch9161: 0162-check-if-mem_init-returns-errno.patch Patch9162: 0163-LWIPOPTS-support-setsockopt-SO_SNDTIMEO.patch Patch9163: 0164-LWIPOPTS-support-setsockopt-SO_SNDBUF.patch +Patch9164: 0165-add-sk_sleep-to-lwip_sock.patch BuildRequires: gcc-c++ dos2unix dpdk-devel @@ -205,6 +206,9 @@ cd %{_builddir}/%{name}-%{version}/src %{_libdir}/liblwip.a %changelog +* Thu Sep 19 2024 zhuheqin - 2.2.0-55 +- add sk_sleep to lwip_sock + * Tue Sep 10 2024 yinbin - 2.2.0-54 - LWIPOPTS support setsockopt SO_SNDTIMEO - LWIPOPTS support setsockopt SO_SNDBUF -- Gitee