Commit 186e2538 authored by Dragos Tatulea's avatar Dragos Tatulea Committed by Michael S. Tsirkin
Browse files

vdpa/mlx5: Move mr mutex out of mr struct 



The mutex is named like it is supposed to protect only the mkey but in
reality it is a global lock for all mr resources.

Shift the mutex to it's rightful location (struct mlx5_vdpa_dev) and
give it a more appropriate name.

Signed-off-by: default avatarDragos Tatulea <dtatulea@nvidia.com>
Acked-by: default avatarEugenio Pérez <eperezma@redhat.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Message-Id: <20231018171456.1624030-13-dtatulea@nvidia.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarSi-Wei Liu <si-wei.liu@oracle.com>
Tested-by: default avatarSi-Wei Liu <si-wei.liu@oracle.com>
Tested-by: default avatarLei Yang <leiyang@redhat.com>
parent 1b3ce957

drivers/vdpa/mlx5/core/mlx5_vdpa.h

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ struct mlx5_vdpa_mr { 
	/* state of dvq mr */

	bool initialized;



	/* serialize mkey creation and destruction */

	struct mutex mkey_mtx;

	bool user_mr;

};
@@ -94,6 +92,8 @@ struct mlx5_vdpa_dev { 
	u32 generation;



	struct mlx5_vdpa_mr mr;

	/* serialize mr access */

	struct mutex mr_mtx;

	struct mlx5_control_vq cvq;

	struct workqueue_struct *wq;

	unsigned int group2asid[MLX5_VDPA_NUMVQ_GROUPS];

drivers/vdpa/mlx5/core/mr.c

+7 −6
Original line number Diff line number Diff line
@@ -509,11 +509,11 @@ static void _mlx5_vdpa_destroy_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_ 
void mlx5_vdpa_destroy_mr(struct mlx5_vdpa_dev *mvdev,

			  struct mlx5_vdpa_mr *mr)

{

	mutex_lock(&mr->mkey_mtx);

	mutex_lock(&mvdev->mr_mtx);



	_mlx5_vdpa_destroy_mr(mvdev, mr);



	mutex_unlock(&mr->mkey_mtx);

	mutex_unlock(&mvdev->mr_mtx);

}



void mlx5_vdpa_destroy_mr_resources(struct mlx5_vdpa_dev *mvdev)
@@ -550,9 +550,10 @@ int mlx5_vdpa_create_mr(struct mlx5_vdpa_dev *mvdev, 
{

	int err;



	mutex_lock(&mvdev->mr.mkey_mtx);

	mutex_lock(&mvdev->mr_mtx);

	err = _mlx5_vdpa_create_mr(mvdev, mr, iotlb);

	mutex_unlock(&mvdev->mr.mkey_mtx);

	mutex_unlock(&mvdev->mr_mtx);



	return err;

}
@@ -563,14 +564,14 @@ int mlx5_vdpa_handle_set_map(struct mlx5_vdpa_dev *mvdev, struct vhost_iotlb *io 
	int err = 0;



	*change_map = false;

	mutex_lock(&mr->mkey_mtx);

	mutex_lock(&mvdev->mr_mtx);

	if (mr->initialized) {

		mlx5_vdpa_info(mvdev, "memory map update\n");

		*change_map = true;

	}

	if (!*change_map)

		err = _mlx5_vdpa_create_mr(mvdev, mr, iotlb);

	mutex_unlock(&mr->mkey_mtx);

	mutex_unlock(&mvdev->mr_mtx);



	return err;

}

drivers/vdpa/mlx5/core/resources.c

+3 −3
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ int mlx5_vdpa_alloc_resources(struct mlx5_vdpa_dev *mvdev) 
		mlx5_vdpa_warn(mvdev, "resources already allocated\n");

		return -EINVAL;

	}

	mutex_init(&mvdev->mr.mkey_mtx);

	mutex_init(&mvdev->mr_mtx);

	res->uar = mlx5_get_uars_page(mdev);

	if (IS_ERR(res->uar)) {

		err = PTR_ERR(res->uar);
@@ -301,7 +301,7 @@ int mlx5_vdpa_alloc_resources(struct mlx5_vdpa_dev *mvdev) 
err_uctx:

	mlx5_put_uars_page(mdev, res->uar);

err_uars:

	mutex_destroy(&mvdev->mr.mkey_mtx);

	mutex_destroy(&mvdev->mr_mtx);

	return err;

}
@@ -318,6 +318,6 @@ void mlx5_vdpa_free_resources(struct mlx5_vdpa_dev *mvdev) 
	dealloc_pd(mvdev, res->pdn, res->uid);

	destroy_uctx(mvdev, res->uid);

	mlx5_put_uars_page(mvdev->mdev, res->uar);

	mutex_destroy(&mvdev->mr.mkey_mtx);

	mutex_destroy(&mvdev->mr_mtx);

	res->valid = false;

}