Commit 9fca90cf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma 

Pull rdma fixes from Jason Gunthorpe:
 "Two user triggerable crashers and a some EFA related regressions:

   - Syzkaller found a bug in CM

   - Restore access to the GID table and fix modify_qp for EFA

   - Crasher in qedr"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  RDMA/cm: Fix an attempt to use non-valid pointer when cleaning timewait
  RDMA/core: Fix empty gid table for non IB/RoCE devices
  RDMA/efa: Use the correct current and new states in modify QP
  RDMA/qedr: iWARP invalid(zero) doorbell address fix
parents 40201575 340b940e

drivers/infiniband/core/cache.c

+0 −3
Original line number Diff line number Diff line
@@ -1269,9 +1269,6 @@ ssize_t rdma_query_gid_table(struct ib_device *device, 
	unsigned long flags;



	rdma_for_each_port(device, port_num) {

		if (!rdma_ib_or_roce(device, port_num))

			continue;



		table = rdma_gid_table(device, port_num);

		read_lock_irqsave(&table->rwlock, flags);

		for (i = 0; i < table->sz; i++) {

drivers/infiniband/core/cm.c

+2 −0
Original line number Diff line number Diff line
@@ -1522,6 +1522,7 @@ int ib_send_cm_req(struct ib_cm_id *cm_id, 
							    id.local_id);

	if (IS_ERR(cm_id_priv->timewait_info)) {

		ret = PTR_ERR(cm_id_priv->timewait_info);

		cm_id_priv->timewait_info = NULL;

		goto out;

	}
@@ -2114,6 +2115,7 @@ static int cm_req_handler(struct cm_work *work) 
							    id.local_id);

	if (IS_ERR(cm_id_priv->timewait_info)) {

		ret = PTR_ERR(cm_id_priv->timewait_info);

		cm_id_priv->timewait_info = NULL;

		goto destroy;

	}

	cm_id_priv->timewait_info->work.remote_id = cm_id_priv->id.remote_id;

drivers/infiniband/hw/efa/efa_verbs.c

+2 −2
Original line number Diff line number Diff line
@@ -940,8 +940,8 @@ int efa_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, 
			1);

		EFA_SET(&params.modify_mask,

			EFA_ADMIN_MODIFY_QP_CMD_CUR_QP_STATE, 1);

		params.cur_qp_state = qp_attr->cur_qp_state;

		params.qp_state = qp_attr->qp_state;

		params.cur_qp_state = cur_state;

		params.qp_state = new_state;

	}



	if (qp_attr_mask & IB_QP_EN_SQD_ASYNC_NOTIFY) {

drivers/infiniband/hw/qedr/verbs.c

+9 −0
Original line number Diff line number Diff line
@@ -1936,6 +1936,15 @@ static int qedr_create_user_qp(struct qedr_dev *dev, 
	}



	if (rdma_protocol_iwarp(&dev->ibdev, 1)) {

		qp->urq.db_rec_db2_addr = ctx->dpi_addr + uresp.rq_db2_offset;



		/* calculate the db_rec_db2 data since it is constant so no

		 * need to reflect from user

		 */

		qp->urq.db_rec_db2_data.data.icid = cpu_to_le16(qp->icid);

		qp->urq.db_rec_db2_data.data.value =

			cpu_to_le16(DQ_TCM_IWARP_POST_RQ_CF_CMD);



		rc = qedr_db_recovery_add(dev, qp->urq.db_rec_db2_addr,

					  &qp->urq.db_rec_db2_data,

					  DB_REC_WIDTH_32B,

CRA Git | Maintained and supported by SUSTech CRA and CCSE