From patchwork Tue Jun 15 19:53:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Schutt X-Patchwork-Id: 106317 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 o5FJrgMk028443 for ; Tue, 15 Jun 2010 19:53:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754696Ab0FOTxp (ORCPT ); Tue, 15 Jun 2010 15:53:45 -0400 Received: from sentry-three.sandia.gov ([132.175.109.17]:52775 "EHLO sentry-three.sandia.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752808Ab0FOTxo (ORCPT ); Tue, 15 Jun 2010 15:53:44 -0400 X-WSS-ID: 0L42N9C-0C-6YA-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 105B14D87F1; Tue, 15 Jun 2010 13:53:35 -0600 (MDT) Received: from [132.175.109.1] by sentry.sandia.gov with ESMTP (SMTP Relay 01 (Email Firewall v6.3.2)); Tue, 15 Jun 2010 13:53:30 -0600 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.4/8.14.4) with ESMTP id o5FJrIBJ028244; Tue, 15 Jun 2010 13:53:23 -0600 From: "Jim Schutt" To: linux-rdma@vger.kernel.org cc: sashak@voltaire.com, "Jim Schutt" Subject: [PATCH v3 05/17] opensm: Add struct osm_routing_engine callback to build spanning trees for multicast. Date: Tue, 15 Jun 2010 13:53:12 -0600 Message-ID: <1276631604-29230-6-git-send-email-jaschut@sandia.gov> X-Mailer: git-send-email 1.6.2.2 In-Reply-To: <1276631604-29230-1-git-send-email-jaschut@sandia.gov> References: <1276631604-29230-1-git-send-email-jaschut@sandia.gov> X-PMX-Version: 5.5.9.395186, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2010.6.15.194814 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' BODYTEXTP_SIZE_3000_LESS 0, 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=20100615195335; ID=1; SEV=2.3.1; DFV=B2010061519; IFV=NA; AIF=B2010061519; RPD=5.03.0010; ENG=NA; RPDID=7374723D303030312E30413031303230382E34433137444133462E303045323A534346535441543838363133332C73733D312C6667733D30; CAT=NONE; CON=NONE; SIG=AAAAAAAAAAAAAAAAAAAAAAAAfQ== X-MMS-Spam-Filter-ID: B2010061519_5.03.0010 MIME-Version: 1.0 X-WSS-ID: 600905B02GW1265964-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, 15 Jun 2010 19:53:47 +0000 (UTC) diff --git a/opensm/include/opensm/osm_opensm.h b/opensm/include/opensm/osm_opensm.h index 734a6db..fddcf53 100644 --- a/opensm/include/opensm/osm_opensm.h +++ b/opensm/include/opensm/osm_opensm.h @@ -132,6 +132,8 @@ struct osm_routing_engine { uint8_t (*path_sl)(void *context, IN uint8_t path_sl_hint, IN const osm_port_t *src_port, IN const osm_port_t *dst_port); + ib_api_status_t (*mcast_build_stree)(void *context, + IN OUT osm_mgrp_box_t *mgb); void (*delete) (void *context); struct osm_routing_engine *next; }; @@ -165,6 +167,10 @@ struct osm_routing_engine { * path_sl * The callback for computing path SL. * +* mcast_build_stree +* The callback for building the spanning tree for multicast +* forwarding, called per MLID. +* * delete * The delete method, may be used for routing engine * internals cleanup. diff --git a/opensm/opensm/osm_mcast_mgr.c b/opensm/opensm/osm_mcast_mgr.c index 322635d..bd67d4e 100644 --- a/opensm/opensm/osm_mcast_mgr.c +++ b/opensm/opensm/osm_mcast_mgr.c @@ -986,6 +986,7 @@ Exit: static ib_api_status_t mcast_mgr_process_mlid(osm_sm_t * sm, uint16_t mlid) { ib_api_status_t status = IB_SUCCESS; + struct osm_routing_engine *re = sm->p_subn->p_osm->routing_engine_used; osm_mgrp_box_t *mbox; OSM_LOG_ENTER(sm->p_log); @@ -1000,7 +1001,11 @@ static ib_api_status_t mcast_mgr_process_mlid(osm_sm_t * sm, uint16_t mlid) mbox = osm_get_mbox_by_mlid(sm->p_subn, cl_hton16(mlid)); if (mbox) { - status = mcast_mgr_build_spanning_tree(sm, mbox); + if (re && re->mcast_build_stree) + status = re->mcast_build_stree(re->context, mbox); + else + status = mcast_mgr_build_spanning_tree(sm, mbox); + if (status != IB_SUCCESS) OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 0A17: " "Unable to create spanning tree (%s) for mlid "