Skip to content

Commit 9dba419

Browse files
dtatuleamstsirkin
authored andcommitted
vdpa/mlx5: Parallelize VQ suspend/resume for CVQ MQ command
change_num_qps() is still suspending/resuming VQs one by one. This change switches to parallel suspend/resume. When increasing the number of queues the flow has changed a bit for simplicity: the setup_vq() function will always be called before resume_vqs(). If the VQ is initialized, setup_vq() will exit early. If the VQ is not initialized, setup_vq() will create it and resume_vqs() will resume it. Signed-off-by: Dragos Tatulea <[email protected]> Reviewed-by: Tariq Toukan <[email protected]> Message-Id: <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]> Acked-by: Eugenio Pérez <[email protected]> Tested-by: Lei Yang <[email protected]>
1 parent 74c8907 commit 9dba419

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

drivers/vdpa/mlx5/net/mlx5_vnet.c

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2229,25 +2229,27 @@ static int change_num_qps(struct mlx5_vdpa_dev *mvdev, int newqps)
22292229
if (err)
22302230
return err;
22312231

2232-
for (i = cur_vqs - 1; i >= new_vqs; i--) {
2233-
struct mlx5_vdpa_virtqueue *mvq = &ndev->vqs[i];
2234-
2235-
if (is_resumable(ndev))
2236-
suspend_vq(ndev, mvq);
2237-
else
2238-
teardown_vq(ndev, mvq);
2232+
if (is_resumable(ndev)) {
2233+
suspend_vqs(ndev, new_vqs, cur_vqs - new_vqs);
2234+
} else {
2235+
for (i = new_vqs; i < cur_vqs; i++)
2236+
teardown_vq(ndev, &ndev->vqs[i]);
22392237
}
22402238

22412239
ndev->cur_num_vqs = new_vqs;
22422240
} else {
22432241
ndev->cur_num_vqs = new_vqs;
2244-
for (i = cur_vqs; i < new_vqs; i++) {
2245-
struct mlx5_vdpa_virtqueue *mvq = &ndev->vqs[i];
22462242

2247-
err = mvq->initialized ? resume_vq(ndev, mvq) : setup_vq(ndev, mvq, true);
2243+
for (i = cur_vqs; i < new_vqs; i++) {
2244+
err = setup_vq(ndev, &ndev->vqs[i], false);
22482245
if (err)
22492246
goto clean_added;
22502247
}
2248+
2249+
err = resume_vqs(ndev, cur_vqs, new_vqs - cur_vqs);
2250+
if (err)
2251+
goto clean_added;
2252+
22512253
err = modify_rqt(ndev, new_vqs);
22522254
if (err)
22532255
goto clean_added;

0 commit comments

Comments
 (0)