From: sleybo Date: Thu, 14 Dec 2006 12:53:36 +0000 (+0000) Subject: [SRP] fix/improve log issues X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e54a146774a045386444944407e8026aed137856;p=~shefty%2Frdma-win.git [SRP] fix/improve log issues git-svn-id: svn://openib.tc.cornell.edu/gen1@561 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- diff --git a/trunk/ulp/srp/kernel/srp_data_path.c b/trunk/ulp/srp/kernel/srp_data_path.c index 7d9bafde..44c5901d 100644 --- a/trunk/ulp/srp/kernel/srp_data_path.c +++ b/trunk/ulp/srp/kernel/srp_data_path.c @@ -640,16 +640,19 @@ __srp_build_cmd( SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DATA, ("CDB Length = %d.\n", p_srb->CdbLength) ); -#ifdef DBG +#if DBG { char* cmd; cmd = cl_zalloc(p_srb->CdbLength +1); - for ( i = 0; i < p_srb->CdbLength; i++ ) - { - cmd[i] = p_srb->Cdb[i]; + if(cmd) + { + for ( i = 0; i < p_srb->CdbLength; i++ ) + { + cmd[i] = p_srb->Cdb[i]; + } + cmd[i] = '\0'; + SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DATA, ("CDB = 0x%s\n",cmd) ); } - cmd[i] = '\0'; - SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DATA, ("CDB = 0x%s\n",cmd) ); } #endif diff --git a/trunk/ulp/srp/kernel/srp_debug.h b/trunk/ulp/srp/kernel/srp_debug.h index c4ba72ce..383d3030 100644 --- a/trunk/ulp/srp/kernel/srp_debug.h +++ b/trunk/ulp/srp/kernel/srp_debug.h @@ -52,6 +52,7 @@ extern uint32_t g_srp_dbg_flags; WPP_DEFINE_BIT( SRP_DBG_ERROR) \ WPP_DEFINE_BIT( SRP_DBG_PNP) \ WPP_DEFINE_BIT( SRP_DBG_DATA) \ + WPP_DEFINE_BIT( SRP_DBG_SESSION) \ WPP_DEFINE_BIT( SRP_DBG_DEBUG)) @@ -66,6 +67,7 @@ extern uint32_t g_srp_dbg_flags; // SRP_ENTER(FLAG); // SRP_EXIT(FLAG); // USEPREFIX(SRP_PRINT, "%!STDPREFIX! [SRP] :%!FUNC!() :"); +// USEPREFIX(SRP_PRINT_EXIT, "%!STDPREFIX! [SRP] :%!FUNC!() :"); // USESUFFIX(SRP_ENTER, " [SRP] :%!FUNC!():["); // USESUFFIX(SRP_EXIT, " [SRP] :%!FUNC!():]"); // end_wpp @@ -81,10 +83,11 @@ extern uint32_t g_srp_dbg_flags; */ -#define SRP_DBG_ERR (1 << 0) -#define SRP_DBG_PNP (1 << 1) -#define SRP_DBG_DATA (1 << 2) -#define SRP_DBG_DEBUG (1 << 3) +#define SRP_DBG_ERR (1 << 0) +#define SRP_DBG_PNP (1 << 1) +#define SRP_DBG_DATA (1 << 2) +#define SRP_DBG_SESSION (1 << 3) +#define SRP_DBG_DEBUG (1 << 4) #define SRP_DBG_ERROR (CL_DBG_ERROR | SRP_DBG_ERR) #define SRP_DBG_ALL CL_DBG_ALL diff --git a/trunk/ulp/srp/kernel/srp_driver.c b/trunk/ulp/srp/kernel/srp_driver.c index 976ff1de..fe81ad50 100644 --- a/trunk/ulp/srp/kernel/srp_driver.c +++ b/trunk/ulp/srp/kernel/srp_driver.c @@ -626,9 +626,9 @@ srp_start_io( IN PVOID p_dev_ext, IN PSCSI_REQUEST_BLOCK p_srb ) { - SRP_ENTER( SRP_DBG_DEBUG ); + SRP_ENTER( SRP_DBG_DATA ); - SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DATA, ("Starting I/O for Function = %s(0x%x), Path = 0x%x, " "Target = 0x%x, Lun = 0x%x\n", g_srb_function_name[p_srb->Function], @@ -672,7 +672,7 @@ srp_start_io( p_srp_session->p_shutdown_srb = p_srb; cl_obj_destroy( &p_srp_session->obj ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DATA, ("Returning SrbStatus %s(0x%x) for " "Function = %s(0x%x), Path = 0x%x, " "Target = 0x%x, Lun = 0x%x\n", @@ -687,7 +687,7 @@ srp_start_io( else { p_srb->SrbStatus = SRB_STATUS_SUCCESS; - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DATA, ("Returning SrbStatus %s(0x%x) for " "Function = %s(0x%x), Path = 0x%x, " "Target = 0x%x, Lun = 0x%x\n", @@ -705,7 +705,7 @@ srp_start_io( case SRB_FUNCTION_FLUSH: /* Only receive this if CachesData is TRUE in PORT_CONFIGURATION_INFORMATION */ p_srb->SrbStatus = SRB_STATUS_SUCCESS; - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DATA, ("Returning SrbStatus %s(0x%x) for " "Function = %s(0x%x), Path = 0x%x, " "Target = 0x%x, Lun = 0x%x\n", @@ -741,7 +741,7 @@ srp_start_io( #endif default: p_srb->SrbStatus = SRB_STATUS_INVALID_REQUEST; - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DATA, ("Returning SrbStatus %s(0x%x) for " "Function = %s(0x%x), Path = 0x%x, " "Target = 0x%x, Lun = 0x%x\n", @@ -756,7 +756,7 @@ srp_start_io( } - SRP_EXIT( SRP_DBG_DEBUG ); + SRP_EXIT( SRP_DBG_DATA ); return ( TRUE ); } @@ -856,14 +856,14 @@ srp_build_io( IN PVOID p_dev_ext, IN PSCSI_REQUEST_BLOCK p_srb ) { - SRP_ENTER( SRP_DBG_DEBUG ); + SRP_ENTER( SRP_DBG_DATA ); if ( p_srb->Function == SRB_FUNCTION_EXECUTE_SCSI ) { CL_ASSERT( p_srb->SrbExtension != NULL ); - SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DATA, ("Building I/O for Function = %s(0x%x), " "Path = 0x%x, Target = 0x%x, Lun = 0x%x\n", g_srb_function_name[p_srb->Function], @@ -874,7 +874,7 @@ srp_build_io( if ( srp_format_io_request( p_dev_ext, p_srb ) == FALSE ) { - SRP_PRINT_EXIT( TRACE_LEVEL_ERROR, SRP_DBG_ERROR, + SRP_PRINT_EXIT( TRACE_LEVEL_ERROR, SRP_DBG_DATA, ("Returning SrbStatus %s(0x%x) for " "Function = %s(0x%x), Path = 0x%x, " "Target = 0x%x, Lun = 0x%x\n", @@ -892,7 +892,7 @@ srp_build_io( } } - SRP_EXIT( SRP_DBG_DEBUG ); + SRP_EXIT( SRP_DBG_DATA ); return ( TRUE ); } diff --git a/trunk/ulp/srp/kernel/srp_hba.c b/trunk/ulp/srp/kernel/srp_hba.c index affa246e..f760ce0d 100644 --- a/trunk/ulp/srp/kernel/srp_hba.c +++ b/trunk/ulp/srp/kernel/srp_hba.c @@ -597,9 +597,9 @@ __srp_find_path( check_preference ) == TRUE ) { SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP, - ("Found path record (slid:%d dlid:%d) for %s.\n", - p_path_rec->slid, - p_path_rec->dlid, + ("Found path record (slid:0x%x dlid:0x%x) for %s.\n", + cl_ntoh16(p_path_rec->slid), + cl_ntoh16(p_path_rec->dlid), p_hba->ioc_info.profile.id_string) ); break; } @@ -635,9 +635,9 @@ __srp_remove_path( cl_spinlock_acquire( &p_hba->path_record_list_lock ); SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP, - ("Removing path record (slid:%d dlid:%d) for %s.\n", - p_path_rec->slid, - p_path_rec->dlid, + ("Removing path record (slid:0x%x dlid:0x%x) for %s.\n", + cl_ntoh16(p_path_rec->slid), + cl_ntoh16(p_path_rec->dlid), p_hba->ioc_info.profile.id_string) ); cl_qlist_remove_item( &p_hba->path_record_list, &p_srp_path_record->list_item ); @@ -682,9 +682,9 @@ __srp_add_path( } SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP, - ("Adding path record (slid:%d dlid:%d) for %s.\n", - p_path_rec->slid, - p_path_rec->dlid, + ("Adding path record (slid:0x%x dlid:0x%x) for %s.\n", + cl_ntoh16(p_path_rec->slid), + cl_ntoh16(p_path_rec->dlid), p_hba->ioc_info.profile.id_string) ); @@ -1072,9 +1072,9 @@ __srp_pnp_cb( case IB_PNP_IOC_PATH_REMOVE: SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, - ("IB_PNP_IOC_PATH_REMOVE (slid:%d dlid:%d) for %s.\n", - p_ioc_path->path.slid, - p_ioc_path->path.dlid, + ("IB_PNP_IOC_PATH_REMOVE (slid:%x dlid:%x) for %s.\n", + cl_ntoh16(p_ioc_path->path.slid), + cl_ntoh16(p_ioc_path->path.dlid), p_hba->ioc_info.profile.id_string)); p_srp_path_record = __srp_remove_path( p_hba, &p_ioc_path->path ); diff --git a/trunk/ulp/srp/kernel/srp_session.c b/trunk/ulp/srp/kernel/srp_session.c index ffeb7c7c..3cef1aab 100644 --- a/trunk/ulp/srp/kernel/srp_session.c +++ b/trunk/ulp/srp/kernel/srp_session.c @@ -54,7 +54,7 @@ __srp_destroying_session( { srp_session_t *p_srp_session; - SRP_ENTER( SRP_DBG_PNP ); + SRP_ENTER( SRP_DBG_SESSION ); p_srp_session = PARENT_STRUCT( p_obj, srp_session_t, obj ); @@ -63,7 +63,7 @@ __srp_destroying_session( SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG, ("Session Object ref_cnt = %d\n", p_srp_session->obj.ref_cnt) ); - SRP_EXIT( SRP_DBG_PNP ); + SRP_EXIT( SRP_DBG_SESSION ); } @@ -82,7 +82,7 @@ __srp_cleanup_session( { srp_session_t *p_srp_session; - SRP_ENTER( SRP_DBG_PNP ); + SRP_ENTER( SRP_DBG_SESSION ); p_srp_session = PARENT_STRUCT( p_obj, srp_session_t, obj ); @@ -111,7 +111,7 @@ __srp_cleanup_session( SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG, ("Session Object ref_cnt = %d\n", p_srp_session->obj.ref_cnt) ); - SRP_EXIT( SRP_DBG_PNP ); + SRP_EXIT( SRP_DBG_SESSION ); } /* __srp_free_session */ @@ -129,7 +129,7 @@ __srp_free_session( { srp_session_t *p_srp_session; - SRP_ENTER( SRP_DBG_PNP ); + SRP_ENTER( SRP_DBG_SESSION ); p_srp_session = PARENT_STRUCT( p_obj, srp_session_t, obj ); @@ -145,7 +145,7 @@ __srp_free_session( cl_free( p_srp_session ); - SRP_EXIT( SRP_DBG_PNP ); + SRP_EXIT( SRP_DBG_SESSION ); } /* __srp_validate_service_entry */ @@ -170,7 +170,7 @@ __srp_validate_service_entry( uint64_t multiplier = 1; ULONG id_extension; - SRP_ENTER( SRP_DBG_PNP ); + SRP_ENTER( SRP_DBG_SESSION ); if ( cl_memcmp( p_svc_entry->name, SRP_SERVICE_NAME_PREFIX, strlen(SRP_SERVICE_NAME_PREFIX)) != 0 ) { @@ -214,7 +214,7 @@ __srp_validate_service_entry( *p_target_id_extension = cl_hton64( *p_target_id_extension ); exit: - SRP_EXIT( SRP_DBG_PNP ); + SRP_EXIT( SRP_DBG_SESSION ); return ( status ); } @@ -240,7 +240,7 @@ srp_new_session( srp_session_t *p_srp_session = NULL; cl_status_t cl_status; - SRP_ENTER( SRP_DBG_PNP ); + SRP_ENTER( SRP_DBG_SESSION ); *p_status = __srp_validate_service_entry( p_svc_entry, &target_id_extension ); if ( *p_status != IB_SUCCESS ) @@ -304,7 +304,7 @@ srp_new_session( p_srp_session->obj.ref_cnt) ); exit: - SRP_EXIT( SRP_DBG_PNP ); + SRP_EXIT( SRP_DBG_SESSION ); return ( p_srp_session ); } @@ -323,7 +323,7 @@ srp_session_login( { ib_api_status_t status; - SRP_ENTER( SRP_DBG_PNP ); + SRP_ENTER( SRP_DBG_SESSION ); status = srp_init_hca( &p_srp_session->hca, p_srp_session->p_hba ); if ( status != IB_SUCCESS ) @@ -341,6 +341,6 @@ srp_session_login( p_srp_session ); exit: - SRP_EXIT( SRP_DBG_PNP ); + SRP_EXIT( SRP_DBG_SESSION ); return ( status ); }