UCT/API: Moved iface query flag to v2, minor fixes

Signed-off-by: Roie Danino <rdanino@nvidia.com>

Author: roiedanino

src/uct/api/uct.h

@@ -429,9 +429,6 @@ typedef enum uct_atomic_op {
                                                        channel with remote peer is broken, even if there
                                                        are no outstanding send operations */
 
-        /* Token query capability */
-#define UCT_IFACE_FLAG_QUERY_TOKEN UCS_BIT(47) /**< Interface supports token query */
-
         /* Tag matching operations */
 #define UCT_IFACE_FLAG_TAG_EAGER_SHORT UCS_BIT(50) /**< Hardware tag matching short eager support */
 #define UCT_IFACE_FLAG_TAG_EAGER_BCOPY UCS_BIT(51) /**< Hardware tag matching bcopy eager support */

src/uct/api/v2/uct_v2.h

@@ -1059,6 +1059,7 @@ enum uct_iface_attr_field {
  */
         /* PUT capabilities */
 #define UCT_IFACE_FLAG_V2_PUT_SGL_ZCOPY       UCS_BIT(0)  /**< Zero-copy SGL put */
+#define UCT_IFACE_FLAG_V2_QUERY_TOKEN         UCS_BIT(1)  /**< Interface supports token query */
 /**
  * @}
  */

src/uct/ib/mlx5/ib_mlx5_ext.c

@@ -27,5 +27,5 @@ void uct_ib_mlx5_ext_register(const uct_ib_mlx5_ext_ops_t *ops)
     ucs_assertv(ops->iface_flags != NULL, "ext_resgiter: iface_flags function is NULL");
     ucs_assertv(ops->qp_query != NULL, "ext_resgiter: qp_query function is NULL");
     uct_ib_mlx5_ext_ops = *ops;
-    ucs_info("ib mlx5: registered external ops successfully");
+    ucs_debug("ib mlx5: registered external ops successfully");
 }

src/uct/ib/mlx5/ib_mlx5_ext.h

@@ -7,15 +7,15 @@
 #ifndef UCT_IB_MLX5_EXT_H_
 #define UCT_IB_MLX5_EXT_H_
 
+#include <infiniband/verbs.h>
+#include <infiniband/mlx5dv.h>
+
 #include <stdint.h>
+
 #include <ucs/debug/assert.h>
 #include <ucs/type/status.h>
 #include <ucs/sys/stubs.h>
 
-
-struct ibv_qp;
-struct mlx5dv_devx_obj;
-
 /**
  * @brief Field mask bits for @ref uct_ib_mlx5_ext_qp_query_attr_t.
  * Selects which output fields to populate.
@@ -29,19 +29,26 @@ enum uct_ib_mlx5_ext_qp_query_attr_field {
 };
 
 /**
- * @brief QP query output attributes.
+ * @brief QP tx/rx token query output attributes.
  */
 typedef struct uct_ib_mlx5_ext_qp_query_attr {
-    uint64_t field_mask;
-    size_t   tx_token_len;
-    size_t   rx_token_len;
-    void     *tx_token;
-    void     *rx_token;
-    uint32_t qp_num;
+    uint64_t field_mask;   /**< Mask of valid fields in this structure, using bits from @ref uct_ib_mlx5_ext_qp_query_attr_field. */
+    size_t   tx_token_len; /**< Length of the TX token in bytes. */
+    size_t   rx_token_len; /**< Length of the RX token in bytes. */
+    void     *tx_token;    /**< TX token pointer. */
+    void     *rx_token;    /**< RX token pointer. */
+    uint32_t qp_num;       /**< QP number. */
 } uct_ib_mlx5_ext_qp_query_attr_t;
 
 
+/**
+ * @brief External plugin iface flags function type.
+ */
 typedef ucs_status_t (*uct_ib_mlx5_ext_iface_flags_func_t)(uint64_t *flags);
+
+/**
+ * @brief QP tx/rx token query function type.
+ */
 typedef ucs_status_t (*uct_ib_mlx5_ext_qp_query_func_t)(
         struct ibv_qp *qp, struct mlx5dv_devx_obj *devx_obj,
         uct_ib_mlx5_ext_qp_query_attr_t *attr);