diff --git a/0027-per-thread-reassdata-variables.patch b/0027-per-thread-reassdata-variables.patch new file mode 100644 index 0000000000000000000000000000000000000000..32fa837105887a34775555495f51f93dbdec81ab --- /dev/null +++ b/0027-per-thread-reassdata-variables.patch @@ -0,0 +1,30 @@ +From 464de9f32488b59d927378cdcc2d08d402af3729 Mon Sep 17 00:00:00 2001 +From: wuchangsheng +Date: Thu, 6 Oct 2022 17:42:58 +0800 +Subject: [PATCH] per-thread-reassdata-variables + +--- + src/core/ipv4/ip4_frag.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/core/ipv4/ip4_frag.c b/src/core/ipv4/ip4_frag.c +index 17a4ccd..c60523d 100644 +--- a/src/core/ipv4/ip4_frag.c ++++ b/src/core/ipv4/ip4_frag.c +@@ -115,8 +115,13 @@ PACK_STRUCT_END + IPH_ID(iphdrA) == IPH_ID(iphdrB)) ? 1 : 0 + + /* global variables */ ++#if USE_LIBOS ++static PER_THREAD struct ip_reassdata *reassdatagrams; ++static PER_THREAD u16_t ip_reass_pbufcount; ++#else + static struct ip_reassdata *reassdatagrams; + static u16_t ip_reass_pbufcount; ++#endif + + /* function prototypes */ + static void ip_reass_dequeue_datagram(struct ip_reassdata *ipr, struct ip_reassdata *prev); +-- +2.27.0 + diff --git a/lwip.spec b/lwip.spec index 773d70e674884b4ea52774c07b1a359000ce5cf0..47b52cce0ab33e3c6262787842e509c5ca2215d8 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: 6 +Release: 7 License: BSD URL: http://savannah.nongnu.org/projects/lwip/ Source0: http://download.savannah.nongnu.org/releases/lwip/%{name}-%{version}.zip @@ -40,6 +40,7 @@ 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 Patch9026: 0026-modify-EISCONN-condition.patch +Patch9027: 0027-per-thread-reassdata-variables.patch BuildRequires: gcc-c++ dos2unix dpdk-devel @@ -84,6 +85,7 @@ find %{_builddir}/%{name}-%{version} -type f -exec dos2unix -q {} \; %patch9024 -p1 %patch9025 -p1 %patch9026 -p1 +%patch9027 -p1 %build cd %{_builddir}/%{name}-%{version}/src @@ -99,6 +101,9 @@ cd %{_builddir}/%{name}-%{version}/src %{_libdir}/liblwip.a %changelog +* Thu Oct 6 2022 wuchangsheng - 2.1.2-7 +- per thread reassdata variables + * Thu Sep 22 2022 zhujunhao - 2.1.2-6 - modify EISCONN path condition add in_send and send_flag value for gazelle