From patchwork Fri Sep 3 16:43:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Schutt X-Patchwork-Id: 154541 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o83Ghm0X023398 for ; Fri, 3 Sep 2010 16:43:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756334Ab0ICQnj (ORCPT ); Fri, 3 Sep 2010 12:43:39 -0400 Received: from sentry-three.sandia.gov ([132.175.109.17]:46254 "EHLO sentry-three.sandia.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756317Ab0ICQng (ORCPT ); Fri, 3 Sep 2010 12:43:36 -0400 X-WSS-ID: 0L86JSK-0C-40A-02 X-M-MSG: Received: from sentry.sandia.gov (sentry.sandia.gov [132.175.109.20]) by sentry-three.sandia.gov (Postfix) with ESMTP id 171E7529C0E; Fri, 3 Sep 2010 10:43:32 -0600 (MDT) Received: from [132.175.109.1] by sentry.sandia.gov with ESMTP (SMTP Relay 01 (Email Firewall v6.3.2)); Fri, 03 Sep 2010 10:43:29 -0600 X-Server-Uuid: 6BFC7783-7E22-49B4-B610-66D6BE496C0E Received: from localhost.localdomain (sale659.sandia.gov [134.253.4.20]) by mailgate.sandia.gov (8.14.4/8.14.4) with ESMTP id o83Gh6ah008533; Fri, 3 Sep 2010 10:43:20 -0600 From: "Jim Schutt" To: linux-rdma@vger.kernel.org cc: sashak@voltaire.com, "Jim Schutt" Subject: [PATCH v4 13/18] opensm: Add opensm option to specify file name for extra torus-2QoS configuration information. Date: Fri, 3 Sep 2010 10:43:09 -0600 Message-ID: <1283532194-27112-14-git-send-email-jaschut@sandia.gov> X-Mailer: git-send-email 1.6.2.2 In-Reply-To: <1283532194-27112-1-git-send-email-jaschut@sandia.gov> References: <1283532194-27112-1-git-send-email-jaschut@sandia.gov> X-PMX-Version: 5.6.0.2009776, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2010.9.3.163016 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' BODY_SIZE_4000_4999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __MIME_TEXT_ONLY 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_PATH 0, __URI_NO_WWW 0, __URI_NS ' X-TMWD-Spam-Summary: TS=20100903164331; ID=1; SEV=2.3.1; DFV=B2010090317; IFV=NA; AIF=B2010090317; RPD=5.03.0010; ENG=NA; RPDID=7374723D303030312E30413031303230382E34433831323542322E303042333A534346535441543838363133332C73733D312C6667733D30; CAT=NONE; CON=NONE; SIG=AAAAAAAAAAAAAAAAAAAAAAAAfQ== X-MMS-Spam-Filter-ID: B2010090317_5.03.0010 MIME-Version: 1.0 X-WSS-ID: 609FFA3B2JS1816523-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 (demeter1.kernel.org [140.211.167.41]); Fri, 03 Sep 2010 16:43:53 +0000 (UTC) diff --git a/opensm/include/opensm/osm_base.h b/opensm/include/opensm/osm_base.h index e0d6c66..fa4c78d 100644 --- a/opensm/include/opensm/osm_base.h +++ b/opensm/include/opensm/osm_base.h @@ -271,6 +271,24 @@ BEGIN_C_DECLS #endif /***********/ +/****d* OpenSM: Base/OSM_DEFAULT_TORUS_CONF_FILE +* NAME +* OSM_DEFAULT_TORUS_CONF_FILE +* +* DESCRIPTION +* Specifies the default file name for extra torus-2QoS configuration +* +* SYNOPSIS +*/ +#ifdef __WIN__ +#define OSM_DEFAULT_TORUS_CONF_FILE strcat(GetOsmCachePath(), "osm-torus-2QoS.conf") +#elif defined(OPENSM_CONFIG_DIR) +#define OSM_DEFAULT_TORUS_CONF_FILE OPENSM_CONFIG_DIR "/torus-2QoS.conf" +#else +#define OSM_DEFAULT_TORUS_CONF_FILE "/etc/opensm/torus-2QoS.conf" +#endif /* __WIN__ */ +/***********/ + /****d* OpenSM: Base/OSM_DEFAULT_PREFIX_ROUTES_FILE * NAME * OSM_DEFAULT_PREFIX_ROUTES_FILE diff --git a/opensm/include/opensm/osm_subnet.h b/opensm/include/opensm/osm_subnet.h index 4fa0161..fa3e46e 100644 --- a/opensm/include/opensm/osm_subnet.h +++ b/opensm/include/opensm/osm_subnet.h @@ -204,6 +204,7 @@ typedef struct osm_subn_opt { char *guid_routing_order_file; char *sa_db_file; boolean_t sa_db_dump; + char *torus_conf_file; boolean_t do_mesh_analysis; boolean_t exit_on_fatal; boolean_t honor_guid2lid_file; @@ -431,6 +432,10 @@ typedef struct osm_subn_opt { * When TRUE causes OpenSM to dump SA DB at the end of every * light sweep regardless the current verbosity level. * +* torus_conf_file +* Name of the file with extra configuration info for torus-2QoS +* routing engine. +* * exit_on_fatal * If TRUE (default) - SM will exit on fatal subnet initialization * issues. diff --git a/opensm/opensm/main.c b/opensm/opensm/main.c index 3a6d565..e74dc46 100644 --- a/opensm/opensm/main.c +++ b/opensm/opensm/main.c @@ -231,6 +231,10 @@ static void show_usage(void) " Set the order port guids will be routed for the MinHop\n" " and Up/Down routing algorithms to the guids provided in the\n" " given file (one to a line)\n\n"); + printf("--torus_config \n" + " This option defines the file name for the extra configuration\n" + " info needed for the torus-2QoS routing engine. The default\n" + " name is \'"OSM_DEFAULT_TORUS_CONF_FILE"\'\n\n"); printf("--once, -o\n" " This option causes OpenSM to configure the subnet\n" " once, then exit. Ports remain in the ACTIVE state.\n\n"); @@ -615,6 +619,7 @@ int main(int argc, char *argv[]) {"sm_sl", 1, NULL, 7}, {"retries", 1, NULL, 8}, {"log_prefix", 1, NULL, 9}, + {"torus_config", 1, NULL, 10}, {NULL, 0, NULL, 0} /* Required at the end of the array */ }; @@ -1006,6 +1011,10 @@ int main(int argc, char *argv[]) SET_STR_OPT(opt.log_prefix, optarg); printf("Log prefix = %s\n", opt.log_prefix); break; + case 10: + SET_STR_OPT(opt.torus_conf_file, optarg); + printf("Torus-2QoS config file = %s\n", opt.torus_conf_file); + break; case 'h': case '?': case ':': diff --git a/opensm/opensm/osm_subnet.c b/opensm/opensm/osm_subnet.c index 8224b5f..bc34a0f 100644 --- a/opensm/opensm/osm_subnet.c +++ b/opensm/opensm/osm_subnet.c @@ -753,6 +753,7 @@ void osm_subn_set_default_opt(IN osm_subn_opt_t * p_opt) p_opt->guid_routing_order_file = NULL; p_opt->sa_db_file = NULL; p_opt->sa_db_dump = FALSE; + p_opt->torus_conf_file = strdup(OSM_DEFAULT_TORUS_CONF_FILE); p_opt->do_mesh_analysis = FALSE; p_opt->exit_on_fatal = TRUE; p_opt->enable_quirks = FALSE; diff --git a/opensm/opensm/osm_torus.c b/opensm/opensm/osm_torus.c index 41eb187..0b7741d 100644 --- a/opensm/opensm/osm_torus.c +++ b/opensm/opensm/osm_torus.c @@ -9037,7 +9037,7 @@ int torus_build_lfts(void *context) torus->osm = ctx->osm; fabric->osm = ctx->osm; - if (!parse_config(OPENSM_CONFIG_DIR "/opensm-torus.conf", + if (!parse_config(ctx->osm->subn.opt.torus_conf_file, fabric, torus)) goto out;