From patchwork Tue Jun 15 19:53:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Schutt X-Patchwork-Id: 106322 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5FJrgMp028443 for ; Tue, 15 Jun 2010 19:53:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757090Ab0FOTxv (ORCPT ); Tue, 15 Jun 2010 15:53:51 -0400 Received: from sentry-three.sandia.gov ([132.175.109.17]:52852 "EHLO sentry-three.sandia.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756006Ab0FOTxu (ORCPT ); Tue, 15 Jun 2010 15:53:50 -0400 X-WSS-ID: 0L42N9H-0C-6YP-02 X-M-MSG: Received: from sentry.sandia.gov (mm04snlnto.sandia.gov [132.175.109.21]) by sentry-three.sandia.gov (Postfix) with ESMTP id 120EA4D887C; Tue, 15 Jun 2010 13:53:41 -0600 (MDT) Received: from [132.175.109.1] by sentry.sandia.gov with ESMTP (SMTP Relay 01 (Email Firewall v6.3.2)); Tue, 15 Jun 2010 13:53:39 -0600 X-Server-Uuid: AF72F651-81B1-4134-BA8C-A8E1A4E620FF Received: from localhost.localdomain (sale659.sandia.gov [134.253.4.20]) by mailgate.sandia.gov (8.14.4/8.14.4) with ESMTP id o5FJrIBR028244; Tue, 15 Jun 2010 13:53:31 -0600 From: "Jim Schutt" To: linux-rdma@vger.kernel.org cc: sashak@voltaire.com, "Jim Schutt" Subject: [PATCH v3 13/17] opensm: Do not require -Q option for torus-2QoS routing engine. Date: Tue, 15 Jun 2010 13:53:20 -0600 Message-ID: <1276631604-29230-14-git-send-email-jaschut@sandia.gov> X-Mailer: git-send-email 1.6.2.2 In-Reply-To: <1276631604-29230-1-git-send-email-jaschut@sandia.gov> References: <1276631604-29230-1-git-send-email-jaschut@sandia.gov> X-PMX-Version: 5.5.9.395186, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2010.6.15.194814 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, TO_NO_NAME 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __MIME_TEXT_ONLY 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __URI_NO_PATH 0, __URI_NO_WWW 0, __URI_NS ' X-TMWD-Spam-Summary: TS=20100615195340; ID=1; SEV=2.3.1; DFV=B2010061519; IFV=NA; AIF=B2010061519; RPD=5.03.0010; ENG=NA; RPDID=7374723D303030312E30413031303230362E34433137444134342E303138323A534346535441543838363133332C73733D312C6667733D30; CAT=NONE; CON=NONE; SIG=AAAAAAAAAAAAAAAAAAAAAAAAfQ== X-MMS-Spam-Filter-ID: B2010061519_5.03.0010 MIME-Version: 1.0 X-WSS-ID: 600905C92GW1265986-01-01 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]); Tue, 15 Jun 2010 19:53:52 +0000 (UTC) diff --git a/opensm/opensm/osm_qos.c b/opensm/opensm/osm_qos.c index dadef29..6d2af55 100644 --- a/opensm/opensm/osm_qos.c +++ b/opensm/opensm/osm_qos.c @@ -290,7 +290,9 @@ int osm_qos_setup(osm_opensm_t * p_osm) osm_node_t *p_node; int ret = 0; - if (!p_osm->subn.opt.qos) + if (!(p_osm->subn.opt.qos || + (p_osm->routing_engine_used && + p_osm->routing_engine_used->update_sl2vl))) return 0; OSM_LOG_ENTER(&p_osm->log); @@ -307,7 +309,8 @@ int osm_qos_setup(osm_opensm_t * p_osm) cl_plock_excl_acquire(&p_osm->lock); /* read QoS policy config file */ - osm_qos_parse_policy_file(&p_osm->subn); + if (p_osm->subn.opt.qos) + osm_qos_parse_policy_file(&p_osm->subn); p_tbl = &p_osm->subn.port_guid_tbl; p_next = cl_qmap_head(p_tbl); diff --git a/opensm/opensm/osm_subnet.c b/opensm/opensm/osm_subnet.c index bc34a0f..f714af7 100644 --- a/opensm/opensm/osm_subnet.c +++ b/opensm/opensm/osm_subnet.c @@ -1051,6 +1051,8 @@ static void subn_verify_qos_set(osm_qos_options_t *set, const char *prefix, int osm_subn_verify_config(IN osm_subn_opt_t * p_opts) { + osm_qos_options_t dflt; + if (p_opts->lmc > 7) { log_report(" Invalid Cached Option Value:lmc = %u:" "Using Default:%u\n", p_opts->lmc, OSM_DEFAULT_LMC); @@ -1101,17 +1103,15 @@ int osm_subn_verify_config(IN osm_subn_opt_t * p_opts) p_opts->console = OSM_DEFAULT_CONSOLE; } - if (p_opts->qos) { - osm_qos_options_t dflt; - - /* the default options in qos_options must be correct. - * every other one need not be, b/c those will default - * back to whatever is in qos_options. - */ - subn_set_default_qos_options(&dflt); + /* the default options in qos_options must be correct. + * every other one need not be, b/c those will default + * back to whatever is in qos_options. + */ + subn_set_default_qos_options(&dflt); + subn_verify_qos_set(&p_opts->qos_options, "qos", &dflt); - subn_verify_qos_set(&p_opts->qos_options, "qos", &dflt); + if (p_opts->qos) { subn_verify_qos_set(&p_opts->qos_ca_options, "qos_ca", &p_opts->qos_options); subn_verify_qos_set(&p_opts->qos_sw0_options, "qos_sw0",