From 78f3496bae4eb6c8e8a2c9606bc127dda562324c Mon Sep 17 00:00:00 2001 From: Arlin Davis Date: Mon, 6 Oct 2014 13:54:39 -0700 Subject: [PATCH] openib: add port_num to provider named attributes Signed-off-by: Arlin Davis --- dapl/openib_common/dapl_ib_common.h | 1 + dapl/openib_common/util.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/dapl/openib_common/dapl_ib_common.h b/dapl/openib_common/dapl_ib_common.h index 453f437..b0b346d 100644 --- a/dapl/openib_common/dapl_ib_common.h +++ b/dapl/openib_common/dapl_ib_common.h @@ -156,6 +156,7 @@ typedef struct _ib_named_attr const char *guid; const char *mtu; const char *port; + const char *port_num; } ib_named_attr_t; diff --git a/dapl/openib_common/util.c b/dapl/openib_common/util.c index e735655..d65c172 100644 --- a/dapl/openib_common/util.c +++ b/dapl/openib_common/util.c @@ -327,6 +327,22 @@ const char *dapl_ib_port_str(enum ibv_port_state state) } } +const char *dapl_ib_port_num_str(unsigned long num) +{ + switch (num) { + case 1: + return "1"; + case 2: + return "2"; + case 3: + return "3"; + case 4: + return "4"; + default: + return "UNKNOWN"; + } +} + /* * dapls_ib_query_hca * @@ -451,6 +467,7 @@ DAT_RETURN dapls_ib_query_hca(IN DAPL_HCA * hca_ptr, hca_ptr->ib_trans.na.dev = ia_attr->adapter_name; hca_ptr->ib_trans.na.mtu = dapl_ib_mtu_str(hca_ptr->ib_trans.mtu); hca_ptr->ib_trans.na.port = dapl_ib_port_str(port_attr.state); + hca_ptr->ib_trans.na.port_num = dapl_ib_port_num_str(hca_ptr->port_num); if (!hca_ptr->ib_trans.guid) hca_ptr->ib_trans.guid = ntohll(ibv_get_device_guid(hca_ptr->ib_trans.ib_dev)); sprintf(hca_ptr->ib_trans.guid_str, "%04x:%04x:%04x:%04x", @@ -777,6 +794,9 @@ DAT_NAMED_ATTR ib_attrs[] = { { "DAT_IB_PORT_STATUS", "UNKNOWN"} , + { + "DAT_IB_PORT_NUMBER", "UNKNOWN"} + , #ifdef DAT_EXTENSIONS { "DAT_EXTENSION_INTERFACE", "TRUE"} @@ -854,6 +874,7 @@ void dapls_query_provider_specific_attr(IN DAPL_IA * ia_ptr, ib_attrs[4].value = ia_ptr->hca_ptr->ib_trans.guid_str; ib_attrs[5].value = ia_ptr->hca_ptr->ib_trans.na.mtu; ib_attrs[6].value = ia_ptr->hca_ptr->ib_trans.na.port; + ib_attrs[7].value = ia_ptr->hca_ptr->ib_trans.na.port_num; #ifdef _OPENIB_MCM_ { int i = attr_ptr->num_provider_specific_attr; -- 2.46.0