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: Mark Zhang <markzhang@nvidia.com>
Link: https://lore.kernel.org/r/c449ebd955923b0e54c58832fd322f9d461b37a0.1718553901.git.leon@kernel.org
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>

diff --git a/drivers/infiniband/core/agent.c b/drivers/infiniband/core/agent.c
index f82b4260de42c495ad18ba958e3a3aff88684cbc..3bb46696731ee3f59225779bfc3f9618ab3f32a6 100644 (file)
--- a/drivers/infiniband/core/agent.c
+++ b/drivers/infiniband/core/agent.c
@@ -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,14 +181,16 @@ int ib_agent_port_open(struct ib_device *device, int 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,
-                                                   &agent_send_handler,
-                                                   NULL, NULL, 0);
-       if (IS_ERR(port_priv->agent[1])) {
-               ret = PTR_ERR(port_priv->agent[1]);
-               goto error3;
+       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,
+                                                           &agent_send_handler,
+                                                           NULL, NULL, 0);
+               if (IS_ERR(port_priv->agent[1])) {
+                       ret = PTR_ERR(port_priv->agent[1]);
+                       goto error3;
+               }
        }
 
        spin_lock_irqsave(&ib_agent_port_list_lock, flags);
@@ -212,7 +223,8 @@ 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);
 
-       ib_unregister_mad_agent(port_priv->agent[1]);
+       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]);
 

diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 674344eb8e2f48562f3c49694fd5bc86515a8e36..7439e47ff951d4b82f4acba16c56a8b9b2f858a0 100644 (file)
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -2983,9 +2983,12 @@ static int ib_mad_port_open(struct ib_device *device,
                if (ret)
                        goto error6;
        }
-       ret = create_mad_qp(&port_priv->qp_info[1], IB_QPT_GSI);
-       if (ret)
-               goto error7;
+
+       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);