net/virtio: reconfigure LSC handler when required
PATCH 1/1 net/virtio: reconfigure LSC handler when required
There is no reason to re-register a interrupt handler for LSC if this feature was not requested in the first place.
A simple usecase is when asking for Rx interrupts without LSC interrupt.
--- drivers/net/virtio/virtio_ethdev.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/net/virtio/virtio_ethdev.c +9 -7
@@ -1684,13 +1684,15 @@ virtio_configure_intr(struct rte_eth_dev *dev) } } -/* Re-register callback to update max_intr */ -rte_intr_callback_unregister (dev->intr_handle, - virtio_interrupt_handler, - dev); -rte_intr_callback_register (dev->intr_handle, - virtio_interrupt_handler, - dev); +if (dev->data->dev_flags &RTE_ETH_DEV_INTR_LSC ) { +/* Re-register callback to update max_intr */ +rte_intr_callback_unregister (dev->intr_handle, + virtio_interrupt_handler, + dev); +rte_intr_callback_register (dev->intr_handle, + virtio_interrupt_handler, + dev); + }/* DO NOT try to remove this! This function will enable msix, or QEMU * will encounter SIGSEGV when DRIVER_OK is sent.
Signature · 1 line
2.23.0
v2 cover virtio-user interrupt fixes
Trying to use virtio-user as a replacement for taps in OVS, I ended up with some fixes on the interrupt side.
The patches for OVS are not ready yet, but sending the DPDK fixes in any case.
@CI guys:
Patch 2 probably means there is a hole in the virtio-user interrupt test plan in DTS (I could not find a setup with virtio-user+rx interrupts+multi queue).
Signature · 12 lines
David Marchand David Marchand (2): net/virtio: reconfigure LSC handler when required net/virtio: fix virtio-user Rx interrupts with multi queue drivers/net/virtio/virtio_ethdev.c | 16 +++++++++------- drivers/net/virtio/virtio_user/virtio_user_dev.c | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) -- 2.23.0
PATCH v2 1/2 net/virtio: reconfigure LSC handler when required
There is no reason to re-register a interrupt handler for LSC if this feature was not requested in the first place.
A simple usecase is when asking for Rx interrupts without LSC interrupt.
--- drivers/net/virtio/virtio_ethdev.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/net/virtio/virtio_ethdev.c +9 -7
@@ -1684,13 +1684,15 @@ virtio_configure_intr(struct rte_eth_dev *dev) } } -/* Re-register callback to update max_intr */ -rte_intr_callback_unregister (dev->intr_handle, - virtio_interrupt_handler, - dev); -rte_intr_callback_register (dev->intr_handle, - virtio_interrupt_handler, - dev); +if (dev->data->dev_flags &RTE_ETH_DEV_INTR_LSC ) { +/* Re-register callback to update max_intr */ +rte_intr_callback_unregister (dev->intr_handle, + virtio_interrupt_handler, + dev); +rte_intr_callback_register (dev->intr_handle, + virtio_interrupt_handler, + dev); + }/* DO NOT try to remove this! This function will enable msix, or QEMU * will encounter SIGSEGV when DRIVER_OK is sent.
Signature · 1 line
2.23.0
Quoted 30 lines · David Marchand
There is no reason to re-register a interrupt handler for LSC if this feature was not requested in the first place.
A simple usecase is when asking for Rx interrupts without LSC interrupt.Fixes 26b683b4f7d0 ("net/virtio: setup Rx queue interrupts")Signed-off-by David Marchand <[email protected]>--- drivers/net/virtio/virtio_ethdev.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)drivers/net/virtio/virtio_ethdev.c +2
-7@@ -1684,13 +1684,15 @@ virtio_configure_intr(struct rte_eth_dev *dev) } } -/* Re-register callback to update max_intr */ -rte_intr_callback_unregister (dev->intr_handle, - virtio_interrupt_handler, - dev); -rte_intr_callback_register (dev->intr_handle, - virtio_interrupt_handler, - dev); +if (dev->data->dev_flags &RTE_ETH_DEV_INTR_LSC ) { +/* Re-register callback to update max_intr */
drivers/net/virtio/virtio_ethdev.c virtio_configure_intr(struct rte_eth_dev *dev) · line 1698
Quoted 10 lines
drivers/net/virtio/virtio_ethdev.c +7
-0+rte_intr_callback_unregister (dev->intr_handle, + virtio_interrupt_handler, + dev); +rte_intr_callback_register (dev->intr_handle, + virtio_interrupt_handler, + dev); + }/* DO NOT try to remove this! This function will enable msix, or QEMU * will encounter SIGSEGV when DRIVER_OK is sent.
Thanks,
Maxime
PATCH v2 2/2 net/virtio: fix virtio-user Rx interrupts with multi queue
In reply to David MarchandThe callfds[] array stores eventfds sequentially for Rx and Tx vq.
--- drivers/net/virtio/virtio_user/virtio_user_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/virtio/virtio_user/virtio_user_dev.c +1 -1
@@ -416,7 +416,7 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *dev) }for (i =0 ; i < dev->max_queue_pairs; ++i) - eth_dev->intr_handle->efds[i] = dev->callfds[i]; + eth_dev->intr_handle->efds[i] = dev->callfds[2 * i]; eth_dev->intr_handle->nb_efd = dev->max_queue_pairs; eth_dev->intr_handle->max_intr = dev->max_queue_pairs +1 ; eth_dev->intr_handle->type =RTE_INTR_HANDLE_VDEV ;
Signature · 1 line
2.23.0
Re: [dpdk-dev] [PATCH v2 2/2] net/virtio: fix virtio-user Rx interrupts with multi queue
Quoted 16 lines · David Marchand
The callfds[] array stores eventfds sequentially for Rx and Tx vq.
Fixes 3d4fb6fd2505 ("net/virtio-user: support Rx interrupt")Signed-off-by David Marchand <[email protected]>--- drivers/net/virtio/virtio_user/virtio_user_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/virtio/virtio_user/virtio_user_dev.c +0
-0
drivers/net/virtio/virtio_user/virtio_user_dev.c virtio_user_fill_intr_handle(struct virtio_user_dev *dev) · line 422
Quoted 8 lines
drivers/net/virtio/virtio_user/virtio_user_dev.c +1
-1@@ -416,7 +416,7 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *dev) }for (i =0 ; i < dev->max_queue_pairs; ++i) - eth_dev->intr_handle->efds[i] = dev->callfds[i]; + eth_dev->intr_handle->efds[i] = dev->callfds[2 * i]; eth_dev->intr_handle->nb_efd = dev->max_queue_pairs; eth_dev->intr_handle->max_intr = dev->max_queue_pairs +1 ; eth_dev->intr_handle->type =RTE_INTR_HANDLE_VDEV ;
Thanks,
Maxime
Maxime Coquelin
AppliedRe: [dpdk-dev] [PATCH v2 0/2] virtio-user interrupt fixes
In reply to David MarchandQuoted 11 lines · David Marchand
Trying to use virtio-user as a replacement for taps in OVS, I ended up with some fixes on the interrupt side.
The patches for OVS are not ready yet, but sending the DPDK fixes in any case.@CI guys:
Patch 2 probably means there is a hole in the virtio-user interrupt test plan in DTS (I could not find a setup with virtio-user+rx interrupts+multi queue).
Applied to dpdk-next-virtio/main.
Thanks,
Maxime