From patchwork Sun Nov 1 08:09:37 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Eli Dorfman (Voltaire)" X-Patchwork-Id: 56827 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA180w9k023052 for ; Sun, 1 Nov 2009 08:00:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751430AbZKAIAu (ORCPT ); Sun, 1 Nov 2009 03:00:50 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751446AbZKAIAu (ORCPT ); Sun, 1 Nov 2009 03:00:50 -0500 Received: from fwil.voltaire.com ([193.47.165.2]:58588 "EHLO exil.voltaire.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751430AbZKAIAu (ORCPT ); Sun, 1 Nov 2009 03:00:50 -0500 Received: from [172.25.1.69] ([172.25.1.69]) by exil.voltaire.com with Microsoft SMTPSVC(6.0.3790.3959); Sun, 1 Nov 2009 10:00:41 +0200 Message-ID: <4AED4241.4000808@gmail.com> Date: Sun, 01 Nov 2009 10:09:37 +0200 From: "Eli Dorfman (Voltaire)" User-Agent: Thunderbird 2.0.0.17 (X11/20080914) MIME-Version: 1.0 To: Sasha Khapyorsky CC: linux-rdma Subject: [PATCH] infiniband-diags/saquery: Report SA MAD Class specific status. X-OriginalArrivalTime: 01 Nov 2009 08:00:41.0478 (UTC) FILETIME=[68178A60:01CA5AC9] Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org diff --git a/infiniband-diags/src/saquery.c b/infiniband-diags/src/saquery.c index 6c44b63..71823d5 100644 --- a/infiniband-diags/src/saquery.c +++ b/infiniband-diags/src/saquery.c @@ -124,6 +124,41 @@ int requested_lid_flag = 0; uint64_t requested_guid = 0; int requested_guid_flag = 0; +#define SA_ERR_UNKNOWN IB_SA_MAD_STATUS_PRIO_SUGGESTED + +const char *ib_sa_error_str[] = { + "SA_NO_ERROR", + "SA_ERR_NO_RESOURCES", + "SA_ERR_REQ_INVALID", + "SA_ERR_NO_RECORDS", + "SA_ERR_TOO_MANY_RECORDS", + "SA_ERR_REQ_INVALID_GID", + "SA_ERR_REQ_INSUFFICIENT_COMPONENTS", + "SA_ERR_REQ_DENIED", + "SA_ERR_STATUS_PRIO_SUGGESTED", + "SA_ERR_UNKNOWN" +}; + +static inline const char *ib_sa_err_str(IN uint8_t status) +{ + if (status > SA_ERR_UNKNOWN) + status = SA_ERR_UNKNOWN; + return (ib_sa_error_str[status]); +} + +static inline void report_err(int status) +{ + int st = status & 0xff; + + if (st) + fprintf(stderr, "ERROR: Query result returned: %s (0x%x)\n", + ib_get_err_str(st), status); + st = status >> 8; + if (st) + fprintf(stderr, "ERROR: Query result returned: %s (0x%x)\n", + ib_sa_err_str(st), status); +} + static int sa_query(struct bind_handle *h, uint8_t method, uint16_t attr, uint32_t mod, uint64_t comp_mask, uint64_t sm_key, void *data) @@ -794,8 +829,7 @@ static int get_any_records(bind_handle_t h, } if (result.status != IB_SUCCESS) { - fprintf(stderr, "Query result returned: %s\n", - ib_get_err_str(result.status)); + report_err(result.status); return result.status; } @@ -1009,8 +1043,7 @@ static int get_print_class_port_info(bind_handle_t h) return ret; } if (result.status != IB_SUCCESS) { - fprintf(stderr, "ERROR: Query result returned: %s\n", - ib_get_err_str(result.status)); + report_err(result.status); return (result.status); } dump_results(&result, dump_class_port_info);