infiniband-diags/ibqueryerrors: Reformat the output of the xmtdiscard details.
PATCH 1/1 infiniband-diags/ibqueryerrors: Reformat the output of the xmtdiscard details.
From: Ira Weiny <[email protected]>
Date: Tue, 3 Nov 2009 13:58:03 -0800
Subject: [PATCH] infiniband-diags/ibqueryerrors: Reformat the output of the xmtdiscard details.
Old:
Errors for 0x2c9020040fec8 "Infiniscale-IV Mellanox Technologies"
GUID 0x2c9020040fec8 port 27: [XmtDiscards == 8] GUID 0x2c9020040fec8 port 27: [PortNeighborMTUDiscards == 8]
New:
Errors for 0x2c9020040fec8 "Infiniscale-IV Mellanox Technologies"
GUID 0x2c9020040fec8 port 27: [XmtDiscards == 8] [PortNeighborMTUDiscards == 8]
--- infiniband-diags/src/ibqueryerrors.c | 77 ++++++++++++++++------------------ 1 files changed, 36 insertions(+), 41 deletions(-)
infiniband-diags/src/ibqueryerrors.c +36 -41
@@ -199,8 +199,35 @@ static void report_suppressed(void) } } -static void print_results (char *node_name,ibnd_node_t * node,uint8_t * pc, -int portnum,int *header_printed) +static int print_xmitdisc_details (char *buf,size_t size,ib_portid_t * portid, +ibnd_node_t * node,char * node_name,int portnum) +{ +uint8_t pc[1024 ]; +uint32_t val =0 ; +int n =0 ; +int i =0 ; + +memset (pc,0 ,1024 ); + +if (!pma_query_via (pc, portid, portnum, ibd_timeout, +IB_GSI_PORT_XMIT_DISCARD_DETAILS , + ibmad_port)) { +IBWARN ("IB_GSI_PORT_XMIT_DISCARD_DETAILS query failed on %s, %s port %d" , + node_name,portid2str (portid), portnum); +return 0 ; + } + +for (n =0 , i =IB_PC_XMT_INACT_DISC_F ; i <=IB_PC_XMT_SW_HOL_DISC_F ; i++) { +mad_decode_field (pc, i, (void *)&val); +if (val) + n +=snprintf (buf + n, size - n," [%s == %d]" , +mad_field_name (i), val); + } +return n; +} + +static void print_results (ib_portid_t * portid,char *node_name,ibnd_node_t * node, +uint8_t * pc,int portnum,int *header_printed) {char buf[1024 ];char *str = buf;
@@ -219,6 +246,12 @@ static void print_results(char *node_name, ibnd_node_t * node, uint8_t * pc,if (val) n +=snprintf (str + n,1024 - n," [%s == %d]" ,mad_field_name (i), val); + +/* If there are PortXmitDiscards, get details (if supported) */ +if (i ==IB_PC_XMT_DISCARDS_F && details && val) { + n +=print_xmitdisc_details (str + n,1024 -n, portid, + node, node_name, portnum); + } }if (!suppress (IB_PC_XMT_WAIT_F )) {
@@ -274,35 +307,10 @@ static int query_cap_mask(ib_portid_t *portid, char *node_name, int portnum,return 0 ; } -static void print_xmitdisc_details (ibnd_node_t * node,char * node_name, -uint8_t * pc,int portnum) -{ -char buf[1024 ]; -char *str = buf; -uint32_t val =0 ; -int n =0 ; -int i =0 ; - - buf[0 ] =0 ; -for (n =0 , i =IB_PC_XMT_INACT_DISC_F ; i <=IB_PC_XMT_SW_HOL_DISC_F ; i++) { -mad_decode_field (pc, i, (void *)&val); -if (val) - n +=snprintf (str + n,1024 - n," [%s == %d]" , -mad_field_name (i), val); - } -if (n >0 ) { -printf (" GUID 0x%" PRIx64" port %d:%s\n" , node->guid, - portnum, str); -if (port_config) -print_port_config (node_name, node, portnum); - } -} -static void print_port (ib_portid_t * portid,uint16_t cap_mask,char *node_name,ibnd_node_t * node,int portnum,int *header_printed) {uint8_t pc[1024 ]; -uint32_t xmtdisc;memset (pc,0 ,1024 );
@@ -317,20 +325,7 @@ static void print_port(ib_portid_t * portid, uint16_t cap_mask, char *node_name,uint32_t foo =0 ;mad_encode_field (pc,IB_PC_XMT_WAIT_F , &foo); } -print_results (node_name, node, pc, portnum, header_printed); - -/* If there are PortXmitDiscards, get details (if supported) */ -mad_decode_field (pc,IB_PC_XMT_DISCARDS_F , &xmtdisc); -if (details && xmtdisc) { -if (!pma_query_via (pc, portid, portnum, ibd_timeout, -IB_GSI_PORT_XMIT_DISCARD_DETAILS , - ibmad_port)) { -IBWARN ("IB_GSI_PORT_XMIT_DISCARD_DETAILS query failed on %s, %s port %d" , - node_name,portid2str (portid), portnum); -return ; - } -print_xmitdisc_details (node, node_name, pc, portnum); - } +print_results (portid, node_name, node, pc, portnum, header_printed); } static void clear_port(ib_portid_t * portid, uint16_t cap_mask,
Signature · 6 lines
1.5.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): [email protected]
Sasha Khapyorsky
AppliedQuoted 10 lines · Ira Weiny
From: Ira Weiny <[email protected]>
Date: Tue, 3 Nov 2009 13:58:03 -0800
Subject: [PATCH] infiniband-diags/ibqueryerrors: Reformat the output of the xmtdiscard details.Old:
Errors for0x2c9020040fec8"Infiniscale-IV Mellanox Technologies"
GUID0x2c9020040fec8port 27: [XmtDiscards == 8] GUID0x2c9020040fec8port 27: [PortNeighborMTUDiscards == 8]
Quoted 5 lines
New:
Errors for0x2c9020040fec8"Infiniscale-IV Mellanox Technologies"
GUID0x2c9020040fec8port 27: [XmtDiscards == 8] [PortNeighborMTUDiscards == 8]Signed-off-by Ira Weiny <[email protected]>
Applied. Thanks.
Sasha
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html