Commit 8094ba0a authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Jason Gunthorpe
Browse files

RDMA/cma: Provide ECE reject reason 

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.

Link: https://lore.kernel.org/r/20200526103304.196371-7-leon@kernel.org


Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 0cb15372

drivers/infiniband/core/cma.c

+4 −5
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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

+3 −2
Original line number Diff line number Diff line
@@ -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>
@@ -502,7 +503,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 +554,7 @@ out_rsp_dma_map: 
	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

+2 −1
Original line number Diff line number Diff line
@@ -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");
@@ -1576,7 +1577,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
Original line number Diff line number Diff line
@@ -2497,7 +2497,8 @@ reject: 
				   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));

CRA Git | Maintained and supported by SUSTech CRA and CCSE