ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio: fix the packet buffering initialization order

Browse Source 
Type: fix

Signed-off-by: Mohsin Kazmi <sykazmi@cisco.com>
Change-Id: Idada695432d2bfac8808f35f1e8cd16f84d963c6
This commit is contained in:
Mohsin Kazmi
2023-05-24 11:25:39 +00:00
committed by Beno�t Ganne
parent 7280e3f866
commit 562ac2f4e4
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vnet/devices/virtio/pci.c
View File

@ -1498,9 +1498,17 @@ virtio_pci_create_if (vlib_main_t * vm, virtio_pci_create_if_args_t * args)
"error encountered during packet buffering init"); "error encountered during packet buffering init");
goto error; goto error;
} }
/*
* packet buffering flag needs to be set 1 before calling the
* virtio_pre_input_node_enable but after the successful initialization
* of buffering queues above.
* Packet buffering flag set to 0 if there will be any error during
* buffering initialization.
*/
vif->packet_buffering = 1;
virtio_pre_input_node_enable (vm, vif);
} }
virtio_pre_input_node_enable (vm, vif);
virtio_vring_set_rx_queues (vm, vif); virtio_vring_set_rx_queues (vm, vif);
virtio_vring_set_tx_queues (vm, vif); virtio_vring_set_tx_queues (vm, vif);
@ -1542,6 +1550,8 @@ virtio_pci_delete_if (vlib_main_t * vm, virtio_if_t * vif)
vlib_pci_intr_disable (vm, vif->pci_dev_handle); vlib_pci_intr_disable (vm, vif->pci_dev_handle);
if (vif->virtio_pci_func)
{
for (i = 0; i < vif->max_queue_pairs; i++) for (i = 0; i < vif->max_queue_pairs; i++)
{ {
vif->virtio_pci_func->del_queue (vm, vif, RX_QUEUE (i)); vif->virtio_pci_func->del_queue (vm, vif, RX_QUEUE (i));
@ -1551,8 +1561,8 @@ virtio_pci_delete_if (vlib_main_t * vm, virtio_if_t * vif)
if (vif->features & VIRTIO_FEATURE (VIRTIO_NET_F_CTRL_VQ)) if (vif->features & VIRTIO_FEATURE (VIRTIO_NET_F_CTRL_VQ))
vif->virtio_pci_func->del_queue (vm, vif, vif->max_queue_pairs * 2); vif->virtio_pci_func->del_queue (vm, vif, vif->max_queue_pairs * 2);
if (vif->virtio_pci_func)
vif->virtio_pci_func->device_reset (vm, vif); vif->virtio_pci_func->device_reset (vm, vif);
}
if (vif->hw_if_index) if (vif->hw_if_index)
{ {
@ -1573,6 +1583,7 @@ virtio_pci_delete_if (vlib_main_t * vm, virtio_if_t * vif)
vlib_physmem_free (vm, vring->desc); vlib_physmem_free (vm, vring->desc);
} }
if (vif->packet_buffering)
virtio_pre_input_node_disable (vm, vif); virtio_pre_input_node_disable (vm, vif);
vec_foreach_index (i, vif->txq_vrings) vec_foreach_index (i, vif->txq_vrings)

1
src/vnet/devices/virtio/virtio.c
View File

@ -207,7 +207,6 @@ virtio_set_packet_buffering (virtio_if_t * vif, u16 buffering_size)
vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, vif->hw_if_index); vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, vif->hw_if_index);
vnet_virtio_vring_t *vring; vnet_virtio_vring_t *vring;
clib_error_t *error = 0; clib_error_t *error = 0;
vif->packet_buffering = 1;
vec_foreach (vring, vif->txq_vrings) vec_foreach (vring, vif->txq_vrings)
{ {