Osmtest general cleanup . -Removal of incompatible flows. -Unique error messages -Makefile.am update for compilation (required osm_helper object) -Remove vendor dependencies. Signed-off-by: Liran Sorani ----- Index: osmtest.c =================================================================== --- osmtest.c (revision 3003) +++ osmtest.c (working copy) @@ -55,12 +55,10 @@ #include #include #include "osmtest.h" -#include +#include -#ifdef OSM_VENDOR_INTF_OPENIB #define strnicmp strncasecmp -#endif #define POOL_MIN_ITEMS 64 #define GUID_ARRAY_SIZE 64 @@ -742,11 +740,11 @@ osmtest_validate_sa_class_port_info( IN ); Exit: - // if( context.result.p_result_madw != NULL ) - //{ - // osm_mad_pool_put( &p_osmt->mad_pool, context.result.p_result_madw ); - // context.result.p_result_madw = NULL; - //} + /* if( context.result.p_result_madw != NULL ) */ + /* { */ + /* osm_mad_pool_put( &p_osmt->mad_pool, context.result.p_result_madw ); */ + /* context.result.p_result_madw = NULL; */ + /* } */ OSM_LOG_EXIT( &p_osmt->log ); return ( status ); @@ -981,7 +979,7 @@ osmtest_get_path_rec_by_guid_pair( IN os if( status != IB_SUCCESS ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_get_path_rec_by_guid_pair: ERR 0064: " + "osmtest_get_path_rec_by_guid_pair: ERR 0066: " "ib_query failed (%s).\n", ib_get_err_str( status ) ); if( status == IB_REMOTE_ERROR ) @@ -1426,7 +1424,7 @@ osmtest_stress_path_recs_by_guid ( IN os if( status != IB_SUCCESS ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_stress_path_recs_by_guid: ERR 0008: " + "osmtest_stress_path_recs_by_guid: ERR 0009: " "osmtest_get_path_rec_by_guid_pair failed (%s)\n", ib_get_err_str( status ) ); if (status != IB_TIMEOUT) @@ -1492,14 +1490,14 @@ osmtest_stress_port_recs_small( IN osmte /* * Do a blocking query for our own PortRecord in the subnet. */ - status = osmtest_get_port_rec( p_osmt, - cl_ntoh16(p_osmt->local_port.lid), + status = osmtest_get_port_rec( p_osmt, + cl_ntoh16(p_osmt->local_port.lid), &context ); if( status != IB_SUCCESS ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_stress_port_recs_small: ERR 0009: " + "osmtest_stress_port_recs_small: ERR 0010: " "osmtest_get_all_recs failed (%s)\n", ib_get_err_str( status ) ); goto Exit; @@ -1600,7 +1598,7 @@ osmtest_wrong_sm_key_ignored( IN osmtest if( status != IB_TIMEOUT ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_wrong_sm_key_ignored: ERR 0010: " + "osmtest_wrong_sm_key_ignored: ERR 0011: " "Did not get a timeout but got (%s).\n", ib_get_err_str( status ) ); goto Exit; } @@ -2829,7 +2827,7 @@ osmtest_stress_small_rmpp( IN osmtest_t printf("-I- Quering %" PRId64 " port_info queries (single mad) took %04ld:%06ld [sec:usec]\n",num_queries, sec_diff,usec_diff); - if (num_timeouts > 50) + if (num_timeouts > 50) { status = IB_TIMEOUT; } @@ -3077,7 +3075,7 @@ osmtest_validate_path_data( IN osmtest_t p_rec->sgid.unicast.interface_id ) ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_validate_path_data: ERR 0011: " + "osmtest_validate_path_data: ERR 0057: " "SGID mismatch on path SLID 0x%X to DLID 0x%X.\n" "\t\t\t\tExpected 0x%016" PRIx64 " 0x%016" PRIx64 ",\n" "\t\t\t\tReceived 0x%016" PRIx64 " 0x%016" PRIx64 ".\n", @@ -3594,7 +3592,7 @@ osmtest_validate_port_data( IN osmtest_t ( p_port->comp.port_info.state_info1 & p_rec->port_info.state_info1 ) ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_validate_port_data: ERR 0057: " + "osmtest_validate_port_data: ERR 0055: " "Field mismatch port LID 0x%X Num:0x%X.\n" "\t\t\t\tExpected state_info1 0x%X, received 0x%X.\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, @@ -4402,9 +4400,9 @@ osmtest_validate_single_path_rec_guid_pa num_recs = context.result.result_cnt; osm_log( &p_osmt->log, OSM_LOG_VERBOSE, "osmtest_validate_single_path_rec_guid_pair: " - "Got: %u records\n", + "osmtest_validate_single_path_rec_guid_pair: %u records\n", num_recs); - + for( i = 0; i < num_recs; i++ ) { p_rec = osmv_get_query_path_rec( context.result.p_result_madw, i ); @@ -6035,7 +6033,7 @@ osmtest_bind( IN osmtest_t * p_osmt, if( p_osmt->h_bind == OSM_BIND_INVALID_HANDLE ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_bind: ERR 00137: " "Unable to bind to SA\n" ); + "osmtest_bind: ERR 00137: " "Unable to bind to SA\n" ); status = IB_ERROR; goto Exit; } @@ -6110,7 +6108,7 @@ osmtest_run( IN osmtest_t * const p_osmt if( status != IB_SUCCESS ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_run: ERR 00143: " + "osmtest_run: ERR 00142: " "Database creation failed (%s)\n", ib_get_err_str( status ) ); goto Exit; @@ -6120,7 +6118,7 @@ osmtest_run( IN osmtest_t * const p_osmt if( status != IB_SUCCESS ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_run: ERR 00142: " + "osmtest_run: ERR 00143: " "Large RMPP stress test failed (%s)\n", ib_get_err_str( status ) ); goto Exit; @@ -6128,7 +6126,7 @@ osmtest_run( IN osmtest_t * const p_osmt break; default: osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_run: ERR 00143: " + "osmtest_run: ERR 00144: " "Unknown stress test value %u.\n", p_osmt->opt.stress ); break; @@ -6146,7 +6144,7 @@ osmtest_run( IN osmtest_t * const p_osmt if( status != IB_SUCCESS ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_run: ERR 00143: " + "osmtest_run: ERR 00145: " "Database creation failed (%s)\n", ib_get_err_str( status ) ); goto Exit; @@ -6156,7 +6154,7 @@ osmtest_run( IN osmtest_t * const p_osmt if( status != IB_SUCCESS ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_run: ERR 00144: " + "osmtest_run: ERR 00146: " "SA validation database failure again (%s)\n", ib_get_err_str( status ) ); goto Exit; @@ -6169,7 +6167,7 @@ osmtest_run( IN osmtest_t * const p_osmt if( status != IB_SUCCESS ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_run: ERR 00145: " + "osmtest_run: ERR 00147: " "Try wrong SM_Key failed (%s)\n", ib_get_err_str( status ) ); goto Exit; @@ -6182,25 +6180,32 @@ osmtest_run( IN osmtest_t * const p_osmt if( status != IB_SUCCESS ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_run: ERR 00146: " + "osmtest_run: ERR 00148: " "Service Flow failed (%s)\n", ib_get_err_str( status ) ); goto Exit; } } -#if defined(OSM_VENDOR_INTF_MTL) || defined(OSM_VENDOR_OPENIB) /* only available for now on mVAPI */ if (!p_osmt->opt.flow || p_osmt->opt.flow == 4) { + /* status = osmt_run_inform_info_flow( p_osmt ); + if( status != IB_SUCCESS ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_run: ERR 00147: " + "osmtest_run: ERR 00149: " "Inform Info Flow Failed: (%s)\n", ib_get_err_str( status ) ); goto Exit; } + */ + osm_log (&p_osmt->log, OSM_LOG_INFO, + "osmtest_run : The event forwarding flow " + "not implemented yet!\n"); + status = IB_SUCCESS; + goto Exit; } /* @@ -6213,7 +6218,7 @@ osmtest_run( IN osmtest_t * const p_osmt if( status != IB_SUCCESS ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_run: ERR 00148: " + "osmtest_run: ERR 00150: " "Fail to get SLtoVL and VL Arbitration Tables (%s)\n", ib_get_err_str( status ) ); goto Exit; @@ -6222,18 +6227,25 @@ osmtest_run( IN osmtest_t * const p_osmt if (p_osmt->opt.flow == 8) { + /* status = osmt_run_trap64_65_flow( p_osmt ); if( status != IB_SUCCESS ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_run: ERR 00150: " + "osmtest_run: ERR 00151: " "Trap 64/65 Flow Failed: (%s)\n", ib_get_err_str( status ) ); goto Exit; } + */ + + osm_log (&p_osmt->log, OSM_LOG_INFO, + "osmtest_run : The event forwarding flow " + "not implemented yet!\n"); + status = IB_SUCCESS; + goto Exit; } -#endif if (!p_osmt->opt.flow || p_osmt->opt.flow == 6) { @@ -6241,7 +6253,7 @@ osmtest_run( IN osmtest_t * const p_osmt if( status != IB_SUCCESS ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_run: ERR 00149: " + "osmtest_run: ERR 00152: " "Multicast Flow Failed: (%s)\n", ib_get_err_str( status ) ); goto Exit; Index: main.c =================================================================== --- main.c (revision 3003) +++ main.c (working copy) @@ -340,7 +340,7 @@ main( int argc, osmt_is_debug() != cl_is_debug() ) { fprintf(stderr, "-E- OpenSM, Complib and OsmTest were compiled using different modes\n"); - fprintf(stderr, "-E- OpenSM debug:%d Complib debug:%d OsmTest debug:%d \n", + fprintf(stderr, "-E- OpenSM debug:%d Complib debug:%d OsmTest debug:%d \n", osm_is_debug(), cl_is_debug(), osmt_is_debug() ); exit(1); } Index: osmt_multicast.c =================================================================== --- osmt_multicast.c (revision 3003) +++ osmt_multicast.c (working copy) @@ -52,9 +52,6 @@ #include #include #include "osmtest.h" -#ifdef OSM_VENDOR_INTF_MTL -#include "osmt_inform.h" -#endif static cl_status_t @@ -177,9 +174,9 @@ osmt_query_mcast( IN osmtest_t * const p if( p_mgids_res != cl_list_end( p_mgids_list ) ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_query_mcast: ERR 0203: " - "MCG MGIDS are the same - invalid MGID : 0x% " - PRIx64 " 0x% " PRIx64 "\n" , + "osmt_query_mcast: ERR 0265: " + "MCG MGIDS are the same - invalid MGID : 0x%016" PRIx64 " 0x%016" + PRIx64 "\n" , cl_ntoh64(p_rec->mgid.unicast.prefix) , cl_ntoh64(p_rec->mgid.unicast.interface_id)); status = IB_ERROR; @@ -297,7 +294,7 @@ osmt_send_mcast_request( IN osmtest_t * if ( status != IB_SUCCESS ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_send_mcast_request: ERR 0205: " + "osmt_send_mcast_request: ERR 0206: " "ib_query failed (%s).\n", ib_get_err_str( status ) ); goto Exit; } @@ -466,10 +463,6 @@ osmt_run_mcast_flow( IN osmtest_t * cons }, }; -#ifdef OSM_VENDOR_INTF_MTL - ib_inform_info_t inform_info; - osmt_qp_ctx_t qp_ctx; -#endif OSM_LOG_ENTER( &p_osmt->log, osmt_run_mcast_flow ); @@ -610,7 +603,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_SUCCESS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 02ee : " + "osmt_run_mcast_flow: ERR 02ef: " "Query as Full Member of already existing ipoib group 0x%016" PRIx64 ":0x%016" PRIx64 " has failed\n", cl_ntoh64(mc_req_rec.mgid.unicast.prefix), @@ -728,7 +721,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons (( ib_net16_t ) (res_sa_mad.status & IB_SMP_STATUS_MASK )) != IB_SA_MAD_STATUS_INSUF_COMPS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0206: " + "osmt_run_mcast_flow: ERR 02eg: " "Expecetd REMOTE ERROR IB_SA_MAD_STATUS_INSUF_COMPS got:%s/%s.\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -774,7 +767,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons (( ib_net16_t ) (res_sa_mad.status & IB_SMP_STATUS_MASK )) != IB_SA_MAD_STATUS_INSUF_COMPS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0206: " + "osmt_run_mcast_flow: ERR 02eh: " "Expecetd REMOTE ERROR IB_SA_MAD_STATUS_INSUF_COMPS got:%s/%s.\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -827,7 +820,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons (( ib_net16_t ) (res_sa_mad.status & IB_SMP_STATUS_MASK )) != IB_SA_MAD_STATUS_INSUF_COMPS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0206: " + "osmt_run_mcast_flow: ERR 02ei: " "Expecetd REMOTE ERROR IB_SA_MAD_STATUS_INSUF_COMPS got:%s/%s.\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -877,7 +870,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons (( ib_net16_t ) (res_sa_mad.status & IB_SMP_STATUS_MASK )) != IB_SA_MAD_STATUS_INSUF_COMPS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0206: " + "osmt_run_mcast_flow: ERR 02ej: " "Expecetd REMOTE ERROR IB_SA_MAD_STATUS_INSUF_COMPS got:%s/%s.\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -928,7 +921,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons (( ib_net16_t ) (res_sa_mad.status & IB_SMP_STATUS_MASK )) != IB_SA_MAD_STATUS_INSUF_COMPS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0206: " + "osmt_run_mcast_flow: ERR 02ek: " "Expecetd REMOTE ERROR IB_SA_MAD_STATUS_INSUF_COMPS got:%s/%s.\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -1008,7 +1001,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_REMOTE_ERROR || res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0207: " + "osmt_run_mcast_flow: ERR 0208: " "Expecetd REMOTE ERROR IB_SA_MAD_STATUS_REQ_INVALID got:%s/%s.\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -1081,7 +1074,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_REMOTE_ERROR || res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0207: " + "osmt_run_mcast_flow: ERR 02ac: " "Expected REMOTE ERROR IB_SA_MAD_STATUS_REQ_INVALID got:%s/%s.\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -1122,7 +1115,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_REMOTE_ERROR || res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0207: " + "osmt_run_mcast_flow: ERR 02ad: " "Expecetd REMOTE ERROR IB_SA_MAD_STATUS_REQ_INVALID got:%s/%s.\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -1157,7 +1150,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_REMOTE_ERROR || res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0207: " + "osmt_run_mcast_flow: ERR 02ae: " "Expecetd REMOTE ERROR IB_SA_MAD_STATUS_REQ_INVALID got:%s/%s.\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -1193,7 +1186,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_REMOTE_ERROR || res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0207: " + "osmt_run_mcast_flow: ERR 02af: " "Expected REMOTE ERROR IB_SA_MAD_STATUS_REQ_INVALID got:%s/%s.\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -1249,7 +1242,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons (( ib_net16_t ) (res_sa_mad.status & IB_SMP_STATUS_MASK )) != IB_SA_MAD_STATUS_INSUF_COMPS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0206: " + "osmt_run_mcast_flow: ERR 02ag: " "Expecetd REMOTE ERROR IB_SA_MAD_STATUS_INSUF_COMPS got:%s/%s.\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -1281,7 +1274,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (middle_cnt != start_cnt) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 02ab: " + "osmt_run_mcast_flow: ERR 02ah: " "Got different number of records stored in SA DB (before any creation)\n" "Instead of %d got %d.\n",start_cnt,middle_cnt); status=IB_ERROR; @@ -1334,7 +1327,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons (( ib_net16_t ) (res_sa_mad.status & IB_SMP_STATUS_MASK )) != IB_SA_MAD_STATUS_INSUF_COMPS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0206: " + "osmt_run_mcast_flow: ERR 02ai: " "Expecetd REMOTE ERROR IB_SA_MAD_STATUS_INSUF_COMPS got:%s/%s.\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -1391,7 +1384,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons (( ib_net16_t ) (res_sa_mad.status & IB_SMP_STATUS_MASK )) != IB_SA_MAD_STATUS_INSUF_COMPS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0206: " + "osmt_run_mcast_flow: ERR 02aj: " "Expecetd REMOTE ERROR IB_SA_MAD_STATUS_INSUF_COMPS got:%s/%s.\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -1433,7 +1426,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_SUCCESS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0208: " + "osmt_run_mcast_flow: ERR 02ak: " "Fail to create MGC for MGID=0 with higher then minimum RATE.\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -1466,7 +1459,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_SUCCESS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 020ab: " + "osmt_run_mcast_flow: ERR 021: " "Fail to create MGC for MGID=0 with less then highest RATE.\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -1633,7 +1626,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_SUCCESS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0240: " + "osmt_run_mcast_flow: ERR 0242: " "Fail to create MGC for MGID=0 with exact MTU.\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -1702,7 +1695,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_SUCCESS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0208: " + "osmt_run_mcast_flow: ERR 0210: " "Fail to create MGC for MGID=0.\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -1728,7 +1721,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_SUCCESS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0210: " + "osmt_run_mcast_flow: ERR 0211: " "Fail to create MGC for MGID=0x%016" PRIx64 " : " "0x%016" PRIx64 " (o15.0.1.6)...\n", ib_get_err_str( status ), @@ -1749,7 +1742,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons (p_mc_res->mgid.multicast.raw_group_id[1] != 0x1C) ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0211: " + "osmt_run_mcast_flow: ERR 0212: " "Validating MGID failed. MGID:0x%016" PRIx64 "\n", p_mc_res->mgid ); @@ -1780,7 +1773,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if ((status != IB_REMOTE_ERROR) || (res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID)) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0212: " + "osmt_run_mcast_flow: ERR 0213: " "Fail to recognize MGID error for MGID=0xFA......\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -1815,7 +1808,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if ((status != IB_REMOTE_ERROR) || (res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID)) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0213: " + "osmt_run_mcast_flow: ERR 0214: " "Fail to recognize MGID error for A01B with link-local bit (status %s) (rem status %s)\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -1854,7 +1847,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if ((status != IB_REMOTE_ERROR) || (res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID)) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0212: " + "osmt_run_mcast_flow: ERR 0215: " "Fail to recognize MGID PREFIX error for MGID=0xEF....\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -1883,7 +1876,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_SUCCESS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0210: " + "osmt_run_mcast_flow: ERR 0216: " "Fail to create MGC for MGID=0x%016" PRIx64 " : " "0x%016" PRIx64 ".\n", ib_get_err_str( status ), @@ -1923,7 +1916,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if ((status != IB_REMOTE_ERROR) || (res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID)) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0214: " + "osmt_run_mcast_flow: ERR 0217: " "Fail to recognize create with invalid flags value 0x2\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -1955,7 +1948,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_SUCCESS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0210: " + "osmt_run_mcast_flow: ERR 0218: " "Fail to create MGC for MGID=0xFF02:0:0:0:0:0:0:1.\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -1995,7 +1988,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if ((status != IB_REMOTE_ERROR) || (res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID)) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0214: " + "osmt_run_mcast_flow: ERR 0219: " "Fail to recognize create with JoinState != FullMember\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -2021,7 +2014,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_SUCCESS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0210: " + "osmt_run_mcast_flow: ERR 0220: " "Fail to create MGC with valid join state 0x3.\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -2056,7 +2049,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if ((status != IB_REMOTE_ERROR) || (res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID)) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0214: " + "osmt_run_mcast_flow: ERR 0221: " "Fail to recognize create with JoinState != FullMember\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -2084,7 +2077,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_SUCCESS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0210: " + "osmt_run_mcast_flow: ERR 0222: " "Fail to create MGC with valid join state 0xF\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -2139,7 +2132,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_SUCCESS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0215: " + "osmt_run_mcast_flow: ERR 02cd: " "Fail to update existing MGID\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -2155,7 +2148,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (p_mc_res->scope_state != 0x23) /* scope is LSB */ { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0216: " + "osmt_run_mcast_flow: ERR 02ce: " "Validating JoinState update failed. Expected 0x23 got: 0x%02X\n", p_mc_res->scope_state ); @@ -2187,7 +2180,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if ((status != IB_SUCCESS) || (p_mc_res->scope_state != 0x21)) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0218: " + "osmt_run_mcast_flow: ERR 02cf: " "Fail to partially update JoinState : %s/%s\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -2207,7 +2200,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_SUCCESS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0215: " + "osmt_run_mcast_flow: ERR 02cg: " "Fail to update existing MCG\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -2223,7 +2216,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (p_mc_res->scope_state != 0x25) /* scope is MSB */ { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0216: " + "osmt_run_mcast_flow: ERR 02ch: " "Validating JoinState update failed. Expected 0x25 got: 0x%02X\n", p_mc_res->scope_state ); @@ -2240,7 +2233,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_SUCCESS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0215: " + "osmt_run_mcast_flow: ERR 02ci: " "Fail to update existing MGID\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -2256,7 +2249,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (p_mc_res->scope_state != 0x25) /* scope is LSB */ { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0216: " + "osmt_run_mcast_flow: ERR 02cj: " "Validating JoinState update failed. Expected 0x25 got: 0x%02X\n", p_mc_res->scope_state ); @@ -2274,7 +2267,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_SUCCESS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0215: " + "osmt_run_mcast_flow: ERR 02ck: " "Fail to update existing MGID\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -2289,7 +2282,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (p_mc_res->scope_state != 0x27) /* scope is LSB */ { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0216: " + "osmt_run_mcast_flow: ERR 02cl: " "Validating JoinState update failed. Expected 0x27 got: 0x%02X\n", p_mc_res->scope_state ); @@ -2346,7 +2339,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if ((status != IB_REMOTE_ERROR) || (res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID)) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0217: " + "osmt_run_mcast_flow: ERR 02cm: " "Fail to catch BAD RATE joining an exiting MGID: %s/%s\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -2393,7 +2386,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if ((status != IB_REMOTE_ERROR) || (res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID)) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0217: " + "osmt_run_mcast_flow: ERR 02cn: " "Fail to catch BAD RATE (higher them max) joining an exiting MGID: %s/%s\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -2440,7 +2433,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if ((status != IB_REMOTE_ERROR) || (res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID)) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 02cd: " + "osmt_run_mcast_flow: ERR 02co: " "Fail to catch BAD RATE (less them min) joining an exiting MGID: %s/%s\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -2484,7 +2477,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_SUCCESS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0218: " + "osmt_run_mcast_flow: ERR 02cp: " "Fail to partially update JoinState during delete: %s/%s\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -2500,7 +2493,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (p_mc_res->scope_state != 0x25) /* scope is MSB - now only the non member & send only member have left */ { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0219: " + "osmt_run_mcast_flow: ERR 02cq: " "Validating JoinState update failed. Expected 0x25 got: 0x%02X\n", p_mc_res->scope_state ); @@ -2519,7 +2512,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_SUCCESS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0218: " + "osmt_run_mcast_flow: ERR 02cr: " "Fail to update JoinState during delete: %s/%s\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -2536,7 +2529,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (p_mc_res->scope_state != 0x25) /* scope is MSB - now only 0x0 so port is removed from MCG */ { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0219: " + "osmt_run_mcast_flow: ERR 02cs: " "Validating JoinState update failed. Expected 0x25 got: 0x%02X\n", p_mc_res->scope_state ); @@ -2565,7 +2558,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_REMOTE_ERROR) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0221: " + "osmt_run_mcast_flow: ERR 02ct: " "Succeeded Joining Deleted Group: %s/%s\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -2601,7 +2594,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if ((status != IB_REMOTE_ERROR) || (res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID)) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0222: " + "osmt_run_mcast_flow: ERR 02cu: " "Fail to catch BAD delete from IPoIB: %s/%s\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) @@ -2641,7 +2634,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_SUCCESS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0210: " + "osmt_run_mcast_flow: ERR 02cv: " "Fail to create MGC for 0x%016" PRIx64 " : " "0x%016" PRIx64 ".\n", ib_get_err_str( status ), @@ -2651,58 +2644,6 @@ osmt_run_mcast_flow( IN osmtest_t * cons goto Exit; } -#ifdef OSM_VENDOR_INTF_MTL - - /* - Register by InformInfo flow to receive trap 67 on MCG delete. */ - /* bind the QP */ - osm_log( &p_osmt->log, OSM_LOG_INFO, - "osmt_run_mcast_flow: " - "Setting InformInfo for Trap 67 (o15.0.1.14)...\n" - ); - status = osmt_bind_inform_qp( p_osmt, &qp_ctx); - if (status != IB_SUCCESS) - { - goto Exit; - } - - /* init the inform info */ - osmt_init_inform_info(p_osmt, &inform_info); - - /* limit to trap 67 from SM */ - inform_info.lid_range_begin = cl_ntoh16(p_osmt->local_port.sm_lid); - inform_info.lid_range_end = cl_ntoh16(p_osmt->local_port.sm_lid); - inform_info.g_or_v.generic.trap_num = cl_hton16(67); - - /* send the inform info registration */ - status = osmt_reg_unreg_inform_info(p_osmt, - &qp_ctx, - &inform_info, - 1); - if (status != IB_SUCCESS) - { - goto Exit; - } - - - /*--------------------- PREP -------------------------*/ - if (osmt_mtl_mad_post_recv_bufs( - &qp_ctx.qp_bind_hndl, - qp_ctx.p_recv_buf, - 1, /* we need to reveive the report */ - GRH_LEN + MAD_BLOCK_SIZE, - 1) != 1) { - osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0127: " - "Error posting recv bufs .\n"); - status = IB_ERROR; - goto Exit; - } - osm_log( &p_osmt->log, OSM_LOG_DEBUG, - "osmt_run_mcast_flow: " - "Posted recv bufs .\n"); - -#endif /* OSM_VENDOR_INTF_MTL */ - /* - Try delete with valid join state */ osm_log( &p_osmt->log, OSM_LOG_INFO, "osmt_run_mcast_flow: " @@ -2719,21 +2660,6 @@ osmt_run_mcast_flow( IN osmtest_t * cons goto Exit; } -#ifdef OSM_VENDOR_INTF_MTL - - /* - Wait for trap 67. */ - status = osmt_trap_wait( p_osmt, &qp_ctx); - - /* cleanup */ - osmt_unbind_inform_qp( p_osmt, &qp_ctx); - - if (status != IB_SUCCESS) - { - goto Exit; - } - -#endif - /* o15.0.1.15: */ /* - Try deletion of the IPoIB MCG and get: ERR_REQ_INVALID */ osm_log( &p_osmt->log, OSM_LOG_INFO, @@ -2805,7 +2731,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_SUCCESS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 02ea " + "osmt_run_mcast_flow: ERR 02eb: " "Failed to create new mgrp.\n"); goto Exit; } @@ -2874,7 +2800,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if( status != IB_SUCCESS ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 0007: " + "osmt_run_mcast_flow: ERR 02e5: " "osmtest_get_all_recs failed on getting all node records(%s)\n", ib_get_err_str( status ) ); goto Exit; @@ -2979,7 +2905,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if (status != IB_SUCCESS) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 02ab: " + "osmt_run_mcast_flow: ERR 02b0: " "Failed to delete mgid with remote port guid MGID : " "0x%016" PRIx64 " : 0x%016" PRIx64 " , Got : %s/%s\n", cl_ntoh64(p_mgrp->mcmember_rec.mgid.unicast.prefix), @@ -3157,7 +3083,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons if ((end_cnt-fail_to_delete_mcg) != (start_cnt - mcg_outside_test_cnt)) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmt_run_mcast_flow: ERR 02ab: " + "osmt_run_mcast_flow: ERR 02FG: " "Got different number of records stored in SA DB at Start got \n\t\t" "(only IPoIB groups) %d , at End got %d\n", (start_cnt-mcg_outside_test_cnt),(end_cnt-fail_to_delete_mcg)); Index: Makefile.am =================================================================== --- Makefile.am (revision 3003) +++ Makefile.am (working copy) @@ -9,14 +9,15 @@ INCLUDES = -I$(srcdir)/include \ bin_PROGRAMS = osmtest osmtest_SOURCES = main.c osmtest.c osmt_service.c osmt_slvl_vl_arb.c \ - osmt_multicast.c osmt_inform.c + osmt_multicast.c osmtest_CFLAGS = -Wall -DOSM_VENDOR_INTF_OPENIB -DVENDOR_RMPP_SUPPORT osmtest_LDADD = $(libdir)/libibumad.la \ $(libdir)/libibcommon.la \ $(libdir)/libopensm.la \ $(libdir)/libosmcomp.la \ - $(libdir)/libosmvendor.la + $(libdir)/libosmvendor.la \ + $(srcdir)/../opensm/opensm-osm_helper.o osmtest_LDFLAGS = -Wl,--rpath -Wl,$(libdir) -lpthread -L../opensm