vdpa/mlx5: Update Control VQ callback information

elic307i · gregkh · commit 10f88306f9f3 · 2022-07-07T17:53:27.000+02:00
commit 40f2f3e upstream. The control VQ specific information is stored in the dedicated struct mlx5_control_vq. When the callback is updated through mlx5_vdpa_set_vq_cb(), make sure to update the control VQ struct. Fixes: 5262912 ("vdpa/mlx5: Add support for control VQ and MAC setting") Signed-off-by: Eli Cohen <elic@nvidia.com> Message-Id: <20220613075958.511064-1-elic@nvidia.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Jason Wang <jasowang@redhat.com) Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
@@ -1698,6 +1698,8 @@ static void mlx5_vdpa_set_vq_cb(struct vdpa_device *vdev, u16 idx, struct vdpa_c
 	struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
 
 	ndev->event_cbs[idx] = *cb;
+	if (is_ctrl_vq_idx(mvdev, idx))
+		mvdev->cvq.event_cb = *cb;
 }
 
 static void mlx5_cvq_notify(struct vringh *vring)

Original file line number	Diff line number	Diff line change
`@@ -1698,6 +1698,8 @@ static void mlx5_vdpa_set_vq_cb(struct vdpa_device *vdev, u16 idx, struct vdpa_c`
`1698`	`1698`	`struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);`
`1699`	`1699`
`1700`	`1700`	`ndev->event_cbs[idx] = *cb;`
	`1701`	`+ if (is_ctrl_vq_idx(mvdev, idx))`
	`1702`	`+ mvdev->cvq.event_cb = *cb;`
`1701`	`1703`	`}`
`1702`	`1704`
`1703`	`1705`	`static void mlx5_cvq_notify(struct vringh *vring)`