On Thu, Jun 11, 2020 at 1:06 PM Nithin Dabilpuram
<ndabilpu...@marvell.com> wrote:
>
> Interrupt callback unregister can fail with -EAGAIN
> when interrupt handler is active in interrupt thread.
> Hence retry before reporting a failure or proceeding further.
>
> Signed-off-by: Nithin Dabilpuram <ndabilpu...@marvell.com>
Acked-by: Jerin Jacob <jer...@marvell.com>
Delegating to Thomas as it belongs to common/octeontx2.
> ---
> drivers/common/octeontx2/otx2_irq.c | 19 +++++++++++++++++--
> 1 file changed, 17 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/common/octeontx2/otx2_irq.c
> b/drivers/common/octeontx2/otx2_irq.c
> index fa3206a..c0137ff 100644
> --- a/drivers/common/octeontx2/otx2_irq.c
> +++ b/drivers/common/octeontx2/otx2_irq.c
> @@ -193,6 +193,8 @@ otx2_unregister_irq(struct rte_intr_handle *intr_handle,
> rte_intr_callback_fn cb, void *data, unsigned int vec)
> {
> struct rte_intr_handle tmp_handle;
> + uint8_t retries = 5; /* 5 ms */
> + int rc;
>
> if (vec > intr_handle->max_intr) {
> otx2_err("Error unregistering MSI-X interrupts vec:%d > %d",
> @@ -205,8 +207,21 @@ otx2_unregister_irq(struct rte_intr_handle *intr_handle,
> if (tmp_handle.fd == -1)
> return;
>
> - /* Un-register callback func from eal lib */
> - rte_intr_callback_unregister(&tmp_handle, cb, data);
> + do {
> + /* Un-register callback func from eal lib */
> + rc = rte_intr_callback_unregister(&tmp_handle, cb, data);
> + /* Retry only if -EAGAIN */
> + if (rc != -EAGAIN)
> + break;
> + rte_delay_ms(1);
> + retries--;
> + } while (retries);
> +
> + if (rc < 0) {
> + otx2_err("Error unregistering MSI-X intr vec %d cb, rc=%d",
> + vec, rc);
> + return;
> + }
>
> otx2_base_dbg("Disable vector:0x%x for vfio (efds: %d, max:%d)",
> vec, intr_handle->nb_efd, intr_handle->max_intr);
> --
> 2.8.4
>
