ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avf: improve timeout handling

Browse Source 
Type: feature

Change-Id: I8fa1d691ef7bc51ae5c44c344195207ce7d0a2e7
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Jakub Grajciar
2019-09-02 13:28:52 +02:00
committed by Ole Trøan
parent eeb5fb3a50
commit 1a7bb281f5
2 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/avf/avf.h
View File

@ -23,7 +23,13 @@
#include <vlib/log.h>
#define AVF_AQ_ENQ_SUSPEND_TIME 50e-6
#define AVF_AQ_ENQ_MAX_WAIT_TIME 50e-3
#define AVF_AQ_ENQ_MAX_WAIT_TIME 250e-3
#define AVF_RESET_SUSPEND_TIME 20e-3
#define AVF_RESET_MAX_WAIT_TIME 1
#define AVF_SEND_TO_PF_SUSPEND_TIME 10e-3
#define AVF_SEND_TO_PF_MAX_WAIT_TIME 1
#define AVF_RXD_STATUS(x) (1ULL << x)
#define AVF_RXD_STATUS_DD AVF_RXD_STATUS(0)

60
src/plugins/avf/device.c
View File

@ -115,7 +115,7 @@ avf_aq_desc_enq (vlib_main_t * vm, avf_device_t * ad, avf_aq_desc_t * dt,
{
clib_error_t *err = 0;
avf_aq_desc_t *d, dc;
f64 t0, wait_time, suspend_time = AVF_AQ_ENQ_SUSPEND_TIME;
f64 t0, suspend_time = AVF_AQ_ENQ_SUSPEND_TIME;
d = &ad->atq[ad->atq_next_slot];
clib_memcpy_fast (d, dt, sizeof (avf_aq_desc_t));
@ -144,12 +144,13 @@ avf_aq_desc_enq (vlib_main_t * vm, avf_device_t * ad, avf_aq_desc_t * dt,
t0 = vlib_time_now (vm);
retry:
vlib_process_suspend (vm, suspend_time);
wait_time = vlib_time_now (vm) - t0;
if (((d->flags & AVF_AQ_F_DD) == 0) || ((d->flags & AVF_AQ_F_CMP) == 0))
{
if (wait_time > AVF_AQ_ENQ_MAX_WAIT_TIME)
f64 t = vlib_time_now (vm) - t0;
if (t > AVF_AQ_ENQ_MAX_WAIT_TIME)
{
avf_log_err (ad, "aq_desc_enq failed (timeout %.3fs)", t);
err = clib_error_return (0, "adminq enqueue timeout [opcode 0x%x]",
d->opcode);
goto done;
@ -387,8 +388,7 @@ avf_send_to_pf (vlib_main_t * vm, avf_device_t * ad, virtchnl_ops_t op,
clib_error_t *err;
avf_aq_desc_t *d, dt = {.opcode = 0x801,.v_opcode = op };
u32 head;
int n_retry = 5;
f64 t0, suspend_time = AVF_SEND_TO_PF_SUSPEND_TIME;
/* suppress interrupt in the next adminq receive slot
as we are going to wait for response
@ -399,14 +399,20 @@ avf_send_to_pf (vlib_main_t * vm, avf_device_t * ad, virtchnl_ops_t op,
if ((err = avf_aq_desc_enq (vm, ad, &dt, in, in_len)))
return err;
t0 = vlib_time_now (vm);
retry:
head = avf_get_u32 (ad->bar0, AVF_ARQH);
if (ad->arq_next_slot == head)
{
if (--n_retry == 0)
return clib_error_return (0, "timeout");
vlib_process_suspend (vm, 10e-3);
f64 t = vlib_time_now (vm) - t0;
if (t > AVF_SEND_TO_PF_MAX_WAIT_TIME)
{
avf_log_err (ad, "send_to_pf failed (timeout %.3fs)", t);
return clib_error_return (0, "timeout");
}
vlib_process_suspend (vm, suspend_time);
suspend_time *= 2;
goto retry;
}
@ -425,7 +431,9 @@ retry:
clib_memcpy_fast (e, buf, sizeof (virtchnl_pf_event_t));
avf_arq_slot_init (ad, ad->arq_next_slot);
ad->arq_next_slot++;
n_retry = 5;
/* reset timer */
t0 = vlib_time_now (vm);
suspend_time = AVF_SEND_TO_PF_SUSPEND_TIME;
goto retry;
}
@ -778,7 +786,7 @@ avf_device_reset (vlib_main_t * vm, avf_device_t * ad)
avf_aq_desc_t d = { 0 };
clib_error_t *error;
u32 rstat;
int n_retry = 20;
f64 t0, t = 0, suspend_time = AVF_RESET_SUSPEND_TIME;
avf_log_debug (ad, "reset");
@ -787,19 +795,26 @@ avf_device_reset (vlib_main_t * vm, avf_device_t * ad)
if ((error = avf_aq_desc_enq (vm, ad, &d, 0, 0)))
return error;
t0 = vlib_time_now (vm);
retry:
vlib_process_suspend (vm, 10e-3);
vlib_process_suspend (vm, suspend_time);
rstat = avf_get_u32 (ad->bar0, AVFGEN_RSTAT);
if (rstat == 2 || rstat == 3)
return 0;
if (--n_retry == 0)
{
avf_log_err (ad, "reset failed");
avf_log_debug (ad, "reset completed in %.3fs", t);
return 0;
}
t = vlib_time_now (vm) - t0;
if (t > AVF_RESET_MAX_WAIT_TIME)
{
avf_log_err (ad, "reset failed (timeout %.3fs)", t);
return clib_error_return (0, "reset failed (timeout)");
}
suspend_time *= 2;
goto retry;
}
@ -809,7 +824,7 @@ avf_request_queues (vlib_main_t * vm, avf_device_t * ad, u16 num_queue_pairs)
virtchnl_vf_res_request_t res_req = { 0 };
clib_error_t *error;
u32 rstat;
int n_retry = 20;
f64 t0, t, suspend_time = AVF_RESET_SUSPEND_TIME;
res_req.num_queue_pairs = num_queue_pairs;
@ -829,16 +844,23 @@ avf_request_queues (vlib_main_t * vm, avf_device_t * ad, u16 num_queue_pairs)
res_req.num_queue_pairs);
}
t0 = vlib_time_now (vm);
retry:
vlib_process_suspend (vm, 10e-3);
vlib_process_suspend (vm, suspend_time);
t = vlib_time_now (vm) - t0;
rstat = avf_get_u32 (ad->bar0, AVFGEN_RSTAT);
if ((rstat == VIRTCHNL_VFR_COMPLETED) || (rstat == VIRTCHNL_VFR_VFACTIVE))
goto done;
if (--n_retry == 0)
return clib_error_return (0, "reset failed (timeout)");
if (t > AVF_RESET_MAX_WAIT_TIME)
{
avf_log_err (ad, "request queues failed (timeout %.3f seconds)", t);
return clib_error_return (0, "request queues failed (timeout)");
}
suspend_time *= 2;
goto retry;
done: