d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vdpa/mlx5: fix live migration termination

Browse Source 
There are a lot of per virtq operations in the live migration
handling.

Before the driver support for queue update, when a virtq was not valid,
all the LM handling was terminated.

But now, when the driver supports queue update, the virtq can be invalid
as legal stage.

Skip invalid virtq in LM handling.

Fixes: c47d6e8333 ("vdpa/mlx5: support queue update")

Signed-off-by: Matan Azrad <matan@mellanox.com>
Acked-by: Xueming Li <xuemingl@mellanox.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
This commit is contained in:
Matan Azrad 2020-07-24 12:07:11 +00:00 committed by Ferruh Yigit
parent 819a716858
commit 581e312d69
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/vdpa/mlx5/mlx5_vdpa_lm.c
View File

@ -19,9 +19,13 @@ mlx5_vdpa_logging_enable(struct mlx5_vdpa_priv *priv, int enable)
for (i = 0; i < priv->nr_virtqs; ++i) { for (i = 0; i < priv->nr_virtqs; ++i) {
attr.queue_index = i; attr.queue_index = i;
if (!priv->virtqs[i].virtq || if (!priv->virtqs[i].virtq) {
mlx5_devx_cmd_modify_virtq(priv->virtqs[i].virtq, &attr)) { DRV_LOG(DEBUG, "virtq %d is invalid for dirty bitmap "
DRV_LOG(ERR, "Failed to modify virtq %d logging.", i); "enabling.", i);
} else if (mlx5_devx_cmd_modify_virtq(priv->virtqs[i].virtq,
&attr)) {
DRV_LOG(ERR, "Failed to modify virtq %d for dirty "
"bitmap enabling.", i);
return -1; return -1;
} }
} }
@ -69,9 +73,11 @@ mlx5_vdpa_dirty_bitmap_set(struct mlx5_vdpa_priv *priv, uint64_t log_base,
attr.dirty_bitmap_mkey = mr->mkey->id; attr.dirty_bitmap_mkey = mr->mkey->id;
for (i = 0; i < priv->nr_virtqs; ++i) { for (i = 0; i < priv->nr_virtqs; ++i) {
attr.queue_index = i; attr.queue_index = i;
if (!priv->virtqs[i].virtq || if (!priv->virtqs[i].virtq) {
mlx5_devx_cmd_modify_virtq(priv->virtqs[i].virtq, &attr)) { DRV_LOG(DEBUG, "virtq %d is invalid for LM.", i);
DRV_LOG(ERR, "Failed to modify virtq %d for lm.", i); } else if (mlx5_devx_cmd_modify_virtq(priv->virtqs[i].virtq,
&attr)) {
DRV_LOG(ERR, "Failed to modify virtq %d for LM.", i);
goto err; goto err;
} }
} }
@ -104,15 +110,15 @@ mlx5_vdpa_lm_log(struct mlx5_vdpa_priv *priv)
if (!RTE_VHOST_NEED_LOG(features)) if (!RTE_VHOST_NEED_LOG(features))
return 0; return 0;
for (i = 0; i < priv->nr_virtqs; ++i) { for (i = 0; i < priv->nr_virtqs; ++i) {
if (priv->virtqs[i].virtq) { if (!priv->virtqs[i].virtq) {
DRV_LOG(DEBUG, "virtq %d is invalid for LM log.", i);
} else {
ret = mlx5_vdpa_virtq_stop(priv, i); ret = mlx5_vdpa_virtq_stop(priv, i);
if (ret) { if (ret) {
DRV_LOG(ERR, "Failed to stop virtq %d.", i); DRV_LOG(ERR, "Failed to stop virtq %d for LM "
"log.", i);
return -1; return -1;
} }
} else {
DRV_LOG(ERR, "virtq %d is not created.", i);
return -1;
} }
rte_vhost_log_used_vring(priv->vid, i, 0, rte_vhost_log_used_vring(priv->vid, i, 0,
MLX5_VDPA_USED_RING_LEN(priv->virtqs[i].vq_size)); MLX5_VDPA_USED_RING_LEN(priv->virtqs[i].vq_size));