vdpa/mlx5: fix interrupt trash that leads to crash

Disable interrupt unregister timeout to avoid invalid FD caused
interrupt thread segment fault.

Fixes: 62c813706e41 ("vdpa/mlx5: map doorbell")
Cc: stable@dpdk.org
Signed-off-by: Xueming Li <xuemingl@nvidia.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c b/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c
index 3416797d289c4e2411b727de79bec63dc7d9fe98..2e517beda2437f1576a6b079a14c93a39a9feabe 100644 (file)
--- a/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c
+++ b/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c
@@ -17,7 +17,7 @@
 
 
 static void
-mlx5_vdpa_virtq_handler(void *cb_arg)
+mlx5_vdpa_virtq_kick_handler(void *cb_arg)
 {
        struct mlx5_vdpa_virtq *virtq = cb_arg;
        struct mlx5_vdpa_priv *priv = virtq->priv;
@@ -59,20 +59,16 @@ static int
 mlx5_vdpa_virtq_unset(struct mlx5_vdpa_virtq *virtq)
 {
        unsigned int i;
-       int retries = MLX5_VDPA_INTR_RETRIES;
        int ret = -EAGAIN;
 
-       if (rte_intr_fd_get(virtq->intr_handle) != -1) {
-               while (retries-- && ret == -EAGAIN) {
+       if (rte_intr_fd_get(virtq->intr_handle) >= 0) {
+               while (ret == -EAGAIN) {
                        ret = rte_intr_callback_unregister(virtq->intr_handle,
-                                                       mlx5_vdpa_virtq_handler,
-                                                       virtq);
+                                       mlx5_vdpa_virtq_kick_handler, virtq);
                        if (ret == -EAGAIN) {
-                               DRV_LOG(DEBUG, "Try again to unregister fd %d "
-                               "of virtq %d interrupt, retries = %d.",
-                               rte_intr_fd_get(virtq->intr_handle),
-                               (int)virtq->index, retries);
-
+                               DRV_LOG(DEBUG, "Try again to unregister fd %d of virtq %hu interrupt",
+                                       rte_intr_fd_get(virtq->intr_handle),
+                                       virtq->index);
                                usleep(MLX5_VDPA_INTR_RETRIES_USEC);
                        }
                }
@@ -359,7 +355,7 @@ mlx5_vdpa_virtq_setup(struct mlx5_vdpa_priv *priv, int index)
                        goto error;
 
                if (rte_intr_callback_register(virtq->intr_handle,
-                                              mlx5_vdpa_virtq_handler,
+                                              mlx5_vdpa_virtq_kick_handler,
                                               virtq)) {
                        rte_intr_fd_set(virtq->intr_handle, -1);
                        DRV_LOG(ERR, "Failed to register virtq %d interrupt.",