Commit 0c6949c3 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Jason Gunthorpe
Browse files

RDMA/cm: Fix missing RDMA_CM_EVENT_REJECTED event after receiving REJ message 

The cm_reset_to_idle() call before formatting event changed the CM_ID
state from IB_CM_REQ_RCVD to be IB_CM_IDLE. It caused to wrong value of
CM_REJ_MESSAGE_REJECTED field.

The result of that was that rdma_reject() calls in the passive side didn't
generate RDMA_CM_EVENT_REJECTED event in the active side.

Fixes: 81ddb41f ("RDMA/cm: Allow ib_send_cm_rej() to be done under lock")
Link: https://lore.kernel.org/r/20200406173242.1465911-1-leon@kernel.org


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

drivers/infiniband/core/cm.c

+13 −11
Original line number Diff line number Diff line
@@ -1828,11 +1828,9 @@ static void cm_format_mra(struct cm_mra_msg *mra_msg, 


static void cm_format_rej(struct cm_rej_msg *rej_msg,

			  struct cm_id_private *cm_id_priv,

			  enum ib_cm_rej_reason reason,

			  void *ari,

			  u8 ari_length,

			  const void *private_data,

			  u8 private_data_len)

			  enum ib_cm_rej_reason reason, void *ari,

			  u8 ari_length, const void *private_data,

			  u8 private_data_len, enum ib_cm_state state)

{

	lockdep_assert_held(&cm_id_priv->lock);
@@ -1840,7 +1838,7 @@ static void cm_format_rej(struct cm_rej_msg *rej_msg, 
	IBA_SET(CM_REJ_REMOTE_COMM_ID, rej_msg,

		be32_to_cpu(cm_id_priv->id.remote_id));



	switch(cm_id_priv->id.state) {

	switch (state) {

	case IB_CM_REQ_RCVD:

		IBA_SET(CM_REJ_LOCAL_COMM_ID, rej_msg, be32_to_cpu(0));

		IBA_SET(CM_REJ_MESSAGE_REJECTED, rej_msg, CM_MSG_RESPONSE_REQ);
@@ -1906,7 +1904,8 @@ static void cm_dup_req_handler(struct cm_work *work, 
		break;

	case IB_CM_TIMEWAIT:

		cm_format_rej((struct cm_rej_msg *)msg->mad, cm_id_priv,

			      IB_CM_REJ_STALE_CONN, NULL, 0, NULL, 0);

			      IB_CM_REJ_STALE_CONN, NULL, 0, NULL, 0,

			      IB_CM_TIMEWAIT);

		break;

	default:

		goto unlock;
@@ -2904,6 +2903,7 @@ static int cm_send_rej_locked(struct cm_id_private *cm_id_priv, 
			      u8 ari_length, const void *private_data,

			      u8 private_data_len)

{

	enum ib_cm_state state = cm_id_priv->id.state;

	struct ib_mad_send_buf *msg;

	int ret;
@@ -2913,7 +2913,7 @@ static int cm_send_rej_locked(struct cm_id_private *cm_id_priv, 
	    (ari && ari_length > IB_CM_REJ_ARI_LENGTH))

		return -EINVAL;



	switch (cm_id_priv->id.state) {

	switch (state) {

	case IB_CM_REQ_SENT:

	case IB_CM_MRA_REQ_RCVD:

	case IB_CM_REQ_RCVD:
@@ -2925,7 +2925,8 @@ static int cm_send_rej_locked(struct cm_id_private *cm_id_priv, 
		if (ret)

			return ret;

		cm_format_rej((struct cm_rej_msg *)msg->mad, cm_id_priv, reason,

			      ari, ari_length, private_data, private_data_len);

			      ari, ari_length, private_data, private_data_len,

			      state);

		break;

	case IB_CM_REP_SENT:

	case IB_CM_MRA_REP_RCVD:
@@ -2934,7 +2935,8 @@ static int cm_send_rej_locked(struct cm_id_private *cm_id_priv, 
		if (ret)

			return ret;

		cm_format_rej((struct cm_rej_msg *)msg->mad, cm_id_priv, reason,

			      ari, ari_length, private_data, private_data_len);

			      ari, ari_length, private_data, private_data_len,

			      state);

		break;

	default:

		pr_debug("%s: local_id %d, cm_id->state: %d\n", __func__,