RDMA/cma: Connect ECE to rdma_accept

The rdma_accept() is called by both passive and active sides of CMID
connection to mark readiness to start data transfer. For passive side,
this is called explicitly, for active side, it is called implicitly while
receiving REP message.

Provide ECE data to rdma_accept function needed for passive side to send
that REP message.

Link: https://lore.kernel.org/r/20200526103304.196371-6-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 f554a37..d449afe 100644 (file)
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -4090,6 +4090,8 @@ static int cma_accept_ib(struct rdma_id_private *id_priv,
        rep.flow_control = conn_param->flow_control;
        rep.rnr_retry_count = min_t(u8, 7, conn_param->rnr_retry_count);
        rep.srq = id_priv->srq ? 1 : 0;
+       rep.ece.vendor_id = id_priv->ece.vendor_id;
+       rep.ece.attr_mod = id_priv->ece.attr_mod;
 
        trace_cm_send_rep(id_priv);
        ret = ib_send_cm_rep(id_priv->cm_id.ib, &rep);
@@ -4137,7 +4139,11 @@ static int cma_send_sidr_rep(struct rdma_id_private *id_priv,
                        return ret;
                rep.qp_num = id_priv->qp_num;
                rep.qkey = id_priv->qkey;
+
+               rep.ece.vendor_id = id_priv->ece.vendor_id;
+               rep.ece.attr_mod = id_priv->ece.attr_mod;
        }
+
        rep.private_data = private_data;
        rep.private_data_len = private_data_len;
 
@@ -4195,6 +4201,19 @@ reject:
 }
 EXPORT_SYMBOL(__rdma_accept);
 
+int __rdma_accept_ece(struct rdma_cm_id *id, struct rdma_conn_param *conn_param,
+                     const char *caller, 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_accept(id, conn_param, caller);
+}
+EXPORT_SYMBOL(__rdma_accept_ece);
+
 int rdma_notify(struct rdma_cm_id *id, enum ib_event_type event)
 {
        struct rdma_id_private *id_priv;

diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index 3e5268c..6b27b21 100644 (file)
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -1135,28 +1135,36 @@ static ssize_t ucma_accept(struct ucma_file *file, const char __user *inbuf,
 {
        struct rdma_ucm_accept cmd;
        struct rdma_conn_param conn_param;
+       struct rdma_ucm_ece ece = {};
        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;
 
        ctx = ucma_get_ctx_dev(file, cmd.id);
        if (IS_ERR(ctx))
                return PTR_ERR(ctx);
 
+       if (offsetofend(typeof(cmd), ece) <= in_size) {
+               ece.vendor_id = cmd.ece.vendor_id;
+               ece.attr_mod = cmd.ece.attr_mod;
+       }
+
        if (cmd.conn_param.valid) {
                ucma_copy_conn_param(ctx->cm_id, &conn_param, &cmd.conn_param);
                mutex_lock(&file->mut);
                mutex_lock(&ctx->mutex);
-               ret = __rdma_accept(ctx->cm_id, &conn_param, NULL);
+               ret = __rdma_accept_ece(ctx->cm_id, &conn_param, NULL, &ece);
                mutex_unlock(&ctx->mutex);
                if (!ret)
                        ctx->uid = cmd.uid;
                mutex_unlock(&file->mut);
        } else {
                mutex_lock(&ctx->mutex);
-               ret = __rdma_accept(ctx->cm_id, NULL, NULL);
+               ret = __rdma_accept_ece(ctx->cm_id, NULL, NULL, &ece);
                mutex_unlock(&ctx->mutex);
        }
        ucma_put_ctx(ctx);

diff --git a/include/rdma/rdma_cm.h b/include/rdma/rdma_cm.h
index 418590c..7ac9167 100644 (file)
--- a/include/rdma/rdma_cm.h
+++ b/include/rdma/rdma_cm.h
@@ -280,6 +280,9 @@ int rdma_listen(struct rdma_cm_id *id, int backlog);
 int __rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param,
                  const char *caller);
 
+int __rdma_accept_ece(struct rdma_cm_id *id, struct rdma_conn_param *conn_param,
+                     const char *caller, struct rdma_ucm_ece *ece);
+
 /**
  * rdma_accept - Called to accept a connection request or response.
  * @id: Connection identifier associated with the request.

diff --git a/include/uapi/rdma/rdma_user_cm.h b/include/uapi/rdma/rdma_user_cm.h
index 19c5c3f..6b883dd 100644 (file)
--- a/include/uapi/rdma/rdma_user_cm.h
+++ b/include/uapi/rdma/rdma_user_cm.h
@@ -232,6 +232,7 @@ struct rdma_ucm_accept {
        struct rdma_ucm_conn_param conn_param;
        __u32 id;
        __u32 reserved;
+       struct rdma_ucm_ece ece;
 };
 
 struct rdma_ucm_reject {