From patchwork Wed Mar 10 18:06:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Schutt X-Patchwork-Id: 84659 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 o2AI7eZU024931 for ; Wed, 10 Mar 2010 18:07:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932600Ab0CJSHq (ORCPT ); Wed, 10 Mar 2010 13:07:46 -0500 Received: from sentry-three.sandia.gov ([132.175.109.17]:52241 "EHLO sentry-three.sandia.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932624Ab0CJSHl (ORCPT ); Wed, 10 Mar 2010 13:07:41 -0500 X-WSS-ID: 0KZ2VOP-0C-MMO-02 X-M-MSG: Received: from sentry.sandia.gov (sentry.sandia.gov [132.175.109.21]) by sentry-three.sandia.gov (Postfix) with ESMTP id 1E4794D5689; Wed, 10 Mar 2010 11:07:37 -0700 (MST) Received: from [132.175.109.1] by sentry.sandia.gov with ESMTP (SMTP Relay 01 (Email Firewall v6.3.2)); Wed, 10 Mar 2010 11:07:33 -0700 X-Server-Uuid: AF72F651-81B1-4134-BA8C-A8E1A4E620FF Received: from localhost.localdomain (jast01.sandia.gov [134.253.4.112]) by mailgate.sandia.gov (8.14.1/8.14.1) with ESMTP id o2AI7OpP016900; Wed, 10 Mar 2010 11:07:32 -0700 From: "Jim Schutt" To: linux-rdma@vger.kernel.org cc: sashak@voltaire.com, eitan@mellanox.co.il, jaschut@sandia.gov Subject: [PATCH v2 15/15] opensm: Cause status of unicast routing attempt to propogate to callers of osm_ucast_mgr_process(). Date: Wed, 10 Mar 2010 11:06:56 -0700 Message-ID: <1268244416-20351-15-git-send-email-jaschut@sandia.gov> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1268244416-20351-1-git-send-email-jaschut@sandia.gov> References: <1268244416-20351-1-git-send-email-jaschut@sandia.gov> X-PMX-Version: 5.5.9.388399, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2010.3.10.175422 X-PerlMx-Spam: Gauge=IIIIIIII, Probability=8%, Report=' BODY_SIZE_2000_2999 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=20100310180735; ID=1; SEV=2.3.1; DFV=B2010031017; IFV=NA; AIF=B2010031017; RPD=5.03.0010; ENG=NA; RPDID=7374723D303030312E30413031303230392E34423937444645372E303039303A534346535441543838363133332C73733D312C6667733D30; CAT=NONE; CON=NONE; SIG=AAAAAAAAAAAAAAAAAAAAAAAAfQ== X-MMS-Spam-Filter-ID: B2010031017_5.03.0010 MIME-Version: 1.0 X-WSS-ID: 6789006F0JG908666-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]); Wed, 10 Mar 2010 18:07:47 +0000 (UTC) diff --git a/opensm/opensm/osm_state_mgr.c b/opensm/opensm/osm_state_mgr.c index 96ad348..e666034 100644 --- a/opensm/opensm/osm_state_mgr.c +++ b/opensm/opensm/osm_state_mgr.c @@ -1140,7 +1140,11 @@ static void do_sweep(osm_sm_t * sm) /* Re-program the switches fully */ sm->p_subn->ignore_existing_lfts = TRUE; - osm_ucast_mgr_process(&sm->ucast_mgr); + if (osm_ucast_mgr_process(&sm->ucast_mgr)) { + OSM_LOG_MSG_BOX(sm->p_log, OSM_LOG_VERBOSE, + "REROUTE FAILED"); + return; + } osm_qos_setup(sm->p_subn->p_osm); /* Reset flag */ @@ -1299,12 +1303,14 @@ repeat_discovery: "LID ASSIGNMENT COMPLETE - STARTING SWITCH TABLE CONFIG"); /* - * Proceed with unicast forwarding table configuration. + * Proceed with unicast forwarding table configuration; repeat + * if unicast routing fails. */ if (!sm->ucast_mgr.cache_valid || osm_ucast_cache_process(&sm->ucast_mgr)) - osm_ucast_mgr_process(&sm->ucast_mgr); + if (osm_ucast_mgr_process(&sm->ucast_mgr)) + goto repeat_discovery; osm_qos_setup(sm->p_subn->p_osm); diff --git a/opensm/opensm/osm_ucast_mgr.c b/opensm/opensm/osm_ucast_mgr.c index fbc9244..8ea2e52 100644 --- a/opensm/opensm/osm_ucast_mgr.c +++ b/opensm/opensm/osm_ucast_mgr.c @@ -955,6 +955,7 @@ int osm_ucast_mgr_process(IN osm_ucast_mgr_t * p_mgr) osm_opensm_t *p_osm; struct osm_routing_engine *p_routing_eng; cl_qmap_t *p_sw_guid_tbl; + int failed = 0; OSM_LOG_ENTER(p_mgr->p_log); @@ -973,7 +974,8 @@ int osm_ucast_mgr_process(IN osm_ucast_mgr_t * p_mgr) p_osm->routing_engine_used = NULL; while (p_routing_eng) { - if (!ucast_mgr_route(p_routing_eng, p_osm)) + failed = ucast_mgr_route(p_routing_eng, p_osm); + if (!failed) break; p_routing_eng = p_routing_eng->next; } @@ -984,9 +986,11 @@ int osm_ucast_mgr_process(IN osm_ucast_mgr_t * p_mgr) struct osm_routing_engine *r = p_osm->default_routing_engine; r->build_lid_matrices(r->context); - r->ucast_build_fwd_tables(r->context); - p_osm->routing_engine_used = r; - osm_ucast_mgr_set_fwd_tables(p_mgr); + failed = r->ucast_build_fwd_tables(r->context); + if (!failed) { + p_osm->routing_engine_used = r; + osm_ucast_mgr_set_fwd_tables(p_mgr); + } } if (p_osm->routing_engine_used) { @@ -1006,7 +1010,7 @@ int osm_ucast_mgr_process(IN osm_ucast_mgr_t * p_mgr) Exit: CL_PLOCK_RELEASE(p_mgr->p_lock); OSM_LOG_EXIT(p_mgr->p_log); - return 0; + return failed; } static int ucast_build_lid_matrices(void *context)