From patchwork Mon Feb 4 13:20:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Netes X-Patchwork-Id: 2092001 X-Patchwork-Delegate: hal@mellanox.com Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id CEA8A3FD56 for ; Mon, 4 Feb 2013 13:20:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755304Ab3BDNUm (ORCPT ); Mon, 4 Feb 2013 08:20:42 -0500 Received: from mail-vb0-f50.google.com ([209.85.212.50]:65441 "EHLO mail-vb0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754973Ab3BDNUl (ORCPT ); Mon, 4 Feb 2013 08:20:41 -0500 Received: by mail-vb0-f50.google.com with SMTP id ft2so3853054vbb.9 for ; Mon, 04 Feb 2013 05:20:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=HRWWZwHLurK7JSuFYWv4smZWTzWkZLMKb7GAzFxnTGE=; b=OeG8COeiZDYZi2Xdcs+457fMDAaYiEXy5Ba3Mp2jc5HCXH1r2h8Z+/Mg0ypoQSZ3yP +/sjqodw7sjpw1H35CBYSBTPhXr3cIgv6NJ8O40qpBnd0XjzEUAQ6u62pvwZLEDeVXhy xLBFEw01Y2XbBxDiMu39gVvFYxb4PfuxI94jx7BwcyTp2PEIMU91WF5AX2KIka8RHMUF vm7+PCtlqekh0abEmpza/9J67DwRQL6Grqy9nul38dgjM9mbl10sYZMd0SHU/3F8sPvw Mz4HiOvxHHpQrH9X8G/Kd/1NGaO1dEGSsaqhrOOJ0dF4wXx/g/2xRnDLxaAINPveUr63 AbcQ== X-Received: by 10.220.208.204 with SMTP id gd12mr22211125vcb.27.1359984041023; Mon, 04 Feb 2013 05:20:41 -0800 (PST) Received: from localhost (out.voltaire.com. [193.47.165.251]) by mx.google.com with ESMTPS id p7sm10688847vdt.2.2013.02.04.05.20.39 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 04 Feb 2013 05:20:40 -0800 (PST) From: Alex Netes To: linux-rdma@vger.kernel.org Cc: Alex Netes , Vincent Ficet Subject: [PATCH] opensm: Revert "opensm/osm_ucast_ftree: When roots are not connected, update hop count but not lft" Date: Mon, 4 Feb 2013 15:20:08 +0200 Message-Id: <1359984011-30753-7-git-send-email-alexne@mellanox.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1359984011-30753-1-git-send-email-alexne@mellanox.com> References: <1359984011-30753-1-git-send-email-alexne@mellanox.com> X-Gm-Message-State: ALoCoQnwGi4AIHGsvRVJL3oO/pBZSbFuWRBsg3gMB34f38kz78Pp51GaVraliWVQkhTjX8fRgxAP Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org This reverts commit 81dade3aeb1d5c80472a4f9fef55e9916bb38d3a. The patch causes crashes in fat-tree routing and it's replaced by the following patch. Signed-off-by: Vincent Ficet Signed-off-by: Alex Netes --- opensm/osm_ucast_ftree.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/opensm/osm_ucast_ftree.c b/opensm/osm_ucast_ftree.c index 8363bd2..c81e7a3 100644 --- a/opensm/osm_ucast_ftree.c +++ b/opensm/osm_ucast_ftree.c @@ -3038,10 +3038,8 @@ static void fabric_route_roots(IN ftree_fabric_t * p_ftree) "through port %u\n", tuple_to_str(p_sw->tuple), lid, port_num); - if (p_ftree->p_osm->subn.opt.connect_roots) { - /* set local lft */ - p_sw->p_osm_sw->new_lft[lid] = port_num; - } + /* set local lft */ + p_sw->p_osm_sw->new_lft[lid] = port_num; /* * Set local min hop table. @@ -4221,10 +4219,12 @@ static int do_routing(IN void *context) "Filling switch forwarding tables for switch-to-switch paths\n"); fabric_route_to_switches(p_ftree); - OSM_LOG(&p_ftree->p_osm->log, OSM_LOG_VERBOSE, - "Connecting switches that are unreachable within " - "Up/Down rules\n"); - fabric_route_roots(p_ftree); + if (p_ftree->p_osm->subn.opt.connect_roots) { + OSM_LOG(&p_ftree->p_osm->log, OSM_LOG_VERBOSE, + "Connecting switches that are unreachable within " + "Up/Down rules\n"); + fabric_route_roots(p_ftree); + } /* for each switch, set its fwd table */ cl_qmap_apply_func(&p_ftree->sw_tbl, set_sw_fwd_table, (void *)p_ftree);