Commit ad03a0f4 authored by Eugenio Pérez's avatar Eugenio Pérez Committed by Michael S. Tsirkin
Browse files

vdpa/mlx5: Delete control vq iotlb in destroy_mr only when necessary 



mlx5_vdpa_destroy_mr can be called from .set_map with data ASID after
the control virtqueue ASID iotlb has been populated. The control vq
iotlb must not be cleared, since it will not be populated again.

So call the ASID aware destroy function which makes sure that the
right vq resource is destroyed.

Fixes: 8fcd20c3 ("vdpa/mlx5: Support different address spaces for control and data")
Signed-off-by: default avatarEugenio Pérez <eperezma@redhat.com>
Reviewed-by: default avatarGal Pressman <gal@nvidia.com>
Message-Id: <20230802171231.11001-5-dtatulea@nvidia.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
parent 9ee81100

drivers/vdpa/mlx5/core/mlx5_vdpa.h

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ int mlx5_vdpa_handle_set_map(struct mlx5_vdpa_dev *mvdev, struct vhost_iotlb *io 
int mlx5_vdpa_create_mr(struct mlx5_vdpa_dev *mvdev, struct vhost_iotlb *iotlb,

			unsigned int asid);

void mlx5_vdpa_destroy_mr(struct mlx5_vdpa_dev *mvdev);

void mlx5_vdpa_destroy_mr_asid(struct mlx5_vdpa_dev *mvdev, unsigned int asid);



#define mlx5_vdpa_warn(__dev, format, ...)                                                         \

	dev_warn((__dev)->mdev->device, "%s:%d:(pid %d) warning: " format, __func__, __LINE__,     \

drivers/vdpa/mlx5/core/mr.c

+1 −1
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ static void _mlx5_vdpa_destroy_dvq_mr(struct mlx5_vdpa_dev *mvdev, unsigned int 
	mr->initialized = false;

}



static void mlx5_vdpa_destroy_mr_asid(struct mlx5_vdpa_dev *mvdev, unsigned int asid)

void mlx5_vdpa_destroy_mr_asid(struct mlx5_vdpa_dev *mvdev, unsigned int asid)

{

	struct mlx5_vdpa_mr *mr = &mvdev->mr;

drivers/vdpa/mlx5/net/mlx5_vnet.c

+2 −2
Original line number Diff line number Diff line
@@ -2644,7 +2644,7 @@ static int mlx5_vdpa_change_map(struct mlx5_vdpa_dev *mvdev, 
		goto err_mr;



	teardown_driver(ndev);

	mlx5_vdpa_destroy_mr(mvdev);

	mlx5_vdpa_destroy_mr_asid(mvdev, asid);

	err = mlx5_vdpa_create_mr(mvdev, iotlb, asid);

	if (err)

		goto err_mr;
@@ -2660,7 +2660,7 @@ static int mlx5_vdpa_change_map(struct mlx5_vdpa_dev *mvdev, 
	return 0;



err_setup:

	mlx5_vdpa_destroy_mr(mvdev);

	mlx5_vdpa_destroy_mr_asid(mvdev, asid);

err_mr:

	return err;

}