Merge pull request #10661 from tvegas1/revert_ep_addr_size_flush_master

UCT/IB/RC: Revert adapt EP address size without flush_rkey

Author: tvegas1

src/uct/ib/rc/verbs/rc_verbs_ep.c

@@ -591,7 +591,7 @@ ucs_status_t uct_rc_verbs_ep_get_address(uct_ep_h tl_ep, uct_ep_addr_t *addr)
 
     rc_addr->super.flags = 0;
     uct_ib_pack_uint24(rc_addr->super.qp_num, ep->qp->qp_num);
-    if (uct_rc_iface_flush_rkey_enabled(&iface->super)) {
+    if (uct_ib_md_is_flush_rkey_valid(md->flush_rkey)) {
         rc_addr->super.flags  |= UCT_RC_VERBS_ADDR_HAS_ATOMIC_MR;
         rc_addr->atomic_mr_id  = uct_ib_md_get_atomic_mr_id(md);
         rc_addr->flush_rkey_hi = md->flush_rkey >> 16;

src/uct/ib/rc/verbs/rc_verbs_iface.c

@@ -198,6 +198,7 @@ uct_rc_verbs_iface_query(uct_iface_h tl_iface, uct_iface_attr_t *iface_attr)
 {
     uct_rc_verbs_iface_t *iface = ucs_derived_of(tl_iface,
                                                  uct_rc_verbs_iface_t);
+    uct_ib_md_t *md             = uct_ib_iface_md(&iface->super.super);
     ucs_status_t status;
 
     status = uct_rc_iface_query(&iface->super, iface_attr,
@@ -217,7 +218,7 @@ uct_rc_verbs_iface_query(uct_iface_h tl_iface, uct_iface_attr_t *iface_attr)
     /* Software overhead */
     iface_attr->overhead = UCT_RC_VERBS_IFACE_OVERHEAD;
 
-    iface_attr->ep_addr_len = uct_rc_iface_flush_rkey_enabled(&iface->super) ?
+    iface_attr->ep_addr_len = uct_ib_md_is_flush_rkey_valid(md->flush_rkey) ?
                                       sizeof(uct_rc_verbs_ep_flush_addr_t) :
                                       sizeof(uct_rc_verbs_ep_addr_t);
 

test/gtest/uct/ib/test_rc.cc

@@ -145,10 +145,12 @@ UCS_TEST_SKIP_COND_P(test_rc_max_wr, send_limit,
 UCT_INSTANTIATE_RC_TEST_CASE(test_rc_max_wr)
 
 
-class test_rc_iface_address : public uct_test {
+class test_rc_iface_flush_remote : public uct_test {
 protected:
-    entity *m_entity;
+    entity *m_e1;
+    entity *m_e2;
     entity *m_entity_flush_rkey;
+    int m_err_count;
 
 public:
     int rc_iface_flush_rkey_enabled(entity *e)
@@ -164,29 +166,43 @@ class test_rc_iface_address : public uct_test {
         return uct_ib_md_get_atomic_mr_id(md);
     }
 
-    static uct_iface_params_t iface_params()
+    uct_iface_params_t iface_params()
     {
         uct_iface_params_t params = {};
 
-        params.field_mask |= UCT_IFACE_PARAM_FIELD_OPEN_MODE;
-        params.field_mask |= UCT_IFACE_PARAM_FIELD_FEATURES;
+        params.field_mask      = UCT_IFACE_PARAM_FIELD_ERR_HANDLER       |
+                                 UCT_IFACE_PARAM_FIELD_ERR_HANDLER_ARG   |
+                                 UCT_IFACE_PARAM_FIELD_OPEN_MODE         |
+                                 UCT_IFACE_PARAM_FIELD_FEATURES;
+        params.open_mode       = UCT_IFACE_OPEN_MODE_DEVICE;
+        params.err_handler_arg = &m_err_count,
+        params.err_handler     =
+            [](void *arg, uct_ep_h ep, ucs_status_t status) {
+                (*reinterpret_cast<int*>(arg))++;
+                return UCS_OK;
+        };
+        params.features        = UCT_IFACE_FEATURE_PUT;
 
-        params.features  = UCT_IFACE_FEATURE_PUT;
-        params.open_mode = UCT_IFACE_OPEN_MODE_DEVICE;
         return params;
     }
 
     void init()
     {
         uct_test::init();
 
+        m_err_count               = 0;
         uct_iface_params_t params = iface_params();
-        m_entity                  = uct_test::create_entity(params);
+        m_e1                      = uct_test::create_entity(params);
+        params                    = iface_params();
+        m_e2                      = uct_test::create_entity(params);
+        m_e1->connect(0, *m_e2, 0);
+        m_e2->connect(0, *m_e1, 0);
 
         params.features    |= UCT_IFACE_FEATURE_FLUSH_REMOTE;
         m_entity_flush_rkey = uct_test::create_entity(params);
 
-        m_entities.push_back(m_entity);
+        m_entities.push_back(m_e1);
+        m_entities.push_back(m_e2);
         m_entities.push_back(m_entity_flush_rkey);
     }
 
@@ -202,18 +218,18 @@ class test_rc_iface_address : public uct_test {
     }
 };
 
-UCS_TEST_P(test_rc_iface_address, size_no_flush_remote)
+UCS_TEST_P(test_rc_iface_flush_remote, size_no_flush_remote)
 {
     map_size_t sizes = {
         {"rc_mlx5", {7, 1}},
         {"dc_mlx5", {0, 5}},
-        {"rc_verbs", {4, 0}},
+        {"rc_verbs", {7, 0}},
         {"gga_mlx5", {7, 8}},
     };
-    check_sizes(m_entity, sizes);
+    check_sizes(m_e1, sizes);
 }
 
-UCS_TEST_P(test_rc_iface_address, size_flush_remote)
+UCS_TEST_P(test_rc_iface_flush_remote, size_flush_remote)
 {
     int flush_rkey_enabled = rc_iface_flush_rkey_enabled(m_entity_flush_rkey);
     int mr_id              = rc_iface_mr_id(m_entity_flush_rkey);
@@ -226,7 +242,31 @@ UCS_TEST_P(test_rc_iface_address, size_flush_remote)
     check_sizes(m_entity_flush_rkey, sizes);
 }
 
-UCT_INSTANTIATE_RC_DC_GGA_TEST_CASE(test_rc_iface_address)
+UCS_TEST_SKIP_COND_P(test_rc_iface_flush_remote, put_fence_no_flush_remote,
+                     !check_caps(UCT_IFACE_FLAG_PUT_ZCOPY),
+                     "IB_PCI_RELAXED_ORDERING?=try")
+{
+    mapped_buffer sendbuf(64, 0ul, *m_e1);
+    mapped_buffer recvbuf(64, 0ul, *m_e2);
+    UCS_TEST_GET_BUFFER_IOV(iov, iovcnt, sendbuf.ptr(), 64, sendbuf.memh(),
+                            1);
+
+    uct_completion_t comp;
+    comp.func   = [](uct_completion_t*) {};
+    comp.count  = 1;
+    comp.status = UCS_OK;
+
+    // Trigger the use of atomic key, PUT fails with invalid atomic_mr_offset
+    ASSERT_UCS_OK(uct_ep_fence(m_e1->ep(0), 0));
+    EXPECT_EQ(UCS_INPROGRESS,
+              uct_ep_put_zcopy(m_e1->ep(0), iov, iovcnt, recvbuf.addr(),
+                               recvbuf.rkey(), &comp));
+    wait_for_value(&comp.count, 0, true);
+    EXPECT_EQ(0, comp.count);
+    EXPECT_EQ(0, m_err_count);
+}
+
+UCT_INSTANTIATE_RC_DC_GGA_TEST_CASE(test_rc_iface_flush_remote)
 
 
 class test_rc_get_limit : public test_rc {