From patchwork Thu Nov 29 19:11:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 1822261 X-Patchwork-Delegate: alexne@voltaire.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 1A80F3FC23 for ; Thu, 29 Nov 2012 19:11:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753259Ab2K2TLt (ORCPT ); Thu, 29 Nov 2012 14:11:49 -0500 Received: from mail-bk0-f46.google.com ([209.85.214.46]:60895 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753244Ab2K2TLs (ORCPT ); Thu, 29 Nov 2012 14:11:48 -0500 Received: by mail-bk0-f46.google.com with SMTP id q16so6456263bkw.19 for ; Thu, 29 Nov 2012 11:11:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding:x-gm-message-state; bh=eUr8JanIoYFfSjLktdjv8ZmpKxOVC99Jq34nUMwhFp8=; b=izKOUYsmz3OACBlY/hJypYSxB2l+zO3N6JzmqIeoYv2uSlBI2vV0za7huL8/tShLC+ EhDYB5YoGkj20KZ5nv0+vm5raXzLOxMdjsVZ2ebtTJy/WfHlY7nAsjjqScT7z+Dg8+U0 CQPzzBW/Z5i5SLsJIIo4fE6ggGq507EFcRfLizP3/qSKCXuM0Tgav5oQDi8PSNzSaCxB ZpARrVFsOaNrNNL3uVITaDVd2D+K/yMfCSCONIWi5vcF2LPmlCh2O3exJ7/nzS2abAGa W0KEiK02XS5RLrWko2qCIn+fuqAK2hRSUcOij8V2eXaiXDgmGZ/U334WXOBhmzjHFfgq U1hQ== Received: by 10.204.147.78 with SMTP id k14mr6984742bkv.7.1354216306817; Thu, 29 Nov 2012 11:11:46 -0800 (PST) Received: from [192.168.1.102] (c-71-192-10-85.hsd1.ma.comcast.net. [71.192.10.85]) by mx.google.com with ESMTPS id l17sm1968773bkw.12.2012.11.29.11.11.43 (version=SSLv3 cipher=OTHER); Thu, 29 Nov 2012 11:11:45 -0800 (PST) Message-ID: <50B7B36E.1030400@dev.mellanox.co.il> Date: Thu, 29 Nov 2012 14:11:42 -0500 From: Hal Rosenstock User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:9.0) Gecko/20111222 Thunderbird/9.0.1 MIME-Version: 1.0 To: Alex Netes CC: "linux-rdma (linux-rdma@vger.kernel.org)" , Jim Schutt Subject: [PATCH] opensm/osm_torus.c: Improve some misconfiguration error messages X-Gm-Message-State: ALoCoQlB3XuxCuv9ipQvmMQKG8sypBEvO+1BdKSdrpQ7yjuJkT6me2243lPJQHPyVXODrx0zpp+L Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Signed-off-by: Jim Schutt Signed-off-by: Hal Rosenstock --- opensm/osm_torus.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/opensm/osm_torus.c b/opensm/osm_torus.c index 43343c7..4d1bec7 100644 --- a/opensm/osm_torus.c +++ b/opensm/osm_torus.c @@ -7025,8 +7025,9 @@ out: return; } -#define LINK_ERR_STR " direction link required!\n" -#define SEED_ERR_STR " direction links with different seed switches!\n" +#define LINK_ERR_STR " direction link required for topology seed configuration since radix == 4! See torus-2QoS.conf(5).\n" +#define LINK_ERR2_STR " direction link required for topology seed configuration! See torus-2QoS.conf(5).\n" +#define SEED_ERR_STR " direction links for topology seed do not share a common switch! See torus-2QoS.conf(5).\n" static bool verify_setup(struct torus *t, struct fabric *f) @@ -7154,7 +7155,7 @@ again: if (o->xp_link.end[0].port >= 0 && o->xm_link.end[0].port >= 0) { OSM_LOG(&t->osm->log, OSM_LOG_ERROR, - "ERR 4E2B: Positive or negative x" LINK_ERR_STR); + "ERR 4E2B: Positive or negative x" LINK_ERR2_STR); goto out; } if (o->xp_link.end[0].port < 0 && @@ -7177,7 +7178,7 @@ again: if (o->zp_link.end[0].port >= 0 && o->zm_link.end[0].port >= 0) { OSM_LOG(&t->osm->log, OSM_LOG_ERROR, - "ERR 4E2C: Positive or negative z" LINK_ERR_STR); + "ERR 4E2C: Positive or negative z" LINK_ERR2_STR); goto out; } if ((o->xp_link.end[0].port < 0 && @@ -7220,7 +7221,7 @@ again: if (o->yp_link.end[0].port >= 0 && o->ym_link.end[0].port >= 0) { OSM_LOG(&t->osm->log, OSM_LOG_ERROR, - "ERR 4E2E: Positive or negative y" LINK_ERR_STR); + "ERR 4E2E: Positive or negative y" LINK_ERR2_STR); goto out; } if ((o->xp_link.end[0].port < 0 && @@ -7269,7 +7270,9 @@ again: if (need_seed) OSM_LOG(&t->osm->log, OSM_LOG_ERROR, "ERR 4E30: Every configured torus seed has at " - "least one switch missing in fabric!\n"); + "least one switch missing in fabric! See " + "torus-2QoS.conf(5) and TORUS TOPOLOGY DISCOVERY " + "in torus-2QoS(8)\n"); else success = true; out: