From fdeeaea46e2ab3a441b5cb19c3cf5e52ea11c3dc Mon Sep 17 00:00:00 2001 From: Kamal Heib Date: Tue, 24 Oct 2023 10:21:54 -0400 Subject: [PATCH] Update to upstream release 9.8.31 Resolves: RHEL-933 Signed-off-by: Kamal Heib --- .gitignore | 1 + ...525812-Fix-buffer-leak-socketextreme.patch | 35 ------------------- libvma.spec | 9 +++-- sources | 2 +- 4 files changed, 8 insertions(+), 39 deletions(-) delete mode 100644 0001-issue-3525812-Fix-buffer-leak-socketextreme.patch diff --git a/.gitignore b/.gitignore index 0abee8e..b30e812 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ SOURCES/libvma-9.6.4.tar.gz /libvma-9.6.4.tar.gz /libvma-9.8.20.tar.gz +/libvma-9.8.31.tar.gz diff --git a/0001-issue-3525812-Fix-buffer-leak-socketextreme.patch b/0001-issue-3525812-Fix-buffer-leak-socketextreme.patch deleted file mode 100644 index 8e95801..0000000 --- a/0001-issue-3525812-Fix-buffer-leak-socketextreme.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 92f3868fd0474956afe6cb43f8de4d16abba83d6 Mon Sep 17 00:00:00 2001 -From: Iftah Levi -Date: Sun, 9 Jul 2023 14:08:44 +0300 -Subject: [PATCH] issue: 3525812 Fix buffer leak socketextreme - -In reclaim buffer api - vma_socketxtreme_free_vma_packets -we use reclaim_recv_buffers method which uses try_lock -on the ring, but in case the lock has failed - buffers -will not be returned. -The fix - in case the ring is locked - reclaim buffers -to the global pool. - -Signed-off-by: Iftah Levi ---- - src/vma/sock/sock-redirect.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/vma/sock/sock-redirect.cpp b/src/vma/sock/sock-redirect.cpp -index 4308d21e8478..9b232e6093ca 100644 ---- a/src/vma/sock/sock-redirect.cpp -+++ b/src/vma/sock/sock-redirect.cpp -@@ -466,7 +466,9 @@ int vma_socketxtreme_free_vma_packets(struct vma_packet_desc_t *packets, int num - p_socket_object->free_buffs(packets[i].total_len); - } - if (rng) { -- rng->reclaim_recv_buffers(desc); -+ if (!rng->reclaim_recv_buffers(desc)) { -+ g_buffer_pool_rx->put_buffers_thread_safe(desc); -+ } - } else { - goto err; - } --- -2.41.0 - diff --git a/libvma.spec b/libvma.spec index d776432..460102e 100644 --- a/libvma.spec +++ b/libvma.spec @@ -1,14 +1,13 @@ %{!?configure_options: %global configure_options %{nil}} Name: libvma -Version: 9.8.20 -Release: 3%{?dist} +Version: 9.8.31 +Release: 1%{?dist} Summary: A library for boosting TCP and UDP traffic (over RDMA hardware) License: GPLv2 or BSD Url: https://github.com/Mellanox/libvma Source0: https://github.com/Mellanox/libvma/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: 0001-issue-3525812-Fix-buffer-leak-socketextreme.patch # libvma currently supports only the following architectures ExclusiveArch: x86_64 ppc64le ppc64 aarch64 @@ -100,6 +99,10 @@ rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/vma %{_mandir}/man8/vma_stats.* %changelog +* Tue Oct 24 2023 Kamal Heib - 9.8.31-1 +- Update to upstream release 9.8.31. +- Resolves: RHEL-933 + * Mon Jul 31 2023 Kamal Heib - 9.8.20-3 - Rebuilt for libvma-utils - Resolves: rhbz#2217883 diff --git a/sources b/sources index 246a014..5f52f54 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvma-9.8.20.tar.gz) = e4f88ea259f3f8cb111b367e3c665890cb3ff5fc8d4138232a21b2296aff2a570ad0427892356eb91e1e7373ca719ef0aede56cc9f1edd1783667953c5a7ce80 +SHA512 (libvma-9.8.31.tar.gz) = 0e0e9c8ff57de90badfec2fef2c6f308402d299370b6586aeb10b3393912b5933d5c2f95849188019be6d704163923fa30fb69a829b094e4a6aafe53d8ea7015