Control: tags 1148146 + pending

Dear maintainer,

I've prepared an NMU for rdma-core (versioned as 65.0-1.1) and uploaded 
it to DELAYED/2. Please feel free to tell me if I should cancel it.

cu
Adrian
diffstat for rdma-core-65.0 rdma-core-65.0

 changelog                                                         |    7 +
 patches/0001-pyverbs-Fix-uint64_t-type-mismatch-in-CompCntr.patch |   66 ++++++++++
 patches/series                                                    |    1 
 3 files changed, 74 insertions(+)

diff -Nru rdma-core-65.0/debian/changelog rdma-core-65.0/debian/changelog
--- rdma-core-65.0/debian/changelog	2026-09-15 12:27:05.000000000 +0300
+++ rdma-core-65.0/debian/changelog	2026-10-02 20:14:41.000000000 +0300
@@ -1,3 +1,10 @@
+rdma-core (65.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport proposed fix for FTBFS on 32-bit. (Closes: #1148146)
+
+ -- Adrian Bunk <[email protected]>  Fri, 02 Oct 2026 20:14:41 +0300
+
 rdma-core (65.0-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru rdma-core-65.0/debian/patches/0001-pyverbs-Fix-uint64_t-type-mismatch-in-CompCntr.patch rdma-core-65.0/debian/patches/0001-pyverbs-Fix-uint64_t-type-mismatch-in-CompCntr.patch
--- rdma-core-65.0/debian/patches/0001-pyverbs-Fix-uint64_t-type-mismatch-in-CompCntr.patch	1970-01-01 02:00:00.000000000 +0200
+++ rdma-core-65.0/debian/patches/0001-pyverbs-Fix-uint64_t-type-mismatch-in-CompCntr.patch	2026-10-02 20:03:35.000000000 +0300
@@ -0,0 +1,66 @@
+From 7a7785ade11ecf8c03ac711b6407457cac5fabe7 Mon Sep 17 00:00:00 2001
+From: Filip Balluch <[email protected]>
+Date: Fri, 11 Sep 2026 10:55:09 +0200
+Subject: pyverbs: Fix uint64_t type mismatch in CompCntr
+
+The read() and read_err() methods in CompCntr used 'unsigned long' for
+the value parameter, which is 32-bit on i686 but the C API
+(ibv_read_comp_cntr / ibv_read_err_comp_cntr) expects uint64_t.
+This caused a build failure on 32-bit architectures.
+
+Use uint64_t consistently and add the missing cimport.
+
+Signed-off-by: Filip Balluch <[email protected]>
+---
+ pyverbs/comp_cntr.pyx  | 5 +++--
+ pyverbs/libibverbs.pxd | 4 ++--
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/pyverbs/comp_cntr.pyx b/pyverbs/comp_cntr.pyx
+index 12e812cb..79592f27 100644
+--- a/pyverbs/comp_cntr.pyx
++++ b/pyverbs/comp_cntr.pyx
+@@ -3,6 +3,7 @@
+ 
+ #cython: language_level=3
+ 
++from libc.stdint cimport uint64_t
+ from pyverbs.base import PyverbsRDMAErrno, PyverbsRDMAError
+ from pyverbs.device cimport Context
+ cimport pyverbs.libibverbs as v
+@@ -81,7 +82,7 @@ cdef class CompCntr(PyverbsCM):
+ 
+     def read(self):
+         """Read and return the current completion count."""
+-        cdef unsigned long value = 0
++        cdef uint64_t value = 0
+         rc = v.ibv_read_comp_cntr(self.comp_cntr, &value)
+         if rc:
+             raise PyverbsRDMAError('Failed to read comp_cntr', rc)
+@@ -89,7 +90,7 @@ cdef class CompCntr(PyverbsCM):
+ 
+     def read_err(self):
+         """Read and return the current error count."""
+-        cdef unsigned long value = 0
++        cdef uint64_t value = 0
+         rc = v.ibv_read_err_comp_cntr(self.comp_cntr, &value)
+         if rc:
+             raise PyverbsRDMAError('Failed to read_err comp_cntr', rc)
+diff --git a/pyverbs/libibverbs.pxd b/pyverbs/libibverbs.pxd
+index 82bfa869..2afa76c4 100644
+--- a/pyverbs/libibverbs.pxd
++++ b/pyverbs/libibverbs.pxd
+@@ -785,8 +785,8 @@ cdef extern from 'infiniband/verbs.h':
+     int ibv_set_err_comp_cntr(ibv_comp_cntr *comp_cntr, unsigned long value)
+     int ibv_inc_comp_cntr(ibv_comp_cntr *comp_cntr, unsigned long amount)
+     int ibv_inc_err_comp_cntr(ibv_comp_cntr *comp_cntr, unsigned long amount)
+-    int ibv_read_comp_cntr(ibv_comp_cntr *comp_cntr, unsigned long *value)
+-    int ibv_read_err_comp_cntr(ibv_comp_cntr *comp_cntr, unsigned long *value)
++    int ibv_read_comp_cntr(ibv_comp_cntr *comp_cntr, uint64_t *value)
++    int ibv_read_err_comp_cntr(ibv_comp_cntr *comp_cntr, uint64_t *value)
+     ibv_ah *ibv_create_ah(ibv_pd *pd, ibv_ah_attr *attr)
+     int ibv_init_ah_from_wc(ibv_context *context, uint8_t port_num,
+                             ibv_wc *wc, ibv_grh *grh, ibv_ah_attr *ah_attr)
+-- 
+2.47.3
+
diff -Nru rdma-core-65.0/debian/patches/series rdma-core-65.0/debian/patches/series
--- rdma-core-65.0/debian/patches/series	1970-01-01 02:00:00.000000000 +0200
+++ rdma-core-65.0/debian/patches/series	2026-10-02 20:14:41.000000000 +0300
@@ -0,0 +1 @@
+0001-pyverbs-Fix-uint64_t-type-mismatch-in-CompCntr.patch

Reply via email to