From patchwork Mon Sep 16 14:38:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Line Holen X-Patchwork-Id: 2898011 X-Patchwork-Delegate: hal@mellanox.com Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2971DBFF05 for ; Mon, 16 Sep 2013 14:38:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 709A120212 for ; Mon, 16 Sep 2013 14:38:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A6F252020F for ; Mon, 16 Sep 2013 14:38:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753499Ab3IPOin (ORCPT ); Mon, 16 Sep 2013 10:38:43 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:30844 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753037Ab3IPOim convert rfc822-to-8bit (ORCPT ); Mon, 16 Sep 2013 10:38:42 -0400 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r8GEceGP015521 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 16 Sep 2013 14:38:41 GMT Received: from aserz7021.oracle.com (aserz7021.oracle.com [141.146.126.230]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r8GEccZj000333 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 16 Sep 2013 14:38:39 GMT Received: from abhmt105.oracle.com (abhmt105.oracle.com [141.146.116.57]) by aserz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r8GEccoJ024551; Mon, 16 Sep 2013 14:38:38 GMT MIME-Version: 1.0 Message-ID: Date: Mon, 16 Sep 2013 07:38:38 -0700 (PDT) From: Line Holen To: Hal Cc: Linux-Rdma Subject: [PATCH] osm_state_mgr.c Add info to some error messages X-Mailer: Zimbra on Oracle Beehive Content-Disposition: inline X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Line Holen --- -- 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 --git a/opensm/osm_state_mgr.c b/opensm/osm_state_mgr.c index adfea9a..20f91da 100644 --- a/opensm/osm_state_mgr.c +++ b/opensm/osm_state_mgr.c @@ -4,6 +4,7 @@ * Copyright (c) 2002-2009 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) 2013 Oracle and/or its affiliates. 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 @@ -146,7 +147,8 @@ static void state_mgr_get_sw_info(IN cl_map_item_t * p_object, IN void *context) OSM_MSG_LIGHT_SWEEP_FAIL, &mad_context); if (status != IB_SUCCESS) OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 3304: " - "Request for SwitchInfo failed (%s)\n", + "Request for SwitchInfo from 0x%" PRIx64 " failed (%s)\n", + cl_ntoh64(osm_node_get_node_guid(p_node)), ib_get_err_str(status)); OSM_LOG_EXIT(sm->p_log); @@ -191,8 +193,8 @@ static void state_mgr_get_remote_port_info(IN osm_sm_t * sm, TRUE, 0, CL_DISP_MSGID_NONE, &mad_context); if (status != IB_SUCCESS) OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 332E: " - "Request for PortInfo failed (%s)\n", - ib_get_err_str(status)); + "Request for remote PortInfo from 0x%" PRIx64 " failed (%s)\n", + cl_ntoh64(p_physp->port_guid), ib_get_err_str(status)); Exit: OSM_LOG_EXIT(sm->p_log); @@ -566,7 +568,8 @@ static void state_mgr_update_node_desc(IN cl_map_item_t * obj, IN void *context) if (status != IB_SUCCESS) OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 331B: Failure initiating NodeDescription request " - "(%s)\n", ib_get_err_str(status)); + "(%s) to 0x%016" PRIx64 "\n", ib_get_err_str(status), + cl_ntoh64(osm_node_get_node_guid(p_node))); exit: OSM_LOG_EXIT(sm->p_log); @@ -774,7 +777,7 @@ static osm_remote_sm_t *state_mgr_get_highest_sm(IN osm_sm_t * sm) if (p_highest_sm != NULL) { p_node = osm_get_node_by_guid(sm->p_subn, p_highest_sm->smi.guid); OSM_LOG(sm->p_log, OSM_LOG_DEBUG, - "Found higher SM with guid: %016" PRIx64 " (node %s)\n", + "Found higher priority SM with guid: %016" PRIx64 " (node %s)\n", cl_ntoh64(p_highest_sm->smi.guid), p_node ? p_node->print_desc : "UNKNOWN"); } @@ -848,8 +851,10 @@ static void state_mgr_send_handover(IN osm_sm_t * sm, IN osm_remote_sm_t * p_sm) if (status != IB_SUCCESS) OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 3317: " - "Failure requesting SMInfo (%s)\n", - ib_get_err_str(status)); + "Failure requesting SMInfo (%s), remote SM at 0x%" + PRIx64 "(node %s)\n", + ib_get_err_str(status), cl_ntoh64(p_port->guid), + p_port->p_node ? p_port->p_node->print_desc : "UNKNOWN"); Exit: OSM_LOG_EXIT(sm->p_log);