Update to upstream release 9.8.31

Resolves: RHEL-933
Signed-off-by: Kamal Heib <kheib@redhat.com>
This commit is contained in:
Kamal Heib 2023-10-24 10:21:54 -04:00
parent e994b5e55e
commit fdeeaea46e
4 changed files with 8 additions and 39 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
SOURCES/libvma-9.6.4.tar.gz SOURCES/libvma-9.6.4.tar.gz
/libvma-9.6.4.tar.gz /libvma-9.6.4.tar.gz
/libvma-9.8.20.tar.gz /libvma-9.8.20.tar.gz
/libvma-9.8.31.tar.gz

View File

@ -1,35 +0,0 @@
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

View File

@ -1,14 +1,13 @@
%{!?configure_options: %global configure_options %{nil}} %{!?configure_options: %global configure_options %{nil}}
Name: libvma Name: libvma
Version: 9.8.20 Version: 9.8.31
Release: 3%{?dist} Release: 1%{?dist}
Summary: A library for boosting TCP and UDP traffic (over RDMA hardware) Summary: A library for boosting TCP and UDP traffic (over RDMA hardware)
License: GPLv2 or BSD License: GPLv2 or BSD
Url: https://github.com/Mellanox/libvma Url: https://github.com/Mellanox/libvma
Source0: https://github.com/Mellanox/libvma/archive/%{version}/%{name}-%{version}.tar.gz 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 # libvma currently supports only the following architectures
ExclusiveArch: x86_64 ppc64le ppc64 aarch64 ExclusiveArch: x86_64 ppc64le ppc64 aarch64
@ -100,6 +99,10 @@ rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/vma
%{_mandir}/man8/vma_stats.* %{_mandir}/man8/vma_stats.*
%changelog %changelog
* Tue Oct 24 2023 Kamal Heib <kheib@redhat.com> - 9.8.31-1
- Update to upstream release 9.8.31.
- Resolves: RHEL-933
* Mon Jul 31 2023 Kamal Heib <kheib@redhat.com> - 9.8.20-3 * Mon Jul 31 2023 Kamal Heib <kheib@redhat.com> - 9.8.20-3
- Rebuilt for libvma-utils - Rebuilt for libvma-utils
- Resolves: rhbz#2217883 - Resolves: rhbz#2217883

View File

@ -1 +1 @@
SHA512 (libvma-9.8.20.tar.gz) = e4f88ea259f3f8cb111b367e3c665890cb3ff5fc8d4138232a21b2296aff2a570ad0427892356eb91e1e7373ca719ef0aede56cc9f1edd1783667953c5a7ce80 SHA512 (libvma-9.8.31.tar.gz) = 0e0e9c8ff57de90badfec2fef2c6f308402d299370b6586aeb10b3393912b5933d5c2f95849188019be6d704163923fa30fb69a829b094e4a6aafe53d8ea7015