From patchwork Fri Dec 4 09:41:50 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Line.Holen@Sun.COM X-Patchwork-Id: 64836 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nB49gUke032751 for ; Fri, 4 Dec 2009 09:42:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752528AbZLDJmW (ORCPT ); Fri, 4 Dec 2009 04:42:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752869AbZLDJmW (ORCPT ); Fri, 4 Dec 2009 04:42:22 -0500 Received: from gmp-eb-inf-2.sun.com ([192.18.6.24]:62436 "EHLO gmp-eb-inf-2.sun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752528AbZLDJmV (ORCPT ); Fri, 4 Dec 2009 04:42:21 -0500 Received: from fe-emea-09.sun.com (gmp-eb-lb-1-fe1.eu.sun.com [192.18.6.7] (may be forged)) by gmp-eb-inf-2.sun.com (8.13.7+Sun/8.12.9) with ESMTP id nB49gNqY024263 for ; Fri, 4 Dec 2009 09:42:23 GMT MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; CHARSET=US-ASCII Received: from conversion-daemon.fe-emea-09.sun.com by fe-emea-09.sun.com (Sun Java(tm) System Messaging Server 7u2-7.04 64bit (built Jul 2 2009)) id <0KU400400FVKH300@fe-emea-09.sun.com> for linux-rdma@vger.kernel.org; Fri, 04 Dec 2009 09:42:04 +0000 (GMT) Received: from [129.159.138.141] ([unknown] [129.159.138.141]) by fe-emea-09.sun.com (Sun Java(tm) System Messaging Server 7u2-7.04 64bit (built Jul 2 2009)) with ESMTPSA id <0KU4003YUG9QUT80@fe-emea-09.sun.com>; Fri, 04 Dec 2009 09:41:51 +0000 (GMT) Date: Fri, 04 Dec 2009 10:41:50 +0100 From: Line Holen Subject: [PATCH] opensm/osm_vendor_ibumad.c: Move error info into single message To: sashak@voltaire.com Cc: linux-rdma@vger.kernel.org Message-id: <4B18D95E.1090007@Sun.COM> User-Agent: Thunderbird 2.0.0.23 (X11/20090910) Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org diff --git a/opensm/libvendor/osm_vendor_ibumad.c b/opensm/libvendor/osm_vendor_ibumad.c index 8f9bbf5..b4319cd 100644 --- a/opensm/libvendor/osm_vendor_ibumad.c +++ b/opensm/libvendor/osm_vendor_ibumad.c @@ -3,6 +3,7 @@ * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. * Copyright (c) 2009 HNR Consulting. All rights reserved. + * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -325,28 +326,30 @@ static void *umad_receiver(void *p_ptr) /* if status != 0 then we are handling recv timeout on send */ if (umad_status(p_madw->vend_wrap.umad)) { - OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5409: " - "send completed with error" - " (method=0x%X attr=0x%X trans_id=0x%" PRIx64 - ") -- dropping\n", - mad->method, cl_ntoh16(mad->attr_id), - cl_ntoh64(mad->trans_id)); + if (mad->mgmt_class != IB_MCLASS_SUBN_DIR) { /* LID routed */ - OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, - "ERR 5410: class 0x%x LID %u\n", - mad->mgmt_class, + OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5410: " + "Send completed with error -- dropping\n" + "\t\t\tClass 0x%x, Method 0x%X, Attr 0x%X, " + "TID 0x%" PRIx64 ", LID %u\n", + mad->mgmt_class, mad->method, + cl_ntoh16(mad->attr_id), + cl_ntoh64(mad->trans_id), cl_ntoh16(ib_mad_addr->lid)); } else { ib_smp_t *smp; /* Direct routed SMP */ smp = (ib_smp_t *) mad; - OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, - "ERR 5411: DR SMP Hop Ptr: 0x%X\n", - smp->hop_ptr); + OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5411: " + "DR SMP Send completed with error -- dropping\n" + "\t\t\tMethod 0x%X, Attr 0x%X, TID 0x%" PRIx64 + ", Hop Ptr: 0x%X\n", + mad->method, cl_ntoh16(mad->attr_id), + cl_ntoh64(mad->trans_id), smp->hop_ptr); osm_dump_smp_dr_path(p_vend->p_log, smp, - OSM_LOG_ERROR); + OSM_LOG_VERBOSE); } if (!(p_req_madw = get_madw(p_vend, &mad->trans_id))) {