vdpa/mlx5: Update Control VQ callback information
Subsystems (2)
PATCH 1/2 vdpa/mlx5: Update Control VQ callback information
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.
--- drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -0
@@ -1962,6 +1962,8 @@ static void mlx5_vdpa_set_vq_cb(struct vdpa_device *vdev, u16 idx, struct vdpa_cstruct 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)
Signature · 1 line
2.35.1
PATCH 2/2 vdpa/mlx5: Initializde CVQ vringh only once
Currently, CVQ vringh is initialized inside setup_virtqueues() which is called every time a memory update is done. This is undesirable since it resets all the context of the vring, including the available and used indices.
Move the initialization to mlx5_vdpa_set_status() when VIRTIO_CONFIG_S_DRIVER_OK is set.
--- drivers/vdpa/mlx5/net/mlx5_vnet.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-)
drivers/vdpa/mlx5/net/mlx5_vnet.c +20 -11
@@ -2176,7 +2176,6 @@ static int verify_driver_features(struct mlx5_vdpa_dev *mvdev, u64 features)static int setup_virtqueues (struct mlx5_vdpa_dev *mvdev) {struct mlx5_vdpa_net *ndev =to_mlx5_vdpa_ndev (mvdev); -struct mlx5_control_vq *cvq = &mvdev->cvq;int err;int i;
@@ -2186,16 +2185,6 @@ static int setup_virtqueues(struct mlx5_vdpa_dev *mvdev) goto err_vq; } -if (mvdev->actual_features &BIT_ULL (VIRTIO_NET_F_CTRL_VQ )) { - err =vringh_init_iotlb (&cvq->vring, mvdev->actual_features, -MLX5_CVQ_MAX_ENT , false, - (struct vring_desc *)(uintptr_t )cvq->desc_addr, - (struct vring_avail *)(uintptr_t )cvq->driver_addr, - (struct vring_used *)(uintptr_t )cvq->device_addr); -if (err) - goto err_vq; - } -return 0 ; err_vq:
@@ -2468,6 +2457,21 @@ static void clear_vqs_ready(struct mlx5_vdpa_net *ndev) ndev->mvdev.cvq.ready = false; } +static int setup_cvq_vring (struct mlx5_vdpa_dev *mvdev) +{ +struct mlx5_control_vq *cvq = &mvdev->cvq; +int err =0 ; + +if (mvdev->actual_features &BIT_ULL (VIRTIO_NET_F_CTRL_VQ )) + err =vringh_init_iotlb (&cvq->vring, mvdev->actual_features, +MLX5_CVQ_MAX_ENT , false, + (struct vring_desc *)(uintptr_t )cvq->desc_addr, + (struct vring_avail *)(uintptr_t )cvq->driver_addr, + (struct vring_used *)(uintptr_t )cvq->device_addr); + +return err; +} +static void mlx5_vdpa_set_status (struct vdpa_device *vdev,u8 status) {struct mlx5_vdpa_dev *mvdev =to_mvdev (vdev);
@@ -2480,6 +2484,11 @@ static void mlx5_vdpa_set_status(struct vdpa_device *vdev, u8 status)if ((status ^ ndev->mvdev.status) &VIRTIO_CONFIG_S_DRIVER_OK ) {if (status &VIRTIO_CONFIG_S_DRIVER_OK ) { + err =setup_cvq_vring (mvdev); +if (err) { +mlx5_vdpa_warn (mvdev,"failed to setup control VQ vring\n" ); + goto err_setup; + } err =setup_driver (mvdev);if (err) {mlx5_vdpa_warn (mvdev,"failed to setup driver\n" );
Signature · 1 line
2.35.1
Re: [PATCH 2/2] vdpa/mlx5: Initializde CVQ vringh only once
Quoted 10 lines · Eli Cohen
Currently, CVQ vringh is initialized inside
setup_virtqueues()which is called every time a memory update is done. This is undesirable since it resets all the context of the vring, including the available and used indices.Move the initialization to
mlx5_vdpa_set_status()whenVIRTIO_CONFIG_S_DRIVER_OKis set.Signed-off-by Eli Cohen <[email protected]>
Quoted 68 lines
--- drivers/vdpa/mlx5/net/mlx5_vnet.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-)drivers/vdpa/mlx5/net/mlx5_vnet.c +20
-12@@ -2176,7 +2176,6 @@ static int verify_driver_features(struct mlx5_vdpa_dev *mvdev, u64 features)static int setup_virtqueues (struct mlx5_vdpa_dev *mvdev) {struct mlx5_vdpa_net *ndev =to_mlx5_vdpa_ndev (mvdev); -struct mlx5_control_vq *cvq = &mvdev->cvq;int err;int i;@@ -2186,16 +2185,6 @@ static int setup_virtqueues(struct mlx5_vdpa_dev *mvdev) goto err_vq; } -if (mvdev->actual_features &BIT_ULL (VIRTIO_NET_F_CTRL_VQ )) { - err =vringh_init_iotlb (&cvq->vring, mvdev->actual_features, -MLX5_CVQ_MAX_ENT , false, - (struct vring_desc *)(uintptr_t )cvq->desc_addr, - (struct vring_avail *)(uintptr_t )cvq->driver_addr, - (struct vring_used *)(uintptr_t )cvq->device_addr); -if (err) - goto err_vq; - } -return 0 ; err_vq:@@ -2468,6 +2457,21 @@ static void clear_vqs_ready(struct mlx5_vdpa_net *ndev) ndev->mvdev.cvq.ready = false; } +static int setup_cvq_vring (struct mlx5_vdpa_dev *mvdev) +{ +struct mlx5_control_vq *cvq = &mvdev->cvq; +int err =0 ; + +if (mvdev->actual_features &BIT_ULL (VIRTIO_NET_F_CTRL_VQ )) + err =vringh_init_iotlb (&cvq->vring, mvdev->actual_features, +MLX5_CVQ_MAX_ENT , false, + (struct vring_desc *)(uintptr_t )cvq->desc_addr, + (struct vring_avail *)(uintptr_t )cvq->driver_addr, + (struct vring_used *)(uintptr_t )cvq->device_addr); + +return err; +} +static void mlx5_vdpa_set_status (struct vdpa_device *vdev,u8 status) {struct mlx5_vdpa_dev *mvdev =to_mvdev (vdev);@@ -2480,6 +2484,11 @@ static void mlx5_vdpa_set_status(struct vdpa_device *vdev, u8 status)if ((status ^ ndev->mvdev.status) &VIRTIO_CONFIG_S_DRIVER_OK ) {if (status &VIRTIO_CONFIG_S_DRIVER_OK ) { + err =setup_cvq_vring (mvdev); +if (err) { +mlx5_vdpa_warn (mvdev,"failed to setup control VQ vring\n" ); + goto err_setup; + } err =setup_driver (mvdev);if (err) {mlx5_vdpa_warn (mvdev,"failed to setup driver\n" ); --
Quoted 2 lines
2.35.1
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH 2/2] vdpa/mlx5: Initializde CVQ vringh only once
In reply to Eli CohenQuoted 10 lines · Eli Cohen
Currently, CVQ vringh is initialized inside
setup_virtqueues()which is called every time a memory update is done. This is undesirable since it resets all the context of the vring, including the available and used indices.Move the initialization to
mlx5_vdpa_set_status()whenVIRTIO_CONFIG_S_DRIVER_OKis set.Signed-off-by Eli Cohen <[email protected]>
Quoted 70 lines
--- drivers/vdpa/mlx5/net/mlx5_vnet.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-)drivers/vdpa/mlx5/net/mlx5_vnet.c +20
-12@@ -2176,7 +2176,6 @@ static int verify_driver_features(struct mlx5_vdpa_dev *mvdev, u64 features)static int setup_virtqueues (struct mlx5_vdpa_dev *mvdev) {struct mlx5_vdpa_net *ndev =to_mlx5_vdpa_ndev (mvdev); -struct mlx5_control_vq *cvq = &mvdev->cvq;int err;int i;@@ -2186,16 +2185,6 @@ static int setup_virtqueues(struct mlx5_vdpa_dev *mvdev) goto err_vq; } -if (mvdev->actual_features &BIT_ULL (VIRTIO_NET_F_CTRL_VQ )) { - err =vringh_init_iotlb (&cvq->vring, mvdev->actual_features, -MLX5_CVQ_MAX_ENT , false, - (struct vring_desc *)(uintptr_t )cvq->desc_addr, - (struct vring_avail *)(uintptr_t )cvq->driver_addr, - (struct vring_used *)(uintptr_t )cvq->device_addr); -if (err) - goto err_vq; - } -return 0 ; err_vq:@@ -2468,6 +2457,21 @@ static void clear_vqs_ready(struct mlx5_vdpa_net *ndev) ndev->mvdev.cvq.ready = false; } +static int setup_cvq_vring (struct mlx5_vdpa_dev *mvdev) +{ +struct mlx5_control_vq *cvq = &mvdev->cvq; +int err =0 ; + +if (mvdev->actual_features &BIT_ULL (VIRTIO_NET_F_CTRL_VQ )) + err =vringh_init_iotlb (&cvq->vring, mvdev->actual_features, +MLX5_CVQ_MAX_ENT , false, + (struct vring_desc *)(uintptr_t )cvq->desc_addr, + (struct vring_avail *)(uintptr_t )cvq->driver_addr, + (struct vring_used *)(uintptr_t )cvq->device_addr); + +return err; +} +static void mlx5_vdpa_set_status (struct vdpa_device *vdev,u8 status) {struct mlx5_vdpa_dev *mvdev =to_mvdev (vdev);@@ -2480,6 +2484,11 @@ static void mlx5_vdpa_set_status(struct vdpa_device *vdev, u8 status)if ((status ^ ndev->mvdev.status) &VIRTIO_CONFIG_S_DRIVER_OK ) {if (status &VIRTIO_CONFIG_S_DRIVER_OK ) { + err =setup_cvq_vring (mvdev); +if (err) { +mlx5_vdpa_warn (mvdev,"failed to setup control VQ vring\n" ); + goto err_setup; + } err =setup_driver (mvdev);if (err) {mlx5_vdpa_warn (mvdev,"failed to setup driver\n" ); --2.35.1
Quoted 16 lines · Eli Cohen
The control VQ specific information is stored in the dedicated struct
mlx5_control_vq. When the callback is updated throughmlx5_vdpa_set_vq_cb(), make sure to update the control VQ struct.Fixes 5262912ef3cf ("vdpa/mlx5: Add support for control VQ and MAC setting")Signed-off-by Eli Cohen <[email protected]>--- drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 ++ 1 file changed, 2 insertions(+)drivers/vdpa/mlx5/net/mlx5_vnet.c +0
-0
drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_set_vq_cb(struct vdpa_device *vdev, u16 idx, struct vdpa_c · line 1968
Quoted 7 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +2
-0@@ -1962,6 +1962,8 @@ static void mlx5_vdpa_set_vq_cb(struct vdpa_device *vdev, u16 idx, struct vdpa_cstruct 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; }
In the future, I wonder if we can simply just use event_cbs[] since it has took cvq into account:
struct vdpa_callback event_cbs[MLX5_MAX_SUPPORTED_VQS + 1];
Thanks
Quoted 4 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +0
-1static void mlx5_cvq_notify (struct vringh *vring) --2.35.1
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Quoted 37 lines
-----Original Message-----
From: Jason Wang <[email protected]>
Sent: Monday, June 13, 2022 11:11 AM
To: Eli Cohen <[email protected]>
Cc: mst <[email protected]>; eperezma <[email protected]>; virtualization <[email protected]>; linux- kernel <[email protected]>; Si-Wei Liu <[email protected]>
Subject: Re: [PATCH 1/2] vdpa/mlx5: Update Control VQ callback informationQuoted 16 lines · Eli Cohen
The control VQ specific information is stored in the dedicated struct
mlx5_control_vq. When the callback is updated throughmlx5_vdpa_set_vq_cb(), make sure to update the control VQ struct.Fixes 5262912ef3cf ("vdpa/mlx5: Add support for control VQ and MAC setting")Signed-off-by Eli Cohen <[email protected]>--- drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 ++ 1 file changed, 2 insertions(+)drivers/vdpa/mlx5/net/mlx5_vnet.c +0
-0drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_set_vq_cb(struct vdpa_device *vdev, u16 idx, struct vdpa_c · line 1968
Quoted 7 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +2
-0@@ -1962,6 +1962,8 @@ static void mlx5_vdpa_set_vq_cb(struct vdpa_device *vdev, u16 idx, struct vdpa_cstruct 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; }Acked-by Jason Wang <[email protected])
Quoted 4 lines
In the future, I wonder if we can simply just use event_cbs[] since it has took cvq into account:
struct
vdpa_callbackevent_cbs[MLX5_MAX_SUPPORTED_VQS + 1];
Right. I will change this is some future patch.
Quoted 7 lines
Thanks
Quoted 4 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +0
-1static void mlx5_cvq_notify (struct vringh *vring) --2.35.1