From f4e716b408a9042f18ffba185261c8dca23099dd Mon Sep 17 00:00:00 2001
From: Thomas Vegas <tvegas@nvidia.com>
Date: Tue, 30 Jun 2026 18:42:42 +0300
Subject: [PATCH] Allow rndv-based PUT/GET protocol without error handling

Signed-off-by: Thomas Vegas <tvegas@nvidia.com>
---
 src/plugins/ucx/ucx_utils.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/plugins/ucx/ucx_utils.cpp b/src/plugins/ucx/ucx_utils.cpp
index 2e1ed01122..6006451ef2 100644
--- a/src/plugins/ucx/ucx_utils.cpp
+++ b/src/plugins/ucx/ucx_utils.cpp
@@ -438,6 +438,10 @@ nixlUcxContext::nixlUcxContext(const std::vector<std::string> &devs,
         config.modify("MAX_HCA_PER_GPU", "auto");
     }
 
+    if (ucpVersion_ >= UCP_VERSION(1, 22)) {
+        config.modify("RNDV_PIPELINE_ERROR_HANDLING", "y");
+    }
+
     const auto &hw_info = nixl::hwInfo::instance();
     if (hw_info.numEfaDevices != 0) {
         config.modify("ADDRESS_VERSION", "v2");