From a57a7005d6c04029d168cfdd053f3e334b935cc3 Mon Sep 17 00:00:00 2001 From: Steven Luong Date: Thu, 17 Jun 2021 08:50:32 -0700 Subject: [PATCH] vmxnet3: support manual thread assignment to tx queue Thread assignment to tx queue has always been automatic and there was no way to modify it. With this patch, it is now possible to use the cli "set interface tx-queue" to change the thread assignment to tx queue for vmxnet3 interface, thanks to the new tx infra. Type: feature Signed-off-by: Steven Luong Change-Id: I1544e3557f70251d4bd423cc3d9f28ee1d44db4a --- src/plugins/vmxnet3/output.c | 9 ++++++--- src/plugins/vmxnet3/vmxnet3.c | 34 +++++++++++++++++++--------------- src/plugins/vmxnet3/vmxnet3.h | 1 + 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/plugins/vmxnet3/output.c b/src/plugins/vmxnet3/output.c index 0de91d9bf21..8ba3f99022f 100644 --- a/src/plugins/vmxnet3/output.c +++ b/src/plugins/vmxnet3/output.c @@ -110,7 +110,8 @@ VNET_DEVICE_CLASS_TX_FN (vmxnet3_device_class) (vlib_main_t * vm, u16 space_left; u16 n_left = frame->n_vectors; vmxnet3_txq_t *txq; - u16 qid = vm->thread_index % vd->num_tx_queues, produce; + vnet_hw_if_tx_frame_t *tf = vlib_frame_scalar_args (frame); + u16 qid = tf->queue_id, produce; if (PREDICT_FALSE (!(vd->flags & VMXNET3_DEVICE_F_LINK_UP))) { @@ -121,7 +122,8 @@ VNET_DEVICE_CLASS_TX_FN (vmxnet3_device_class) (vlib_main_t * vm, } txq = vec_elt_at_index (vd->txqs, qid); - clib_spinlock_lock_if_init (&txq->lock); + if (tf->shared_queue) + clib_spinlock_lock (&txq->lock); vmxnet3_txq_release (vm, vd, txq); @@ -228,7 +230,8 @@ VNET_DEVICE_CLASS_TX_FN (vmxnet3_device_class) (vlib_main_t * vm, if (PREDICT_TRUE (produce != txq->tx_ring.produce)) vmxnet3_reg_write_inline (vd, 0, txq->reg_txprod, txq->tx_ring.produce); - clib_spinlock_unlock_if_init (&txq->lock); + if (tf->shared_queue) + clib_spinlock_unlock (&txq->lock); return (frame->n_vectors - n_left); } diff --git a/src/plugins/vmxnet3/vmxnet3.c b/src/plugins/vmxnet3/vmxnet3.c index aeb2af36d0a..ff0a7dc706b 100644 --- a/src/plugins/vmxnet3/vmxnet3.c +++ b/src/plugins/vmxnet3/vmxnet3.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #define PCI_VENDOR_ID_VMWARE 0x15ad @@ -325,23 +326,15 @@ vmxnet3_txq_init (vlib_main_t * vm, vmxnet3_device_t * vd, u16 qid, u16 qsz) vmxnet3_tx_stats *txs; u32 size; - if (qid >= vd->num_tx_queues) - { - qid = qid % vd->num_tx_queues; - txq = vec_elt_at_index (vd->txqs, qid); - if (txq->lock == 0) - clib_spinlock_init (&txq->lock); - vd->flags |= VMXNET3_DEVICE_F_SHARED_TXQ_LOCK; - return 0; - } + vec_validate_aligned (vd->txqs, qid, CLIB_CACHE_LINE_BYTES); + txq = vec_elt_at_index (vd->txqs, qid); + clib_memset (txq, 0, sizeof (*txq)); + clib_spinlock_init (&txq->lock); vec_validate (vd->tx_stats, qid); txs = vec_elt_at_index (vd->tx_stats, qid); clib_memset (txs, 0, sizeof (*txs)); - vec_validate_aligned (vd->txqs, qid, CLIB_CACHE_LINE_BYTES); - txq = vec_elt_at_index (vd->txqs, qid); - clib_memset (txq, 0, sizeof (*txq)); txq->size = qsz; txq->reg_txprod = qid * 8 + VMXNET3_REG_TXPROD; @@ -351,7 +344,7 @@ vmxnet3_txq_init (vlib_main_t * vm, vmxnet3_device_t * vd, u16 qid, u16 qsz) if (txq->tx_desc == 0) return vlib_physmem_last_error (vm); - memset (txq->tx_desc, 0, size); + clib_memset (txq->tx_desc, 0, size); size = qsz * sizeof (*txq->tx_comp); txq->tx_comp = @@ -407,7 +400,6 @@ vmxnet3_device_init (vlib_main_t * vm, vmxnet3_device_t * vd, { clib_error_t *error = 0; u32 ret, i, size; - vlib_thread_main_t *tm = vlib_get_thread_main (); /* Quiesce the device */ vmxnet3_reg_write (vd, 1, VMXNET3_REG_CMD, VMXNET3_CMD_QUIESCE_DEV); @@ -506,7 +498,7 @@ vmxnet3_device_init (vlib_main_t * vm, vmxnet3_device_t * vd, return error; } - for (i = 0; i < tm->n_vlib_mains; i++) + for (i = 0; i < vd->num_tx_queues; i++) { error = vmxnet3_txq_init (vm, vd, i, args->txq_size); if (error) @@ -834,6 +826,18 @@ vmxnet3_create_if (vlib_main_t * vm, vmxnet3_create_if_args_t * args) vmxnet3_rxq_refill_ring0 (vm, vd, rxq); vmxnet3_rxq_refill_ring1 (vm, vd, rxq); } + + vec_foreach_index (qid, vd->txqs) + { + vmxnet3_txq_t *txq = vec_elt_at_index (vd->txqs, qid); + txq->queue_index = + vnet_hw_if_register_tx_queue (vnm, vd->hw_if_index, qid); + } + for (u32 i = 0; i < vlib_get_n_threads (); i++) + { + u32 qi = vd->txqs[i % vd->num_tx_queues].queue_index; + vnet_hw_if_tx_queue_assign_thread (vnm, qi, i); + } vnet_hw_if_update_runtime_data (vnm, vd->hw_if_index); vd->flags |= VMXNET3_DEVICE_F_INITIALIZED; diff --git a/src/plugins/vmxnet3/vmxnet3.h b/src/plugins/vmxnet3/vmxnet3.h index e8d2be0e552..75107689443 100644 --- a/src/plugins/vmxnet3/vmxnet3.h +++ b/src/plugins/vmxnet3/vmxnet3.h @@ -543,6 +543,7 @@ typedef struct { CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); u16 size; + u32 queue_index; u32 reg_txprod; clib_spinlock_t lock; -- 2.16.6