Re: [PATCH] osm_sm_state_mgr.c Fix handling of polling retry number

[Line Holen <line.holen-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>]

On 11/27/13 13:16, Hal Rosenstock wrote:
> On 11/15/2013 7:15 AM, Line Holen wrote:
>> The retry counter is now only updated if a packet is actually sent.
>> (But as before the initial request is also counted.)
>>
>> Prior to this change the actual maximum number of packets sent were
>> polling retry number minus one.
>>
>> Signed-off-by: Line Holen<line.holen-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
>>
>> ---
>>
>> diff --git a/opensm/osm_sm_state_mgr.c b/opensm/osm_sm_state_mgr.c
>> index 596ad8f..6eff9ee 100644
>> --- a/opensm/osm_sm_state_mgr.c
>> +++ b/opensm/osm_sm_state_mgr.c
>> @@ -197,16 +197,14 @@ void osm_sm_state_mgr_polling_callback(IN void *context)
>>   	}
>>
>>   	/*
>> -	 * Incr the retry number.
>> -	 * If it reached the max_retry_number in the subnet opt - call
>> +	 * If retry number reached the max_retry_number in the subnet opt - call
>>   	 * osm_sm_state_mgr_process with signal OSM_SM_SIGNAL_POLLING_TIMEOUT
>>   	 */
>> -	sm->retry_number++;
>>   	OSM_LOG(sm->p_log, OSM_LOG_VERBOSE, "SM State %d (%s), Retry number:%d\n",
>>   		sm->p_subn->sm_state,  osm_get_sm_mgr_state_str(sm->p_subn->sm_state),
>>   		sm->retry_number);
>>
>> -	if (sm->retry_number>= sm->p_subn->opt.polling_retry_number) {
>> +	if (sm->retry_number>  sm->p_subn->opt.polling_retry_number) {
>>   		OSM_LOG(sm->p_log, OSM_LOG_DEBUG,
>>   			"Reached polling_retry_number value in retry_number. "
>>   			"Go to DISCOVERY state\n");
>> @@ -214,6 +212,9 @@ void osm_sm_state_mgr_polling_callback(IN void *context)
>>   		goto Exit;
>>   	}
>>
>> +	/* Increment the retry number */
>> +	sm->retry_number++;
> Would it be better to increment retry number if
> sm_state_mgr_send_master_sm_info_req call just below this succeeds ?
>
> -- Hal
I'm not sure really. The current placement was to avoid potential race 
with response handling
and the clearing of the counter there (incrementing after the response 
were received). Seemed
to me that this could happen with the current locking.

Line
>
>> +
>>   	/* Send a SubnGet(SMInfo) request to the remote sm (depends on our state) */
>>   	sm_state_mgr_send_master_sm_info_req(sm);
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
>> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html