Commit a9e0faca authored by Mark Zhang's avatar Mark Zhang Committed by Leon Romanovsky
Browse files

RDMA/core: Create GSI QP only when CM is supported 



GSI QP is not needed if the port doesn't support connection management.
In following patches mlx5 is going to support IB ports that doesn't
support CM.

Signed-off-by: default avatarMark Zhang <markzhang@nvidia.com>
Link: https://lore.kernel.org/r/c449ebd955923b0e54c58832fd322f9d461b37a0.1718553901.git.leon@kernel.org


Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
parent 36e97bbc

drivers/infiniband/core/agent.c

+22 −10
Original line number Diff line number Diff line
@@ -59,7 +59,16 @@ __ib_get_agent_port(const struct ib_device *device, int port_num) 
	struct ib_agent_port_private *entry;



	list_for_each_entry(entry, &ib_agent_port_list, port_list) {

		if (entry->agent[1]->device == device &&

		/* Need to check both agent[0] and agent[1], as an agent port

		 * may only have one of them

		 */

		if (entry->agent[0] &&

		    entry->agent[0]->device == device &&

		    entry->agent[0]->port_num == port_num)

			return entry;



		if (entry->agent[1] &&

		    entry->agent[1]->device == device &&

		    entry->agent[1]->port_num == port_num)

			return entry;

	}
@@ -172,6 +181,7 @@ int ib_agent_port_open(struct ib_device *device, int port_num) 
		}

	}



	if (rdma_cap_ib_cm(device, port_num)) {

		/* Obtain send only MAD agent for GSI QP */

		port_priv->agent[1] = ib_register_mad_agent(device, port_num,

							    IB_QPT_GSI, NULL, 0,
@@ -181,6 +191,7 @@ int ib_agent_port_open(struct ib_device *device, int port_num) 
			ret = PTR_ERR(port_priv->agent[1]);

			goto error3;

		}

	}



	spin_lock_irqsave(&ib_agent_port_list_lock, flags);

	list_add_tail(&port_priv->port_list, &ib_agent_port_list);
@@ -212,6 +223,7 @@ int ib_agent_port_close(struct ib_device *device, int port_num) 
	list_del(&port_priv->port_list);

	spin_unlock_irqrestore(&ib_agent_port_list_lock, flags);



	if (port_priv->agent[1])

		ib_unregister_mad_agent(port_priv->agent[1]);

	if (port_priv->agent[0])

		ib_unregister_mad_agent(port_priv->agent[0]);

drivers/infiniband/core/mad.c

+6 −3
Original line number Diff line number Diff line
@@ -2983,9 +2983,12 @@ static int ib_mad_port_open(struct ib_device *device, 
		if (ret)

			goto error6;

	}



	if (rdma_cap_ib_cm(device, port_num)) {

		ret = create_mad_qp(&port_priv->qp_info[1], IB_QPT_GSI);

		if (ret)

			goto error7;

	}



	snprintf(name, sizeof(name), "ib_mad%u", port_num);

	port_priv->wq = alloc_ordered_workqueue(name, WQ_MEM_RECLAIM);