| Message ID | e665c9e19767d96562233b0641a4c09ab85e9b38.1543243334.git.haakon.bugge@oracle.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ibacm: acme supports only one port | expand |
On Mon, 2018-11-26 at 15:52 +0100, Håkon Bugge wrote: > acme can display end-point information. This is implemented in acm by > iterating through all end-points and their ports, until the end-point > indexes match. > > This implies, considering a mult-ported device, that the address > information associated with the first port is the only one displayed. > > Before this commit: > > # ibstat | grep ports > Number of ports: 2 > # ib_acme -e > svc,guid,port,pkey,ep_index,prov,addr_0,addresses > /usr/local/var/run/ibacm-unix.sock,0x0021280001a17c96,1,0xffff,1,ibacmp,lab36,lab36-1,192.168.200.200 > > Fixed by adding port_num to the equation, and the above command will yield: > > # ib_acme -e > svc,guid,port,pkey,ep_index,prov,addr_0,addresses > /usr/local/var/run/ibacm-unix.sock,0x0021280001a17c96,1,0xffff,1,ibacmp,192.168.200.200,lab36,lab36-1 > /usr/local/var/run/ibacm-unix.sock,0x0021280001a17c96,2,0xffff,1,ibacmp,192.168.200.201,lab36-2 > > Signed-off-by: Håkon Bugge <haakon.bugge@oracle.com> > --- > ibacm/include/infiniband/acm.h | 6 ++++-- > ibacm/src/acm.c | 11 ++++++++--- > ibacm/src/acme.c | 29 +++++++++++++++++------------ > ibacm/src/libacm.c | 12 +++++++----- > ibacm/src/libacm.h | 2 +- > 5 files changed, 37 insertions(+), 23 deletions(-) > > diff --git a/ibacm/include/infiniband/acm.h b/ibacm/include/infiniband/acm.h > index f6efee18..90f3d431 100644 > --- a/ibacm/include/infiniband/acm.h > +++ b/ibacm/include/infiniband/acm.h > @@ -73,7 +73,8 @@ struct acm_hdr { > uint8_t version; > uint8_t opcode; > uint8_t status; > - uint8_t data[3]; > + uint8_t port_num; > + uint8_t data[2]; > uint16_t length; > uint64_t tid; > }; > @@ -135,7 +136,8 @@ struct acm_perf_msg { > struct acm_ep_config_data { > uint64_t dev_guid; > uint8_t port_num; > - uint8_t rsvd[3]; > + uint8_t phys_port_cnt; > + uint8_t rsvd[2]; > uint16_t pkey; > uint16_t addr_cnt; > uint8_t prov_name[ACM_MAX_PROV_NAME]; > diff --git a/ibacm/src/acm.c b/ibacm/src/acm.c > index 6a02f33d..0eaf0c89 100644 > --- a/ibacm/src/acm.c > +++ b/ibacm/src/acm.c > @@ -876,7 +876,9 @@ static struct acmc_addr *acm_get_ep_address(struct acm_ep_addr_data *data) > return NULL; > } > > -static struct acmc_ep *acm_get_ep(int index) > +/* If port_num is zero, iterate through all ports, otherwise consider > + * only the specific port_num */ > +static struct acmc_ep *acm_get_ep(int index, uint8_t port_num) > { > struct acmc_device *dev; > struct acmc_ep *ep; > @@ -885,6 +887,8 @@ static struct acmc_ep *acm_get_ep(int index) > acm_log(2, "ep index %d\n", index); > list_for_each(&dev_list, dev, entry) { > for (i = 0; i < dev->port_cnt; i++) { > + if (port_num && port_num != (i + 1)) > + continue; > if (dev->port[i].state != IBV_PORT_ACTIVE) > continue; > list_for_each(&dev->port[i].ep_list, ep, entry) { > @@ -1161,7 +1165,7 @@ static int acm_svr_perf_query(struct acmc_client *client, struct acm_msg *msg) > len = ACM_MSG_HDR_LENGTH + (ACM_MAX_COUNTER * sizeof(uint64_t)); > } else { > if (index >= 1) { > - ep = acm_get_ep(index - 1); > + ep = acm_get_ep(index - 1, msg->hdr.port_num); > } else { > addr = acm_get_ep_address(&msg->resolve_data[0]); > if (addr) > @@ -1231,11 +1235,12 @@ static int acm_svr_ep_query(struct acmc_client *client, struct acm_msg *msg) > > acm_log(2, "client %d\n", client->index); > index = msg->hdr.data[0]; > - ep = acm_get_ep(index - 1); > + ep = acm_get_ep(index - 1, msg->hdr.port_num); > if (ep) { > msg->hdr.status = ACM_STATUS_SUCCESS; > msg->ep_data[0].dev_guid = ep->port->dev->device.dev_guid; > msg->ep_data[0].port_num = ep->port->port.port_num; > + msg->ep_data[0].phys_port_cnt = ep->port->dev->port_cnt; > msg->ep_data[0].pkey = htobe16(ep->endpoint.pkey); > strncpy((char *)msg->ep_data[0].prov_name, ep->port->prov->name, > ACM_MAX_PROV_NAME - 1); > diff --git a/ibacm/src/acme.c b/ibacm/src/acme.c > index b592b977..7c4031e4 100644 > --- a/ibacm/src/acme.c > +++ b/ibacm/src/acme.c > @@ -926,21 +926,26 @@ static int enumerate_ep(char *svc, int index) > static int labels; > int ret, i; > struct acm_ep_config_data *ep_data; > + uint8_t port = 0; > > - ret = ib_acm_enum_ep(index, &ep_data); > - if (ret) > - return ret; > + do { > + ret = ib_acm_enum_ep(index, &ep_data, port); > + if (ret) > + return ret; > > - if (!labels) { > - printf("svc,guid,port,pkey,ep_index,prov,addr_0,addresses\n"); > - labels = 1; > - } > + if (!labels) { > + printf("svc,guid,port,pkey,ep_index,prov,addr_0,addresses\n"); > + labels = 1; > + } > + > + printf("%s,0x%016" PRIx64 ",%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"); > + port = ep_data->port_num + 1; > + } while (port <= ep_data->phys_port_cnt); This entire loop looks like it should be done slightly differently. Shouldn't you start at port == 1 since 0 is only valid on switchdevs (and also 0 means all ports in the other part of your patch)? And you can drop the port = ep_data->port_num + 1; entirely since just making the while check be (++port <= ep_data->phys_port_cnt) will suffice. > - printf("%s,0x%016" PRIx64 ",%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; > diff --git a/ibacm/src/libacm.c b/ibacm/src/libacm.c > index 8f0bfc2a..62099393 100644 > --- a/ibacm/src/libacm.c > +++ b/ibacm/src/libacm.c > @@ -382,7 +382,7 @@ out: > return ret; > } > > -int ib_acm_enum_ep(int index, struct acm_ep_config_data **data) > +int ib_acm_enum_ep(int index, struct acm_ep_config_data **data, uint8_t port) > { > struct acm_ep_config_data *netw_edata = NULL; > struct acm_ep_config_data *host_edata = NULL; > @@ -396,6 +396,7 @@ int ib_acm_enum_ep(int index, struct acm_ep_config_data **data) > memset(&msg, 0, sizeof msg); > msg.hdr.version = ACM_VERSION; > msg.hdr.opcode = ACM_OP_EP_QUERY; > + msg.hdr.port_num = port; > msg.hdr.data[0] = index; > msg.hdr.length = htobe16(ACM_MSG_HDR_LENGTH); > > @@ -428,10 +429,11 @@ int ib_acm_enum_ep(int index, struct acm_ep_config_data **data) > goto out; > } > > - host_edata->dev_guid = be64toh(netw_edata->dev_guid); > - host_edata->port_num = netw_edata->port_num; > - host_edata->pkey = be16toh(netw_edata->pkey); > - host_edata->addr_cnt = be16toh(netw_edata->addr_cnt); > + host_edata->dev_guid = be64toh(netw_edata->dev_guid); > + host_edata->port_num = netw_edata->port_num; > + host_edata->phys_port_cnt = netw_edata->phys_port_cnt; > + host_edata->pkey = be16toh(netw_edata->pkey); > + host_edata->addr_cnt = be16toh(netw_edata->addr_cnt); This is needless whitespace churn. > memcpy(host_edata->prov_name, netw_edata->prov_name, > sizeof(host_edata->prov_name)); > diff --git a/ibacm/src/libacm.h b/ibacm/src/libacm.h > index bf8cb79b..fb81b417 100644 > --- a/ibacm/src/libacm.h > +++ b/ibacm/src/libacm.h > @@ -54,7 +54,7 @@ int ib_acm_query_perf_ep_addr(uint8_t *src, uint8_t type, > > const char *ib_acm_cntr_name(int index); > > -int ib_acm_enum_ep(int index, struct acm_ep_config_data **data); > +int ib_acm_enum_ep(int index, struct acm_ep_config_data **data, uint8_t port); > #define ib_acm_free_ep_data(data) free(data) > > #endif /* LIBACM_H */
diff --git a/ibacm/include/infiniband/acm.h b/ibacm/include/infiniband/acm.h index f6efee18..90f3d431 100644 --- a/ibacm/include/infiniband/acm.h +++ b/ibacm/include/infiniband/acm.h @@ -73,7 +73,8 @@ struct acm_hdr { uint8_t version; uint8_t opcode; uint8_t status; - uint8_t data[3]; + uint8_t port_num; + uint8_t data[2]; uint16_t length; uint64_t tid; }; @@ -135,7 +136,8 @@ struct acm_perf_msg { struct acm_ep_config_data { uint64_t dev_guid; uint8_t port_num; - uint8_t rsvd[3]; + uint8_t phys_port_cnt; + uint8_t rsvd[2]; uint16_t pkey; uint16_t addr_cnt; uint8_t prov_name[ACM_MAX_PROV_NAME]; diff --git a/ibacm/src/acm.c b/ibacm/src/acm.c index 6a02f33d..0eaf0c89 100644 --- a/ibacm/src/acm.c +++ b/ibacm/src/acm.c @@ -876,7 +876,9 @@ static struct acmc_addr *acm_get_ep_address(struct acm_ep_addr_data *data) return NULL; } -static struct acmc_ep *acm_get_ep(int index) +/* If port_num is zero, iterate through all ports, otherwise consider + * only the specific port_num */ +static struct acmc_ep *acm_get_ep(int index, uint8_t port_num) { struct acmc_device *dev; struct acmc_ep *ep; @@ -885,6 +887,8 @@ static struct acmc_ep *acm_get_ep(int index) acm_log(2, "ep index %d\n", index); list_for_each(&dev_list, dev, entry) { for (i = 0; i < dev->port_cnt; i++) { + if (port_num && port_num != (i + 1)) + continue; if (dev->port[i].state != IBV_PORT_ACTIVE) continue; list_for_each(&dev->port[i].ep_list, ep, entry) { @@ -1161,7 +1165,7 @@ static int acm_svr_perf_query(struct acmc_client *client, struct acm_msg *msg) len = ACM_MSG_HDR_LENGTH + (ACM_MAX_COUNTER * sizeof(uint64_t)); } else { if (index >= 1) { - ep = acm_get_ep(index - 1); + ep = acm_get_ep(index - 1, msg->hdr.port_num); } else { addr = acm_get_ep_address(&msg->resolve_data[0]); if (addr) @@ -1231,11 +1235,12 @@ static int acm_svr_ep_query(struct acmc_client *client, struct acm_msg *msg) acm_log(2, "client %d\n", client->index); index = msg->hdr.data[0]; - ep = acm_get_ep(index - 1); + ep = acm_get_ep(index - 1, msg->hdr.port_num); if (ep) { msg->hdr.status = ACM_STATUS_SUCCESS; msg->ep_data[0].dev_guid = ep->port->dev->device.dev_guid; msg->ep_data[0].port_num = ep->port->port.port_num; + msg->ep_data[0].phys_port_cnt = ep->port->dev->port_cnt; msg->ep_data[0].pkey = htobe16(ep->endpoint.pkey); strncpy((char *)msg->ep_data[0].prov_name, ep->port->prov->name, ACM_MAX_PROV_NAME - 1); diff --git a/ibacm/src/acme.c b/ibacm/src/acme.c index b592b977..7c4031e4 100644 --- a/ibacm/src/acme.c +++ b/ibacm/src/acme.c @@ -926,21 +926,26 @@ static int enumerate_ep(char *svc, int index) static int labels; int ret, i; struct acm_ep_config_data *ep_data; + uint8_t port = 0; - ret = ib_acm_enum_ep(index, &ep_data); - if (ret) - return ret; + do { + ret = ib_acm_enum_ep(index, &ep_data, port); + if (ret) + return ret; - if (!labels) { - printf("svc,guid,port,pkey,ep_index,prov,addr_0,addresses\n"); - labels = 1; - } + if (!labels) { + printf("svc,guid,port,pkey,ep_index,prov,addr_0,addresses\n"); + labels = 1; + } + + printf("%s,0x%016" PRIx64 ",%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"); + port = ep_data->port_num + 1; + } while (port <= ep_data->phys_port_cnt); - printf("%s,0x%016" PRIx64 ",%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; diff --git a/ibacm/src/libacm.c b/ibacm/src/libacm.c index 8f0bfc2a..62099393 100644 --- a/ibacm/src/libacm.c +++ b/ibacm/src/libacm.c @@ -382,7 +382,7 @@ out: return ret; } -int ib_acm_enum_ep(int index, struct acm_ep_config_data **data) +int ib_acm_enum_ep(int index, struct acm_ep_config_data **data, uint8_t port) { struct acm_ep_config_data *netw_edata = NULL; struct acm_ep_config_data *host_edata = NULL; @@ -396,6 +396,7 @@ int ib_acm_enum_ep(int index, struct acm_ep_config_data **data) memset(&msg, 0, sizeof msg); msg.hdr.version = ACM_VERSION; msg.hdr.opcode = ACM_OP_EP_QUERY; + msg.hdr.port_num = port; msg.hdr.data[0] = index; msg.hdr.length = htobe16(ACM_MSG_HDR_LENGTH); @@ -428,10 +429,11 @@ int ib_acm_enum_ep(int index, struct acm_ep_config_data **data) goto out; } - host_edata->dev_guid = be64toh(netw_edata->dev_guid); - host_edata->port_num = netw_edata->port_num; - host_edata->pkey = be16toh(netw_edata->pkey); - host_edata->addr_cnt = be16toh(netw_edata->addr_cnt); + host_edata->dev_guid = be64toh(netw_edata->dev_guid); + host_edata->port_num = netw_edata->port_num; + host_edata->phys_port_cnt = netw_edata->phys_port_cnt; + host_edata->pkey = be16toh(netw_edata->pkey); + host_edata->addr_cnt = be16toh(netw_edata->addr_cnt); memcpy(host_edata->prov_name, netw_edata->prov_name, sizeof(host_edata->prov_name)); diff --git a/ibacm/src/libacm.h b/ibacm/src/libacm.h index bf8cb79b..fb81b417 100644 --- a/ibacm/src/libacm.h +++ b/ibacm/src/libacm.h @@ -54,7 +54,7 @@ int ib_acm_query_perf_ep_addr(uint8_t *src, uint8_t type, const char *ib_acm_cntr_name(int index); -int ib_acm_enum_ep(int index, struct acm_ep_config_data **data); +int ib_acm_enum_ep(int index, struct acm_ep_config_data **data, uint8_t port); #define ib_acm_free_ep_data(data) free(data) #endif /* LIBACM_H */
acme can display end-point information. This is implemented in acm by iterating through all end-points and their ports, until the end-point indexes match. This implies, considering a mult-ported device, that the address information associated with the first port is the only one displayed. Before this commit: # ibstat | grep ports Number of ports: 2 # ib_acme -e svc,guid,port,pkey,ep_index,prov,addr_0,addresses /usr/local/var/run/ibacm-unix.sock,0x0021280001a17c96,1,0xffff,1,ibacmp,lab36,lab36-1,192.168.200.200 Fixed by adding port_num to the equation, and the above command will yield: # ib_acme -e svc,guid,port,pkey,ep_index,prov,addr_0,addresses /usr/local/var/run/ibacm-unix.sock,0x0021280001a17c96,1,0xffff,1,ibacmp,192.168.200.200,lab36,lab36-1 /usr/local/var/run/ibacm-unix.sock,0x0021280001a17c96,2,0xffff,1,ibacmp,192.168.200.201,lab36-2 Signed-off-by: Håkon Bugge <haakon.bugge@oracle.com> --- ibacm/include/infiniband/acm.h | 6 ++++-- ibacm/src/acm.c | 11 ++++++++--- ibacm/src/acme.c | 29 +++++++++++++++++------------ ibacm/src/libacm.c | 12 +++++++----- ibacm/src/libacm.h | 2 +- 5 files changed, 37 insertions(+), 23 deletions(-)