ib_acme: enumerate endpoints

Add support to enumerate a specific endpoint or all endpoints
local to an ibacm service in the tool ib_acme.

Signed-off-by: Kaike Wan <kaike.wan@intel.com>
Signed-off-by: Sean Hefty <sean.hefty@intel.com>

diff --git a/src/acme.c b/src/acme.c
index a2cc71a6696dbc54d521a284204d7e1481f085c1..d281319c035cc0a60a916f574ed1605b43224d19 100644 (file)
--- a/src/acme.c
+++ b/src/acme.c
@@ -58,6 +58,8 @@ static char addr_type = 'u';
 static int verify;
 static int nodelay;
 static int repetitions = 1;
+static int ep_index;
+static int enum_ep;
 
 enum perf_query_output {
        PERF_QUERY_NONE,
@@ -79,6 +81,9 @@ static void show_usage(char *program)
 {
        printf("usage 1: %s\n", program);
        printf("Query specified ibacm service for data\n");
+       printf("   [-e [N]]         - display one or all endpoints:\n");
+       printf("                        No index: all endpoints\n");
+       printf("                        N: endpoint N (N = 1, 2, ...)\n");
        printf("   [-f addr_format] - i(p), n(ame), l(id), g(gid), or u(nspecified)\n");
        printf("                      address format for -s and -d options, default: 'u'\n");
        printf("   [-s src_addr]    - source address for path queries\n");
@@ -776,6 +781,43 @@ static void query_perf(char *svc)
        ib_acm_free_perf(counters);
 }
 
+static int enumerate_ep(char *svc, int index)
+{
+       static int labels;
+       int ret, i;
+       struct acm_ep_config_data *ep_data;
+
+       ret = ib_acm_enum_ep(index, &ep_data);
+       if (ret) 
+               return ret;
+
+       if (!labels) {
+               printf("svc,guid,port,pkey,ep_index,prov,addr_0,addresses\n");
+               labels = 1;
+       }
+
+       printf("%s,0x%016lx,%d,0x%04x,%d,%s", svc, ep_data->dev_guid,
+              ep_data->port_num, ep_data->pkey, index, ep_data->prov_name);
+       for (i = 0; i < ep_data->addr_cnt; i++) 
+               printf(",%s", ep_data->addrs[i].name);
+       printf("\n");
+       ib_acm_free_ep_data(ep_data);
+
+       return 0;
+}
+
+static void enumerate_eps(char *svc)
+{
+       int index = 1;
+
+       if (ep_index > 0) {
+               if (enumerate_ep(svc, ep_index))
+                       printf(" Endpoint %d is not available\n", ep_index);
+       } else {
+               while (!enumerate_ep(svc, index++));
+       }
+}
+
 static int query_svcs(void)
 {
        char **svc_list;
@@ -801,6 +843,9 @@ static int query_svcs(void)
                if (perf_query)
                        query_perf(svc_list[i]);
 
+               if (enum_ep) 
+                       enumerate_eps(svc_list[i]);
+
                ib_acm_disconnect();
        }
 
@@ -829,8 +874,13 @@ int CDECL_FUNC main(int argc, char **argv)
        if (ret)
                goto out;
 
-       while ((op = getopt(argc, argv, "f:s:d:vcA::O::D:P::S:C:V")) != -1) {
+       while ((op = getopt(argc, argv, "e::f:s:d:vcA::O::D:P::S:C:V")) != -1) {
                switch (op) {
+               case 'e':
+                       enum_ep = 1;
+                       if (opt_arg(argc, argv))
+                               ep_index = atoi(opt_arg(argc, argv));
+                       break;
                case 'f':
                        addr_type = optarg[0];
                        if (addr_type != 'i' && addr_type != 'n' &&
@@ -885,10 +935,11 @@ int CDECL_FUNC main(int argc, char **argv)
        }
 
        if ((src_arg && !dest_arg) ||
-           (!src_arg && !dest_arg && !perf_query && !make_addr && !make_opts))
+           (!src_arg && !dest_arg && !perf_query && !make_addr && !make_opts &&
+            !enum_ep))
                goto show_use;
 
-       if (dest_arg || perf_query)
+       if (dest_arg || perf_query || enum_ep)
                ret = query_svcs();
 
        if (!ret && make_addr)

diff --git a/src/libacm.c b/src/libacm.c
index 6ed653c9c263872bb638dde750a7bab4cbf9ea84..16cdead2de09101a4c412ac5d3018a652fbc20a5 100644 (file)
--- a/src/libacm.c
+++ b/src/libacm.c
@@ -346,6 +346,56 @@ out:
        return ret;
 }
 
+int ib_acm_enum_ep(int index, struct acm_ep_config_data **data)
+{
+       struct acm_msg msg;
+       int ret;
+       int len;
+       int cnt;
+       struct acm_ep_config_data *edata;
+
+       lock_acquire(&lock);
+       memset(&msg, 0, sizeof msg);
+       msg.hdr.version = ACM_VERSION;
+       msg.hdr.opcode = ACM_OP_EP_QUERY;
+       msg.hdr.data[0] = index;
+       msg.hdr.length = htons(ACM_MSG_HDR_LENGTH);
+
+       ret = send(sock, (char *) &msg, ACM_MSG_HDR_LENGTH, 0);
+       if (ret != ACM_MSG_HDR_LENGTH)
+               goto out;
+
+       ret = recv(sock, (char *) &msg, sizeof msg, 0);
+       if (ret < ACM_MSG_HDR_LENGTH || ret != ntohs(msg.hdr.length)) {
+               ret = ACM_STATUS_EINVAL;
+               goto out;
+       }
+
+       if (msg.hdr.status) {
+               ret = acm_error(msg.hdr.status);
+               goto out;
+       }
+
+       cnt = ntohs(msg.ep_data[0].addr_cnt);
+       len = sizeof(struct acm_ep_config_data) + 
+               ACM_MAX_ADDRESS * cnt;
+       edata = malloc(len);
+       if (!edata) {
+               ret = ACM_STATUS_ENOMEM;
+               goto out;
+       }
+
+       memcpy(edata, &msg.ep_data[0], len);
+       edata->dev_guid = ntohll(msg.ep_data[0].dev_guid);
+       edata->pkey = ntohs(msg.ep_data[0].pkey);
+       edata->addr_cnt = cnt;
+       *data = edata;
+       ret = 0;
+out:
+       lock_release(&lock);
+       return ret;
+}
+
 const char *ib_acm_cntr_name(int index)
 {
        static const char *const cntr_name[] = {

diff --git a/src/libacm.h b/src/libacm.h
index 9a241aa0d8c4f99a874891d142adc7664f64f600..e94291f2ca1519934e50ebc28c39e203f1e77f4e 100644 (file)
--- a/src/libacm.h
+++ b/src/libacm.h
@@ -50,4 +50,7 @@ int ib_acm_query_perf(uint64_t **counters, int *count);
 
 const char *ib_acm_cntr_name(int index);
 
+int ib_acm_enum_ep(int index, struct acm_ep_config_data **data);
+#define ib_acm_free_ep_data(data) free(data)
+
 #endif /* LIBACM_H */