From patchwork Fri Nov 27 13:16:56 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: 63330 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 nARDFOqm004007 for ; Fri, 27 Nov 2009 13:17:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751768AbZK0NRL (ORCPT ); Fri, 27 Nov 2009 08:17:11 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752176AbZK0NRL (ORCPT ); Fri, 27 Nov 2009 08:17:11 -0500 Received: from gmp-eb-inf-1.sun.com ([192.18.6.21]:48167 "EHLO gmp-eb-inf-1.sun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751768AbZK0NRK (ORCPT ); Fri, 27 Nov 2009 08:17:10 -0500 Received: from fe-emea-10.sun.com (gmp-eb-lb-1-fe1.eu.sun.com [192.18.6.7] (may be forged)) by gmp-eb-inf-1.sun.com (8.13.7+Sun/8.12.9) with ESMTP id nARDHGWX018351 for ; Fri, 27 Nov 2009 13:17:16 GMT MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; CHARSET=US-ASCII Received: from conversion-daemon.fe-emea-10.sun.com by fe-emea-10.sun.com (Sun Java(tm) System Messaging Server 7u2-7.04 64bit (built Jul 2 2009)) id <0KTR00600QFWOO00@fe-emea-10.sun.com> for linux-rdma@vger.kernel.org; Fri, 27 Nov 2009 13:16:59 +0000 (GMT) Received: from [129.159.138.141] ([unknown] [129.159.138.141]) by fe-emea-10.sun.com (Sun Java(tm) System Messaging Server 7u2-7.04 64bit (built Jul 2 2009)) with ESMTPSA id <0KTR0088ZRK8FYC0@fe-emea-10.sun.com>; Fri, 27 Nov 2009 13:16:57 +0000 (GMT) Date: Fri, 27 Nov 2009 14:16:56 +0100 From: Line Holen Subject: [PATCH] opensm/osm_ucast_ftree.c Changed log level To: sashak@voltaire.com Cc: linux-rdma@vger.kernel.org Message-id: <4B0FD148.2000604@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/opensm/osm_ucast_ftree.c b/opensm/opensm/osm_ucast_ftree.c index 76b1d6a..e1effd0 100644 --- a/opensm/opensm/osm_ucast_ftree.c +++ b/opensm/opensm/osm_ucast_ftree.c @@ -3586,7 +3586,7 @@ static int fabric_rank(IN ftree_fabric_t * p_ftree) if (res) goto Exit; - OSM_LOG(&p_ftree->p_osm->log, OSM_LOG_INFO, + OSM_LOG(&p_ftree->p_osm->log, OSM_LOG_VERBOSE, "FatTree max switch rank is %u\n", p_ftree->max_switch_rank); Exit: @@ -3644,7 +3644,7 @@ static void fabric_set_leaf_rank(IN ftree_fabric_t * p_ftree) p_ftree->leaf_switch_rank = p_sw->rank; } - OSM_LOG(&p_ftree->p_osm->log, OSM_LOG_INFO, + OSM_LOG(&p_ftree->p_osm->log, OSM_LOG_VERBOSE, "FatTree leaf switch rank is %u\n", p_ftree->leaf_switch_rank); OSM_LOG_EXIT(&p_ftree->p_osm->log); } /* fabric_set_leaf_rank() */ @@ -3772,7 +3772,7 @@ static int construct_fabric(IN void *context) fabric_clear(p_ftree); if (p_ftree->p_osm->subn.opt.lmc > 0) { - osm_log(&p_ftree->p_osm->log, OSM_LOG_SYS, + osm_log(&p_ftree->p_osm->log, OSM_LOG_INFO, "LMC > 0 is not supported by fat-tree routing.\n" "Falling back to default routing\n"); status = -1; @@ -3780,7 +3780,7 @@ static int construct_fabric(IN void *context) } if (cl_qmap_count(&p_ftree->p_osm->subn.sw_guid_tbl) < 2) { - osm_log(&p_ftree->p_osm->log, OSM_LOG_SYS, + osm_log(&p_ftree->p_osm->log, OSM_LOG_INFO, "Fabric has %u switches - topology is not fat-tree.\n" "Falling back to default routing\n", cl_qmap_count(&p_ftree->p_osm->subn.sw_guid_tbl)); @@ -3790,7 +3790,7 @@ static int construct_fabric(IN void *context) if ((cl_qmap_count(&p_ftree->p_osm->subn.node_guid_tbl) - cl_qmap_count(&p_ftree->p_osm->subn.sw_guid_tbl)) < 2) { - osm_log(&p_ftree->p_osm->log, OSM_LOG_SYS, + osm_log(&p_ftree->p_osm->log, OSM_LOG_INFO, "Fabric has %u nodes (%u switches) - topology is not fat-tree.\n" "Falling back to default routing\n", cl_qmap_count(&p_ftree->p_osm->subn.node_guid_tbl), @@ -3807,7 +3807,7 @@ static int construct_fabric(IN void *context) OSM_LOG(&p_ftree->p_osm->log, OSM_LOG_VERBOSE, "Populating FatTree Switch and CA tables\n"); if (fabric_populate_nodes(p_ftree) != 0) { - osm_log(&p_ftree->p_osm->log, OSM_LOG_SYS, + osm_log(&p_ftree->p_osm->log, OSM_LOG_INFO, "Fabric topology is not fat-tree - " "falling back to default routing\n"); status = -1; @@ -3817,7 +3817,7 @@ static int construct_fabric(IN void *context) OSM_LOG(&p_ftree->p_osm->log, OSM_LOG_VERBOSE, "Reading guid files provided by user\n"); if (fabric_read_guid_files(p_ftree) != 0) { - osm_log(&p_ftree->p_osm->log, OSM_LOG_SYS, + osm_log(&p_ftree->p_osm->log, OSM_LOG_INFO, "Failed reading guid files - " "falling back to default routing\n"); status = -1; @@ -3825,8 +3825,8 @@ static int construct_fabric(IN void *context) } if (cl_qmap_count(&p_ftree->hca_tbl) < 2) { - osm_log(&p_ftree->p_osm->log, OSM_LOG_SYS, - "Fabric has %u CAa - topology is not fat-tree.\n" + osm_log(&p_ftree->p_osm->log, OSM_LOG_INFO, + "Fabric has %u CAs - topology is not fat-tree.\n" "Falling back to default routing\n", cl_qmap_count(&p_ftree->hca_tbl)); status = -1; @@ -3839,7 +3839,7 @@ static int construct_fabric(IN void *context) whole tree rank after filling ports and marking CNs. */ OSM_LOG(&p_ftree->p_osm->log, OSM_LOG_VERBOSE, "Ranking FatTree\n"); if (fabric_rank(p_ftree) != 0) { - osm_log(&p_ftree->p_osm->log, OSM_LOG_SYS, + osm_log(&p_ftree->p_osm->log, OSM_LOG_INFO, "Failed ranking the tree\n"); status = -1; goto Exit; @@ -3853,12 +3853,12 @@ static int construct_fabric(IN void *context) OSM_LOG(&p_ftree->p_osm->log, OSM_LOG_VERBOSE, "Populating CA & switch ports\n"); if (fabric_populate_ports(p_ftree) != 0) { - osm_log(&p_ftree->p_osm->log, OSM_LOG_SYS, + osm_log(&p_ftree->p_osm->log, OSM_LOG_INFO, "Fabric topology is not a fat-tree\n"); status = -1; goto Exit; } else if (p_ftree->cn_num == 0) { - osm_log(&p_ftree->p_osm->log, OSM_LOG_SYS, + osm_log(&p_ftree->p_osm->log, OSM_LOG_INFO, "Fabric has no valid compute nodes\n"); status = -1; goto Exit; @@ -3870,7 +3870,7 @@ static int construct_fabric(IN void *context) if (fabric_get_rank(p_ftree) > FAT_TREE_MAX_RANK || fabric_get_rank(p_ftree) < FAT_TREE_MIN_RANK) { - osm_log(&p_ftree->p_osm->log, OSM_LOG_SYS, + osm_log(&p_ftree->p_osm->log, OSM_LOG_INFO, "Fabric rank is %u (should be between %u and %u)\n", fabric_get_rank(p_ftree), FAT_TREE_MIN_RANK, FAT_TREE_MAX_RANK); @@ -3883,7 +3883,7 @@ static int construct_fabric(IN void *context) As a by-product, this function also runs basic topology validation - it checks that all the CNs are at the same rank. */ if (fabric_mark_leaf_switches(p_ftree)) { - osm_log(&p_ftree->p_osm->log, OSM_LOG_SYS, + osm_log(&p_ftree->p_osm->log, OSM_LOG_INFO, "Fabric topology is not a fat-tree\n"); status = -1; goto Exit; @@ -3901,7 +3901,7 @@ static int construct_fabric(IN void *context) switches at the same leaf rank w/o CNs, if this is the order of indexing. In any case, the first and the last switches in the array are REAL leafs. */ if (fabric_create_leaf_switch_array(p_ftree)) { - osm_log(&p_ftree->p_osm->log, OSM_LOG_SYS, + osm_log(&p_ftree->p_osm->log, OSM_LOG_INFO, "Fabric topology is not a fat-tree\n"); status = -1; goto Exit; @@ -3921,7 +3921,7 @@ static int construct_fabric(IN void *context) guid file hasn't been provided by user */ if (!fabric_roots_provided(p_ftree) && !fabric_validate_topology(p_ftree)) { - osm_log(&p_ftree->p_osm->log, OSM_LOG_SYS, + osm_log(&p_ftree->p_osm->log, OSM_LOG_INFO, "Fabric topology is not a fat-tree\n"); status = -1; goto Exit;