From patchwork Mon Aug 2 18:30:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arlin Davis X-Patchwork-Id: 116574 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o72IUjC9015544 for ; Mon, 2 Aug 2010 18:30:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753685Ab0HBSax (ORCPT ); Mon, 2 Aug 2010 14:30:53 -0400 Received: from mga02.intel.com ([134.134.136.20]:14401 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752000Ab0HBSaw convert rfc822-to-8bit (ORCPT ); Mon, 2 Aug 2010 14:30:52 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 02 Aug 2010 11:28:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.55,304,1278313200"; d="scan'208";a="541226575" Received: from orsmsx603.amr.corp.intel.com ([10.22.226.49]) by orsmga002.jf.intel.com with ESMTP; 02 Aug 2010 11:31:08 -0700 Received: from orsmsx606.amr.corp.intel.com (10.22.226.128) by orsmsx603.amr.corp.intel.com (10.22.226.49) with Microsoft SMTP Server (TLS) id 8.2.254.0; Mon, 2 Aug 2010 11:30:51 -0700 Received: from orsmsx506.amr.corp.intel.com ([10.22.226.44]) by orsmsx606.amr.corp.intel.com ([10.22.226.128]) with mapi; Mon, 2 Aug 2010 11:30:51 -0700 From: "Davis, Arlin R" To: linux-rdma , "ofw@lists.openfabrics.org" Date: Mon, 2 Aug 2010 11:30:50 -0700 Subject: [PATCH] dapl-2.0 - ucm: cleanup CM debug warning messages Thread-Topic: [PATCH] dapl-2.0 - ucm: cleanup CM debug warning messages Thread-Index: AcsNeGIZrKpDLe9TRUW5U9YZUm3b7gk9zv/gAAAtdbA= Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US 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.3 (demeter.kernel.org [140.211.167.41]); Mon, 02 Aug 2010 18:30:53 +0000 (UTC) diff --git a/dapl/openib_ucm/cm.c b/dapl/openib_ucm/cm.c index b874c8b..05b5af5 100644 --- a/dapl/openib_ucm/cm.c +++ b/dapl/openib_ucm/cm.c @@ -165,9 +165,9 @@ static void ucm_check_timers(dp_ib_cm_handle_t cm, int *timer) if ((time - cm->timer)/1000 > (cm->hca->ib_trans.rep_time << cm->retries)) { dapl_log(DAPL_DBG_TYPE_WARN, - " CM_REQ retry %d %p [lid, port, qpn]:" - " %x %x %x -> %x %x %x Time(ms) %llu > %llu\n", - cm, cm->retries, ntohs(cm->msg.saddr.ib.lid), + " CM_REQ retry %p %d [lid, port, qpn]:" + " %x %x %x -> %x %x %x Time(ms) %llu > %d\n", + cm, cm->retries+1, ntohs(cm->msg.saddr.ib.lid), ntohs(cm->msg.sport), ntohl(cm->msg.saddr.ib.qpn), ntohs(cm->msg.daddr.ib.lid), ntohs(cm->msg.dport), ntohl(cm->msg.dqpn), (time - cm->timer)/1000, @@ -184,8 +184,8 @@ static void ucm_check_timers(dp_ib_cm_handle_t cm, int *timer) (cm->hca->ib_trans.rtu_time << cm->retries)) { dapl_log(DAPL_DBG_TYPE_WARN, " CM_REPLY retry %d [lid, port, qpn]:" - " %x %x %x -> %x %x %x r_pid %x (%x) Time(ms) %llu > %llu\n", - cm->retries, + " %x %x %x -> %x %x %x r_pid %x (%x) Time(ms) %llu > %d\n", + cm->retries+1, ntohs(cm->msg.saddr.ib.lid), ntohs(cm->msg.sport), ntohl(cm->msg.saddr.ib.qpn), @@ -194,7 +194,8 @@ static void ucm_check_timers(dp_ib_cm_handle_t cm, int *timer) ntohl(cm->msg.daddr.ib.qpn), ntohl(*(DAT_UINT32*)cm->msg.resv), ntohl(*(DAT_UINT32*)cm->msg.resv), - (time - cm->timer)/1000, cm->hca->ib_trans.rtu_time << cm->retries); + (time - cm->timer)/1000, + cm->hca->ib_trans.rtu_time << cm->retries); cm->retries++; dapl_os_unlock(&cm->lock); ucm_reply(cm); @@ -208,8 +209,8 @@ static void ucm_check_timers(dp_ib_cm_handle_t cm, int *timer) (cm->hca->ib_trans.rtu_time << cm->retries)) { dapl_log(DAPL_DBG_TYPE_WARN, " CM_DREQ retry %d [lid, port, qpn]:" - " %x %x %x -> %x %x %x r_pid %x (%x) Time(ms) %llu > %llu\n", - cm->retries, + " %x %x %x -> %x %x %x r_pid %x (%x) Time(ms) %llu > %d\n", + cm->retries+1, ntohs(cm->msg.saddr.ib.lid), ntohs(cm->msg.sport), ntohl(cm->msg.saddr.ib.qpn), @@ -218,7 +219,8 @@ static void ucm_check_timers(dp_ib_cm_handle_t cm, int *timer) ntohl(cm->msg.dqpn), ntohl(*(DAT_UINT32*)cm->msg.resv), ntohl(*(DAT_UINT32*)cm->msg.resv), - (time - cm->timer)/1000, cm->hca->ib_trans.rtu_time << cm->retries); + (time - cm->timer)/1000, + cm->hca->ib_trans.rtu_time << cm->retries); cm->retries++; dapl_os_unlock(&cm->lock); dapli_cm_disconnect(cm);