.gitignore

@@ -1 +1 @@
-SOURCES/libvma-9.8.60.tar.gz
+SOURCES/libvma-9.8.20.tar.gz

.libvma.metadata

@@ -1 +1 @@
-b4b372a9a9344bc64f9848b8b4efd39efcd1c590 SOURCES/libvma-9.8.60.tar.gz
+fab25759447602ec4602b1c2c949b8f153d34e1d SOURCES/libvma-9.8.20.tar.gz

SOURCES/0001-Fix-build-failure.patch

@@ -1,31 +0,0 @@
-From 3801620674bb052fcf7acf03915999fd6f48dd66 Mon Sep 17 00:00:00 2001
-From: Kamal Heib <kheib@redhat.com>
-Date: Mon, 29 Apr 2024 18:54:39 -0400
-Subject: [PATCH] Fix build failure
-
-../../src/vma/util/vma_list.h:210:31: error: template-id not allowed for constructor in C++20 [-Werror=template-id-cdtor]
-  210 |         vma_list_t<T, offset> (const vma_list_t<T, offset>& other) {
-      |                               ^
-../../src/vma/util/vma_list.h:210:31: note: remove the '< >'
-
-Signed-off-by: Kamal Heib <kheib@redhat.com>
----
- src/vma/util/vma_list.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/vma/util/vma_list.h b/src/vma/util/vma_list.h
-index 0ce65e8e5268..32fdedbb826f 100644
---- a/src/vma/util/vma_list.h
-+++ b/src/vma/util/vma_list.h
-@@ -207,7 +207,7 @@ public:
- 		}
- 	}
- 
--	vma_list_t<T, offset> (const vma_list_t<T, offset>& other) {
-+	vma_list_t(const vma_list_t<T, offset>& other) {
- 		if (!other.empty())
- 			vlist_logwarn("Copy constructor is not supported for non-empty list! other.size=%zu", other.m_size);
- 		init_list();
--- 
-2.44.0
-

SOURCES/0001-issue-3525812-Fix-buffer-leak-socketextreme.patch

@@ -0,0 +1,35 @@
+From 92f3868fd0474956afe6cb43f8de4d16abba83d6 Mon Sep 17 00:00:00 2001
+From: Iftah Levi <iftahl@nvidia.com>
+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 <iftahl@nvidia.com>
+---
+ 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
+

SPECS/libvma.spec

@@ -1,14 +1,14 @@
 %{!?configure_options: %global configure_options %{nil}}
 
 Name: libvma
-Version: 9.8.60
+Version: 9.8.20
-Release: 1%{?dist}
+Release: 3%{?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-Fix-build-failure.patch
+Patch0: 0001-issue-3525812-Fix-buffer-leak-socketextreme.patch
 
 # libvma currently supports only the following architectures
 ExclusiveArch: x86_64 ppc64le ppc64 aarch64
@@ -100,75 +100,36 @@ rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/vma
 %{_mandir}/man8/vma_stats.*
 
 %changelog
-* Wed Nov 20 2024 Mohammad Heib <mheib@redhat.com> - 9.8.60-1
+* Mon Jul 31 2023 Kamal Heib <kheib@redhat.com> - 9.8.20-3
-- Update to upstream release 9.8.60.
+- Rebuilt for libvma-utils
-  Resolves: RHEL-24810
+- Resolves: rhbz#2227843
 
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 9.8.51-4
+* Tue Jul 18 2023 Kamal Heib <kheib@redhat.com> - 9.8.20-2
-- Bump release for October 2024 mass rebuild:
+- Fix Socketxtreme buffer reclaim leak
-  Resolves: RHEL-64018
+- Resolves: rhbz#2223701
 
-* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 9.8.51-3
+* Thu Jun 01 2023 Kamal Heib <kheib@redhat.com> - 9.8.20-1
-- Rebuilt for MSVSphere 10
+- Update to upstream release 9.8.20.
+- Resolves: rhbz#2170370
 
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 9.8.51-3
+* Wed Aug 03 2022 Michal Schmidt <mschmidt@redhat.com> - 9.6.4-1
-- Bump release for June 2024 mass rebuild
+- Update to upstream release 9.6.4.
+- Resolves: rhbz#2049573
 
-* Mon Apr 29 2024 Kamal Heib <kheib@redhat.com> - 9.8.51-1
+* Sat Nov 27 2021 Honggang Li <honli@redhat.com> - 9.4.0-1
-- Update to upstream release 9.8.51
-- Resolves: RHEL-24810
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.8.40-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.8.40-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Oct 27 2023 Igor Ivanov <igori@nvidia.com> 9.8.40-1
-- Bump version to 9.8.40
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.8.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon Feb 20 2023 Igor Ivanov <igori@nvidia.com> 9.8.1-2
-- Fix gcc13 compilation issue
-
-* Mon Feb 20 2023 Igor Ivanov <igori@nvidia.com> 9.8.1-1
-- Bump version to 9.8.1
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.6.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Jul 26 2022 Igor Ivanov <igori@nvidia.com> 9.6.4-1
-- Bump version to 9.6.4
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.5.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Apr 29 2022 Igor Ivanov <igori@nvidia.com> 9.5.3-1
-- Bump version to 9.5.3
-
-* Thu Apr  7 2022 Igor Ivanov <igori@nvidia.com> 9.5.2-1
-- Bump version to 9.5.2
-
-* Mon Jan 31 2022 Fedora Release Engineering <igori@nvidia.com> - 9.4.0-3
-- Fix gcc12 compilation issue
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Nov 09 2021 Honggang Li <honli@redhat.com> - 9.4.0-1
 - Bump version to 9.4.0
+- Resolves: rhbz#2024548
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.3.1-2
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 9.3.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Thu Jun 17 2021 Igor Ivanov <igori@nvidia.com> 9.3.1-1
+* Tue Jul 06 2021 Honggang Li <honli@redhat.com> - 9.3.1-1
 - Bump version to 9.3.1
+- Resolves: rhbz#1858572
 
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 9.2.2-3
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 9.2.2-3
-- Rebuilt for updated systemd-rpm-macros
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-  See https://pagure.io/fesco/issue/2583.
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild