From a181eaa59bb2ff2784376918e95bbf92e5340db1 Mon Sep 17 00:00:00 2001 From: Mohsin Kazmi Date: Tue, 29 Aug 2023 09:18:20 +0000 Subject: virtio: add support for tx-queue-size Type: improvement DBGvpp# set loggin class virtio level debug DBGvpp# create int virtio 0000:00:03.0 tx-queue-size 1024 show virtio pci ``` Virtqueue (TX) 1 qsz 1024, last_used_idx 0, desc_next 0, desc_in_use 0 avail.flags 0x1 avail.idx 0 used.flags 0x0 used.idx 0 ``` show logging ``` 2022/07/22 23:20:22:557 debug virtio 0000:00:03.0: tx-queue: number 1, default-size 256 2022/07/22 23:20:22:557 debug virtio 0000:00:03.0: tx-queue: number 1, new size 1024 ``` Change-Id: Ib1a3ebe742b3a6c9fe72bd1c5accfe07682cbdd1 Signed-off-by: Mohsin Kazmi --- src/vnet/devices/virtio/pci.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'src/vnet/devices/virtio/pci.c') diff --git a/src/vnet/devices/virtio/pci.c b/src/vnet/devices/virtio/pci.c index 85e6abdbbe5..0820f8a5016 100644 --- a/src/vnet/devices/virtio/pci.c +++ b/src/vnet/devices/virtio/pci.c @@ -721,8 +721,8 @@ virtio_pci_control_vring_init (vlib_main_t * vm, virtio_if_t * vif, } clib_error_t * -virtio_pci_vring_split_init (vlib_main_t * vm, virtio_if_t * vif, - u16 queue_num) +virtio_pci_vring_split_init (vlib_main_t *vm, virtio_if_t *vif, u16 queue_num, + u16 txq_size) { clib_error_t *error = 0; u16 queue_size = 0; @@ -745,6 +745,16 @@ virtio_pci_vring_split_init (vlib_main_t * vm, virtio_if_t * vif, if (queue_num % 2) { + if (txq_size) + { + virtio_log_debug (vif, "tx-queue: number %u, default-size %u", + queue_num, queue_size); + vif->virtio_pci_func->set_queue_size (vm, vif, queue_num, txq_size); + queue_size = + vif->virtio_pci_func->get_queue_size (vm, vif, queue_num); + virtio_log_debug (vif, "tx-queue: number %u, new size %u", queue_num, + queue_size); + } vec_validate_aligned (vif->txq_vrings, TX_QUEUE_ACCESS (queue_num), CLIB_CACHE_LINE_BYTES); vring = vec_elt_at_index (vif->txq_vrings, TX_QUEUE_ACCESS (queue_num)); @@ -886,12 +896,13 @@ virtio_pci_vring_packed_init (vlib_main_t * vm, virtio_if_t * vif, } clib_error_t * -virtio_pci_vring_init (vlib_main_t * vm, virtio_if_t * vif, u16 queue_num) +virtio_pci_vring_init (vlib_main_t *vm, virtio_if_t *vif, u16 queue_num, + u16 txq_size) { if (vif->is_packed) return virtio_pci_vring_packed_init (vm, vif, queue_num); else - return virtio_pci_vring_split_init (vm, vif, queue_num); + return virtio_pci_vring_split_init (vm, vif, queue_num, txq_size); } static void @@ -1229,7 +1240,7 @@ virtio_pci_device_init (vlib_main_t * vm, virtio_if_t * vif, for (int i = 0; i < vif->max_queue_pairs; i++) { - if ((error = virtio_pci_vring_init (vm, vif, RX_QUEUE (i)))) + if ((error = virtio_pci_vring_init (vm, vif, RX_QUEUE (i), 0))) { args->rv = VNET_API_ERROR_INIT_FAILED; virtio_log_error (vif, "%s (%u) %s", "error in rxq-queue", @@ -1244,7 +1255,8 @@ virtio_pci_device_init (vlib_main_t * vm, virtio_if_t * vif, vif->num_rxqs++; } - if ((error = virtio_pci_vring_init (vm, vif, TX_QUEUE (i)))) + if ((error = virtio_pci_vring_init (vm, vif, TX_QUEUE (i), + args->tx_queue_size))) { args->rv = VNET_API_ERROR_INIT_FAILED; virtio_log_error (vif, "%s (%u) %s", "error in txq-queue", -- cgit 1.2.3-korg