From patchwork Tue Nov 4 17:46:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 5230371 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 85D21C11AC for ; Tue, 4 Nov 2014 17:47:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6E4FB2015E for ; Tue, 4 Nov 2014 17:47:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D4CB2012B for ; Tue, 4 Nov 2014 17:47:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751901AbaKDRrA (ORCPT ); Tue, 4 Nov 2014 12:47:00 -0500 Received: from mail-wi0-f175.google.com ([209.85.212.175]:60718 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751502AbaKDRq7 (ORCPT ); Tue, 4 Nov 2014 12:46:59 -0500 Received: by mail-wi0-f175.google.com with SMTP id ex7so10145243wid.14 for ; Tue, 04 Nov 2014 09:46:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:content-type:content-transfer-encoding; bh=emkqlyNTU3pouKlaTX8sFZp0TJbVFHMz82KsINknIoA=; b=lFzFD74Do7Zi0oHwrY3aH0K4bg7Ic332NgerJV6J6UgsDWeFe0cZGWcTWunaZS5scS vSfM/GHAIwQPJFFCESp052D5PpZiWAh7q0Jw3xep3G5DKyKhbQl5hoeYJ18nBo4+HTMi 6TQ0rAob89soyQv7FXQX/n08rjOYCaZAM/gT4VjQ4zMTpS67xvmJw2IFylZagIlc42Hj WcBu8r+kukq+XXZNbK7U0dnC+rWcco2F1645IMzwoAfUGfDB6YsPhx7Cs9aIJHGGzc2h zaaKmirfSR/X4iDgRFa/Ke1OBnjbOf/q+lCN51ih/Q+/yDRjN/fNZ/Sc2G48vFsIu1Or LPqA== X-Gm-Message-State: ALoCoQk4RV7LBpezdWUtkKTA1orV+Jy2CScNX4Ord5mniihL3WA57ZmP2+78PZ13DlNxlHN8Luk4 X-Received: by 10.194.60.109 with SMTP id g13mr13435692wjr.109.1415123218692; Tue, 04 Nov 2014 09:46:58 -0800 (PST) Received: from [192.168.1.102] (c-98-229-118-119.hsd1.ma.comcast.net. [98.229.118.119]) by mx.google.com with ESMTPSA id s2sm1809026wia.3.2014.11.04.09.46.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Nov 2014 09:46:57 -0800 (PST) Message-ID: <5459110F.70009@dev.mellanox.co.il> Date: Tue, 04 Nov 2014 12:46:55 -0500 From: Hal Rosenstock User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:9.0) Gecko/20111222 Thunderbird/9.0.1 MIME-Version: 1.0 To: "linux-rdma (linux-rdma@vger.kernel.org)" CC: Daniel Klein , Vladimir Koushnir Subject: [PATCH opensm] osm_mcast_mgr.c: Add MLID to error 0A06 log message 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.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 From: Daniel Klein Add MLID to error 0A06 log message in the function mcast_mgr_purge_list Signed-off-by: Daniel Klein Signed-off-by: Hal Rosenstock --- opensm/osm_mcast_mgr.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/opensm/osm_mcast_mgr.c b/opensm/osm_mcast_mgr.c index fe73695..8ed2d8f 100644 --- a/opensm/osm_mcast_mgr.c +++ b/opensm/osm_mcast_mgr.c @@ -462,7 +462,7 @@ static void mcast_mgr_subdivide(osm_sm_t * sm, uint16_t mlid_ho, OSM_LOG_EXIT(sm->p_log); } -static void mcast_mgr_purge_list(osm_sm_t * sm, cl_qlist_t * list) +static void mcast_mgr_purge_list(osm_sm_t * sm, uint16_t mlid, cl_qlist_t * list) { if (OSM_LOG_IS_ACTIVE_V2(sm->p_log, OSM_LOG_ERROR)) { osm_mcast_work_obj_t *wobj; @@ -471,8 +471,8 @@ static void mcast_mgr_purge_list(osm_sm_t * sm, cl_qlist_t * list) i = cl_qlist_next(i)) { wobj = cl_item_obj(i, wobj, list_item); OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 0A06: " - "Unable to route for port 0x%" PRIx64 "\n", - cl_ntoh64(osm_port_get_guid(wobj->p_port))); + "Unable to route MLID 0x%X for port 0x%" PRIx64 "\n", + mlid, cl_ntoh64(osm_port_get_guid(wobj->p_port))); } } osm_mcast_drop_port_list(list); @@ -523,7 +523,7 @@ static osm_mtree_node_t *mcast_mgr_branch(osm_sm_t * sm, uint16_t mlid_ho, OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 0A21: " "Maximal hops number is reached for MLID 0x%x." " Break processing\n", mlid_ho); - mcast_mgr_purge_list(sm, p_list); + mcast_mgr_purge_list(sm, mlid_ho, p_list); goto Exit; } @@ -543,7 +543,7 @@ static osm_mtree_node_t *mcast_mgr_branch(osm_sm_t * sm, uint16_t mlid_ho, /* Deallocate all the work objects on this branch of the tree. */ - mcast_mgr_purge_list(sm, p_list); + mcast_mgr_purge_list(sm, mlid_ho, p_list); goto Exit; } @@ -559,7 +559,7 @@ static osm_mtree_node_t *mcast_mgr_branch(osm_sm_t * sm, uint16_t mlid_ho, /* Deallocate all the work objects on this branch of the tree. */ - mcast_mgr_purge_list(sm, p_list); + mcast_mgr_purge_list(sm, mlid_ho, p_list); goto Exit; } @@ -576,7 +576,7 @@ static osm_mtree_node_t *mcast_mgr_branch(osm_sm_t * sm, uint16_t mlid_ho, if (list_array == NULL) { OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 0A16: " "Unable to allocate list array\n"); - mcast_mgr_purge_list(sm, p_list); + mcast_mgr_purge_list(sm, mlid_ho, p_list); osm_mtree_destroy(p_mtn); p_mtn = NULL; goto Exit; @@ -670,7 +670,7 @@ static osm_mtree_node_t *mcast_mgr_branch(osm_sm_t * sm, uint16_t mlid_ho, mlid_ho, cl_ntoh64(node_guid), i); /* Free memory */ - mcast_mgr_purge_list(sm, p_port_list); + mcast_mgr_purge_list(sm, mlid_ho, p_port_list); /* Invalidate ucast cache */ if (sm->ucast_mgr.p_subn->opt.use_ucast_cache &&