Changes from V1:
        Fix spacing
Changes from V2:
        Add option to disable query.
Changes from V3:
        Update copyright
        Fix reissue of redirected MAD to be original query if query_cpi is not
        enabled

Signed-off-by: Ira Weiny <[email protected]>
---
 include/opensm/osm_perfmgr.h |   15 +++
 include/opensm/osm_subnet.h  |    1 +
 opensm/osm_console.c         |   13 ++-
 opensm/osm_perfmgr.c         |  246 ++++++++++++++++++++++++++++++++++--------
 opensm/osm_subnet.c          |    9 ++-
 5 files changed, 235 insertions(+), 49 deletions(-)

diff --git a/include/opensm/osm_perfmgr.h b/include/opensm/osm_perfmgr.h
index 26b1ae6..fddd687 100644
--- a/include/opensm/osm_perfmgr.h
+++ b/include/opensm/osm_perfmgr.h
@@ -100,6 +100,9 @@ typedef struct monitored_port {
        ib_net16_t lid;
        ib_net16_t pkey;
        ib_net32_t qp;
+       /* ClassPortInfo fields */
+       boolean_t cpi_valid;
+       ib_net16_t cap_mask;
 } monitored_port_t;
 
 /* Node to store information about nodes being monitored */
@@ -107,6 +110,7 @@ typedef struct monitored_node {
        cl_map_item_t map_item;
        struct monitored_node *next;
        uint64_t guid;
+       uint8_t node_type;
        boolean_t esp0;
        char *name;
        uint32_t num_ports;
@@ -144,6 +148,7 @@ typedef struct osm_perfmgr {
        ib_net64_t port_guid;
        int16_t local_port;
        int rm_nodes;
+       boolean_t query_cpi;
 } osm_perfmgr_t;
 /*
 * FIELDS
@@ -191,6 +196,16 @@ inline static int osm_perfmgr_get_rm_nodes(osm_perfmgr_t 
*perfmgr)
        return perfmgr->rm_nodes;
 }
 
+inline static void osm_perfmgr_set_query_cpi(osm_perfmgr_t *perfmgr,
+                                           int query_cpi)
+{
+       perfmgr->query_cpi = query_cpi;
+}
+inline static int osm_perfmgr_get_query_cpi(osm_perfmgr_t *perfmgr)
+{
+       return perfmgr->query_cpi;
+}
+
 inline static const char *osm_perfmgr_get_state_str(osm_perfmgr_t * p_perfmgr)
 {
        switch (p_perfmgr->state) {
diff --git a/include/opensm/osm_subnet.h b/include/opensm/osm_subnet.h
index 36c18a9..f0a0a11 100644
--- a/include/opensm/osm_subnet.h
+++ b/include/opensm/osm_subnet.h
@@ -356,6 +356,7 @@ typedef struct osm_subn_opt {
        char *event_db_dump_file;
        int perfmgr_rm_nodes;
        boolean_t perfmgr_log_errors;
+       boolean_t perfmgr_query_cpi;
 #endif                         /* ENABLE_OSM_PERF_MGR */
        char *event_plugin_name;
        char *event_plugin_options;
diff --git a/opensm/osm_console.c b/opensm/osm_console.c
index 8e26bab..c393ce6 100644
--- a/opensm/osm_console.c
+++ b/opensm/osm_console.c
@@ -242,6 +242,7 @@ static void help_perfmgr(FILE * out, int detail)
                "perfmgr(pm) [enable|disable\n"
                "             
|clear_counters|dump_counters|print_counters(pc)|print_errors(pe)\n"
                "             |set_rm_nodes|clear_rm_nodes|clear_inactive\n"
+               "             |set_query_cpi|clear_query_cpi\n"
                "             |dump_redir|clear_redir\n"
                "             |sweep|sweep_time[seconds]]\n");
        if (detail) {
@@ -275,6 +276,9 @@ static void help_perfmgr(FILE * out, int detail)
                        "   [[set|clear]_rm_nodes] -- enable/disable the 
removal of \"inactive\" nodes from the DB\n"
                        "                             Inactive nodes are those 
which no longer appear on the fabric\n");
                fprintf(out,
+                       "   [[set|clear]_query_cpi] -- enable/disable 
PerfMgrGet(ClassPortInfo)\n"
+                       "                             ClassPortInfo indicates 
hardware support for extended attributes such as PortCountersExtended\n");
+               fprintf(out,
                        "   [clear_inactive] -- Delete inactive nodes from the 
DB\n");
        }
 }
@@ -1506,6 +1510,10 @@ static void perfmgr_parse(char **p_last, osm_opensm_t * 
p_osm, FILE * out)
                        osm_perfmgr_set_rm_nodes(&p_osm->perfmgr, 1);
                } else if (strcmp(p_cmd, "clear_rm_nodes") == 0) {
                        osm_perfmgr_set_rm_nodes(&p_osm->perfmgr, 0);
+               } else if (strcmp(p_cmd, "set_query_cpi") == 0) {
+                       osm_perfmgr_set_query_cpi(&p_osm->perfmgr, 1);
+               } else if (strcmp(p_cmd, "clear_query_cpi") == 0) {
+                       osm_perfmgr_set_query_cpi(&p_osm->perfmgr, 0);
                } else if (strcmp(p_cmd, "dump_counters") == 0) {
                        p_cmd = next_token(p_last);
                        if (p_cmd && (strcmp(p_cmd, "mach") == 0)) {
@@ -1573,13 +1581,16 @@ static void perfmgr_parse(char **p_last, osm_opensm_t * 
p_osm, FILE * out)
                        "sweep state                  : %s\n"
                        "sweep time                   : %us\n"
                        "outstanding queries/max      : %d/%u\n"
-                       "remove missing nodes from DB : %s\n",
+                       "remove missing nodes from DB : %s\n"
+                       "query ClassPortInfo          : %s\n",
                        osm_perfmgr_get_state_str(&p_osm->perfmgr),
                        osm_perfmgr_get_sweep_state_str(&p_osm->perfmgr),
                        osm_perfmgr_get_sweep_time_s(&p_osm->perfmgr),
                        p_osm->perfmgr.outstanding_queries,
                        p_osm->perfmgr.max_outstanding_queries,
                        osm_perfmgr_get_rm_nodes(&p_osm->perfmgr)
+                                                ? "TRUE" : "FALSE",
+                       osm_perfmgr_get_query_cpi(&p_osm->perfmgr)
                                                 ? "TRUE" : "FALSE");
        }
 }
diff --git a/opensm/osm_perfmgr.c b/opensm/osm_perfmgr.c
index cfcd197..b19933e 100644
--- a/opensm/osm_perfmgr.c
+++ b/opensm/osm_perfmgr.c
@@ -2,6 +2,7 @@
  * Copyright (c) 2007 The Regents of the University of California.
  * Copyright (c) 2007-2009 Voltaire, Inc. All rights reserved.
  * Copyright (c) 2009,2010 HNR Consulting. All rights reserved.
+ * Copyright (c) 2013 Lawrence Livermore National Security. All rights * 
reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -356,17 +357,20 @@ static ib_net16_t get_lid(osm_node_t * p_node, uint8_t 
port,
        return get_base_lid(p_node, port);
 }
 
+
 /**********************************************************************
- * Form and send the Port Counters MAD for a single port.
+ * Build a Performance Management class MAD
  **********************************************************************/
-static ib_api_status_t perfmgr_send_pc_mad(osm_perfmgr_t * perfmgr,
-                                          ib_net16_t dest_lid,
-                                          ib_net32_t dest_qp, uint16_t pkey_ix,
-                                          uint8_t port, uint8_t mad_method,
-                                          osm_madw_context_t * p_context)
+static osm_madw_t *perfmgr_build_mad(osm_perfmgr_t * perfmgr,
+                                    ib_net16_t dest_lid,
+                                    uint8_t sl,
+                                    ib_net32_t dest_qp,
+                                    uint16_t pkey_ix,
+                                    uint8_t mad_method,
+                                    ib_net16_t attr_id,
+                                    osm_madw_context_t * p_context,
+                                    ib_perfmgt_mad_t ** p_pm_mad)
 {
-       ib_api_status_t status = IB_SUCCESS;
-       ib_port_counters_t *port_counter = NULL;
        ib_perfmgt_mad_t *pm_mad = NULL;
        osm_madw_t *p_madw = NULL;
 
@@ -375,7 +379,7 @@ static ib_api_status_t perfmgr_send_pc_mad(osm_perfmgr_t * 
perfmgr,
        p_madw = osm_mad_pool_get(perfmgr->mad_pool, perfmgr->bind_handle,
                                  MAD_BLOCK_SIZE, NULL);
        if (p_madw == NULL)
-               return IB_INSUFFICIENT_MEMORY;
+               return NULL;
 
        pm_mad = osm_madw_get_perfmgt_mad_ptr(p_madw);
 
@@ -393,29 +397,38 @@ static ib_api_status_t perfmgr_send_pc_mad(osm_perfmgr_t 
* perfmgr,
                pm_mad->header.trans_id =
                    cl_hton64((uint64_t) cl_atomic_inc(&perfmgr->trans_id) &
                              (uint64_t) (0xFFFFFFFF));
-       pm_mad->header.attr_id = IB_MAD_ATTR_PORT_CNTRS;
+       pm_mad->header.attr_id = attr_id;
        pm_mad->header.resv = 0;
        pm_mad->header.attr_mod = 0;
 
-       port_counter = (ib_port_counters_t *) & pm_mad->data;
-       memset(port_counter, 0, sizeof(*port_counter));
-       port_counter->port_select = port;
-       port_counter->counter_select = 0xFFFF;
-
        p_madw->mad_addr.dest_lid = dest_lid;
        p_madw->mad_addr.addr_type.gsi.remote_qp = dest_qp;
        p_madw->mad_addr.addr_type.gsi.remote_qkey =
            cl_hton32(IB_QP1_WELL_KNOWN_Q_KEY);
        p_madw->mad_addr.addr_type.gsi.pkey_ix = pkey_ix;
-       p_madw->mad_addr.addr_type.gsi.service_level = 0;
+       p_madw->mad_addr.addr_type.gsi.service_level = sl;
        p_madw->mad_addr.addr_type.gsi.global_route = FALSE;
        p_madw->resp_expected = TRUE;
 
        if (p_context)
                p_madw->context = *p_context;
 
-       status = osm_vendor_send(perfmgr->bind_handle, p_madw, TRUE);
+       if (p_pm_mad)
+               *p_pm_mad = pm_mad;
+
+       OSM_LOG_EXIT(perfmgr->log);
+
+       return (p_madw);
+}
 
+/**********************************************************************
+ * Send a Performance Management class MAD
+ **********************************************************************/
+static ib_api_status_t perfmgr_send_mad(osm_perfmgr_t *perfmgr,
+                                       osm_madw_t * const p_madw)
+{
+       ib_api_status_t status = osm_vendor_send(perfmgr->bind_handle, p_madw,
+                                                TRUE);
        if (status == IB_SUCCESS) {
                /* pause thread if there are too many outstanding requests */
                cl_atomic_inc(&(perfmgr->outstanding_queries));
@@ -427,6 +440,39 @@ static ib_api_status_t perfmgr_send_pc_mad(osm_perfmgr_t * 
perfmgr,
                }
                perfmgr->sweep_state = PERFMGR_SWEEP_ACTIVE;
        }
+       return (status);
+}
+
+
+/**********************************************************************
+ * Form and send the PortCounters MAD for a single port.
+ **********************************************************************/
+static ib_api_status_t perfmgr_send_pc_mad(osm_perfmgr_t * perfmgr,
+                                          ib_net16_t dest_lid,
+                                          ib_net32_t dest_qp, uint16_t pkey_ix,
+                                          uint8_t port, uint8_t mad_method,
+                                          osm_madw_context_t * p_context,
+                                          uint8_t sl)
+{
+       ib_api_status_t status = IB_SUCCESS;
+       ib_port_counters_t *port_counter = NULL;
+       ib_perfmgt_mad_t *pm_mad = NULL;
+       osm_madw_t *p_madw = NULL;
+
+       OSM_LOG_ENTER(perfmgr->log);
+
+       p_madw = perfmgr_build_mad(perfmgr, dest_lid, sl, dest_qp, pkey_ix,
+                               mad_method, IB_MAD_ATTR_PORT_CNTRS, p_context,
+                               &pm_mad);
+       if (p_madw == NULL)
+               return IB_INSUFFICIENT_MEMORY;
+
+       port_counter = (ib_port_counters_t *) & pm_mad->data;
+       memset(port_counter, 0, sizeof(*port_counter));
+       port_counter->port_select = port;
+       port_counter->counter_select = 0xFFFF;
+
+       status = perfmgr_send_mad(perfmgr, p_madw);
 
        OSM_LOG_EXIT(perfmgr->log);
        return status;
@@ -469,6 +515,7 @@ static void collect_guids(cl_map_item_t * p_map_item, void 
*context)
                mon_node->guid = node_guid;
                mon_node->name = strdup(node->print_desc);
                mon_node->num_ports = num_ports;
+               mon_node->node_type = node->node_info.node_type;
                /* check for enhanced switch port 0 */
                mon_node->esp0 = (node->sw &&
                                  ib_switch_info_is_enhanced_port0(&node->sw->
@@ -491,6 +538,35 @@ Exit:
 }
 
 /**********************************************************************
+ * Form and send the ClassPortInfo MAD for a single port.
+ **********************************************************************/
+static ib_api_status_t perfmgr_send_cpi_mad(osm_perfmgr_t * pm,
+                                           ib_net16_t dest_lid,
+                                           ib_net32_t dest_qp,
+                                           uint16_t pkey_ix,
+                                           uint8_t port,
+                                           osm_madw_context_t * p_context,
+                                           uint8_t sl)
+{
+       ib_api_status_t status = IB_SUCCESS;
+       osm_madw_t *p_madw = NULL;
+
+       OSM_LOG_ENTER(pm->log);
+
+       p_madw = perfmgr_build_mad(pm, dest_lid, sl, dest_qp,
+                                  pkey_ix, IB_MAD_METHOD_GET,
+                                  IB_MAD_ATTR_CLASS_PORT_INFO, p_context,
+                                  NULL);
+       if (p_madw == NULL)
+               return IB_INSUFFICIENT_MEMORY;
+
+       status = perfmgr_send_mad(pm, p_madw);
+
+       OSM_LOG_EXIT(pm->log);
+       return status;
+}
+
+/**********************************************************************
  * query the Port Counters of all the nodes in the subnet.
  **********************************************************************/
 static void perfmgr_query_counters(cl_map_item_t * p_map_item, void *context)
@@ -557,22 +633,42 @@ static void perfmgr_query_counters(cl_map_item_t * 
p_map_item, void *context)
                mad_context.perfmgr_context.node_guid = node_guid;
                mad_context.perfmgr_context.port = port;
                mad_context.perfmgr_context.mad_method = IB_MAD_METHOD_GET;
+
+               if (pm->query_cpi && !mon_node->port[port].cpi_valid) {
+                       status = perfmgr_send_cpi_mad(pm, lid, remote_qp,
+                                               mon_node->port[port].pkey_ix,
+                                               port, &mad_context,
+                                               0); /* FIXME SL != 0 */
+                       if (status != IB_SUCCESS)
+                               OSM_LOG(pm->log, OSM_LOG_ERROR, "ERR 5410: "
+                                       "Failed to issue ClassPortInfo query "
+                                       "for node 0x%" PRIx64
+                                       " port %d (%s)\n",
+                                       node->node_info.node_guid, port,
+                                       node->print_desc);
+                       if (mon_node->node_type == IB_NODE_TYPE_SWITCH)
+                               goto Exit; /* only need to issue 1 CPI query
+                                               for switches */
+               } else {
+
 #ifdef ENABLE_OSM_PERF_MGR_PROFILE
-               gettimeofday(&mad_context.perfmgr_context.query_start, NULL);
+                       gettimeofday(&mad_context.perfmgr_context.query_start, 
NULL);
 #endif
-               OSM_LOG(pm->log, OSM_LOG_VERBOSE, "Getting stats for node 0x%"
-                       PRIx64 " port %d (lid %u) (%s)\n", node_guid, port,
-                       cl_ntoh16(lid), node->print_desc);
-               status = perfmgr_send_pc_mad(pm, lid, remote_qp,
-                                            mon_node->port[port].pkey_ix,
-                                            port, IB_MAD_METHOD_GET,
-                                            &mad_context);
-               if (status != IB_SUCCESS)
-                       OSM_LOG(pm->log, OSM_LOG_ERROR, "ERR 5409: "
-                               "Failed to issue port counter query for node 
0x%"
-                               PRIx64 " port %d (%s)\n",
-                               node->node_info.node_guid, port,
-                               node->print_desc);
+                       OSM_LOG(pm->log, OSM_LOG_VERBOSE, "Getting stats for 
node 0x%"
+                               PRIx64 " port %d (lid %u) (%s)\n", node_guid, 
port,
+                               cl_ntoh16(lid), node->print_desc);
+                       status = perfmgr_send_pc_mad(pm, lid, remote_qp,
+                                                    
mon_node->port[port].pkey_ix,
+                                                    port, IB_MAD_METHOD_GET,
+                                                    &mad_context,
+                                                    0); /* FIXME SL != 0 */
+                       if (status != IB_SUCCESS)
+                               OSM_LOG(pm->log, OSM_LOG_ERROR, "ERR 5409: "
+                                       "Failed to issue port counter query for 
node 0x%"
+                                       PRIx64 " port %d (%s)\n",
+                                       node->node_info.node_guid, port,
+                                       node->print_desc);
+               }
        }
 Exit:
        cl_plock_release(&pm->osm->lock);
@@ -1055,7 +1151,8 @@ static void perfmgr_check_overflow(osm_perfmgr_t * pm,
                /* clear port counters */
                status = perfmgr_send_pc_mad(pm, lid, remote_qp, pkey_ix,
                                             port, IB_MAD_METHOD_SET,
-                                            &mad_context);
+                                            &mad_context,
+                                            0); /* FIXME SL != 0 */
                if (status != IB_SUCCESS)
                        OSM_LOG(pm->log, OSM_LOG_ERROR, "PerfMgr: ERR 5411: "
                                "Failed to send clear counters MAD for %s (0x%"
@@ -1189,6 +1286,7 @@ static void pc_recv_process(void *context, void *data)
        monitored_node_t *p_mon_node;
        int16_t pkey_ix = 0;
        boolean_t valid = TRUE;
+       ib_class_port_info_t *cpi = NULL;
 
        OSM_LOG_ENTER(pm->log);
 
@@ -1211,14 +1309,49 @@ static void pc_recv_process(void *context, void *data)
        CL_ASSERT(p_mad->attr_id == IB_MAD_ATTR_PORT_CNTRS ||
                  p_mad->attr_id == IB_MAD_ATTR_CLASS_PORT_INFO);
 
+       cl_plock_acquire(&pm->osm->lock);
+       /* validate port number */
+       if (port >= p_mon_node->num_ports) {
+               cl_plock_release(&pm->osm->lock);
+               OSM_LOG(pm->log, OSM_LOG_ERROR, "ERR 5413: "
+                       "Invalid port num %d for GUID 0x%016"
+                       PRIx64 " num ports %d\n", port, node_guid,
+                       p_mon_node->num_ports);
+               goto Exit;
+       }
+       cl_plock_release(&pm->osm->lock);
+
+       /* capture CLASS_PORT_INFO data */
+       if (p_mad->attr_id == IB_MAD_ATTR_CLASS_PORT_INFO) {
+               cpi = (ib_class_port_info_t *) &
+                   (osm_madw_get_perfmgt_mad_ptr(p_madw)->data);
+
+               if (pm->query_cpi) {
+                       cl_plock_acquire(&pm->osm->lock);
+                       if (p_mon_node->node_type == IB_NODE_TYPE_SWITCH) {
+                               int i = 0;
+                               for (i = p_mon_node->esp0 ? 0 : 1;
+                                    i < p_mon_node->num_ports;
+                                    i++) {
+                                       p_mon_node->port[i].cap_mask = 
cpi->cap_mask;
+                                       p_mon_node->port[i].cpi_valid = TRUE;
+                               }
+                       } else {
+                               p_mon_node->port[port].cap_mask = cpi->cap_mask;
+                               p_mon_node->port[port].cpi_valid = TRUE;
+                       }
+                       cl_plock_release(&pm->osm->lock);
+               }
+       }
+
        /* Response could also be redirection (IBM eHCA PMA does this) */
-       if (p_mad->status & IB_MAD_STATUS_REDIRECT &&
-           p_mad->attr_id == IB_MAD_ATTR_CLASS_PORT_INFO) {
+       if (p_mad->status & IB_MAD_STATUS_REDIRECT) {
                char gid_str[INET6_ADDRSTRLEN];
-               ib_class_port_info_t *cpi =
-                   (ib_class_port_info_t *) &
-                   (osm_madw_get_perfmgt_mad_ptr(p_madw)->data);
                ib_api_status_t status;
+               uint8_t mad_method;
+
+               CL_ASSERT(cpi); /* Redirect should have returned CPI
+                                       (processed in previous block) */
 
                OSM_LOG(pm->log, OSM_LOG_VERBOSE,
                        "Redirection to LID %u GID %s QP 0x%x received\n",
@@ -1294,20 +1427,40 @@ static void pc_recv_process(void *context, void *data)
                if (!valid)
                        goto Exit;
 
-               /* Finally, reissue the query to the redirected location */
-               status = perfmgr_send_pc_mad(pm, cpi->redir_lid, cpi->redir_qp,
-                                            pkey_ix, port,
-                                            mad_context->perfmgr_context.
-                                            mad_method, mad_context);
+               /* either */
+               if (pm->query_cpi)
+               {
+                       /* issue a CPI query to the redirected location */
+                       mad_method = IB_MAD_METHOD_GET;
+                       p_mon_node->port[port].cpi_valid = FALSE;
+                       status = perfmgr_send_cpi_mad(pm, cpi->redir_lid,
+                                                       cpi->redir_qp, pkey_ix,
+                                                       port, mad_context,
+                                                       0); /* FIXME SL != 0 */
+               } else {
+                       /* reissue the original query to the redirected 
location */
+                       mad_method = mad_context->perfmgr_context.mad_method,
+                       status = perfmgr_send_pc_mad(pm, cpi->redir_lid, 
cpi->redir_qp,
+                                                       pkey_ix, port,
+                                                       mad_method,
+                                                       mad_context,
+                                                       0); /* FIXME SL != 0 */
+               }
                if (status != IB_SUCCESS)
                        OSM_LOG(pm->log, OSM_LOG_ERROR, "ERR 5414: "
-                               "Failed to send redirected MAD with method 0x%x 
for node 0x%"
-                               PRIx64 " port %d\n",
-                               mad_context->perfmgr_context.mad_method,
-                               node_guid, port);
+                               "Failed to send redirected MAD "
+                               "with method 0x%x for node %s "
+                               "(NodeGuid 0x%" PRIx64 ") port %d\n",
+                               mad_method, p_mon_node->name, node_guid, port);
                goto Exit;
        }
 
+       /* ClassPortInfo needed to process optional Redirection
+        * now exit normally
+        */
+       if (p_mad->attr_id == IB_MAD_ATTR_CLASS_PORT_INFO)
+               goto Exit;
+
        perfmgr_db_fill_err_read(wire_read, &err_reading);
        /* FIXME separate query for extended counters if they are supported
         * on the port.
@@ -1405,6 +1558,7 @@ ib_api_status_t osm_perfmgr_init(osm_perfmgr_t * pm, 
osm_opensm_t * osm,
                cl_timer_start(&pm->sweep_timer, pm->sweep_time_s * 1000);
 
        pm->rm_nodes = p_opt->perfmgr_rm_nodes;
+       pm->query_cpi = p_opt->perfmgr_query_cpi;
        status = IB_SUCCESS;
 Exit:
        OSM_LOG_EXIT(pm->log);
diff --git a/opensm/osm_subnet.c b/opensm/osm_subnet.c
index b026ddd..c32bc99 100644
--- a/opensm/osm_subnet.c
+++ b/opensm/osm_subnet.c
@@ -784,6 +784,7 @@ static const opt_rec_t opt_tbl[] = {
        { "event_db_dump_file", OPT_OFFSET(event_db_dump_file), 
opts_parse_charp, NULL, 0 },
        { "perfmgr_rm_nodes", OPT_OFFSET(perfmgr_rm_nodes), opts_parse_boolean, 
NULL, 0 },
        { "perfmgr_log_errors", OPT_OFFSET(perfmgr_log_errors), 
opts_parse_boolean, NULL, 0 },
+       { "perfmgr_query_cpi", OPT_OFFSET(perfmgr_query_cpi), 
opts_parse_boolean, NULL, 0 },
 #endif                         /* ENABLE_OSM_PERF_MGR */
        { "event_plugin_name", OPT_OFFSET(event_plugin_name), opts_parse_charp, 
NULL, 0 },
        { "event_plugin_options", OPT_OFFSET(event_plugin_options), 
opts_parse_charp, NULL, 0 },
@@ -1487,6 +1488,7 @@ void osm_subn_set_default_opt(IN osm_subn_opt_t * p_opt)
        p_opt->event_db_dump_file = NULL; /* use default */
        p_opt->perfmgr_rm_nodes = TRUE;
        p_opt->perfmgr_log_errors = TRUE;
+       p_opt->perfmgr_query_cpi = TRUE;
 #endif                         /* ENABLE_OSM_PERF_MGR */
 
        p_opt->event_plugin_name = NULL;
@@ -2555,14 +2557,17 @@ int osm_subn_output_conf(FILE *out, IN osm_subn_opt_t * 
p_opts)
                "# Remove missing nodes from DB\n"
                "perfmgr_rm_nodes %s\n\n"
                "# Log error counters to opensm.log\n"
-               "perfmgr_log_errors %s\n\n",
+               "perfmgr_log_errors %s\n\n"
+               "# Query PerfMgrGet(ClassPortInfo) for extended capabilities\n"
+               "perfmgr_query_cpi %s\n\n",
                p_opts->perfmgr ? "TRUE" : "FALSE",
                p_opts->perfmgr_redir ? "TRUE" : "FALSE",
                p_opts->perfmgr_sweep_time_s,
                p_opts->perfmgr_max_outstanding_queries,
                p_opts->perfmgr_ignore_cas ? "TRUE" : "FALSE",
                p_opts->perfmgr_rm_nodes ? "TRUE" : "FALSE",
-               p_opts->perfmgr_log_errors ? "TRUE" : "FALSE");
+               p_opts->perfmgr_log_errors ? "TRUE" : "FALSE",
+               p_opts->perfmgr_query_cpi ? "TRUE" : "FALSE");
 
        fprintf(out,
                "#\n# Event DB Options\n#\n"
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to