lkml.org 
[lkml]   [2022]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/2] vdpa: mlx5: synchronize driver status with CVQ
    Date
    Currently, CVQ doesn't have any synchronization with the driver
    status. Then CVQ emulation code run in the middle of:

    1) device reset
    2) device status changed
    3) map updating

    The will lead several unexpected issue like trying to execute CVQ
    command after the driver has been teared down.

    Fixing this by using reslock to synchronize CVQ emulation code with
    the driver status changing:

    - protect the whole device reset, status changing and map updating
    with reslock
    - protect the CVQ handler with the reslock and check
    VIRTIO_CONFIG_S_DRIVER_OK in the CVQ handler

    This will guarantee that:

    1) CVQ handler won't work if VIRTIO_CONFIG_S_DRIVER_OK is not set
    2) CVQ handler will see a consistent state of the driver instead of
    the partial one when it is running in the middle of the
    teardown_driver() or setup_driver().

    Cc: 5262912ef3cfc ("vdpa/mlx5: Add support for control VQ and MAC setting")
    Signed-off-by: Jason Wang <jasowang@redhat.com>
    ---
    drivers/vdpa/mlx5/net/mlx5_vnet.c | 42 +++++++++++++++++++++++--------
    1 file changed, 31 insertions(+), 11 deletions(-)

    diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
    index d5a6fb3f9c41..524240f55c1c 100644
    --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
    +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
    @@ -1618,11 +1618,17 @@ static void mlx5_cvq_kick_handler(struct work_struct *work)
    mvdev = wqent->mvdev;
    ndev = to_mlx5_vdpa_ndev(mvdev);
    cvq = &mvdev->cvq;
    +
    + mutex_lock(&ndev->reslock);
    +
    + if (!(mvdev->status & VIRTIO_CONFIG_S_DRIVER_OK))
    + goto done;
    +
    if (!(ndev->mvdev.actual_features & BIT_ULL(VIRTIO_NET_F_CTRL_VQ)))
    - return;
    + goto done;

    if (!cvq->ready)
    - return;
    + goto done;

    while (true) {
    err = vringh_getdesc_iotlb(&cvq->vring, &cvq->riov, &cvq->wiov, &cvq->head,
    @@ -1663,6 +1669,9 @@ static void mlx5_cvq_kick_handler(struct work_struct *work)
    break;
    }
    }
    +
    +done:
    + mutex_unlock(&ndev->reslock);
    }

    static void mlx5_vdpa_kick_vq(struct vdpa_device *vdev, u16 idx)
    @@ -2125,6 +2134,8 @@ static int mlx5_vdpa_change_map(struct mlx5_vdpa_dev *mvdev, struct vhost_iotlb
    struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
    int err;

    + mutex_lock(&ndev->reslock);
    +
    suspend_vqs(ndev);
    err = save_channels_info(ndev);
    if (err)
    @@ -2137,18 +2148,20 @@ static int mlx5_vdpa_change_map(struct mlx5_vdpa_dev *mvdev, struct vhost_iotlb
    goto err_mr;

    if (!(mvdev->status & VIRTIO_CONFIG_S_DRIVER_OK))
    - return 0;
    + goto err_mr;

    restore_channels_info(ndev);
    err = setup_driver(mvdev);
    if (err)
    goto err_setup;

    + mutex_unlock(&ndev->reslock);
    return 0;

    err_setup:
    mlx5_vdpa_destroy_mr(mvdev);
    err_mr:
    + mutex_unlock(&ndev->reslock);
    return err;
    }

    @@ -2157,7 +2170,8 @@ static int setup_driver(struct mlx5_vdpa_dev *mvdev)
    struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
    int err;

    - mutex_lock(&ndev->reslock);
    + WARN_ON(!mutex_is_locked(&ndev->reslock));
    +
    if (ndev->setup) {
    mlx5_vdpa_warn(mvdev, "setup driver called for already setup driver\n");
    err = 0;
    @@ -2187,7 +2201,6 @@ static int setup_driver(struct mlx5_vdpa_dev *mvdev)
    goto err_fwd;
    }
    ndev->setup = true;
    - mutex_unlock(&ndev->reslock);

    return 0;

    @@ -2198,23 +2211,22 @@ static int setup_driver(struct mlx5_vdpa_dev *mvdev)
    err_rqt:
    teardown_virtqueues(ndev);
    out:
    - mutex_unlock(&ndev->reslock);
    return err;
    }

    static void teardown_driver(struct mlx5_vdpa_net *ndev)
    {
    - mutex_lock(&ndev->reslock);
    +
    + WARN_ON(!mutex_is_locked(&ndev->reslock));
    +
    if (!ndev->setup)
    - goto out;
    + return;

    remove_fwd_to_tir(ndev);
    destroy_tir(ndev);
    destroy_rqt(ndev);
    teardown_virtqueues(ndev);
    ndev->setup = false;
    -out:
    - mutex_unlock(&ndev->reslock);
    }

    static void clear_vqs_ready(struct mlx5_vdpa_net *ndev)
    @@ -2235,6 +2247,8 @@ static void mlx5_vdpa_set_status(struct vdpa_device *vdev, u8 status)

    print_status(mvdev, status, true);

    + mutex_lock(&ndev->reslock);
    +
    if ((status ^ ndev->mvdev.status) & VIRTIO_CONFIG_S_DRIVER_OK) {
    if (status & VIRTIO_CONFIG_S_DRIVER_OK) {
    err = setup_driver(mvdev);
    @@ -2244,16 +2258,19 @@ static void mlx5_vdpa_set_status(struct vdpa_device *vdev, u8 status)
    }
    } else {
    mlx5_vdpa_warn(mvdev, "did not expect DRIVER_OK to be cleared\n");
    - return;
    + goto err_clear;
    }
    }

    ndev->mvdev.status = status;
    + mutex_unlock(&ndev->reslock);
    return;

    err_setup:
    mlx5_vdpa_destroy_mr(&ndev->mvdev);
    ndev->mvdev.status |= VIRTIO_CONFIG_S_FAILED;
    +err_clear:
    + mutex_unlock(&ndev->reslock);
    }

    static int mlx5_vdpa_reset(struct vdpa_device *vdev)
    @@ -2263,6 +2280,8 @@ static int mlx5_vdpa_reset(struct vdpa_device *vdev)

    print_status(mvdev, 0, true);
    mlx5_vdpa_info(mvdev, "performing device reset\n");
    +
    + mutex_lock(&ndev->reslock);
    teardown_driver(ndev);
    clear_vqs_ready(ndev);
    mlx5_vdpa_destroy_mr(&ndev->mvdev);
    @@ -2275,6 +2294,7 @@ static int mlx5_vdpa_reset(struct vdpa_device *vdev)
    if (mlx5_vdpa_create_mr(mvdev, NULL))
    mlx5_vdpa_warn(mvdev, "create MR failed\n");
    }
    + mutex_unlock(&ndev->reslock);

    return 0;
    }
    --
    2.18.1
    \
     
     \ /
      Last update: 2022-03-21 07:05    [W:3.252 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site