From patchwork Wed May 25 16:50:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ira Weiny X-Patchwork-Id: 816602 X-Patchwork-Delegate: ira.weiny@intel.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4PGiST1027599 for ; Wed, 25 May 2011 16:44:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932944Ab1EYQoN (ORCPT ); Wed, 25 May 2011 12:44:13 -0400 Received: from nspiron-2.llnl.gov ([128.115.41.82]:12028 "EHLO nspiron-2.llnl.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932932Ab1EYQoM (ORCPT ); Wed, 25 May 2011 12:44:12 -0400 X-Attachments: None Received: from mail-2.llnl.gov ([128.115.41.181]) by nspiron-2.llnl.gov with ESMTP; 25 May 2011 09:44:12 -0700 Received: from trebuchet.chaos (eris.llnl.gov [134.9.2.84]) by mail-2.llnl.gov (8.13.1/8.12.3/LLNL evision: 1.7 $) with SMTP id p4PGiA30023148; Wed, 25 May 2011 09:44:10 -0700 Date: Wed, 25 May 2011 09:50:37 -0700 From: Ira Weiny To: Hal Rosenstock Cc: "linux-rdma@vger.kernel.org" Subject: [PATCH 2/2 V2] infiniband-diags: perfquery; Support PortCountersExtendedNoIETF Message-Id: <20110525095037.c7a945e7.weiny2@llnl.gov> In-Reply-To: <4DDCF65C.6000309@dev.mellanox.co.il> References: <20110524144206.edb3b5d4.weiny2@llnl.gov> <4DDCF65C.6000309@dev.mellanox.co.il> X-Mailer: Sylpheed 3.0.3 (GTK+ 2.10.4; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 25 May 2011 16:44:28 +0000 (UTC) From: Ira Weiny Date: Fri, 13 May 2011 22:28:55 -0700 Subject: [PATCH 2/2] infiniband-diags: perfquery; Support PortCountersExtendedNoIETF Changes since V1: fix typo if (cap_mask & IB_PM_EXT_WIDTH_NOIETF_SUP) { to if (cap_mask & IB_PM_EXT_WIDTH_SUPPORTED) { Signed-off-by: Ira Weiny --- src/perfquery.c | 52 ++++++++++++++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 20 deletions(-) diff --git a/src/perfquery.c b/src/perfquery.c index 165c419..8923654 100644 --- a/src/perfquery.c +++ b/src/perfquery.c @@ -227,7 +227,7 @@ static void output_aggregate_perfcounters(ib_portid_t * portid, portid2str(portid), ALL_PORTS, ntohs(cap_mask), buf); } -static void aggregate_perfcounters_ext(void) +static void aggregate_perfcounters_ext(uint16_t cap_mask) { uint32_t val; uint64_t val64; @@ -244,14 +244,17 @@ static void aggregate_perfcounters_ext(void) aggregate_64bit(&perf_count_ext.portxmitpkts, val64); mad_decode_field(pc, IB_PC_EXT_RCV_PKTS_F, &val64); aggregate_64bit(&perf_count_ext.portrcvpkts, val64); - mad_decode_field(pc, IB_PC_EXT_XMT_UPKTS_F, &val64); - aggregate_64bit(&perf_count_ext.portunicastxmitpkts, val64); - mad_decode_field(pc, IB_PC_EXT_RCV_UPKTS_F, &val64); - aggregate_64bit(&perf_count_ext.portunicastrcvpkts, val64); - mad_decode_field(pc, IB_PC_EXT_XMT_MPKTS_F, &val64); - aggregate_64bit(&perf_count_ext.portmulticastxmitpkits, val64); - mad_decode_field(pc, IB_PC_EXT_RCV_MPKTS_F, &val64); - aggregate_64bit(&perf_count_ext.portmulticastrcvpkts, val64); + + if (cap_mask & IB_PM_EXT_WIDTH_SUPPORTED) { + mad_decode_field(pc, IB_PC_EXT_XMT_UPKTS_F, &val64); + aggregate_64bit(&perf_count_ext.portunicastxmitpkts, val64); + mad_decode_field(pc, IB_PC_EXT_RCV_UPKTS_F, &val64); + aggregate_64bit(&perf_count_ext.portunicastrcvpkts, val64); + mad_decode_field(pc, IB_PC_EXT_XMT_MPKTS_F, &val64); + aggregate_64bit(&perf_count_ext.portmulticastxmitpkits, val64); + mad_decode_field(pc, IB_PC_EXT_RCV_MPKTS_F, &val64); + aggregate_64bit(&perf_count_ext.portmulticastrcvpkts, val64); + } } static void output_aggregate_perfcounters_ext(ib_portid_t * portid, @@ -260,6 +263,8 @@ static void output_aggregate_perfcounters_ext(ib_portid_t * portid, char buf[1024]; uint32_t val = ALL_PORTS; + memset(buf, 0, 1024); + /* set port_select to 255 to emulate AllPortSelect */ mad_encode_field(pc, IB_PC_EXT_PORT_SELECT_F, &val); mad_encode_field(pc, IB_PC_EXT_COUNTER_SELECT_F, @@ -271,14 +276,17 @@ static void output_aggregate_perfcounters_ext(ib_portid_t * portid, mad_encode_field(pc, IB_PC_EXT_XMT_PKTS_F, &perf_count_ext.portxmitpkts); mad_encode_field(pc, IB_PC_EXT_RCV_PKTS_F, &perf_count_ext.portrcvpkts); - mad_encode_field(pc, IB_PC_EXT_XMT_UPKTS_F, - &perf_count_ext.portunicastxmitpkts); - mad_encode_field(pc, IB_PC_EXT_RCV_UPKTS_F, - &perf_count_ext.portunicastrcvpkts); - mad_encode_field(pc, IB_PC_EXT_XMT_MPKTS_F, - &perf_count_ext.portmulticastxmitpkits); - mad_encode_field(pc, IB_PC_EXT_RCV_MPKTS_F, - &perf_count_ext.portmulticastrcvpkts); + + if (cap_mask & IB_PM_EXT_WIDTH_SUPPORTED) { + mad_encode_field(pc, IB_PC_EXT_XMT_UPKTS_F, + &perf_count_ext.portunicastxmitpkts); + mad_encode_field(pc, IB_PC_EXT_RCV_UPKTS_F, + &perf_count_ext.portunicastrcvpkts); + mad_encode_field(pc, IB_PC_EXT_XMT_MPKTS_F, + &perf_count_ext.portmulticastxmitpkits); + mad_encode_field(pc, IB_PC_EXT_RCV_MPKTS_F, + &perf_count_ext.portmulticastrcvpkts); + } mad_dump_perfcounters_ext(buf, sizeof buf, pc, sizeof pc); @@ -312,9 +320,13 @@ static void dump_perfcounters(int extended, int timeout, uint16_t cap_mask, (cap_mask & IB_PM_PC_XMIT_WAIT_SUP)?IB_PC_LAST_F:(IB_PC_RCV_PKTS_F+1)); } else { - if (!(cap_mask & IB_PM_EXT_WIDTH_SUPPORTED)) /* 1.2 errata: bit 9 is extended counter support */ + /* 1.2 errata: bit 9 is extended counter support + * bit 10 is extended counter NoIETF + */ + if (!(cap_mask & IB_PM_EXT_WIDTH_SUPPORTED) && + !(cap_mask & IB_PM_EXT_WIDTH_NOIETF_SUP)) IBWARN - ("PerfMgt ClassPortInfo 0x%x extended counters not indicated\n", + ("PerfMgt ClassPortInfo 0x%x; No extended counter support indicated\n", ntohs(cap_mask)); memset(pc, 0, sizeof(pc)); @@ -322,7 +334,7 @@ static void dump_perfcounters(int extended, int timeout, uint16_t cap_mask, IB_GSI_PORT_COUNTERS_EXT, srcport)) IBERROR("perfextquery"); if (aggregate) - aggregate_perfcounters_ext(); + aggregate_perfcounters_ext(cap_mask); else mad_dump_perfcounters_ext(buf, sizeof buf, pc, sizeof pc);