From patchwork Tue Feb 16 16:16:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Schutt X-Patchwork-Id: 79739 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 o1GGH0i2015342 for ; Tue, 16 Feb 2010 16:17:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757188Ab0BPQRA (ORCPT ); Tue, 16 Feb 2010 11:17:00 -0500 Received: from sentry-three.sandia.gov ([132.175.109.17]:59493 "EHLO sentry-three.sandia.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757189Ab0BPQQ6 (ORCPT ); Tue, 16 Feb 2010 11:16:58 -0500 X-WSS-ID: 0KXXZWA-08-3IF-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 29D158CB9BB; Tue, 16 Feb 2010 09:16:58 -0700 (MST) Received: from [132.175.109.1] by sentry.sandia.gov with ESMTP (SMTP Relay 01 (Email Firewall v6.3.2)); Tue, 16 Feb 2010 09:16:48 -0700 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.1/8.14.1) with ESMTP id o1GGGjkL001176; Tue, 16 Feb 2010 09:16:47 -0700 From: "Jim Schutt" To: linux-rdma@vger.kernel.org cc: sashak@voltaire.com, eitan@mellanox.co.il, kliteyn@mellanox.co.il, jaschut@sandia.gov Subject: [PATCH 3/3] opensm: Avoid havoc in dump_ucast_routes() caused by torus-2QoS persistent use of osm_port_t:priv. Date: Tue, 16 Feb 2010 09:16:45 -0700 Message-ID: <1266337005-29874-4-git-send-email-jaschut@sandia.gov> X-Mailer: git-send-email 1.5.6.GIT In-Reply-To: <1261169461-2516-1-git-send-email-jaschut@sandia.gov> References: <1261169461-2516-1-git-send-email-jaschut@sandia.gov> X-PMX-Version: 5.5.7.378829, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2010.2.16.160618 X-PerlMx-Spam: Gauge=IIIIIIII, Probability=8%, Report=' BODY_SIZE_4000_4999 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_NS ' X-TMWD-Spam-Summary: TS=20100216161650; ID=1; SEV=2.3.1; DFV=B2010021615; IFV=NA; AIF=B2010021615; RPD=5.03.0010; ENG=NA; RPDID=7374723D303030312E30413031303230352E34423741433446322E303046313A534346535441543838363133332C73733D312C6667733D30; CAT=NONE; CON=NONE; SIG=AAAAAAAAAAAAAAAAAAAAAAAAfQ== X-MMS-Spam-Filter-ID: B2010021615_5.03.0010 MIME-Version: 1.0 X-WSS-ID: 67641B7A2EK684199-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, 16 Feb 2010 16:17:01 +0000 (UTC) diff --git a/opensm/include/opensm/osm_switch.h b/opensm/include/opensm/osm_switch.h index 205896d..0b4fc78 100644 --- a/opensm/include/opensm/osm_switch.h +++ b/opensm/include/opensm/osm_switch.h @@ -876,6 +876,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 @@ -898,6 +899,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 f3f4623..030de74 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 1cd8bfc..14b0021 100644 --- a/opensm/opensm/osm_switch.c +++ b/opensm/opensm/osm_switch.c @@ -214,6 +214,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) { /* @@ -223,10 +224,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 9a3ea25..fbc9244 100644 --- a/opensm/opensm/osm_ucast_mgr.c +++ b/opensm/opensm/osm_ucast_mgr.c @@ -251,6 +251,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) {