diff mbox

[V2,05/07] opensm/perfmgr: don't clear data counters in PortCounters when ExtendedPortCounters is supported

Message ID 20130228170849.fda78e041419da35daa894d0@llnl.gov (mailing list archive)
State Accepted
Delegated to: Hal Rosenstock
Headers show

Commit Message

Ira Weiny March 1, 2013, 1:08 a.m. UTC 
Some hardware apparently clears the data counters of ExtendedPortCounters when
the PortCounters data counters are cleared.  (Must be using the same hardware
registers.)

Therefore, when ExtendedPortCounters is supported on a port; alter the counter
select of PortCounters to exclude the data counters when clearing.

Rebased for new series

Signed-off-by: Ira Weiny <weiny2@llnl.gov>
---
 opensm/osm_perfmgr.c |   89 ++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 75 insertions(+), 14 deletions(-)

Comments

Hal Rosenstock March 2, 2013, 2:13 p.m. UTC | #1 
On 2/28/2013 8:08 PM, Ira Weiny wrote:
> 
> Some hardware apparently clears the data counters of ExtendedPortCounters when
> the PortCounters data counters are cleared.  (Must be using the same hardware
> registers.)
> 
> Therefore, when ExtendedPortCounters is supported on a port; alter the counter
> select of PortCounters to exclude the data counters when clearing.
> 
> Rebased for new series
> 
> Signed-off-by: Ira Weiny <weiny2@llnl.gov>

Thanks. Applied.

-- Hal
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/opensm/osm_perfmgr.c b/opensm/osm_perfmgr.c
index 8e74256..8c6e1a3 100644
--- a/opensm/osm_perfmgr.c
+++ b/opensm/osm_perfmgr.c
@@ -451,6 +451,7 @@  static ib_api_status_t perfmgr_send_pc_mad(osm_perfmgr_t * perfmgr,
 					   ib_net16_t dest_lid,
 					   ib_net32_t dest_qp, uint16_t pkey_ix,
 					   uint8_t port, uint8_t mad_method,
+					   uint16_t counter_select,
 					   osm_madw_context_t * p_context,
 					   uint8_t sl)
 {
@@ -471,7 +472,7 @@  static ib_api_status_t perfmgr_send_pc_mad(osm_perfmgr_t * perfmgr,
 	port_counter = (ib_port_counters_t *) & pm_mad->data;
 	memset(port_counter, 0, sizeof(*port_counter));
 	port_counter->port_select = port;
-	port_counter->counter_select = 0xFFFF;
+	port_counter->counter_select = cl_hton16(counter_select);
 
 	status = perfmgr_send_mad(perfmgr, p_madw);
 
@@ -617,7 +618,7 @@  static ib_api_status_t perfmgr_send_pce_mad(osm_perfmgr_t * perfmgr,
 	port_counter_ext = (ib_port_counters_ext_t *) & pm_mad->data;
 	memset(port_counter_ext, 0, sizeof(*port_counter_ext));
 	port_counter_ext->port_select = port;
-	port_counter_ext->counter_select = cl_hton16(0xFF);
+	port_counter_ext->counter_select = cl_hton16(0x00FF);
 
 	status = perfmgr_send_mad(perfmgr, p_madw);
 
@@ -719,6 +720,7 @@  static void perfmgr_query_counters(cl_map_item_t * p_map_item, void *context)
 			status = perfmgr_send_pc_mad(pm, lid, remote_qp,
 						     mon_node->port[port].pkey_ix,
 						     port, IB_MAD_METHOD_GET,
+						     0xffff,
 						     &mad_context,
 						     0); /* FIXME SL != 0 */
 			if (status != IB_SUCCESS)
@@ -1104,6 +1106,35 @@  static void perfmgr_check_oob_clear(osm_perfmgr_t * pm,
 		return;
 	}
 
+	OSM_LOG(pm->log, OSM_LOG_DEBUG,
+		"Errors vs previous node %s (0x%" PRIx64 ") port %u\n"
+		"SE:   %"PRIu64" ?< %"PRIu64"\n"
+		"LE:   %"PRIu64" ?< %"PRIu64"\n"
+		"LD:   %"PRIu64" ?< %"PRIu64"\n"
+		"RE:   %"PRIu64" ?< %"PRIu64"\n"
+		"RPE:  %"PRIu64" ?< %"PRIu64"\n"
+		"SRE:  %"PRIu64" ?< %"PRIu64"\n"
+		"XD:   %"PRIu64" ?< %"PRIu64"\n"
+		"XCE:  %"PRIu64" ?< %"PRIu64"\n"
+		"RCE:  %"PRIu64" ?< %"PRIu64"\n"
+		"LI:   %"PRIu64" ?< %"PRIu64"\n"
+		"BO:   %"PRIu64" ?< %"PRIu64"\n"
+		"VL15: %"PRIu64" ?< %"PRIu64"\n"
+		,
+		mon_node->name, mon_node->guid, port,
+		cr->symbol_err_cnt, prev_err.symbol_err_cnt,
+		cr->link_err_recover, prev_err.link_err_recover,
+		cr->link_downed, prev_err.link_downed,
+		cr->rcv_err, prev_err.rcv_err,
+		cr->rcv_rem_phys_err, prev_err.rcv_rem_phys_err,
+		cr->rcv_switch_relay_err, prev_err.rcv_switch_relay_err,
+		cr->xmit_discards, prev_err.xmit_discards,
+		cr->xmit_constraint_err, prev_err.xmit_constraint_err,
+		cr->rcv_constraint_err, prev_err.rcv_constraint_err,
+		cr->link_integrity, prev_err.link_integrity,
+		cr->buffer_overrun, prev_err.buffer_overrun,
+		cr->vl15_dropped, prev_err.vl15_dropped);
+
 	if (cr->symbol_err_cnt < prev_err.symbol_err_cnt ||
 	    cr->link_err_recover < prev_err.link_err_recover ||
 	    cr->link_downed < prev_err.link_downed ||
@@ -1164,6 +1195,7 @@  static void perfmgr_check_overflow(osm_perfmgr_t * pm,
 	osm_madw_context_t mad_context;
 	ib_api_status_t status;
 	ib_net32_t remote_qp;
+	uint16_t counter_select;
 
 	OSM_LOG_ENTER(pm->log);
 
@@ -1213,9 +1245,20 @@  static void perfmgr_check_overflow(osm_perfmgr_t * pm,
 		mad_context.perfmgr_context.node_guid = mon_node->guid;
 		mad_context.perfmgr_context.port = port;
 		mad_context.perfmgr_context.mad_method = IB_MAD_METHOD_SET;
-		/* clear port counters */
+
+		/* apparently some HW uses the same counters for the 32 and 64
+		 * bit versions and a clear of them in the PortCounters
+		 * attribute also clears the ExtendedPortCounters equivalant
+		 * counters
+		 */
+		if (pce_supported(mon_node, port))
+			counter_select = 0x0fff;
+		else
+			counter_select = 0xffff;
+
 		status = perfmgr_send_pc_mad(pm, lid, remote_qp, pkey_ix,
 					     port, IB_MAD_METHOD_SET,
+					     counter_select,
 					     &mad_context,
 					     0); /* FIXME SL != 0 */
 		if (status != IB_SUCCESS)
@@ -1499,6 +1542,7 @@  static boolean_t handle_redirect(osm_perfmgr_t *pm,
 			status = perfmgr_send_pc_mad(pm, cpi->redir_lid, cpi->redir_qp,
 						     pkey_ix, port,
 						     mad_method,
+						     0xffff,
 						     mad_context,
 						     0); /* FIXME SL != 0 */
 		} else {
@@ -1545,6 +1589,27 @@  static void perfmgr_check_data_cnt_oob_clear(osm_perfmgr_t * pm,
 		return;
 	}
 
+	OSM_LOG(pm->log, OSM_LOG_DEBUG,
+		"Data vs previous node %s (0x%" PRIx64 ") port %u\n"
+		"TX:    %"PRIu64" ?< %"PRIu64"\n"
+		"RX:    %"PRIu64" ?< %"PRIu64"\n"
+		"TXP:   %"PRIu64" ?< %"PRIu64"\n"
+		"RXP:   %"PRIu64" ?< %"PRIu64"\n"
+		"UTXP:  %"PRIu64" ?< %"PRIu64"\n"
+		"URXP:  %"PRIu64" ?< %"PRIu64"\n"
+		"MTXP:  %"PRIu64" ?< %"PRIu64"\n"
+		"MRXP:  %"PRIu64" ?< %"PRIu64"\n"
+		,
+		mon_node->name, mon_node->guid, port,
+		dc->xmit_data, prev_dc.xmit_data,
+		dc->rcv_data, prev_dc.rcv_data,
+		dc->xmit_pkts, prev_dc.xmit_pkts,
+		dc->rcv_pkts, prev_dc.rcv_pkts,
+		dc->unicast_xmit_pkts, prev_dc.unicast_xmit_pkts,
+		dc->unicast_rcv_pkts, prev_dc.unicast_rcv_pkts,
+		dc->multicast_xmit_pkts, prev_dc.multicast_xmit_pkts,
+		dc->multicast_rcv_pkts, prev_dc.multicast_rcv_pkts);
+
 	if (dc->xmit_data < prev_dc.xmit_data ||
 	    dc->rcv_data < prev_dc.rcv_data ||
 	    dc->xmit_pkts < prev_dc.xmit_pkts ||
@@ -1558,6 +1623,7 @@  static void perfmgr_check_data_cnt_oob_clear(osm_perfmgr_t * pm,
 			"PerfMgr: ERR 540B: Detected an out of band data counter "
 			"clear on node %s (0x%" PRIx64 ") port %u\n",
 			mon_node->name, mon_node->guid, port);
+
 		perfmgr_db_clear_prev_dc(pm->db, mon_node->guid, port);
 	}
 }
@@ -1655,15 +1721,13 @@  static void pc_recv_process(void *context, void *data)
 						  ietf_supported(p_mon_node,
 								 port));
 
-		/* detect an out of band clear on the port */
-		if (mad_context->perfmgr_context.mad_method !=
-		    IB_MAD_METHOD_SET)
-			perfmgr_check_data_cnt_oob_clear(pm, p_mon_node, port,
-						    &data_reading);
-
 		/* add counter */
 		if (mad_context->perfmgr_context.mad_method
 		    == IB_MAD_METHOD_GET) {
+			/* detect an out of band clear on the port */
+			perfmgr_check_data_cnt_oob_clear(pm, p_mon_node, port,
+						    &data_reading);
+
 			perfmgr_db_add_dc_reading(pm->db, node_guid, port,
 						  &data_reading,
 						  ietf_supported(p_mon_node,
@@ -1672,7 +1736,6 @@  static void pc_recv_process(void *context, void *data)
 			perfmgr_db_clear_prev_dc(pm->db, node_guid, port);
 		}
 
-		/* check overflow */
 		perfmgr_check_pce_overflow(pm, p_mon_node,
 					   p_mon_node->port[port].pkey_ix,
 					   port, ext_wire_read);
@@ -1686,15 +1749,13 @@  static void pc_recv_process(void *context, void *data)
 		if (!pce_sup)
 			perfmgr_db_fill_data_cnt_read_pc(wire_read, &data_reading);
 
-		/* detect an out of band clear on the port */
-		if (mad_context->perfmgr_context.mad_method != IB_MAD_METHOD_SET) {
+		if (mad_context->perfmgr_context.mad_method == IB_MAD_METHOD_GET) {
+			/* detect an out of band clear on the port */
 			perfmgr_check_oob_clear(pm, p_mon_node, port, &err_reading);
 			if (!pce_sup)
 				perfmgr_check_data_cnt_oob_clear(pm, p_mon_node, port,
 							    &data_reading);
-		}
 
-		if (mad_context->perfmgr_context.mad_method == IB_MAD_METHOD_GET) {
 			/* log errors from this reading */
 			if (pm->subn->opt.perfmgr_log_errors)
 				perfmgr_log_errors(pm, p_mon_node, port, &err_reading);