From patchwork Thu Feb 17 21:31:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Heinz X-Patchwork-Id: 572261 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 p1HM04lU016433 for ; Thu, 17 Feb 2011 22:00:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754579Ab1BQWAN (ORCPT ); Thu, 17 Feb 2011 17:00:13 -0500 Received: from [198.186.4.11] ([198.186.4.11]:35859 "EHLO homer.dev.silverstorm.com" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752642Ab1BQWAM (ORCPT ); Thu, 17 Feb 2011 17:00:12 -0500 Received: from [172.21.1.208] (homer [127.0.0.1]) by homer.dev.silverstorm.com (8.13.8/8.13.8) with ESMTP id p1HLV35G025783; Thu, 17 Feb 2011 16:31:03 -0500 Subject: [PATCH 1/2] Improved node descriptions To: roland@kernel.org, linux-rdma@vger.kernel.org, michael.heinz@qlogic.com From: Michael Heinz Date: Thu, 17 Feb 2011 16:31:03 -0500 Message-ID: <20110217213103.25708.4630.stgit@homer> In-Reply-To: <20110217213017.25708.95042.stgit@homer> References: <20110217213017.25708.95042.stgit@homer> User-Agent: StGit/0.15 MIME-Version: 1.0 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.6 (demeter1.kernel.org [140.211.167.41]); Thu, 17 Feb 2011 22:00:14 +0000 (UTC) difficult to figure out which node is suffering from symbol errors. This patch addresses the problem by providing a function to build the node description. If the provided source string for the description contains an '@' character, the function will substitute the current utsname. This ensures that even after a fabric has been completely initialized, if a node's hostname changes, that change will be reflected in the next sweep of the SM, but also maintains compatibility with existing code since the behavior is unchanged if the description string does not contain an '@' character. Signed-off-by: Michael Heinz --- drivers/infiniband/core/mad.c | 18 ++++++++++++++++++ include/rdma/ib_mad.h | 8 ++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c index 822cfdc..8e4ac68 100644 --- a/drivers/infiniband/core/mad.c +++ b/drivers/infiniband/core/mad.c @@ -41,6 +41,7 @@ #include "mad_rmpp.h" #include "smi.h" #include "agent.h" +#include "linux/utsname.h" MODULE_LICENSE("Dual BSD/GPL"); MODULE_DESCRIPTION("kernel IB MAD API"); @@ -932,6 +933,23 @@ int ib_get_mad_data_offset(u8 mgmt_class) } EXPORT_SYMBOL(ib_get_mad_data_offset); +void ib_build_node_desc(char *dest, char *src) +{ + int i; + for (i = 0; i < 64;) { + if (*src == '@') { + char *name = init_utsname()->nodename; + for (; *name && (*name != '.') && (i < 64); ++i) + *dest++ = *name++; + src++; + } else { + *dest++ = *src++; + i++; + } + } +} +EXPORT_SYMBOL(ib_build_node_desc); + int ib_is_mad_class_rmpp(u8 mgmt_class) { if ((mgmt_class == IB_MGMT_CLASS_SUBN_ADM) || diff --git a/include/rdma/ib_mad.h b/include/rdma/ib_mad.h index d3b9401..5916617 100644 --- a/include/rdma/ib_mad.h +++ b/include/rdma/ib_mad.h @@ -637,6 +637,14 @@ int ib_is_mad_class_rmpp(u8 mgmt_class); int ib_get_mad_data_offset(u8 mgmt_class); /** + * ib_build_node_desc - copies the node description and replaces + * any @ markers with the present system node name. + * @dest: destination + * @src: source + */ +void ib_build_node_desc(char *dest, char *src); + +/** * ib_get_rmpp_segment - returns the data buffer for a given RMPP segment. * @send_buf: Previously allocated send data buffer. * @seg_num: number of segment to return