From 6e84bc993240c5523427209d2c4c561426beffa7 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Nov 04 2019 10:34:21 +0000 Subject: Upstream release 3.6 Plus a couple of fixes from upstream git. --- diff --git a/.gitignore b/.gitignore index 16930da..a6aff81 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /sockperf-c1f3ca79bff93024d566a7ef1d876060189657ab.tar.gz /3.3.tar.gz /3.5.tar.gz +/3.6.tar.gz diff --git a/0001-issue-1380243-Fix-close-SocketXtreme-established-TCP.patch b/0001-issue-1380243-Fix-close-SocketXtreme-established-TCP.patch new file mode 100644 index 0000000..1afab2d --- /dev/null +++ b/0001-issue-1380243-Fix-close-SocketXtreme-established-TCP.patch @@ -0,0 +1,29 @@ +From c98f80e51a7013bff81f4f61d7ce1096e792a9ff Mon Sep 17 00:00:00 2001 +From: Mohammad Qurt +Date: Fri, 14 Dec 2018 07:03:27 +0000 +Subject: [PATCH 1/2] issue: 1380243 Fix close SocketXtreme established TCP + sockets + +Handle close segment for SocketXtreme to close established TCP sockets. + +Signed-off-by: Mohammad Qurt +--- + src/iohandlers.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/iohandlers.h b/src/iohandlers.h +index debc68c7f4..41e3d3072a 100644 +--- a/src/iohandlers.h ++++ b/src/iohandlers.h +@@ -468,6 +468,8 @@ public: + } else if (g_vma_comps->events & VMA_SOCKETXTREME_PACKET) { + g_vma_buff = g_vma_comps->packet.buff_lst; + ifd = g_vma_comps->user_data; ++ } else if (g_vma_comps->events & (EPOLLIN | EPOLLERR | EPOLLHUP | EPOLLRDHUP)) { ++ ifd = g_vma_comps->user_data; + } else { + ifd = 0; + } +-- +2.23.0 + diff --git a/0002-issue-1679157-Fix-gcc8-build-warnings.patch b/0002-issue-1679157-Fix-gcc8-build-warnings.patch new file mode 100644 index 0000000..ff80efa --- /dev/null +++ b/0002-issue-1679157-Fix-gcc8-build-warnings.patch @@ -0,0 +1,54 @@ +From 13ced4c1eb0dccf434aa0fde44994c0dbfbca1f9 Mon Sep 17 00:00:00 2001 +From: Liran Oz +Date: Sun, 10 Feb 2019 09:58:52 +0000 +Subject: [PATCH 2/2] issue: 1679157 Fix gcc8 build warnings + +Signed-off-by: Liran Oz +--- + src/message.cpp | 2 +- + src/sockperf.cpp | 2 +- + src/switches.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/message.cpp b/src/message.cpp +index 8973decec4..5994311b02 100644 +--- a/src/message.cpp ++++ b/src/message.cpp +@@ -93,7 +93,7 @@ Message::Message() { + + for (int len = 0; len < ms_maxSize; len++) + m_addr[len] = (uint8_t)rand(); +- memset(m_header, 0, MsgHeader::EFFECTIVE_SIZE); ++ memset((void *)m_header, 0, MsgHeader::EFFECTIVE_SIZE); + + /* + log_msg("ms_maxSize=%d, m_buf=%p, alignment=%d, m_data=%p, m_header=%p", ms_maxSize, m_buf, +diff --git a/src/sockperf.cpp b/src/sockperf.cpp +index 60242201b5..1f1953cb7f 100644 +--- a/src/sockperf.cpp ++++ b/src/sockperf.cpp +@@ -2156,7 +2156,7 @@ void set_defaults() { + int igmp_max_memberships = read_int_from_sys_file("/proc/sys/net/ipv4/igmp_max_memberships"); + if (igmp_max_memberships != -1) IGMP_MAX_MEMBERSHIPS = igmp_max_memberships; + +- memset(&s_user_params, 0, sizeof(struct user_params_t)); ++ memset((void *)&s_user_params, 0, sizeof(s_user_params)); + memset(g_fds_array, 0, sizeof(fds_data *) * MAX_FDS_NUM); + s_user_params.rx_mc_if_addr.s_addr = htonl(INADDR_ANY); + s_user_params.tx_mc_if_addr.s_addr = htonl(INADDR_ANY); +diff --git a/src/switches.h b/src/switches.h +index d70fadf485..31a5e1f3da 100644 +--- a/src/switches.h ++++ b/src/switches.h +@@ -285,7 +285,7 @@ private: + if (!drops_num) + seq_num_map_itr->second.seq_num--; + else { +- char drops_num_str[10]; ++ char drops_num_str[30]; + char seq_num_info_str[50]; + char ip_port_str[30]; + sprintf(ip_port_str, "[%s:%d]", inet_ntoa(seq_num_map_itr->second.addr.sin_addr), +-- +2.23.0 + diff --git a/sockperf.spec b/sockperf.spec index 17fa8f4..b47bea5 100644 --- a/sockperf.spec +++ b/sockperf.spec @@ -1,10 +1,12 @@ Name: sockperf -Version: 3.5 -Release: 3%{?dist} +Version: 3.6 +Release: 1%{?dist} Summary: Network benchmarking utility for testing latency and throughput License: BSD URL: https://github.com/Mellanox/%{name} Source0: https://github.com/Mellanox/%{name}/archive/%{version}.tar.gz +Patch0001: 0001-issue-1380243-Fix-close-SocketXtreme-established-TCP.patch +Patch0002: 0002-issue-1679157-Fix-gcc8-build-warnings.patch BuildRequires: gcc-c++ BuildRequires: autoconf automake @@ -39,7 +41,7 @@ following: allow cleanest results. %prep -%setup -q +%autosetup -p1 %build ./autogen.sh @@ -68,6 +70,10 @@ make %{?_smp_mflags} %{_pkgdocdir} %changelog +* Mon Nov 04 2019 Michal Schmidt - 3.6-1 +- Upstream release 3.6. +- Plus a couple of fixes from upstream git. + * Fri Jul 26 2019 Fedora Release Engineering - 3.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 78b7b4f..a1d8a6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (3.5.tar.gz) = 927cb43608679e7d77b1a60d326dd4aa434c58cff2d3d8a12f01ab3e9c0468ef52a96cd035d0b860e22b0a0733547549f8cd4b247ca218cd1cbb0fbdd529eeb7 +SHA512 (3.6.tar.gz) = cb15ab34a6e99f5637956e440515fe73f6a0b6e5bd26a1c1c1ed1d649486fb5983d5e05a2cfa81bb11f99c269f17ad830c65d586ebaa3a2a7cef216d6ec8db12