From patchwork Sun Dec 6 14:52:08 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yevgeny Kliteynik X-Patchwork-Id: 65162 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 nB6EjsSI009203 for ; Sun, 6 Dec 2009 14:45:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756906AbZLFOpr (ORCPT ); Sun, 6 Dec 2009 09:45:47 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756916AbZLFOpr (ORCPT ); Sun, 6 Dec 2009 09:45:47 -0500 Received: from mail.mellanox.co.il ([194.90.237.43]:43554 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756906AbZLFOpq (ORCPT ); Sun, 6 Dec 2009 09:45:46 -0500 Received: from Internal Mail-Server by MTLPINE1 (envelope-from kliteyn@dev.mellanox.co.il) with SMTP; 6 Dec 2009 16:53:12 +0200 Received: from [10.4.1.29] ([10.4.1.29]) by mtlexch01.mtl.com with Microsoft SMTPSVC(6.0.3790.3959); Sun, 6 Dec 2009 16:44:28 +0200 Message-ID: <4B1BC518.6090803@dev.mellanox.co.il> Date: Sun, 06 Dec 2009 16:52:08 +0200 From: Yevgeny Kliteynik Reply-To: kliteyn@dev.mellanox.co.il User-Agent: Thunderbird 1.5.0.5 (X11/20060719) MIME-Version: 1.0 To: Sasha Khapyorsky CC: Linux RDMA Subject: [PATCH 2/2 v3] opensm SA DB dump/restore: added option to dump SA DB on every sweep X-OriginalArrivalTime: 06 Dec 2009 14:44:28.0726 (UTC) FILETIME=[9D1D7560:01CA7682] X-TM-AS-Product-Ver: SMEX-8.0.0.1181-6.000.1038-17052.007 X-TM-AS-Result: No--0.423900-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org diff --git a/opensm/include/opensm/osm_subnet.h b/opensm/include/opensm/osm_subnet.h index 3c08689..89807cc 100644 --- a/opensm/include/opensm/osm_subnet.h +++ b/opensm/include/opensm/osm_subnet.h @@ -200,6 +200,7 @@ typedef struct osm_subn_opt { char *ids_guid_file; char *guid_routing_order_file; char *sa_db_file; + boolean_t sa_db_dump; boolean_t do_mesh_analysis; boolean_t exit_on_fatal; boolean_t honor_guid2lid_file; @@ -411,6 +412,10 @@ typedef struct osm_subn_opt { * sa_db_file * Name of the SA database file. * +* sa_db_dump +* When TRUE causes OpenSM to dump SA DB at the end of every +* light sweep regardless the current verbosity level. +* * exit_on_fatal * If TRUE (default) - SM will exit on fatal subnet initialization * issues. diff --git a/opensm/opensm/osm_state_mgr.c b/opensm/opensm/osm_state_mgr.c index 08985d3..57eda7b 100644 --- a/opensm/opensm/osm_state_mgr.c +++ b/opensm/opensm/osm_state_mgr.c @@ -1080,6 +1080,8 @@ static void do_sweep(osm_sm_t * sm) if (wait_for_pending_transactions(&sm->p_subn->p_osm->stats)) return; if (!sm->p_subn->force_heavy_sweep) { + if (sm->p_subn->opt.sa_db_dump) + osm_sa_db_file_dump(sm->p_subn->p_osm); OSM_LOG_MSG_BOX(sm->p_log, OSM_LOG_VERBOSE, "LIGHT SWEEP COMPLETE"); return; @@ -1344,7 +1346,8 @@ repeat_discovery: state_mgr_up_msg(sm); sm->p_subn->first_time_master_sweep = FALSE; - if (osm_log_is_active(sm->p_log, OSM_LOG_VERBOSE)) + if (osm_log_is_active(sm->p_log, OSM_LOG_VERBOSE) || + sm->p_subn->opt.sa_db_dump) osm_sa_db_file_dump(sm->p_subn->p_osm); } diff --git a/opensm/opensm/osm_subnet.c b/opensm/opensm/osm_subnet.c index 09029db..032ef38 100644 --- a/opensm/opensm/osm_subnet.c +++ b/opensm/opensm/osm_subnet.c @@ -348,6 +348,7 @@ static const opt_rec_t opt_tbl[] = { { "ids_guid_file", OPT_OFFSET(ids_guid_file), opts_parse_charp, NULL, 0 }, { "guid_routing_order_file", OPT_OFFSET(guid_routing_order_file), opts_parse_charp, NULL, 0 }, { "sa_db_file", OPT_OFFSET(sa_db_file), opts_parse_charp, NULL, 0 }, + { "sa_db_dump", OPT_OFFSET(sa_db_dump), opts_parse_boolean, NULL, 1 }, { "do_mesh_analysis", OPT_OFFSET(do_mesh_analysis), opts_parse_boolean, NULL, 1 }, { "exit_on_fatal", OPT_OFFSET(exit_on_fatal), opts_parse_boolean, NULL, 1 }, { "honor_guid2lid_file", OPT_OFFSET(honor_guid2lid_file), opts_parse_boolean, NULL, 1 }, @@ -752,6 +753,7 @@ void osm_subn_set_default_opt(IN osm_subn_opt_t * p_opt) p_opt->ids_guid_file = NULL; p_opt->guid_routing_order_file = NULL; p_opt->sa_db_file = NULL; + p_opt->sa_db_dump = FALSE; p_opt->do_mesh_analysis = FALSE; p_opt->exit_on_fatal = TRUE; p_opt->enable_quirks = FALSE; @@ -1452,6 +1454,12 @@ int osm_subn_output_conf(FILE *out, IN osm_subn_opt_t * p_opts) p_opts->sa_db_file ? p_opts->sa_db_file : null_str); fprintf(out, + "# If TRUE causes OpenSM to dump SA database at the end of\n" + "# every light sweep, regardless of the verbosity level\n" + "sa_db_dump %s\n\n", + p_opts->sa_db_dump ? "TRUE" : "FALSE"); + + fprintf(out, "#\n# HANDOVER - MULTIPLE SMs OPTIONS\n#\n" "# SM priority used for deciding who is the master\n" "# Range goes from 0 (lowest priority) to 15 (highest).\n"