diff mbox series

[v2,6/7] vdpa/mlx5: support device cleanup callback

Message ID 20220224155101.1991626-7-xuemingl@nvidia.com (mailing list archive)
State Superseded
Delegated to: Maxime Coquelin
Headers show
Series vdpa/mlx5: improve device shutdown time | expand

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Xueming Li Feb. 24, 2022, 3:51 p.m. UTC
This patch supports device cleanup callback API which called when device
disconnected with VM. Cached resources like VM MR and VQ memory are
released.

Signed-off-by: Xueming Li <xuemingl@nvidia.com>
---
 drivers/vdpa/mlx5/mlx5_vdpa.c | 23 +++++++++++++++++++++++
 drivers/vdpa/mlx5/mlx5_vdpa.h |  1 +
 2 files changed, 24 insertions(+)

Comments

Maxime Coquelin April 21, 2022, 8:19 a.m. UTC | #1
On 2/24/22 16:51, Xueming Li wrote:
> This patch supports device cleanup callback API which called when device
> disconnected with VM.

"This patch supports device cleanup callback API which is called when
the device is disconnected from the VM."

> Cached resources like VM MR and VQ memory are
> released.
> 
> Signed-off-by: Xueming Li <xuemingl@nvidia.com>
> ---
>   drivers/vdpa/mlx5/mlx5_vdpa.c | 23 +++++++++++++++++++++++
>   drivers/vdpa/mlx5/mlx5_vdpa.h |  1 +
>   2 files changed, 24 insertions(+)
> 
> diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c
> index 38ed45f95f7..47874c9b1ff 100644
> --- a/drivers/vdpa/mlx5/mlx5_vdpa.c
> +++ b/drivers/vdpa/mlx5/mlx5_vdpa.c
> @@ -270,6 +270,8 @@ mlx5_vdpa_dev_close(int vid)
>   	if (priv->lm_mr.addr)
>   		mlx5_os_wrapped_mkey_destroy(&priv->lm_mr);
>   	priv->state = MLX5_VDPA_STATE_PROBED;
> +	if (!priv->connected)
> +		mlx5_vdpa_dev_cache_clean(priv);
>   	priv->vid = 0;
>   	/* The mutex may stay locked after event thread cancel - initiate it. */
>   	pthread_mutex_init(&priv->vq_config_lock, NULL);
> @@ -294,6 +296,7 @@ mlx5_vdpa_dev_config(int vid)
>   		return -1;
>   	}
>   	priv->vid = vid;
> +	priv->connected = true;
>   	if (mlx5_vdpa_mtu_set(priv))
>   		DRV_LOG(WARNING, "MTU cannot be set on device %s.",
>   				vdev->device->name);
> @@ -431,12 +434,32 @@ mlx5_vdpa_reset_stats(struct rte_vdpa_device *vdev, int qid)
>   	return mlx5_vdpa_virtq_stats_reset(priv, qid);
>   }
>   
> +static int
> +mlx5_vdpa_dev_clean(int vid)

mlx5_vdpa_dev_cleanup

> +{
> +	struct rte_vdpa_device *vdev = rte_vhost_get_vdpa_device(vid);
> +	struct mlx5_vdpa_priv *priv;
> +
> +	if (vdev == NULL)
> +		return -1;
> +	priv = mlx5_vdpa_find_priv_resource_by_vdev(vdev);
> +	if (priv == NULL) {
> +		DRV_LOG(ERR, "Invalid vDPA device: %s.", vdev->device->name);
> +		return -1;
> +	}
> +	if (priv->state == MLX5_VDPA_STATE_PROBED)
> +		mlx5_vdpa_dev_cache_clean(priv);
> +	priv->connected = false;
> +	return 0;
> +}
> +
>   static struct rte_vdpa_dev_ops mlx5_vdpa_ops = {
>   	.get_queue_num = mlx5_vdpa_get_queue_num,
>   	.get_features = mlx5_vdpa_get_vdpa_features,
>   	.get_protocol_features = mlx5_vdpa_get_protocol_features,
>   	.dev_conf = mlx5_vdpa_dev_config,
>   	.dev_close = mlx5_vdpa_dev_close,
> +	.dev_cleanup = mlx5_vdpa_dev_clean,
>   	.set_vring_state = mlx5_vdpa_set_vring_state,
>   	.set_features = mlx5_vdpa_features_set,
>   	.migration_done = NULL,
> diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.h b/drivers/vdpa/mlx5/mlx5_vdpa.h
> index 540bf87a352..24bafe85b44 100644
> --- a/drivers/vdpa/mlx5/mlx5_vdpa.h
> +++ b/drivers/vdpa/mlx5/mlx5_vdpa.h
> @@ -121,6 +121,7 @@ enum mlx5_dev_state {
>   
>   struct mlx5_vdpa_priv {
>   	TAILQ_ENTRY(mlx5_vdpa_priv) next;
> +	bool connected;
>   	enum mlx5_dev_state state;
>   	pthread_mutex_t vq_config_lock;
>   	uint64_t no_traffic_counter;


Other then that:

Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Thanks,
Maxime
diff mbox series

Patch

diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c
index 38ed45f95f7..47874c9b1ff 100644
--- a/drivers/vdpa/mlx5/mlx5_vdpa.c
+++ b/drivers/vdpa/mlx5/mlx5_vdpa.c
@@ -270,6 +270,8 @@  mlx5_vdpa_dev_close(int vid)
 	if (priv->lm_mr.addr)
 		mlx5_os_wrapped_mkey_destroy(&priv->lm_mr);
 	priv->state = MLX5_VDPA_STATE_PROBED;
+	if (!priv->connected)
+		mlx5_vdpa_dev_cache_clean(priv);
 	priv->vid = 0;
 	/* The mutex may stay locked after event thread cancel - initiate it. */
 	pthread_mutex_init(&priv->vq_config_lock, NULL);
@@ -294,6 +296,7 @@  mlx5_vdpa_dev_config(int vid)
 		return -1;
 	}
 	priv->vid = vid;
+	priv->connected = true;
 	if (mlx5_vdpa_mtu_set(priv))
 		DRV_LOG(WARNING, "MTU cannot be set on device %s.",
 				vdev->device->name);
@@ -431,12 +434,32 @@  mlx5_vdpa_reset_stats(struct rte_vdpa_device *vdev, int qid)
 	return mlx5_vdpa_virtq_stats_reset(priv, qid);
 }
 
+static int
+mlx5_vdpa_dev_clean(int vid)
+{
+	struct rte_vdpa_device *vdev = rte_vhost_get_vdpa_device(vid);
+	struct mlx5_vdpa_priv *priv;
+
+	if (vdev == NULL)
+		return -1;
+	priv = mlx5_vdpa_find_priv_resource_by_vdev(vdev);
+	if (priv == NULL) {
+		DRV_LOG(ERR, "Invalid vDPA device: %s.", vdev->device->name);
+		return -1;
+	}
+	if (priv->state == MLX5_VDPA_STATE_PROBED)
+		mlx5_vdpa_dev_cache_clean(priv);
+	priv->connected = false;
+	return 0;
+}
+
 static struct rte_vdpa_dev_ops mlx5_vdpa_ops = {
 	.get_queue_num = mlx5_vdpa_get_queue_num,
 	.get_features = mlx5_vdpa_get_vdpa_features,
 	.get_protocol_features = mlx5_vdpa_get_protocol_features,
 	.dev_conf = mlx5_vdpa_dev_config,
 	.dev_close = mlx5_vdpa_dev_close,
+	.dev_cleanup = mlx5_vdpa_dev_clean,
 	.set_vring_state = mlx5_vdpa_set_vring_state,
 	.set_features = mlx5_vdpa_features_set,
 	.migration_done = NULL,
diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.h b/drivers/vdpa/mlx5/mlx5_vdpa.h
index 540bf87a352..24bafe85b44 100644
--- a/drivers/vdpa/mlx5/mlx5_vdpa.h
+++ b/drivers/vdpa/mlx5/mlx5_vdpa.h
@@ -121,6 +121,7 @@  enum mlx5_dev_state {
 
 struct mlx5_vdpa_priv {
 	TAILQ_ENTRY(mlx5_vdpa_priv) next;
+	bool connected;
 	enum mlx5_dev_state state;
 	pthread_mutex_t vq_config_lock;
 	uint64_t no_traffic_counter;