diff --git a/0001-sync-Fix-incorrect-argument-for-rxr_pkt_post_or_queue.patch b/0001-sync-Fix-incorrect-argument-for-rxr_pkt_post_or_queue.patch new file mode 100644 index 0000000000000000000000000000000000000000..e6f48bc1b8d18c1149e88d50da5f0fb8f576364e --- /dev/null +++ b/0001-sync-Fix-incorrect-argument-for-rxr_pkt_post_or_queue.patch @@ -0,0 +1,28 @@ +From 96748aadc881b48a6c63f80a12ca9388067654ed Mon Sep 17 00:00:00 2001 +From: zhangzhangxin +Date: Fri, 12 May 2023 16:52:25 +0800 +Subject: [PATCH] sync:In rxr_pkt_post_req, the rxr_pkt_post_or_queue's inject + argument was passed as flags, which is incorrect. This patch make + rxr_pkt_post_or_queue called with the correct inject argument. + +Signed-off-by: zhangzhangxin +--- + prov/efa/src/rxr/rxr_pkt_cmd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/prov/efa/src/rxr/rxr_pkt_cmd.c b/prov/efa/src/rxr/rxr_pkt_cmd.c +index af73e87..80db730 100644 +--- a/prov/efa/src/rxr/rxr_pkt_cmd.c ++++ b/prov/efa/src/rxr/rxr_pkt_cmd.c +@@ -454,7 +454,7 @@ ssize_t rxr_pkt_post_req(struct rxr_ep *ep, struct rxr_op_entry *tx_entry, int r + if (rxr_pkt_type_is_mulreq(req_type)) { + assert(!inject); + +- return rxr_pkt_post_or_queue(ep, tx_entry, req_type, flags); ++ return rxr_pkt_post_or_queue(ep, tx_entry, req_type, inject); + } + + return rxr_pkt_post(ep, tx_entry, req_type, inject, flags); +-- +2.40.0.windows.1 + diff --git a/backport-libfabric-fix-multiple-definition.patch b/backport-libfabric-fix-multiple-definition.patch deleted file mode 100644 index f58138feea7f1ffb02d8512b14b54fd7da6a03a8..0000000000000000000000000000000000000000 --- a/backport-libfabric-fix-multiple-definition.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/prov/verbs/src/fi_verbs.h 2018-05-09 03:27:04.000000000 +0800 -+++ b/prov/verbs/src/fi_verbs.h 2021-08-04 17:37:52.143247627 +0800 -@@ -680,11 +680,11 @@ - int fi_ibv_dgram_av_open(struct fid_domain *domain_fid, struct fi_av_attr *attr, - struct fid_av **av_fid, void *context); - --struct fi_ops_atomic fi_ibv_msg_ep_atomic_ops; --struct fi_ops_cm fi_ibv_msg_ep_cm_ops; --struct fi_ops_msg fi_ibv_msg_ep_msg_ops; --struct fi_ops_rma fi_ibv_msg_ep_rma_ops; --struct fi_ops_msg fi_ibv_msg_srq_ep_msg_ops; -+extern struct fi_ops_atomic fi_ibv_msg_ep_atomic_ops; -+extern struct fi_ops_cm fi_ibv_msg_ep_cm_ops; -+extern struct fi_ops_msg fi_ibv_msg_ep_msg_ops; -+extern struct fi_ops_rma fi_ibv_msg_ep_rma_ops; -+extern struct fi_ops_msg fi_ibv_msg_srq_ep_msg_ops; - - struct fi_ibv_connreq { - struct fid handle; diff --git a/libfabric-1.16.1.tar.bz2 b/libfabric-1.16.1.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..740b2a97ff898409aabdb7ade937fc774d42c0d6 Binary files /dev/null and b/libfabric-1.16.1.tar.bz2 differ diff --git a/libfabric-1.6.1.tar.bz2 b/libfabric-1.6.1.tar.bz2 deleted file mode 100644 index 4d29f34ed42eab5afd42a371063ec2107e65baac..0000000000000000000000000000000000000000 Binary files a/libfabric-1.6.1.tar.bz2 and /dev/null differ diff --git a/libfabric.spec b/libfabric.spec index 00241f259edf5f874a2310b5174eaef974b668c6..93322587f8f34fbff9fad74abfaf4e50f45429f4 100644 --- a/libfabric.spec +++ b/libfabric.spec @@ -1,17 +1,17 @@ Name: libfabric -Version: 1.6.1 -Release: 5 +Version: 1.16.1 +Release: 2 Summary: A core component of OpenFabric Interfaces License: BSD or GPLv2 URL: http://ofiwg.github.io/libfabric/ Source0: https://github.com/ofiwg/libfabric/releases/download/v%{version}/%{name}-%{version}.tar.bz2 -Patch0001: backport-libfabric-fix-multiple-definition.patch BuildRequires: gcc libibverbs-devel libnl3-devel librdmacm-devel chrpath %ifarch x86_64 BuildRequires: infinipath-psm-devel libpsm2-devel %endif +Patch0: 0001-sync-Fix-incorrect-argument-for-rxr_pkt_post_or_queue.patch %description OpenFabrics Interfaces (OFI) is a framework focused on exporting fabric @@ -77,6 +77,12 @@ chrpath -d %{buildroot}%{_bindir}/fi_* %changelog +* Fri May 12 2023 zhangxin 1.16.1-2 +- prov/efa: Fix incorrect argument for rxr_pkt_post_or_queue + +* Sat Nov 12 2022 hua 1.16.1-1 +- update to 1.16.1 + * Fri Sep 10 2021 gongzhengtang -1.6.1-5 - fix rpath