IB: Replace ib_query_gid/ib_get_cached_gid with rdma_query_gid

If the gid_attr argument is NULL then the functions behave identically to
rdma_query_gid. ib_query_gid just calls ib_get_cached_gid, so everything
can be consolidated to one function.

Now that all callers either use rdma_query_gid() or ib_get_cached_gid(),
ib_query_gid() API is removed.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 27a7b0a2e27a79c5d3f7bc9160915af35dbcb495..800ff69e09b3548a0fc4b0e311aea3e960005c57 100644 (file)
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -1646,7 +1646,7 @@ static void cm_opa_to_ib_sgid(struct cm_work *work,
            (ib_is_opa_gid(&path->sgid))) {
                union ib_gid sgid;
 
-               if (ib_get_cached_gid(dev, port_num, 0, &sgid, NULL)) {
+               if (rdma_query_gid(dev, port_num, 0, &sgid)) {
                        dev_warn(&dev->dev,
                                 "Error updating sgid in CM request\n");
                        return;
@@ -1997,10 +1997,9 @@ static int cm_req_handler(struct cm_work *work)
        if (ret) {
                int err;
 
-               err = ib_get_cached_gid(work->port->cm_dev->ib_device,
-                                       work->port->port_num, 0,
-                                       &work->path[0].sgid,
-                                       NULL);
+               err = rdma_query_gid(work->port->cm_dev->ib_device,
+                                    work->port->port_num, 0,
+                                    &work->path[0].sgid);
                if (err)
                        ib_send_cm_rej(cm_id, IB_CM_REJ_INVALID_GID,
                                       NULL, 0, NULL, 0);

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index bff10ab141b04fe418cb2f289eb2b12f754fc0ce..c2f478761ae929daf7be52ae3695f38084d8d794 100644 (file)
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -732,8 +732,8 @@ static int cma_resolve_ib_dev(struct rdma_id_private *id_priv)
 
                        if (ib_get_cached_port_state(cur_dev->device, p, &port_state))
                                continue;
-                       for (i = 0; !ib_get_cached_gid(cur_dev->device, p, i,
-                                                      &gid, NULL);
+                       for (i = 0; !rdma_query_gid(cur_dev->device,
+                                                   p, i, &gid);
                             i++) {
                                if (!memcmp(&gid, dgid, sizeof(gid))) {
                                        cma_dev = cur_dev;
@@ -2791,7 +2791,7 @@ static int cma_bind_loopback(struct rdma_id_private *id_priv)
        p = 1;
 
 port_found:
-       ret = ib_get_cached_gid(cma_dev->device, p, 0, &gid, NULL);
+       ret = rdma_query_gid(cma_dev->device, p, 0, &gid);
        if (ret)
                goto out;
 

diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 6fa4c59dc7a732de600c8ebabd9430d44d9b4dc0..b8144f194777c0e361ad1430a884d7db982bf767 100644 (file)
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -861,25 +861,6 @@ int ib_query_port(struct ib_device *device,
 }
 EXPORT_SYMBOL(ib_query_port);
 
-/**
- * ib_query_gid - Get GID table entry
- * @device:Device to query
- * @port_num:Port number to query
- * @index:GID table index to query
- * @gid:Returned GID
- * @attr: Returned GID attributes related to this GID index (only in RoCE).
- *   NULL means ignore.
- *
- * ib_query_gid() fetches the specified GID table entry from the cache.
- */
-int ib_query_gid(struct ib_device *device,
-                u8 port_num, int index, union ib_gid *gid,
-                struct ib_gid_attr *attr)
-{
-       return ib_get_cached_gid(device, port_num, index, gid, attr);
-}
-EXPORT_SYMBOL(ib_query_gid);
-
 /**
  * ib_enum_roce_netdev - enumerate all RoCE ports
  * @ib_dev : IB device we want to query
@@ -1057,7 +1038,7 @@ int ib_find_gid(struct ib_device *device, union ib_gid *gid,
                        continue;
 
                for (i = 0; i < device->port_immutable[port].gid_tbl_len; ++i) {
-                       ret = ib_query_gid(device, port, i, &tmp_gid, NULL);
+                       ret = rdma_query_gid(device, port, i, &tmp_gid);
                        if (ret)
                                return ret;
                        if (!memcmp(&tmp_gid, gid, sizeof *gid)) {

diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index f742ae7a768b2ea4e3b98f665a297c6e5c314a5e..db0f93a9d507c7896d9b7c64842f5a8d51dde1ba 100644 (file)
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -1896,8 +1896,8 @@ static inline int rcv_has_same_gid(const struct ib_mad_agent_private *mad_agent_
                        const struct ib_global_route *grh =
                                        rdma_ah_read_grh(&attr);
 
-                       if (ib_get_cached_gid(device, port_num,
-                                             grh->sgid_index, &sgid, NULL))
+                       if (rdma_query_gid(device, port_num,
+                                          grh->sgid_index, &sgid))
                                return 0;
                        return !memcmp(sgid.raw, rwc->recv_buf.grh->dgid.raw,
                                       16);

diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 0b56828c1319b1b350385dfd5be2c981d26d6ffa..5e34e359f7b45865b6df37c31df295fe3aae69c0 100644 (file)
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -516,10 +516,8 @@ static int ib_resolve_unicast_gid_dmac(struct ib_device *device,
 
        grh = rdma_ah_retrieve_grh(ah_attr);
 
-       ret = ib_query_gid(device,
-                          rdma_ah_get_port_num(ah_attr),
-                          grh->sgid_index,
-                          &sgid, &sgid_attr);
+       ret = ib_get_cached_gid(device, rdma_ah_get_port_num(ah_attr),
+                               grh->sgid_index, &sgid, &sgid_attr);
        if (ret || !sgid_attr.ndev) {
                if (!ret)
                        ret = -ENXIO;

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index f47f9ace1f48ffc0240810098faf45adb1900c18..fb3728bf7e400b895c54e482735a74339ad80e22 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -40,6 +40,7 @@
 
 #include <linux/ip.h>
 #include <linux/tcp.h>
+#include <rdma/ib_cache.h>
 
 #include "ipoib.h"
 
@@ -1069,7 +1070,7 @@ static bool ipoib_dev_addr_changed_valid(struct ipoib_dev_priv *priv)
        bool ret = false;
 
        netdev_gid = (union ib_gid *)(priv->dev->dev_addr + 4);
-       if (ib_query_gid(priv->ca, priv->port, 0, &gid0, NULL))
+       if (rdma_query_gid(priv->ca, priv->port, 0, &gid0))
                return false;
 
        netif_addr_lock_bh(priv->dev);

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 26cde95bc0f30dcc418a7abb954f730965692cac..f4fac48aeade4cda73238abc2ecb92b3e44e1ede 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -2287,9 +2287,9 @@ static struct net_device *ipoib_add_port(const char *format,
        priv->dev->broadcast[8] = priv->pkey >> 8;
        priv->dev->broadcast[9] = priv->pkey & 0xff;
 
-       result = ib_query_gid(hca, port, 0, &priv->local_gid, NULL);
+       result = rdma_query_gid(hca, port, 0, &priv->local_gid);
        if (result) {
-               pr_warn("%s: ib_query_gid port %d failed (ret = %d)\n",
+               pr_warn("%s: rdma_query_gid port %d failed (ret = %d)\n",
                        hca->name, port, result);
                goto device_init_failed;
        }

diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 9786b24b956fcde94acb16608853341216f018a0..34b1aaffa5219d0ec745d3ef12971cc0be6f6578 100644 (file)
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -3843,7 +3843,7 @@ static ssize_t srp_create_target(struct device *dev,
        INIT_WORK(&target->tl_err_work, srp_tl_err_work);
        INIT_WORK(&target->remove_work, srp_remove_work);
        spin_lock_init(&target->lock);
-       ret = ib_query_gid(ibdev, host->port, 0, &target->sgid, NULL);
+       ret = rdma_query_gid(ibdev, host->port, 0, &target->sgid);
        if (ret)
                goto out;
 

diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 3081c629a7f79730e319504fd72fa4e92f66debf..698f7779e231c37af8d52535a7bb4c7dafff5e27 100644 (file)
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -575,8 +575,7 @@ static int srpt_refresh_port(struct srpt_port *sport)
        sport->sm_lid = port_attr.sm_lid;
        sport->lid = port_attr.lid;
 
-       ret = ib_query_gid(sport->sdev->device, sport->port, 0, &sport->gid,
-                          NULL);
+       ret = rdma_query_gid(sport->sdev->device, sport->port, 0, &sport->gid);
        if (ret)
                goto err_query_port;
 

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 1c153cc046eee28805657bade61caa1c40dcd70a..67c45821551247999b29a166291a93c27d8d071b 100644 (file)
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -3046,10 +3046,6 @@ static inline bool rdma_cap_read_inv(struct ib_device *dev, u32 port_num)
        return rdma_protocol_iwarp(dev, port_num);
 }
 
-int ib_query_gid(struct ib_device *device,
-                u8 port_num, int index, union ib_gid *gid,
-                struct ib_gid_attr *attr);
-
 int ib_set_vf_link_state(struct ib_device *device, int vf, u8 port,
                         int state);
 int ib_get_vf_config(struct ib_device *device, int vf, u8 port,