From patchwork Fri Sep 3 16:43:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Schutt X-Patchwork-Id: 154591 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 o83Ghm0c023398 for ; Fri, 3 Sep 2010 16:43:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756449Ab0ICQno (ORCPT ); Fri, 3 Sep 2010 12:43:44 -0400 Received: from sentry-three.sandia.gov ([132.175.109.17]:46355 "EHLO sentry-three.sandia.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756421Ab0ICQnl (ORCPT ); Fri, 3 Sep 2010 12:43:41 -0400 X-WSS-ID: 0L86JSQ-0C-40S-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 19E61529C07; Fri, 3 Sep 2010 10:43:37 -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:33 -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 o83Gh6al008533; Fri, 3 Sep 2010 10:43:23 -0600 From: "Jim Schutt" To: linux-rdma@vger.kernel.org cc: sashak@voltaire.com, "Jim Schutt" Subject: [PATCH v4 17/18] opensm: Avoid havoc in dump_ucast_routes() caused by torus-2QoS persistent use of osm_port_t:priv. Date: Fri, 3 Sep 2010 10:43:13 -0600 Message-ID: <1283532194-27112-18-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=20100903164334; ID=1; SEV=2.3.1; DFV=B2010090317; IFV=NA; AIF=B2010090317; RPD=5.03.0010; ENG=NA; RPDID=7374723D303030312E30413031303230392E34433831323542362E303041383A534346535441543838363133332C73733D312C6667733D30; CAT=NONE; CON=NONE; SIG=AAAAAAAAAAAAAAAAAAAAAAAAfQ== X-MMS-Spam-Filter-ID: B2010090317_5.03.0010 MIME-Version: 1.0 X-WSS-ID: 609FFA3F2JS1816535-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:57 +0000 (UTC) diff --git a/opensm/include/opensm/osm_switch.h b/opensm/include/opensm/osm_switch.h index 51a8427..f407dd9 100644 --- a/opensm/include/opensm/osm_switch.h +++ b/opensm/include/opensm/osm_switch.h @@ -918,6 +918,7 @@ uint8_t osm_switch_recommend_path(IN const osm_switch_t * p_sw, IN osm_port_t * p_port, IN uint16_t lid_ho, IN unsigned start_from, IN boolean_t ignore_existing, + IN boolean_t routing_for_lmc, IN boolean_t dor); /* * PARAMETERS @@ -940,6 +941,17 @@ uint8_t osm_switch_recommend_path(IN const osm_switch_t * p_sw, * If false, the switch will choose an existing route if one * exists, otherwise will choose the optimal route. * +* routing_for_lmc +* [in] We support an enhanced LMC aware routing mode: +* In the case of LMC > 0, we can track the remote side +* system and node for all of the lids of the target +* and try and avoid routing again through the same +* system / node. +* +* Assume if routing_for_lmc is TRUE that this procedure +* was provided with the tracking array and counter via +* p_port->priv, and we can conduct this algorithm. +* * dor * [in] If TRUE, Dimension Order Routing will be done. * diff --git a/opensm/opensm/osm_dump.c b/opensm/opensm/osm_dump.c index bfff1a0..535a03f 100644 --- a/opensm/opensm/osm_dump.c +++ b/opensm/opensm/osm_dump.c @@ -221,7 +221,7 @@ static void dump_ucast_routes(cl_map_item_t * item, FILE * file, void *cxt) /* No LMC Optimization */ best_port = osm_switch_recommend_path(p_sw, p_port, lid_ho, 1, TRUE, - dor); + FALSE, dor); fprintf(file, "No %u hop path possible via port %u!", best_hops, best_port); } diff --git a/opensm/opensm/osm_switch.c b/opensm/opensm/osm_switch.c index b621852..9785a9d 100644 --- a/opensm/opensm/osm_switch.c +++ b/opensm/opensm/osm_switch.c @@ -216,6 +216,7 @@ uint8_t osm_switch_recommend_path(IN const osm_switch_t * p_sw, IN osm_port_t * p_port, IN uint16_t lid_ho, IN unsigned start_from, IN boolean_t ignore_existing, + IN boolean_t routing_for_lmc, IN boolean_t dor) { /* @@ -225,10 +226,10 @@ uint8_t osm_switch_recommend_path(IN const osm_switch_t * p_sw, and try and avoid routing again through the same system / node. - If this procedure is provided with the tracking array - and counter we can conduct this algorithm. + Assume if routing_for_lmc is true that this procedure was + provided the tracking array and counter via p_port->priv, + and we can conduct this algorithm. */ - boolean_t routing_for_lmc = (p_port->priv != NULL); uint16_t base_lid; uint8_t hops; uint8_t least_hops; diff --git a/opensm/opensm/osm_ucast_mgr.c b/opensm/opensm/osm_ucast_mgr.c index e6e40f0..f5a715f 100644 --- a/opensm/opensm/osm_ucast_mgr.c +++ b/opensm/opensm/osm_ucast_mgr.c @@ -252,6 +252,7 @@ static void ucast_mgr_process_port(IN osm_ucast_mgr_t * p_mgr, */ port = osm_switch_recommend_path(p_sw, p_port, lid_ho, start_from, p_mgr->p_subn->ignore_existing_lfts, + p_mgr->p_subn->opt.lmc, p_mgr->is_dor); if (port == OSM_NO_PATH) {