ibacm: Move calling of helper functions out of get_devaddr

Again this is in prep for sharing this code with ibacm and ib_acme

get_devaddr uses globals which are specific to ib_acme.  Move toward this
function being ib_acme specific while the code in get_addr_ip becomes generic.

Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Sean Hefty <sean.hefty@intel.com>

diff --git a/linux/acme_linux.c b/linux/acme_linux.c
index b246a9cfdbd512d33db88d2689ef46739022a779..187507d48b64b75e3cefcebfff25d25f2faad02f 100644 (file)
--- a/linux/acme_linux.c
+++ b/linux/acme_linux.c
@@ -47,25 +47,13 @@ extern int dev_cnt;
 extern int verbose;
 
 static int
-get_devaddr(char *ifname, int *dev_index, uint8_t *port, uint16_t *pkey)
+get_devaddr(union ibv_gid *sgid, int *dev_index, uint8_t *port)
 {
        struct ibv_device_attr dev_attr;
        struct ibv_port_attr port_attr;
-       union ibv_gid sgid, gid;
+       union ibv_gid gid;
        int ret, i;
 
-       ret = acm_if_get_sgid(ifname, &sgid);
-       if (ret) {
-               printf("unable to get sgid\n");
-               return ret;
-       }
-
-       ret = acm_if_get_pkey(ifname, pkey);
-       if (ret) {
-               printf("unable to get pkey\n");
-               return ret;
-       }
-
        for (*dev_index = 0; *dev_index < dev_cnt; (*dev_index)++) {
                ret = ibv_query_device(verbs[*dev_index], &dev_attr);
                if (ret)
@@ -81,7 +69,7 @@ get_devaddr(char *ifname, int *dev_index, uint8_t *port, uint16_t *pkey)
                                if (ret || !gid.global.interface_id)
                                        break;
 
-                               if (!memcmp(sgid.raw, gid.raw, sizeof gid))
+                               if (!memcmp(sgid->raw, gid.raw, sizeof gid))
                                        return 0;
                        }
                }
@@ -89,14 +77,39 @@ get_devaddr(char *ifname, int *dev_index, uint8_t *port, uint16_t *pkey)
        return -1;
 }
 
+static void iter_cb(char *ifname, union ibv_gid *gid, uint16_t pkey,
+               uint8_t addr_type, uint8_t *addr, size_t addr_len,
+               char *addr_name, void *ctx)
+{
+       FILE *f = (FILE *)ctx;
+       int ret;
+       int dev_index;
+       uint8_t port;
+
+       ret = get_devaddr(gid, &dev_index, &port);
+       if (ret) {
+               printf("Failed to find verbs device for %s\n", ifname);
+               return;
+       }
+
+       if (verbose)
+               printf("%s %s %d 0x%x\n", addr_name, verbs[dev_index]->device->name, port, pkey);
+       fprintf(f, "%s %s %d 0x%x\n", addr_name, verbs[dev_index]->device->name, port, pkey);
+}
+
 int gen_addr_ip(FILE *f)
+{
+       return acm_if_iter_sys(iter_cb, (void *)f);
+}
+
+int acm_if_iter_sys(acm_if_iter_cb cb, void *ctx)
 {
        struct ifconf *ifc;
        struct ifreq *ifr;
        char ip[INET6_ADDRSTRLEN];
-       int s, ret, dev_index, i, len;
+       int s, ret, i, len;
        uint16_t pkey;
-       uint8_t port;
+       union ibv_gid sgid;
 
        s = socket(AF_INET6, SOCK_DGRAM, 0);
        if (!s)
@@ -137,13 +150,19 @@ int gen_addr_ip(FILE *f)
                if (!acm_if_is_ib(ifr[i].ifr_name))
                        continue;
 
-               ret = get_devaddr(ifr[i].ifr_name, &dev_index, &port, &pkey);
-               if (ret)
+               ret = acm_if_get_sgid(ifr[i].ifr_name, &sgid);
+               if (ret) {
+                       printf("unable to get sgid\n");
+                       continue;
+               }
+
+               ret = acm_if_get_pkey(ifr[i].ifr_name, &pkey);
+               if (ret) {
+                       printf("unable to get pkey\n");
                        continue;
+               }
 
-               if (verbose)
-                       printf("%s %s %d 0x%x\n", ip, verbs[dev_index]->device->name, port, pkey);
-               fprintf(f, "%s %s %d 0x%x\n", ip, verbs[dev_index]->device->name, port, pkey);
+               cb(ifr[i].ifr_name, &sgid, pkey, 0, NULL, 0, ip, ctx);
        }
        ret = 0;
 
@@ -152,4 +171,5 @@ out2:
 out1:
        close(s);
        return ret;
+
 }

diff --git a/src/acm_util.h b/src/acm_util.h
index 94aac9da81724671d077a01615245a64528634b6..ea86133b45eda0cb1bac1b7fda0a3d319dab356d 100644 (file)
--- a/src/acm_util.h
+++ b/src/acm_util.h
@@ -36,4 +36,9 @@ int acm_if_is_ib(char *ifname);
 int acm_if_get_pkey(char *ifname, uint16_t *pkey);
 int acm_if_get_sgid(char *ifname, union ibv_gid *sgid);
 
+typedef void (*acm_if_iter_cb)(char *ifname, union ibv_gid *gid, uint16_t pkey,
+                               uint8_t addr_type, uint8_t *addr, size_t addr_len,
+                               char *addr_name, void *ctx);
+int acm_if_iter_sys(acm_if_iter_cb cb, void *ctx);
+
 #endif /* ACM_IF_H */