Add Enhanced Connection Established (ECE)
Subsystems (10)
v3 cover Add Enhanced Connection Established (ECE)
From: Leon Romanovsky <[email protected]>
Changelog:
v3:
* Rebased on top of ebd6e96b33a2 RDMA/ipoib: Remove can_sleep parameter from iboib_mcast_alloc
* Updated rdma_reject patch to include newly added RTR ulp
* Remove empty hunks added by rebase
* Changed signature of rdma_reject so kernel users will provide reason by themselves
* Squashed UAPI patch to other patches which add functionality
* Removed define of the IBTA reason from UAPI
v2: https://lore.kernel.org/linux-rdma/[email protected]/
* Rebased on latest rdma-next and removed already accepted patches.
* Updated all rdma_reject in-kernel users to provide reject reason.
v1: Dropped field_avail patch in favor of mass conversion to use function
which already exists in the kernel code.
https://lore.kernel.org/lkml/[email protected]
v0: https://lore.kernel.org/lkml/[email protected]
Enhanced Connection Established or ECE is new negotiation scheme introduced in IBTA v1.4 to exchange extra information about nodes capabilities and later negotiate them at the connection establishment phase.
The RDMA-CM messages (REQ, REP, SIDR_REQ and SIDR_REP) were extended to carry two fields, one new and another gained new functionality:
* VendorID is a new field that indicates that common subset of vendor option bits are supported as indicated by that VendorID.
* AttributeModifier already exists, but overloaded to indicate which vendor options are supported by this VendorID.
This is kernel part of such functionality which is responsible to get data from librdmacm and properly create and handle RDMA-CM messages.
Thanks
Leon Romanovsky (6):
RDMA/cm: Add Enhanced Connection Establishment (ECE) bits RDMA/ucma: Extend ucma_connect to receive ECE parameters RDMA/ucma: Deliver ECE parameters through UCMA events RDMA/cm: Send and receive ECE parameter over the wire RDMA/cma: Connect ECE to rdma_accept
RDMA/cma: Provide ECE reject reason
drivers/infiniband/core/cm.c | 39 ++++++++++++++--- drivers/infiniband/core/cma.c | 57 ++++++++++++++++++++++--- drivers/infiniband/core/cma_priv.h | 1 + drivers/infiniband/core/ucma.c | 49 +++++++++++++++++---- drivers/infiniband/ulp/isert/ib_isert.c | 4 +- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 2 +- drivers/infiniband/ulp/srpt/ib_srpt.c | 3 +- drivers/nvme/target/rdma.c | 3 +- include/rdma/ib_cm.h | 9 +++- include/rdma/ibta_vol1_c12.h | 6 +++ include/rdma/rdma_cm.h | 9 +++- include/uapi/rdma/rdma_user_cm.h | 11 ++++- net/rds/ib_cm.c | 4 +- 13 files changed, 170 insertions(+), 27 deletions(-)
--
2.26.2
PATCH v3 1/6 RDMA/cm: Add Enhanced Connection Establishment (ECE) bits
From: Leon Romanovsky <[email protected]>
Extend REQ (request for communications), REP (reply to request for communication), rejected reason and SIDR_REP (service ID resolution response) structures with hardware vendor ID bits according to IBTA v1.4.
--- include/rdma/ibta_vol1_c12.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/rdma/ibta_vol1_c12.h +6 -0
@@ -38,6 +38,7 @@/* Table 106 REQ Message Contents */ #define CM_REQ_LOCAL_COMM_ID CM_FIELD32_LOC(struct cm_req_msg, 0, 32) +#define CM_REQ_VENDOR_ID CM_FIELD32_LOC(struct cm_req_msg, 5, 24)#define CM_REQ_SERVICE_ID CM_FIELD64_LOC(struct cm_req_msg, 8)#define CM_REQ_LOCAL_CA_GUID CM_FIELD64_LOC(struct cm_req_msg, 16)#define CM_REQ_LOCAL_Q_KEY CM_FIELD32_LOC(struct cm_req_msg, 28, 32)
@@ -119,8 +120,11 @@ CM_STRUCT(struct cm_rej_msg, 84 * 8 + 1184);#define CM_REP_REMOTE_COMM_ID CM_FIELD32_LOC(struct cm_rep_msg, 4, 32)#define CM_REP_LOCAL_Q_KEY CM_FIELD32_LOC(struct cm_rep_msg, 8, 32)#define CM_REP_LOCAL_QPN CM_FIELD32_LOC(struct cm_rep_msg, 12, 24) +#define CM_REP_VENDOR_ID_H CM_FIELD8_LOC(struct cm_rep_msg, 15, 8)#define CM_REP_LOCAL_EE_CONTEXT_NUMBER CM_FIELD32_LOC(struct cm_rep_msg, 16, 24) +#define CM_REP_VENDOR_ID_M CM_FIELD8_LOC(struct cm_rep_msg, 19, 8)#define CM_REP_STARTING_PSN CM_FIELD32_LOC(struct cm_rep_msg, 20, 24) +#define CM_REP_VENDOR_ID_L CM_FIELD8_LOC(struct cm_rep_msg, 23, 8)#define CM_REP_RESPONDER_RESOURCES CM_FIELD8_LOC(struct cm_rep_msg, 24, 8)#define CM_REP_INITIATOR_DEPTH CM_FIELD8_LOC(struct cm_rep_msg, 25, 8)#define CM_REP_TARGET_ACK_DELAY CM_FIELD8_LOC(struct cm_rep_msg, 26, 5)
@@ -201,7 +205,9 @@ CM_STRUCT(struct cm_sidr_req_msg, 16 * 8 + 1728);#define CM_SIDR_REP_STATUS CM_FIELD8_LOC(struct cm_sidr_rep_msg, 4, 8)#define CM_SIDR_REP_ADDITIONAL_INFORMATION_LENGTH \ CM_FIELD8_LOC(struct cm_sidr_rep_msg, 5, 8) +#define CM_SIDR_REP_VENDOR_ID_H CM_FIELD16_LOC(struct cm_sidr_rep_msg, 6, 16)#define CM_SIDR_REP_QPN CM_FIELD32_LOC(struct cm_sidr_rep_msg, 8, 24) +#define CM_SIDR_REP_VENDOR_ID_L CM_FIELD8_LOC(struct cm_sidr_rep_msg, 11, 8)#define CM_SIDR_REP_SERVICEID CM_FIELD64_LOC(struct cm_sidr_rep_msg, 12)#define CM_SIDR_REP_Q_KEY CM_FIELD32_LOC(struct cm_sidr_rep_msg, 20, 32)#define CM_SIDR_REP_ADDITIONAL_INFORMATION \
Signature · 1 line
2.26.2
PATCH v3 2/6 RDMA/ucma: Extend ucma_connect to receive ECE parameters
In reply to Leon RomanovskyFrom: Leon Romanovsky <[email protected]>
Active side of CMID initiates connection through librdmacm's rdma_connect() and kernel's ucma_connect(). Extend UCMA interface to handle those new parameters.
--- drivers/infiniband/core/cma.c | 21 +++++++++++++++++++++ drivers/infiniband/core/cma_priv.h | 1 + drivers/infiniband/core/ucma.c | 14 +++++++++++--- include/rdma/rdma_cm.h | 3 +++ include/uapi/rdma/rdma_user_cm.h | 6 ++++++ 5 files changed, 42 insertions(+), 3 deletions(-)
drivers/infiniband/core/cma.c +21 -0
@@ -4036,6 +4036,27 @@ int rdma_connect(struct rdma_cm_id *id, struct rdma_conn_param *conn_param) }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) {
drivers/infiniband/core/cma_priv.h +1 -0
@@ -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 )
drivers/infiniband/core/ucma.c +11 -3
@@ -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;
include/rdma/rdma_cm.h +3 -0
@@ -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.
include/uapi/rdma/rdma_user_cm.h +6 -0
@@ -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 {
Signature · 1 line
2.26.2
PATCH v3 3/6 RDMA/ucma: Deliver ECE parameters through UCMA events
In reply to Leon RomanovskyFrom: Leon Romanovsky <[email protected]>
Passive side of CMID connection receives ECE request through REQ message and needs to respond with relevant REP message which will be forwarded to active side.
The UCMA events interface is responsible for such communication with the user space (librdmacm). Extend it to provide ECE wire data.
--- drivers/infiniband/core/ucma.c | 6 +++++- include/rdma/rdma_cm.h | 1 + include/uapi/rdma/rdma_user_cm.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-)
drivers/infiniband/core/ucma.c +5 -1
@@ -360,6 +360,9 @@ static int ucma_event_handler(struct rdma_cm_id *cm_id,ucma_copy_conn_event (&uevent->resp.param.conn, &event->param.conn); + uevent->resp.ece.vendor_id = event->ece.vendor_id; + uevent->resp.ece.attr_mod = event->ece.attr_mod; +if (event->event ==RDMA_CM_EVENT_CONNECT_REQUEST ) {if (!ctx->backlog) { ret = -ENOMEM ;
@@ -404,7 +407,8 @@ static ssize_t ucma_get_event(struct ucma_file *file, const char __user *inbuf,* Old 32 bit user space does not send the 4 byte padding in the * reserved field. We don't care, allow it to keep working. */ -if (out_len <sizeof (uevent->resp) -sizeof (uevent->resp.reserved)) +if (out_len <sizeof (uevent->resp) -sizeof (uevent->resp.reserved) - +sizeof (uevent->resp.ece))return -ENOSPC ;if (copy_from_user (&cmd, inbuf,sizeof (cmd)))
include/rdma/rdma_cm.h +1 -0
@@ -111,6 +111,7 @@ struct rdma_cm_event {struct rdma_conn_param conn;struct rdma_ud_param ud; } param; +struct rdma_ucm_ece ece; };struct rdma_cm_id ;
include/uapi/rdma/rdma_user_cm.h +1 -0
@@ -297,6 +297,7 @@ struct rdma_ucm_event_resp {struct rdma_ucm_ud_param ud; } param;__u32 reserved; +struct rdma_ucm_ece ece; };/* Option levels */
Signature · 1 line
2.26.2
PATCH v3 4/6 RDMA/cm: Send and receive ECE parameter over the wire
In reply to Leon RomanovskyFrom: Leon Romanovsky <[email protected]>
ECE parameters are exchanged through REQ->REP/SIDR_REP messages, this patch adds the data to provide to other side of CMID communication channel.
--- drivers/infiniband/core/cm.c | 39 ++++++++++++++++++++++++++++++----- drivers/infiniband/core/cma.c | 8 +++++++ include/rdma/ib_cm.h | 9 +++++++- 3 files changed, 50 insertions(+), 6 deletions(-)
drivers/infiniband/core/cm.c +34 -5
@@ -66,6 +66,8 @@ static const char * const ibcm_rej_reason_strs[] = { [IB_CM_REJ_INVALID_CLASS_VERSION] = "invalid class version", [IB_CM_REJ_INVALID_FLOW_LABEL] = "invalid flow label", [IB_CM_REJ_INVALID_ALT_FLOW_LABEL] = "invalid alt flow label", + [IB_CM_REJ_VENDOR_OPTION_NOT_SUPPORTED ] = + "vendor option is not supported", }; const char *__attribute_const__ ibcm_reject_msg(int reason)
@@ -290,6 +292,8 @@ struct cm_id_private {struct list_head work_list;atomic_t work_count; + +struct rdma_ucm_ece ece; };static void cm_work_handler (struct work_struct *work);
@@ -1318,6 +1322,13 @@ static void cm_format_mad_hdr(struct ib_mad_hdr *hdr, hdr->tid = tid; } +static void cm_format_mad_ece_hdr (struct ib_mad_hdr *hdr,__be16 attr_id, +__be64 tid,u32 attr_mod) +{ +cm_format_mad_hdr (hdr, attr_id, tid); + hdr->attr_mod =cpu_to_be32 (attr_mod); +} +static void cm_format_req (struct cm_req_msg *req_msg,struct cm_id_private *cm_id_priv,struct ib_cm_req_param *param)
@@ -1330,8 +1341,8 @@ static void cm_format_req(struct cm_req_msg *req_msg, pri_ext =opa_is_extended_lid (pri_path->opa.dlid, pri_path->opa.slid); -cm_format_mad_hdr (&req_msg->hdr,CM_REQ_ATTR_ID , -cm_form_tid (cm_id_priv)); +cm_format_mad_ece_hdr (&req_msg->hdr,CM_REQ_ATTR_ID , +cm_form_tid (cm_id_priv), param->ece.attr_mod);IBA_SET (CM_REQ_LOCAL_COMM_ID , req_msg,be32_to_cpu (cm_id_priv->id.local_id));
@@ -1454,6 +1465,7 @@ static void cm_format_req(struct cm_req_msg *req_msg,cm_ack_timeout (cm_id_priv->av.port->cm_dev->ack_delay, alt_path->packet_life_time)); } +IBA_SET (CM_REQ_VENDOR_ID , req_msg, param->ece.vendor_id);if (param->private_data && param->private_data_len) IBA_SET_MEM(CM_REQ_PRIVATE_DATA, req_msg, param->private_data,
@@ -1810,6 +1822,9 @@ static void cm_format_req_event(struct cm_work *work, param->rnr_retry_count =IBA_GET (CM_REQ_RNR_RETRY_COUNT , req_msg); param->srq =IBA_GET (CM_REQ_SRQ , req_msg); param->ppath_sgid_attr = cm_id_priv->av.ah_attr.grh.sgid_attr; + param->ece.vendor_id =IBA_GET (CM_REQ_VENDOR_ID , req_msg); + param->ece.attr_mod =be32_to_cpu (req_msg->hdr.attr_mod); + work->cm_event.private_data =IBA_GET_MEM_PTR (CM_REQ_PRIVATE_DATA , req_msg); }
@@ -2202,7 +2217,8 @@ static void cm_format_rep(struct cm_rep_msg *rep_msg,struct cm_id_private *cm_id_priv, struct ib_cm_rep_param *param) { - cm_format_mad_hdr(&rep_msg->hdr, CM_REP_ATTR_ID, cm_id_priv->tid); + cm_format_mad_ece_hdr(&rep_msg->hdr, CM_REP_ATTR_ID, cm_id_priv->tid, + param->ece.attr_mod);IBA_SET (CM_REP_LOCAL_COMM_ID , rep_msg,be32_to_cpu (cm_id_priv->id.local_id)); IBA_SET(CM_REP_REMOTE_COMM_ID, rep_msg,
@@ -2229,6 +2245,10 @@ static void cm_format_rep(struct cm_rep_msg *rep_msg,IBA_SET (CM_REP_LOCAL_EE_CONTEXT_NUMBER , rep_msg, param->qp_num); } +IBA_SET (CM_REP_VENDOR_ID_L , rep_msg, param->ece.vendor_id); +IBA_SET (CM_REP_VENDOR_ID_M , rep_msg, param->ece.vendor_id >>8 ); +IBA_SET (CM_REP_VENDOR_ID_H , rep_msg, param->ece.vendor_id >>16 ); +if (param->private_data && param->private_data_len)IBA_SET_MEM (CM_REP_PRIVATE_DATA , rep_msg, param->private_data, param->private_data_len);
@@ -2376,6 +2396,11 @@ static void cm_format_rep_event(struct cm_work *work, enum ib_qp_type qp_type) param->flow_control =IBA_GET (CM_REP_END_TO_END_FLOW_CONTROL , rep_msg); param->rnr_retry_count =IBA_GET (CM_REP_RNR_RETRY_COUNT , rep_msg); param->srq =IBA_GET (CM_REP_SRQ , rep_msg); + param->ece.vendor_id =IBA_GET (CM_REP_VENDOR_ID_H , rep_msg) <<16 ; + param->ece.vendor_id |=IBA_GET (CM_REP_VENDOR_ID_M , rep_msg) <<8 ; + param->ece.vendor_id |=IBA_GET (CM_REP_VENDOR_ID_L , rep_msg); + param->ece.attr_mod =be32_to_cpu (rep_msg->hdr.attr_mod); + work->cm_event.private_data =IBA_GET_MEM_PTR (CM_REP_PRIVATE_DATA , rep_msg); }
@@ -3597,8 +3622,8 @@ static void cm_format_sidr_rep(struct cm_sidr_rep_msg *sidr_rep_msg,struct cm_id_private *cm_id_priv, struct ib_cm_sidr_rep_param *param) { - cm_format_mad_hdr(&sidr_rep_msg->hdr, CM_SIDR_REP_ATTR_ID, - cm_id_priv->tid); + cm_format_mad_ece_hdr(&sidr_rep_msg->hdr, CM_SIDR_REP_ATTR_ID, + cm_id_priv->tid, param->ece.attr_mod);IBA_SET (CM_SIDR_REP_REQUESTID , sidr_rep_msg,be32_to_cpu (cm_id_priv->id.remote_id));IBA_SET (CM_SIDR_REP_STATUS , sidr_rep_msg, param->status);
@@ -3606,6 +3631,10 @@ static void cm_format_sidr_rep(struct cm_sidr_rep_msg *sidr_rep_msg,IBA_SET (CM_SIDR_REP_SERVICEID , sidr_rep_msg,be64_to_cpu (cm_id_priv->id.service_id));IBA_SET (CM_SIDR_REP_Q_KEY , sidr_rep_msg, param->qkey); +IBA_SET (CM_SIDR_REP_VENDOR_ID_L , sidr_rep_msg, + param->ece.vendor_id &0xFF ); +IBA_SET (CM_SIDR_REP_VENDOR_ID_H , sidr_rep_msg, + (param->ece.vendor_id >>8 ) &0xFF );if (param->info && param->info_length) IBA_SET_MEM(CM_SIDR_REP_ADDITIONAL_INFORMATION, sidr_rep_msg,
drivers/infiniband/core/cma.c +8 -0
@@ -1911,6 +1911,9 @@ static void cma_set_rep_event_data(struct rdma_cm_event *event, event->param.conn.rnr_retry_count = rep_data->rnr_retry_count; event->param.conn.srq = rep_data->srq; event->param.conn.qp_num = rep_data->remote_qpn; + + event->ece.vendor_id = rep_data->ece.vendor_id; + event->ece.attr_mod = rep_data->ece.attr_mod; } static int cma_cm_event_handler(struct rdma_id_private *id_priv,
@@ -2129,6 +2132,9 @@ static void cma_set_req_event_data(struct rdma_cm_event *event, event->param.conn.rnr_retry_count = req_data->rnr_retry_count; event->param.conn.srq = req_data->srq; event->param.conn.qp_num = req_data->remote_qpn; + + event->ece.vendor_id = req_data->ece.vendor_id; + event->ece.attr_mod = req_data->ece.attr_mod; } static int cma_ib_check_req_qp_type(const struct rdma_cm_id *id,
@@ -3947,6 +3953,8 @@ static int cma_connect_ib(struct rdma_id_private *id_priv, req.local_cm_response_timeout =CMA_CM_RESPONSE_TIMEOUT ; req.max_cm_retries =CMA_MAX_CM_RETRIES ; req.srq = id_priv->srq ?1 :0 ; + req.ece.vendor_id = id_priv->ece.vendor_id; + req.ece.attr_mod = id_priv->ece.attr_mod;trace_cm_send_req (id_priv); ret =ib_send_cm_req (id_priv->cm_id.ib, &req);
include/rdma/ib_cm.h +8 -1
@@ -11,6 +11,7 @@#include <rdma/ib_mad.h> #include <rdma/ib_sa.h> +#include <rdma/rdma_cm.h> /* ib_cm and ib_user_cm modules share /sys/class/infiniband_cm */ extern struct class cm_class;
@@ -115,6 +116,7 @@ struct ib_cm_req_event_param { unsigned int retry_count:3; unsigned int rnr_retry_count:3; unsigned int srq:1; +struct rdma_ucm_ece ece; };struct ib_cm_rep_event_param {
@@ -129,6 +131,7 @@ struct ib_cm_rep_event_param { unsigned int flow_control:1; unsigned int rnr_retry_count:3; unsigned int srq:1; +struct rdma_ucm_ece ece; };enum ib_cm_rej_reason {
@@ -164,7 +167,8 @@ enum ib_cm_rej_reason {IB_CM_REJ_DUPLICATE_LOCAL_COMM_ID =30 ,IB_CM_REJ_INVALID_CLASS_VERSION =31 ,IB_CM_REJ_INVALID_FLOW_LABEL =32 , -IB_CM_REJ_INVALID_ALT_FLOW_LABEL =33 +IB_CM_REJ_INVALID_ALT_FLOW_LABEL =33 , + IB_CM_REJ_VENDOR_OPTION_NOT_SUPPORTED = 35, }; struct ib_cm_rej_event_param {
@@ -369,6 +373,7 @@ struct ib_cm_req_param {u8 rnr_retry_count;u8 max_cm_retries;u8 srq; +struct rdma_ucm_ece ece; };/**
@@ -392,6 +397,7 @@ struct ib_cm_rep_param {u8 flow_control;u8 rnr_retry_count;u8 srq; +struct rdma_ucm_ece ece; };/**
@@ -546,6 +552,7 @@ struct ib_cm_sidr_rep_param {u8 info_length;const void *private_data;u8 private_data_len; +struct rdma_ucm_ece ece; };/**
Signature · 1 line
2.26.2
PATCH v3 5/6 RDMA/cma: Connect ECE to rdma_accept
In reply to Leon RomanovskyFrom: Leon Romanovsky <[email protected]>
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.
--- drivers/infiniband/core/cma.c | 19 +++++++++++++++++++ drivers/infiniband/core/ucma.c | 14 +++++++++++--- include/rdma/rdma_cm.h | 3 +++ include/uapi/rdma/rdma_user_cm.h | 1 + 4 files changed, 34 insertions(+), 3 deletions(-)
drivers/infiniband/core/cma.c +19 -0
@@ -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 @@ int __rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param, }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;
drivers/infiniband/core/ucma.c +11 -3
@@ -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);
include/rdma/rdma_cm.h +3 -0
@@ -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.
include/uapi/rdma/rdma_user_cm.h +1 -0
@@ -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 {
Signature · 1 line
2.26.2
PATCH v3 6/6 RDMA/cma: Provide ECE reject reason
In reply to Leon RomanovskyFrom: Leon Romanovsky <[email protected]>
IBTA declares "vendor option not supported" reject reason in REJ messages if passive side doesn't want to accept proposed ECE options.
Due to the fact that ECE is managed by userspace, there is a need to let users to provide such rejected reason.
--- drivers/infiniband/core/cma.c | 9 ++++----- drivers/infiniband/core/ucma.c | 15 ++++++++++++++- drivers/infiniband/ulp/isert/ib_isert.c | 4 ++-- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 2 +- drivers/infiniband/ulp/srpt/ib_srpt.c | 3 ++- drivers/nvme/target/rdma.c | 3 ++- include/rdma/rdma_cm.h | 2 +- include/uapi/rdma/rdma_user_cm.h | 3 ++- net/rds/ib_cm.c | 4 +++- 9 files changed, 31 insertions(+), 14 deletions(-)
drivers/infiniband/core/cma.c +4 -5
@@ -4196,7 +4196,7 @@ int __rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param,return 0 ; reject:cma_modify_qp_err (id_priv); -rdma_reject (id,NULL ,0 ); +rdma_reject (id,NULL ,0 ,IB_CM_REJ_CONSUMER_DEFINED );return ret; }EXPORT_SYMBOL (__rdma_accept);
@@ -4236,7 +4236,7 @@ int rdma_notify(struct rdma_cm_id *id, enum ib_event_type event)EXPORT_SYMBOL (rdma_notify);int rdma_reject (struct rdma_cm_id *id,const void *private_data, -u8 private_data_len) +u8 private_data_len,u8 reason) {struct rdma_id_private *id_priv;int ret;
@@ -4251,9 +4251,8 @@ int rdma_reject(struct rdma_cm_id *id, const void *private_data, private_data, private_data_len); }else {trace_cm_send_rej (id_priv); - ret =ib_send_cm_rej (id_priv->cm_id.ib, -IB_CM_REJ_CONSUMER_DEFINED ,NULL , -0 , private_data, private_data_len); + ret =ib_send_cm_rej (id_priv->cm_id.ib, reason,NULL ,0 , + private_data, private_data_len); } }else if (rdma_cap_iw_cm (id->device, id->port_num)) { ret = iw_cm_reject(id_priv->cm_id.iw,
drivers/infiniband/core/ucma.c +14 -1
@@ -52,6 +52,7 @@#include <rdma/rdma_cm_ib.h> #include <rdma/ib_addr.h> #include <rdma/ib.h> +#include <rdma/ib_cm.h> #include <rdma/rdma_netlink.h> #include "core_priv.h"
@@ -1181,12 +1182,24 @@ static ssize_t ucma_reject(struct ucma_file *file, const char __user *inbuf,if (copy_from_user (&cmd, inbuf,sizeof (cmd)))return -EFAULT ; +if (!cmd.reason) + cmd.reason =IB_CM_REJ_CONSUMER_DEFINED ; + +switch (cmd.reason) { +case IB_CM_REJ_CONSUMER_DEFINED : +case IB_CM_REJ_VENDOR_OPTION_NOT_SUPPORTED : +break ; +default : +return -EINVAL ; + } + ctx =ucma_get_ctx_dev (file, cmd.id);if (IS_ERR (ctx))return PTR_ERR (ctx);mutex_lock (&ctx->mutex); - ret =rdma_reject (ctx->cm_id, cmd.private_data, cmd.private_data_len); + ret =rdma_reject (ctx->cm_id, cmd.private_data, cmd.private_data_len, + cmd.reason);mutex_unlock (&ctx->mutex);ucma_put_ctx (ctx);return ret;
drivers/infiniband/ulp/isert/ib_isert.c +2 -2
@@ -502,7 +502,7 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)if (!np->enabled) {spin_unlock_bh (&np->np_thread_lock);isert_dbg ("iscsi_np is not enabled, reject connect request\n" ); -return rdma_reject (cma_id,NULL ,0 ); +return rdma_reject (cma_id,NULL ,0 ,IB_CM_REJ_CONSUMER_DEFINED ); }spin_unlock_bh (&np->np_thread_lock);
@@ -553,7 +553,7 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)isert_free_login_buf (isert_conn); out:kfree (isert_conn); -rdma_reject (cma_id,NULL ,0 ); +rdma_reject (cma_id,NULL ,0 ,IB_CM_REJ_CONSUMER_DEFINED );return ret; }
drivers/infiniband/ulp/rtrs/rtrs-srv.c +1 -1
@@ -1576,7 +1576,7 @@ static int rtrs_rdma_do_reject(struct rdma_cm_id *cm_id, int errno) .errno = cpu_to_le16(errno), }; - err =rdma_reject (cm_id, &msg,sizeof (msg)); + err =rdma_reject (cm_id, &msg,sizeof (msg),IB_CM_REJ_CONSUMER_DEFINED );if (err)pr_err ("rdma_reject(), err: %d\n" , err);
drivers/infiniband/ulp/srpt/ib_srpt.c +2 -1
@@ -2497,7 +2497,8 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev, SRP_BUF_FORMAT_INDIRECT);if (rdma_cm_id) -rdma_reject (rdma_cm_id, rej,sizeof (*rej)); +rdma_reject (rdma_cm_id, rej,sizeof (*rej), +IB_CM_REJ_CONSUMER_DEFINED );else ib_send_cm_rej (ib_cm_id,IB_CM_REJ_CONSUMER_DEFINED ,NULL ,0 , rej,sizeof (*rej));
drivers/nvme/target/rdma.c +2 -1
@@ -1138,7 +1138,8 @@ static int nvmet_rdma_cm_reject(struct rdma_cm_id *cm_id, rej.recfmt =cpu_to_le16 (NVME_RDMA_CM_FMT_1_0 ); rej.sts =cpu_to_le16 (status); -return rdma_reject (cm_id, (void *)&rej,sizeof (rej)); +return rdma_reject (cm_id, (void *)&rej,sizeof (rej), +IB_CM_REJ_CONSUMER_DEFINED ); } static struct nvmet_rdma_queue *
include/rdma/rdma_cm.h +1 -1
@@ -320,7 +320,7 @@ int rdma_notify(struct rdma_cm_id *id, enum ib_event_type event);* rdma_reject - Called to reject a connection request or response. */ int rdma_reject (struct rdma_cm_id *id,const void *private_data, -u8 private_data_len); +u8 private_data_len,u8 reason);/** * rdma_disconnect - This function disconnects the associated QP and
include/uapi/rdma/rdma_user_cm.h +2 -1
@@ -238,7 +238,8 @@ struct rdma_ucm_accept {struct rdma_ucm_reject {__u32 id;__u8 private_data_len; -__u8 reserved[3 ]; +__u8 reason; +__u8 reserved[2 ];__u8 private_data[RDMA_MAX_PRIVATE_DATA ]; };
net/rds/ib_cm.c +3 -1
@@ -37,6 +37,7 @@#include <linux/vmalloc.h> #include <linux/ratelimit.h> #include <net/addrconf.h> +#include <rdma/ib_cm.h> #include "rds_single_path.h" #include "rds.h"
@@ -927,7 +928,8 @@ int rds_ib_cm_handle_connect(struct rdma_cm_id *cm_id,if (conn)mutex_unlock (&conn->c_cm_lock);if (err) -rdma_reject (cm_id, &err,sizeof (int )); +rdma_reject (cm_id, &err,sizeof (int ), +IB_CM_REJ_CONSUMER_DEFINED );return destroy; }
Signature · 1 line
2.26.2
Re: [PATCH rdma-next v3 6/6] RDMA/cma: Provide ECE reject reason
Quoted 9 lines · Leon Romanovsky
From: Leon Romanovsky <[email protected]>
IBTA declares "vendor option not supported" reject reason in REJ messages if passive side doesn't want to accept proposed ECE options.
Due to the fact that ECE is managed by userspace, there is a need to let users to provide such rejected reason.
Signed-off-by Leon Romanovsky <[email protected]>
Quoted 11 lines
--- drivers/infiniband/core/cma.c | 9 ++++----- drivers/infiniband/core/ucma.c | 15 ++++++++++++++- drivers/infiniband/ulp/isert/ib_isert.c | 4 ++-- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 2 +- drivers/infiniband/ulp/srpt/ib_srpt.c | 3 ++- drivers/nvme/target/rdma.c | 3 ++- include/rdma/rdma_cm.h | 2 +- include/uapi/rdma/rdma_user_cm.h | 3 ++- net/rds/ib_cm.c | 4 +++- 9 files changed, 31 insertions(+), 14 deletions(-)
For some reason didn't get the failure in CI, this small fixup is needed.
commit af02a4a50ec0d18fe9bfb86b96411dfb42054f97 (HEAD -> rdma-next)
Author: Leon Romanovsky <[email protected]> Date: Tue May 26 14:34:34 2020 +0300
fixup! RDMA/cma: Provide ECE reject reason
drivers/nvme/target/rdma.c +1 -0
@@ -18,6 +18,7 @@#include <asm/unaligned.h> #include <rdma/ib_verbs.h> +#include <rdma/ib_cm.h> #include <rdma/rdma_cm.h> #include <rdma/rw.h>
Re: [PATCH rdma-next v3 6/6] RDMA/cma: Provide ECE reject reason
Quoted 38 lines · Leon Romanovsky
Quoted 9 lines · Leon Romanovsky
From: Leon Romanovsky <[email protected]>
IBTA declares "vendor option not supported" reject reason in REJ messages if passive side doesn't want to accept proposed ECE options.
Due to the fact that ECE is managed by userspace, there is a need to let users to provide such rejected reason.
Signed-off-by Leon Romanovsky <[email protected]>Quoted 11 lines
--- drivers/infiniband/core/cma.c | 9 ++++----- drivers/infiniband/core/ucma.c | 15 ++++++++++++++- drivers/infiniband/ulp/isert/ib_isert.c | 4 ++-- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 2 +- drivers/infiniband/ulp/srpt/ib_srpt.c | 3 ++- drivers/nvme/target/rdma.c | 3 ++- include/rdma/rdma_cm.h | 2 +- include/uapi/rdma/rdma_user_cm.h | 3 ++- net/rds/ib_cm.c | 4 +++- 9 files changed, 31 insertions(+), 14 deletions(-)For some reason didn't get the failure in CI, this small fixup is needed.
commit
af02a4a50ec0d18fe9bfb86b96411dfb42054f97(HEAD -> rdma-next)Author: Leon Romanovsky <[email protected]> Date: Tue May 26 14:34:34 2020 +0300fixup! RDMA/cma: Provide ECE reject reason
Signed-off-by Leon Romanovsky <[email protected]>drivers/nvme/target/rdma.c +0
-0
drivers/nvme/target/rdma.c line 24
Quoted 7 lines
drivers/nvme/target/rdma.c +1
-0@@ -18,6 +18,7 @@#include <asm/unaligned.h> #include <rdma/ib_verbs.h> +#include <rdma/ib_cm.h> #include <rdma/rdma_cm.h> #include <rdma/rw.h>
and this one:
commit 4c489c296115d1c795f24cd4aad741058671fe50 (HEAD -> rdma-next)
Author: Leon Romanovsky <[email protected]> Date: Tue May 26 15:01:19 2020 +0300
fixup! RDMA/cma: Provide ECE reject reason
drivers/infiniband/ulp/isert/ib_isert.c +1 -0
@@ -15,6 +15,7 @@#include <linux/in.h> #include <linux/in6.h> #include <rdma/ib_verbs.h> +#include <rdma/ib_cm.h> #include <rdma/rdma_cm.h> #include <target/target_core_base.h> #include <target/target_core_fabric.h>
drivers/infiniband/ulp/rtrs/rtrs-srv.c +1 -0
@@ -15,6 +15,7 @@#include "rtrs-srv.h" #include "rtrs-log.h" +#include <rdma/ib_cm.h> MODULE_DESCRIPTION ("RDMA Transport Server" );MODULE_LICENSE ("GPL" );
(END)
kbuild test robot
build botRe: [PATCH rdma-next v3 6/6] RDMA/cma: Provide ECE reject reason
In reply to Leon RomanovskyI love your patch! Yet something to improve:
Hi Leon,
I love your patch! Yet something to improve:
[auto build test ERROR on rdma/for-next]
[also build test ERROR on next-20200526]
[cannot apply to linus/master bvanassche/for-next v5.7-rc7]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Leon-Romanovsky/Add-Enhanced-Connection-Established-ECE/20200526-183700 base: https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git for-next config: x86_64-allyesconfig (attached as .config) compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project 3393cc4cebf9969db94dc424b7a2b6195589c33b)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>, old ones prefixed by <<):
>> drivers/nvme/target/rdma.c:1142:7: error: use of undeclared identifier 'IB_CM_REJ_CONSUMER_DEFINED'
IB_CM_REJ_CONSUMER_DEFINED);
^
1 error generated.
--
>> drivers/infiniband/ulp/isert/ib_isert.c:505:39: error: use of undeclared identifier 'IB_CM_REJ_CONSUMER_DEFINED'
return rdma_reject(cma_id, NULL, 0, IB_CM_REJ_CONSUMER_DEFINED);
^drivers/infiniband/ulp/isert/ib_isert.c:556:31: error: use of undeclared identifier 'IB_CM_REJ_CONSUMER_DEFINED' rdma_reject(cma_id, NULL, 0, IB_CM_REJ_CONSUMER_DEFINED);
^
2 errors generated.
--
>> drivers/infiniband/ulp/rtrs/rtrs-srv.c:1579:46: error: use of undeclared identifier 'IB_CM_REJ_CONSUMER_DEFINED'
err = rdma_reject(cm_id, &msg, sizeof(msg), IB_CM_REJ_CONSUMER_DEFINED); ^
1 error generated.
vim +/IB_CM_REJ_CONSUMER_DEFINED +1142 drivers/nvme/target/rdma.c
1129
1130 static int nvmet_rdma_cm_reject(struct rdma_cm_id *cm_id,
1131 enum nvme_rdma_cm_status status)
1132 {
1133 struct nvme_rdma_cm_rej rej;
1134
1135 pr_debug("rejecting connect request: status %d (%s)\n",
1136 status, nvme_rdma_cm_msg(status));
1137
1138 rej.recfmt = cpu_to_le16(NVME_RDMA_CM_FMT_1_0);
1139 rej.sts = cpu_to_le16(status);
1140
1141 return rdma_reject(cm_id, (void *)&rej, sizeof(rej),
> 1142 IB_CM_REJ_CONSUMER_DEFINED);
1143 }
1144
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Jason Gunthorpe
AppliedQuoted 35 lines · Leon Romanovsky
From: Leon Romanovsky <[email protected]>
Changelog:
v3:
* Rebased on top ofebd6e96b33a2RDMA/ipoib: Removecan_sleepparameter fromiboib_mcast_alloc
* Updatedrdma_rejectpatch to include newly added RTR ulp
* Remove empty hunks added by rebase
* Changed signature ofrdma_rejectso kernel users will provide reason by themselves
* Squashed UAPI patch to other patches which add functionality
* Removed define of the IBTA reason from UAPI
v2: https://lore.kernel.org/linux-rdma/[email protected]/
* Rebased on latest rdma-next and removed already accepted patches.
* Updated allrdma_rejectin-kernel users to provide reject reason.
v1: Droppedfield_availpatch in favor of mass conversion to use function
which already exists in the kernel code.
https://lore.kernel.org/lkml/[email protected]
v0: https://lore.kernel.org/lkml/[email protected]Enhanced Connection Established or ECE is new negotiation scheme introduced in IBTA v1.4 to exchange extra information about nodes capabilities and later negotiate them at the connection establishment phase.
The RDMA-CM messages (REQ, REP,
SIDR_REQandSIDR_REP) were extended to carry two fields, one new and another gained new functionality:
* VendorID is a new field that indicates that common subset of vendor option bits are supported as indicated by that VendorID.
* AttributeModifier already exists, but overloaded to indicate which vendor options are supported by this VendorID.This is kernel part of such functionality which is responsible to get data from librdmacm and properly create and handle RDMA-CM messages.
Thanks
Quoted 7 lines
Leon Romanovsky (6):
RDMA/cm: Add Enhanced Connection Establishment (ECE) bits RDMA/ucma: Extenducma_connectto receive ECE parameters RDMA/ucma: Deliver ECE parameters through UCMA events RDMA/cm: Send and receive ECE parameter over the wire RDMA/cma: Connect ECE tordma_accept
RDMA/cma: Provide ECE reject reason
Applied to for-next, thanks
Jason