Jason Wang
2021-Sep-14 02:57 UTC
[PATCH 2/3] vdpa/mlx5: Rename control VQ workqueue to vdpa wq
On Thu, Sep 9, 2021 at 8:36 PM Eli Cohen <elic at nvidia.com> wrote:> > A subesequent patch will use the same workqueue for executing other > work not related to control VQ. Rename the workqueue and the work queue > entry used to convey information to the workqueue. > > Signed-off-by: Eli Cohen <elic at nvidia.com>Acked-by: Jason Wang <jasowang at redhat.com>> --- > drivers/vdpa/mlx5/core/mlx5_vdpa.h | 2 +- > drivers/vdpa/mlx5/net/mlx5_vnet.c | 8 ++++---- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/vdpa/mlx5/core/mlx5_vdpa.h b/drivers/vdpa/mlx5/core/mlx5_vdpa.h > index 01a848adf590..81dc3d88d3dd 100644 > --- a/drivers/vdpa/mlx5/core/mlx5_vdpa.h > +++ b/drivers/vdpa/mlx5/core/mlx5_vdpa.h > @@ -63,7 +63,7 @@ struct mlx5_control_vq { > unsigned short head; > }; > > -struct mlx5_ctrl_wq_ent { > +struct mlx5_vdpa_wq_ent { > struct work_struct work; > struct mlx5_vdpa_dev *mvdev; > }; > diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c > index 08ac15b17b83..59f1874648ae 100644 > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c > @@ -1556,14 +1556,14 @@ static void mlx5_cvq_kick_handler(struct work_struct *work) > { > virtio_net_ctrl_ack status = VIRTIO_NET_ERR; > struct virtio_net_ctrl_hdr ctrl; > - struct mlx5_ctrl_wq_ent *wqent; > + struct mlx5_vdpa_wq_ent *wqent; > struct mlx5_vdpa_dev *mvdev; > struct mlx5_control_vq *cvq; > struct mlx5_vdpa_net *ndev; > size_t read, write; > int err; > > - wqent = container_of(work, struct mlx5_ctrl_wq_ent, work); > + wqent = container_of(work, struct mlx5_vdpa_wq_ent, work); > mvdev = wqent->mvdev; > ndev = to_mlx5_vdpa_ndev(mvdev); > cvq = &mvdev->cvq; > @@ -1615,7 +1615,7 @@ static void mlx5_vdpa_kick_vq(struct vdpa_device *vdev, u16 idx) > struct mlx5_vdpa_dev *mvdev = to_mvdev(vdev); > struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev); > struct mlx5_vdpa_virtqueue *mvq; > - struct mlx5_ctrl_wq_ent *wqent; > + struct mlx5_vdpa_wq_ent *wqent; > > if (!is_index_valid(mvdev, idx)) > return; > @@ -2466,7 +2466,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name) > if (err) > goto err_mr; > > - mvdev->wq = create_singlethread_workqueue("mlx5_vdpa_ctrl_wq"); > + mvdev->wq = create_singlethread_workqueue("mlx5_vdpa_wq"); > if (!mvdev->wq) { > err = -ENOMEM; > goto err_res2; > -- > 2.31.1 >