Commit 16c72e40 authored by Parav Pandit's avatar Parav Pandit Committed by Jason Gunthorpe
Browse files

IB/cm: Refactor to avoid setting path record software only fields 



When path ah_attr initialization from path record
fails, ib_cm_send_rej() uses av.ah_attr fields to send out reject
message. In such cases initialization of path record software fields
is not needed. Code is simplified for same.

Additionally in current code in cm_req_handler, when ib_get_cached_gid
fails for a given sgid_index of the GID of the GRH of the incoming CM MAD,
error code 12 is sent. This error code refers to primary GID in incoming
CM REQ and not for the GID in in MAD packet.
Therefore code is refactored to send code 5 (unsupported request) for such
error.

Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Reviewed-by: default avatarHal Rosenstock <hal@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent f6bdb142

drivers/infiniband/core/cm.c

+44 −48
Original line number Original line Diff line number Diff line
@@ -1902,7 +1902,13 @@ static int cm_req_handler(struct cm_work *work) 
				work->port->port_num,

				work->port->port_num,

				grh->sgid_index,

				grh->sgid_index,

				&gid, &gid_attr);

				&gid, &gid_attr);

	if (!ret) {

	if (ret) {

		if (gid_attr.ndev)

			dev_put(gid_attr.ndev);

		ib_send_cm_rej(cm_id, IB_CM_REJ_UNSUPPORTED, NULL, 0, NULL, 0);

		goto rejected;

	}



	if (gid_attr.ndev) {

	if (gid_attr.ndev) {

		work->path[0].rec_type =

		work->path[0].rec_type =

			sa_conv_gid_to_pathrec_type(gid_attr.gid_type);

			sa_conv_gid_to_pathrec_type(gid_attr.gid_type);
@@ -1927,30 +1933,20 @@ static int cm_req_handler(struct cm_work *work) 
	work->path[0].hop_limit = grh->hop_limit;

	work->path[0].hop_limit = grh->hop_limit;

	ret = cm_init_av_by_path(&work->path[0], &cm_id_priv->av,

	ret = cm_init_av_by_path(&work->path[0], &cm_id_priv->av,

				 cm_id_priv);

				 cm_id_priv);

	}

	if (ret) {

	if (ret) {

		int err = ib_get_cached_gid(work->port->cm_dev->ib_device,

		int err;



		err = ib_get_cached_gid(work->port->cm_dev->ib_device,

					work->port->port_num, 0,

					work->port->port_num, 0,

					&work->path[0].sgid,

					&work->path[0].sgid,

					    &gid_attr);

					NULL);

		if (!err && gid_attr.ndev) {

		if (err)

			work->path[0].rec_type =

			ib_send_cm_rej(cm_id, IB_CM_REJ_INVALID_GID,

				sa_conv_gid_to_pathrec_type(gid_attr.gid_type);

				       NULL, 0, NULL, 0);

			sa_path_set_ifindex(&work->path[0],

		else

					    gid_attr.ndev->ifindex);

			sa_path_set_ndev(&work->path[0],

					 dev_net(gid_attr.ndev));

			dev_put(gid_attr.ndev);

		} else {

			cm_path_set_rec_type(work->port->cm_dev->ib_device,

					     work->port->port_num,

					     &work->path[0],

					     &req_msg->primary_local_gid);

		}

		if (cm_req_has_alt_path(req_msg))

			work->path[1].rec_type = work->path[0].rec_type;

			ib_send_cm_rej(cm_id, IB_CM_REJ_INVALID_GID,

			ib_send_cm_rej(cm_id, IB_CM_REJ_INVALID_GID,

			       &work->path[0].sgid, sizeof work->path[0].sgid,

				       &work->path[0].sgid,

				       sizeof(work->path[0].sgid),

				       NULL, 0);

				       NULL, 0);

		goto rejected;

		goto rejected;

	}

	}
@@ -1960,7 +1956,7 @@ static int cm_req_handler(struct cm_work *work) 
		if (ret) {

		if (ret) {

			ib_send_cm_rej(cm_id, IB_CM_REJ_INVALID_ALT_GID,

			ib_send_cm_rej(cm_id, IB_CM_REJ_INVALID_ALT_GID,

				       &work->path[0].sgid,

				       &work->path[0].sgid,

				       sizeof work->path[0].sgid, NULL, 0);

				       sizeof(work->path[0].sgid), NULL, 0);

			goto rejected;

			goto rejected;

		}

		}

	}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE