openucx · brminich · Jun 1, 2026 · Apr 15, 2026 · Apr 15, 2026 · Apr 15, 2026
diff --git a/src/ucp/Makefile.am b/src/ucp/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright (c) NVIDIA CORPORATION & AFFILIATES, 2001-2021. ALL RIGHTS RESERVED.
+# Copyright (c) NVIDIA CORPORATION & AFFILIATES, 2001-2026. ALL RIGHTS RESERVED.
 # Copyright (c) UT-Battelle, LLC. 2017. ALL RIGHTS RESERVED.
 # Copyright (C) Los Alamos National Security, LLC. 2019. ALL RIGHTS RESERVED.
 # See file LICENSE for terms.
@@ -50,6 +50,7 @@ noinst_HEADERS = \
 	dt/dt.inl \
 	dt/dt_contig.h \
 	dt/dt_iov.h \
+	dt/dt_sgl.h \
 	dt/dt_generic.h \
 	proto/lane_type.h \
 	proto/proto_am.h \
@@ -120,6 +121,7 @@ libucp_la_SOURCES = \
 	core/ucp_device.c \
 	dt/datatype_iter.c \
 	dt/dt_iov.c \
+	dt/dt_sgl.c \
 	dt/dt_generic.c \
 	dt/dt.c \
 	proto/lane_type.c \

diff --git a/src/ucp/am/eager_multi.c b/src/ucp/am/eager_multi.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2022, NVIDIA CORPORATION & AFFILIATES. ALL RIGHTS RESERVED.
+ * Copyright (C) 2022-2026, NVIDIA CORPORATION & AFFILIATES. ALL RIGHTS RESERVED.
  * See file LICENSE for terms.
  */
 
@@ -175,6 +175,7 @@ ucp_proto_t ucp_am_eager_multi_bcopy_proto = {
     .name     = "am/egr/multi/bcopy",
     .desc     = UCP_PROTO_MULTI_FRAG_DESC " " UCP_PROTO_COPY_IN_DESC,
     .flags    = 0,
+    .dt_mask  = UCP_PROTO_DT_MASK_DEFAULT,
     .probe    = ucp_am_eager_multi_bcopy_proto_probe,
     .query    = ucp_proto_multi_query,
     .progress = {ucp_am_eager_multi_bcopy_proto_progress},
@@ -349,6 +350,7 @@ ucp_proto_t ucp_am_eager_multi_zcopy_proto = {
     .name     = "am/egr/multi/zcopy",
     .desc     = UCP_PROTO_MULTI_FRAG_DESC " " UCP_PROTO_ZCOPY_DESC,
     .flags    = 0,
+    .dt_mask  = UCP_DT_MASK_CONTIG_IOV,
     .probe    = ucp_am_eager_multi_zcopy_proto_probe,
     .query    = ucp_proto_multi_query,
     .progress = {ucp_am_eager_multi_zcopy_proto_progress},
@@ -449,6 +451,7 @@ ucp_proto_t ucp_am_eager_multi_zcopy_psn_proto = {
     .name     = "am/egr/multi/zcopy/psn",
     .desc     = UCP_PROTO_MULTI_FRAG_DESC " " UCP_PROTO_ZCOPY_DESC " psn",
     .flags    = 0,
+    .dt_mask  = UCP_DT_MASK_CONTIG_IOV,
     .probe    = ucp_am_eager_multi_zcopy_psn_proto_probe,
     .query    = ucp_proto_multi_query,
     .progress = {ucp_am_eager_multi_zcopy_psn_proto_progress},

diff --git a/src/ucp/am/eager_single.c b/src/ucp/am/eager_single.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2021, NVIDIA CORPORATION & AFFILIATES. ALL RIGHTS RESERVED.
+ * Copyright (C) 2021-2026, NVIDIA CORPORATION & AFFILIATES. ALL RIGHTS RESERVED.
  * See file LICENSE for terms.
  */
 
@@ -139,6 +139,7 @@ ucp_proto_t ucp_am_eager_short_proto = {
     .name     = "am/egr/short",
     .desc     = UCP_PROTO_SHORT_DESC,
     .flags    = UCP_PROTO_FLAG_AM_SHORT,
+    .dt_mask  = UCS_BIT(UCP_DATATYPE_CONTIG),
     .probe    = ucp_am_eager_short_probe,
     .query    = ucp_proto_single_query,
     .progress = {ucp_am_eager_short_proto_progress},
@@ -162,6 +163,7 @@ ucp_proto_t ucp_am_eager_short_reply_proto = {
     .name     = "am/egr/short/reply",
     .desc     = UCP_PROTO_SHORT_DESC,
     .flags    = UCP_PROTO_FLAG_AM_SHORT,
+    .dt_mask  = UCS_BIT(UCP_DATATYPE_CONTIG),
     .probe    = ucp_am_eager_short_reply_probe,
     .query    = ucp_proto_single_query,
     .progress = {ucp_am_eager_short_reply_proto_progress},
@@ -264,6 +266,7 @@ ucp_proto_t ucp_am_eager_single_bcopy_proto = {
     .name     = "am/egr/single/bcopy",
     .desc     = UCP_PROTO_COPY_IN_DESC,
     .flags    = 0,
+    .dt_mask  = UCP_PROTO_DT_MASK_DEFAULT,
     .probe    = ucp_am_eager_single_bcopy_probe,
     .query    = ucp_proto_single_query,
     .progress = {ucp_am_eager_single_bcopy_proto_progress},
@@ -301,6 +304,7 @@ ucp_proto_t ucp_am_eager_single_bcopy_reply_proto = {
     .name     = "am/egr/single/bcopy/reply",
     .desc     = UCP_PROTO_COPY_IN_DESC,
     .flags    = 0,
+    .dt_mask  = UCP_PROTO_DT_MASK_DEFAULT,
     .probe    = ucp_am_eager_single_bcopy_reply_probe,
     .query    = ucp_proto_single_query,
     .progress = {ucp_am_eager_single_bcopy_reply_proto_progress},
@@ -339,8 +343,7 @@ static void ucp_am_eager_single_zcopy_probe_common(
     };
 
     if (!ucp_am_check_init_params(init_params, UCS_BIT(op_id),
-                                  UCP_PROTO_SELECT_OP_FLAG_AM_RNDV) ||
-        (init_params->select_param->dt_class != UCP_DATATYPE_CONTIG)) {
+                                  UCP_PROTO_SELECT_OP_FLAG_AM_RNDV)) {
         return;
     }
 
@@ -402,6 +405,7 @@ ucp_proto_t ucp_am_eager_single_zcopy_proto = {
     .name     = "am/egr/single/zcopy",
     .desc     = UCP_PROTO_ZCOPY_DESC,
     .flags    = 0,
+    .dt_mask  = UCS_BIT(UCP_DATATYPE_CONTIG),
     .probe    = ucp_am_eager_single_zcopy_probe,
     .query    = ucp_proto_single_query,
     .progress = {ucp_am_eager_single_zcopy_proto_progress},
@@ -458,6 +462,7 @@ ucp_proto_t ucp_am_eager_single_zcopy_reply_proto = {
     .name     = "am/egr/single/zcopy/reply",
     .desc     = UCP_PROTO_ZCOPY_DESC,
     .flags    = 0,
+    .dt_mask  = UCS_BIT(UCP_DATATYPE_CONTIG),
     .probe    = ucp_am_eager_single_zcopy_reply_probe,
     .query    = ucp_proto_single_query,
     .progress = {ucp_am_eager_single_zcopy_reply_proto_progress},

diff --git a/src/ucp/am/rndv.c b/src/ucp/am/rndv.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2022, NVIDIA CORPORATION & AFFILIATES. ALL RIGHTS RESERVED.
+ * Copyright (C) 2022-2026, NVIDIA CORPORATION & AFFILIATES. ALL RIGHTS RESERVED.
  * See file LICENSE for terms.
  */
 
@@ -73,6 +73,7 @@ ucp_proto_t ucp_am_rndv_proto = {
     .name     = "am/rndv",
     .desc     = NULL,
     .flags    = 0,
+    .dt_mask  = UCP_PROTO_DT_MASK_DEFAULT,
     .probe    = ucp_am_rndv_rts_probe,
     .query    = ucp_proto_rndv_rts_query,
     .progress = {ucp_am_rndv_proto_progress},

diff --git a/src/ucp/api/ucp.h b/src/ucp/api/ucp.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) NVIDIA CORPORATION & AFFILIATES, 2001-2020. ALL RIGHTS RESERVED.
+* Copyright (c) NVIDIA CORPORATION & AFFILIATES, 2001-2026. ALL RIGHTS RESERVED.
 * Copyright (C) UT-Battelle, LLC. 2014-2017. ALL RIGHTS RESERVED.
 * Copyright (C) ARM Ltd. 2016-2017.  ALL RIGHTS RESERVED.
 * Copyright (C) Los Alamos National Security, LLC. 2018 ALL RIGHTS RESERVED.
@@ -941,6 +941,10 @@ enum ucp_dt_remote_sgl_field {
  *
  * @note Currently only N->N mapping is supported: both sides must use
  *       the SGL datatype with equal counts and matching lengths.
+ *
+ * @note All buffers in the descriptor must share the same memory type
+ *       (see @ref ucs_memory_type_t), otherwise @ref UCS_ERR_INVALID_PARAM
+ *       is returned.
  */
 typedef struct {
     uint64_t        field_mask; /**< Valid fields, using bits from

diff --git a/src/ucp/core/ucp_am.c b/src/ucp/core/ucp_am.c
@@ -1,6 +1,6 @@
 /**
 * Copyright (C) Los Alamos National Security, LLC. 2019 ALL RIGHTS RESERVED.
-* Copyright (c) NVIDIA CORPORATION & AFFILIATES, 2019. ALL RIGHTS RESERVED.
+* Copyright (c) NVIDIA CORPORATION & AFFILIATES, 2019-2026. ALL RIGHTS RESERVED.
 * Copyright (C) Advanced Micro Devices, Inc. 2024. ALL RIGHTS RESERVED.
 *
 * See file LICENSE for terms.
@@ -1132,6 +1132,7 @@ UCS_PROFILE_FUNC(ucs_status_ptr_t, ucp_am_recv_data_nbx,
 
     UCP_CONTEXT_CHECK_FEATURE_FLAGS(context, UCP_FEATURE_AM,
                                     return UCS_STATUS_PTR(UCS_ERR_INVALID_PARAM));
+    UCP_REQUEST_CHECK_PARAM(param);
     UCP_WORKER_THREAD_CS_ENTER_CONDITIONAL(worker);
 
 

diff --git a/src/ucp/core/ucp_mm.inl b/src/ucp/core/ucp_mm.inl
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * Copyright (c) 2022-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  *
  * See file LICENSE for terms.
  */
@@ -113,6 +113,16 @@ static UCS_F_ALWAYS_INLINE int ucp_memh_is_user_memh(ucp_mem_h memh)
     return (memh->parent != NULL) && !ucp_memh_is_zero_length(memh);
 }
 
+static UCS_F_ALWAYS_INLINE ucp_memory_info_t
+ucp_memory_info_from_memh(ucp_mem_h memh)
+{
+    ucp_memory_info_t mem_info;
+
+    mem_info.type    = memh->mem_type;
+    mem_info.sys_dev = memh->sys_dev;
+    return mem_info;
+}
+
 static UCS_F_ALWAYS_INLINE int ucp_memh_is_buffer_in_range(const ucp_mem_h memh,
                                                            const void *buffer,
                                                            size_t length)

diff --git a/src/ucp/core/ucp_request.inl b/src/ucp/core/ucp_request.inl
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) NVIDIA CORPORATION & AFFILIATES, 2001-2019. ALL RIGHTS RESERVED.
+ * Copyright (c) NVIDIA CORPORATION & AFFILIATES, 2001-2026. ALL RIGHTS RESERVED.
  *
  * See file LICENSE for terms.
  */
@@ -186,23 +186,49 @@ UCS_PTR_MAP_IMPL(request, 0);
     }
 
 
-#define UCP_REQUEST_CHECK_PARAM(_param) \
-    if (ENABLE_PARAMS_CHECK) { \
-        if (((_param)->op_attr_mask & UCP_OP_ATTR_FIELD_MEMORY_TYPE) && \
-            ((_param)->memory_type > UCS_MEMORY_TYPE_LAST)) { \
-            ucs_error("invalid memory type parameter: %d", \
-                      (_param)->memory_type); \
-            return UCS_STATUS_PTR(UCS_ERR_INVALID_PARAM); \
+#define UCP_REQUEST_CHECK_PARAM_COMMON(_param) \
+    do { \
+        if (ENABLE_PARAMS_CHECK) { \
+            if (((_param)->op_attr_mask & UCP_OP_ATTR_FIELD_MEMORY_TYPE) && \
+                ((_param)->memory_type > UCS_MEMORY_TYPE_LAST)) { \
+                ucs_error("invalid memory type parameter: %d", \
+                          (_param)->memory_type); \
+                return UCS_STATUS_PTR(UCS_ERR_INVALID_PARAM); \
+            } \
+            \
+            if (ucs_test_all_flags((_param)->op_attr_mask, \
+                                   (UCP_OP_ATTR_FLAG_FAST_CMPL | \
+                                    UCP_OP_ATTR_FLAG_MULTI_SEND))) { \
+                ucs_error("UCP_OP_ATTR_FLAG_FAST_CMPL and " \
+                          "UCP_OP_ATTR_FLAG_MULTI_SEND are mutually exclusive"); \
+                return UCS_STATUS_PTR(UCS_ERR_INVALID_PARAM); \
+            } \
         } \
-        \
-        if (ucs_test_all_flags((_param)->op_attr_mask, \
-                               (UCP_OP_ATTR_FLAG_FAST_CMPL | \
-                                UCP_OP_ATTR_FLAG_MULTI_SEND))) { \
-            ucs_error("UCP_OP_ATTR_FLAG_FAST_CMPL and " \
-                      "UCP_OP_ATTR_FLAG_MULTI_SEND are mutually exclusive"); \
+    } while (0)
+
+
+#define UCP_REQUEST_CHECK_PARAM_NO_REMOTE(_param) \
+    do { \
+        if (ENABLE_PARAMS_CHECK && \
+            (((_param)->op_attr_mask & \
+              (UCP_OP_ATTR_FIELD_REMOTE | \
+               UCP_OP_ATTR_FIELD_REMOTE_DATATYPE | \
+               UCP_OP_ATTR_FIELD_REMOTE_COUNT)) || \
+             (((_param)->op_attr_mask & UCP_OP_ATTR_FIELD_DATATYPE) && \
+              (((_param)->datatype & UCP_DATATYPE_CLASS_MASK) == \
+               UCP_DATATYPE_SGL)))) { \
+            ucs_error("SGL datatype and remote descriptor parameters are " \
+                      "only supported for ucp_put_nbx"); \
             return UCS_STATUS_PTR(UCS_ERR_INVALID_PARAM); \
         } \
-    }
+    } while (0)
+
+
+#define UCP_REQUEST_CHECK_PARAM(_param) \
+    do { \
+        UCP_REQUEST_CHECK_PARAM_COMMON(_param); \
+        UCP_REQUEST_CHECK_PARAM_NO_REMOTE(_param); \
+    } while (0)
 
 
 #if UCS_ENABLE_ASSERT

diff --git a/src/ucp/core/ucp_rkey.c b/src/ucp/core/ucp_rkey.c
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) NVIDIA CORPORATION & AFFILIATES, 2001-2015. ALL RIGHTS RESERVED.
+* Copyright (c) NVIDIA CORPORATION & AFFILIATES, 2001-2026. ALL RIGHTS RESERVED.
 *
 * See file LICENSE for terms.
 */
@@ -674,9 +674,8 @@ static ssize_t ucp_memh_do_pack(ucp_mem_h memh, uint64_t flags, int rkey_compat,
         ucs_fatal("packing rkey using ucp_memh_pack() is unsupported");
     }
 
-    mem_info.type    = memh->mem_type;
-    mem_info.sys_dev = memh->sys_dev;
-    sys_distance     = sys_dev_distances;
+    mem_info     = ucp_memory_info_from_memh(memh);
+    sys_distance = sys_dev_distances;
 
     ucs_for_each_bit(ep_sys_dev, sys_dev_map) {
         status = ucs_topo_get_distance(memh->sys_dev, ep_sys_dev, sys_distance);