RDMA/ucma: Extend ucma_connect to receive ECE parameters

Active side of CMID initiates connection through librdmacm's
rdma_connect() and kernel's ucma_connect(). Extend UCMA interface to
handle those new parameters.

Link: https://lore.kernel.org/r/20200526103304.196371-3-leon@kernel.org
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 432eec4..e81b8a5 100644 (file)
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -4036,6 +4036,27 @@ err:
 }
 EXPORT_SYMBOL(rdma_connect);
 
+/**
+ * rdma_connect_ece - Initiate an active connection request with ECE data.
+ * @id: Connection identifier to connect.
+ * @conn_param: Connection information used for connected QPs.
+ * @ece: ECE parameters
+ *
+ * See rdma_connect() explanation.
+ */
+int rdma_connect_ece(struct rdma_cm_id *id, struct rdma_conn_param *conn_param,
+                    struct rdma_ucm_ece *ece)
+{
+       struct rdma_id_private *id_priv =
+               container_of(id, struct rdma_id_private, id);
+
+       id_priv->ece.vendor_id = ece->vendor_id;
+       id_priv->ece.attr_mod = ece->attr_mod;
+
+       return rdma_connect(id, conn_param);
+}
+EXPORT_SYMBOL(rdma_connect_ece);
+
 static int cma_accept_ib(struct rdma_id_private *id_priv,
                         struct rdma_conn_param *conn_param)
 {

diff --git a/drivers/infiniband/core/cma_priv.h b/drivers/infiniband/core/cma_priv.h
index 5edcf44..caece96 100644 (file)
--- a/drivers/infiniband/core/cma_priv.h
+++ b/drivers/infiniband/core/cma_priv.h
@@ -95,6 +95,7 @@ struct rdma_id_private {
         * Internal to RDMA/core, don't use in the drivers
         */
        struct rdma_restrack_entry     res;
+       struct rdma_ucm_ece ece;
 };
 
 #if IS_ENABLED(CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS)

diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index 06127c8..7cbb636 100644 (file)
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -1072,12 +1072,15 @@ static void ucma_copy_conn_param(struct rdma_cm_id *id,
 static ssize_t ucma_connect(struct ucma_file *file, const char __user *inbuf,
                            int in_len, int out_len)
 {
-       struct rdma_ucm_connect cmd;
        struct rdma_conn_param conn_param;
+       struct rdma_ucm_ece ece = {};
+       struct rdma_ucm_connect cmd;
        struct ucma_context *ctx;
+       size_t in_size;
        int ret;
 
-       if (copy_from_user(&cmd, inbuf, sizeof(cmd)))
+       in_size = min_t(size_t, in_len, sizeof(cmd));
+       if (copy_from_user(&cmd, inbuf, in_size))
                return -EFAULT;
 
        if (!cmd.conn_param.valid)
@@ -1088,8 +1091,13 @@ static ssize_t ucma_connect(struct ucma_file *file, const char __user *inbuf,
                return PTR_ERR(ctx);
 
        ucma_copy_conn_param(ctx->cm_id, &conn_param, &cmd.conn_param);
+       if (offsetofend(typeof(cmd), ece) <= in_size) {
+               ece.vendor_id = cmd.ece.vendor_id;
+               ece.attr_mod = cmd.ece.attr_mod;
+       }
+
        mutex_lock(&ctx->mutex);
-       ret = rdma_connect(ctx->cm_id, &conn_param);
+       ret = rdma_connect_ece(ctx->cm_id, &conn_param, &ece);
        mutex_unlock(&ctx->mutex);
        ucma_put_ctx(ctx);
        return ret;

diff --git a/include/rdma/rdma_cm.h b/include/rdma/rdma_cm.h
index ea8e794..4e2975e 100644 (file)
--- a/include/rdma/rdma_cm.h
+++ b/include/rdma/rdma_cm.h
@@ -264,6 +264,9 @@ int rdma_init_qp_attr(struct rdma_cm_id *id, struct ib_qp_attr *qp_attr,
  */
 int rdma_connect(struct rdma_cm_id *id, struct rdma_conn_param *conn_param);
 
+int rdma_connect_ece(struct rdma_cm_id *id, struct rdma_conn_param *conn_param,
+                    struct rdma_ucm_ece *ece);
+
 /**
  * rdma_listen - This function is called by the passive side to
  *   listen for incoming connection requests.

diff --git a/include/uapi/rdma/rdma_user_cm.h b/include/uapi/rdma/rdma_user_cm.h
index 1bb6e75..c1409dd 100644 (file)
--- a/include/uapi/rdma/rdma_user_cm.h
+++ b/include/uapi/rdma/rdma_user_cm.h
@@ -210,10 +210,16 @@ struct rdma_ucm_ud_param {
        __u8  reserved[7];
 };
 
+struct rdma_ucm_ece {
+       __u32 vendor_id;
+       __u32 attr_mod;
+};
+
 struct rdma_ucm_connect {
        struct rdma_ucm_conn_param conn_param;
        __u32 id;
        __u32 reserved;
+       struct rdma_ucm_ece ece;
 };
 
 struct rdma_ucm_listen {