Fixes seg fault when ib_pkey_is_invalid called in last_used_pkey_index Introduced by commit aebd9f9d9cdd1c60c2b3784c0c03cfe8f4014019 for better last block handling
Signed-off-by: Hal Rosenstock <[email protected]> --- diff --git a/opensm/osm_pkey_mgr.c b/opensm/osm_pkey_mgr.c index 06d9b1e..a2021e9 100644 --- a/opensm/osm_pkey_mgr.c +++ b/opensm/osm_pkey_mgr.c @@ -375,14 +375,19 @@ static int pkey_mgr_update_port(osm_log_t * p_log, osm_sm_t * sm, return ret; } -static uint16_t last_used_pkey_index(const osm_port_t * const p_port, - const osm_pkey_tbl_t * p_pkey_tbl) +static int last_used_pkey_index(const osm_port_t * const p_port, + const osm_pkey_tbl_t * p_pkey_tbl, + uint16_t * p_last_index) { ib_pkey_table_t *last_block; uint16_t index, last_index = 0; + CL_ASSERT(p_last_index); + last_block = osm_pkey_tbl_new_block_get(p_pkey_tbl, p_pkey_tbl->used_blocks - 1); + if (!last_block) + return 1; if (p_pkey_tbl->used_blocks == p_pkey_tbl->max_blocks) last_index = cl_ntoh16(p_port->p_node->node_info.partition_cap) % IB_NUM_PKEY_ELEMENTS_IN_BLOCK; @@ -395,7 +400,8 @@ static uint16_t last_used_pkey_index(const osm_port_t * const p_port, break; } while (index != 0); - return index; + *p_last_index = index; + return 0; } static int update_peer_block(osm_log_t * p_log, osm_sm_t * sm, @@ -510,20 +516,21 @@ static int pkey_mgr_update_peer_port(osm_log_t * p_log, osm_sm_t * sm, p_peer_pkey_tbl->used_blocks = peer_block_idx + 1; if (p_peer_pkey_tbl->used_blocks == peer_max_blocks) { /* Is last used pkey index beyond switch peer port capacity ? */ - last_index = peer_block_idx * IB_NUM_PKEY_ELEMENTS_IN_BLOCK + - last_used_pkey_index(p_port, - p_peer_pkey_tbl); - if (cl_ntoh16(p_node->sw->switch_info.enforce_cap) <= last_index) { - OSM_LOG(p_log, OSM_LOG_ERROR, "ERR 0507: " - "Not enough pkey entries (%u <= %u) on switch 0x%016" - PRIx64 " port %u (%s). Clearing Enforcement bit\n", - cl_ntoh16(p_node->sw->switch_info.enforce_cap), - last_index, - cl_ntoh64(osm_node_get_node_guid(p_node)), - osm_physp_get_port_num(peer), - p_node->print_desc); - enforce = FALSE; - ret = -1; + if (!last_used_pkey_index(p_port, p_peer_pkey_tbl, + &last_index)) { + last_index += peer_block_idx * IB_NUM_PKEY_ELEMENTS_IN_BLOCK; + if (cl_ntoh16(p_node->sw->switch_info.enforce_cap) <= last_index) { + OSM_LOG(p_log, OSM_LOG_ERROR, "ERR 0507: " + "Not enough pkey entries (%u <= %u) on switch 0x%016" + PRIx64 " port %u (%s). Clearing Enforcement bit\n", + cl_ntoh16(p_node->sw->switch_info.enforce_cap), + last_index, + cl_ntoh64(osm_node_get_node_guid(p_node)), + osm_physp_get_port_num(peer), + p_node->print_desc); + enforce = FALSE; + ret = -1; + } } } } else { -- 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
