Skip to content

Commit 09e65ee

Browse files
siwliu-kernelmstsirkin
authored andcommitted
vdpa/mlx5: should not activate virtq object when suspended
Otherwise the virtqueue object to instate could point to invalid address that was unmapped from the MTT: mlx5_core 0000:41:04.2: mlx5_cmd_out_err:782:(pid 8321): CREATE_GENERAL_OBJECT(0xa00) op_mod(0xd) failed, status bad parameter(0x3), syndrome (0x5fa1c), err(-22) Fixes: cae15c2 ("vdpa/mlx5: Implement susupend virtqueue callback") Cc: Eli Cohen <[email protected]> Signed-off-by: Si-Wei Liu <[email protected]> Reviewed-by: Eli Cohen <[email protected]> Message-Id: <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]> Acked-by: Jason Wang <[email protected]>
1 parent aed8efd commit 09e65ee

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

drivers/vdpa/mlx5/core/mlx5_vdpa.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ struct mlx5_vdpa_dev {
9696
struct mlx5_control_vq cvq;
9797
struct workqueue_struct *wq;
9898
unsigned int group2asid[MLX5_VDPA_NUMVQ_GROUPS];
99+
bool suspended;
99100
};
100101

101102
int mlx5_vdpa_alloc_pd(struct mlx5_vdpa_dev *dev, u32 *pdn, u16 uid);

drivers/vdpa/mlx5/net/mlx5_vnet.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2438,7 +2438,7 @@ static int mlx5_vdpa_change_map(struct mlx5_vdpa_dev *mvdev,
24382438
if (err)
24392439
goto err_mr;
24402440

2441-
if (!(mvdev->status & VIRTIO_CONFIG_S_DRIVER_OK))
2441+
if (!(mvdev->status & VIRTIO_CONFIG_S_DRIVER_OK) || mvdev->suspended)
24422442
goto err_mr;
24432443

24442444
restore_channels_info(ndev);
@@ -2606,6 +2606,7 @@ static int mlx5_vdpa_reset(struct vdpa_device *vdev)
26062606
clear_vqs_ready(ndev);
26072607
mlx5_vdpa_destroy_mr(&ndev->mvdev);
26082608
ndev->mvdev.status = 0;
2609+
ndev->mvdev.suspended = false;
26092610
ndev->cur_num_vqs = 0;
26102611
ndev->mvdev.cvq.received_desc = 0;
26112612
ndev->mvdev.cvq.completed_desc = 0;
@@ -2852,6 +2853,8 @@ static int mlx5_vdpa_suspend(struct vdpa_device *vdev)
28522853
struct mlx5_vdpa_virtqueue *mvq;
28532854
int i;
28542855

2856+
mlx5_vdpa_info(mvdev, "suspending device\n");
2857+
28552858
down_write(&ndev->reslock);
28562859
ndev->nb_registered = false;
28572860
mlx5_notifier_unregister(mvdev->mdev, &ndev->nb);
@@ -2861,6 +2864,7 @@ static int mlx5_vdpa_suspend(struct vdpa_device *vdev)
28612864
suspend_vq(ndev, mvq);
28622865
}
28632866
mlx5_vdpa_cvq_suspend(mvdev);
2867+
mvdev->suspended = true;
28642868
up_write(&ndev->reslock);
28652869
return 0;
28662870
}

0 commit comments

Comments
 (0)