UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

vdpa/mlx5: function prototype modifications in preparation to control VQ 

Use struct mlx5_vdpa_dev as an argument to setup_driver() and a few
others in preparation to control virtqueue support in a subsequent
patch. The control virtqueue is part of struct mlx5_vdpa_dev so this is
required.

Signed-off-by: Eli Cohen <elic@nvidia.com>
Link: https://lore.kernel.org/r/20210823052123.14909-3-elic@nvidia.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Eli Cohen 2021-08-23 08:21:19 +03:00 committed by Michael S. Tsirkin
parent 4e57a9f622
commit ae0428debf
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/vdpa/mlx5/net/mlx5_vnet.c
View File

@ -155,7 +155,7 @@ struct mlx5_vdpa_net {
static void free_resources(struct mlx5_vdpa_net *ndev); static void free_resources(struct mlx5_vdpa_net *ndev);
static void init_mvqs(struct mlx5_vdpa_net *ndev); static void init_mvqs(struct mlx5_vdpa_net *ndev);
static int setup_driver(struct mlx5_vdpa_net *ndev); static int setup_driver(struct mlx5_vdpa_dev *mvdev);
static void teardown_driver(struct mlx5_vdpa_net *ndev); static void teardown_driver(struct mlx5_vdpa_net *ndev);
static bool mlx5_vdpa_debug; static bool mlx5_vdpa_debug;
@ -1507,12 +1507,13 @@ static int verify_min_features(struct mlx5_vdpa_dev *mvdev, u64 features)
return 0; return 0;
} }
static int setup_virtqueues(struct mlx5_vdpa_net *ndev) static int setup_virtqueues(struct mlx5_vdpa_dev *mvdev)
{ {
struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
int err; int err;
int i; int i;
for (i = 0; i < 2 * mlx5_vdpa_max_qps(ndev->mvdev.max_vqs); i++) { for (i = 0; i < 2 * mlx5_vdpa_max_qps(mvdev->max_vqs); i++) {
err = setup_vq(ndev, &ndev->vqs[i]); err = setup_vq(ndev, &ndev->vqs[i]);
if (err) if (err)
goto err_vq; goto err_vq;
@ -1671,8 +1672,9 @@ static void restore_channels_info(struct mlx5_vdpa_net *ndev)
} }
} }
static int mlx5_vdpa_change_map(struct mlx5_vdpa_net *ndev, struct vhost_iotlb *iotlb) static int mlx5_vdpa_change_map(struct mlx5_vdpa_dev *mvdev, struct vhost_iotlb *iotlb)
{ {
struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
int err; int err;
suspend_vqs(ndev); suspend_vqs(ndev);
@ -1681,58 +1683,59 @@ static int mlx5_vdpa_change_map(struct mlx5_vdpa_net *ndev, struct vhost_iotlb *
goto err_mr; goto err_mr;
teardown_driver(ndev); teardown_driver(ndev);
mlx5_vdpa_destroy_mr(&ndev->mvdev); mlx5_vdpa_destroy_mr(mvdev);
err = mlx5_vdpa_create_mr(&ndev->mvdev, iotlb); err = mlx5_vdpa_create_mr(mvdev, iotlb);
if (err) if (err)
goto err_mr; goto err_mr;
if (!(ndev->mvdev.status & VIRTIO_CONFIG_S_DRIVER_OK)) if (!(mvdev->status & VIRTIO_CONFIG_S_DRIVER_OK))
return 0; return 0;
restore_channels_info(ndev); restore_channels_info(ndev);
err = setup_driver(ndev); err = setup_driver(mvdev);
if (err) if (err)
goto err_setup; goto err_setup;
return 0; return 0;
err_setup: err_setup:
mlx5_vdpa_destroy_mr(&ndev->mvdev); mlx5_vdpa_destroy_mr(mvdev);
err_mr: err_mr:
return err; return err;
} }
static int setup_driver(struct mlx5_vdpa_net *ndev) static int setup_driver(struct mlx5_vdpa_dev *mvdev)
{ {
struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
int err; int err;
mutex_lock(&ndev->reslock); mutex_lock(&ndev->reslock);
if (ndev->setup) { if (ndev->setup) {
mlx5_vdpa_warn(&ndev->mvdev, "setup driver called for already setup driver\n"); mlx5_vdpa_warn(mvdev, "setup driver called for already setup driver\n");
err = 0; err = 0;
goto out; goto out;
} }
err = setup_virtqueues(ndev); err = setup_virtqueues(mvdev);
if (err) { if (err) {
mlx5_vdpa_warn(&ndev->mvdev, "setup_virtqueues\n"); mlx5_vdpa_warn(mvdev, "setup_virtqueues\n");
goto out; goto out;
} }
err = create_rqt(ndev); err = create_rqt(ndev);
if (err) { if (err) {
mlx5_vdpa_warn(&ndev->mvdev, "create_rqt\n"); mlx5_vdpa_warn(mvdev, "create_rqt\n");
goto err_rqt; goto err_rqt;
} }
err = create_tir(ndev); err = create_tir(ndev);
if (err) { if (err) {
mlx5_vdpa_warn(&ndev->mvdev, "create_tir\n"); mlx5_vdpa_warn(mvdev, "create_tir\n");
goto err_tir; goto err_tir;
} }
err = add_fwd_to_tir(ndev); err = add_fwd_to_tir(ndev);
if (err) { if (err) {
mlx5_vdpa_warn(&ndev->mvdev, "add_fwd_to_tir\n"); mlx5_vdpa_warn(mvdev, "add_fwd_to_tir\n");
goto err_fwd; goto err_fwd;
} }
ndev->setup = true; ndev->setup = true;
@ -1798,7 +1801,7 @@ static void mlx5_vdpa_set_status(struct vdpa_device *vdev, u8 status)
if ((status ^ ndev->mvdev.status) & VIRTIO_CONFIG_S_DRIVER_OK) { if ((status ^ ndev->mvdev.status) & VIRTIO_CONFIG_S_DRIVER_OK) {
if (status & VIRTIO_CONFIG_S_DRIVER_OK) { if (status & VIRTIO_CONFIG_S_DRIVER_OK) {
err = setup_driver(ndev); err = setup_driver(mvdev);
if (err) { if (err) {
mlx5_vdpa_warn(mvdev, "failed to setup driver\n"); mlx5_vdpa_warn(mvdev, "failed to setup driver\n");
goto err_setup; goto err_setup;
@ -1848,7 +1851,6 @@ static u32 mlx5_vdpa_get_generation(struct vdpa_device *vdev)
static int mlx5_vdpa_set_map(struct vdpa_device *vdev, struct vhost_iotlb *iotlb) static int mlx5_vdpa_set_map(struct vdpa_device *vdev, struct vhost_iotlb *iotlb)
{ {
struct mlx5_vdpa_dev *mvdev = to_mvdev(vdev); struct mlx5_vdpa_dev *mvdev = to_mvdev(vdev);
struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
bool change_map; bool change_map;
int err; int err;
@ -1859,7 +1861,7 @@ static int mlx5_vdpa_set_map(struct vdpa_device *vdev, struct vhost_iotlb *iotlb
} }
if (change_map) if (change_map)
return mlx5_vdpa_change_map(ndev, iotlb); return mlx5_vdpa_change_map(mvdev, iotlb);
return 0; return 0;
} }