X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fvmxnet3%2Fvmxnet3.c;h=a3aae99f21178c9dfd3c4204fb248ea0ffd35d47;hb=773291163;hp=e34b3e69a27351b0e2bd187677636f630701861d;hpb=b7b929931a07fbb27b43d5cd105f366c3e29807e;p=vpp.git diff --git a/src/plugins/vmxnet3/vmxnet3.c b/src/plugins/vmxnet3/vmxnet3.c index e34b3e69a27..a3aae99f211 100644 --- a/src/plugins/vmxnet3/vmxnet3.c +++ b/src/plugins/vmxnet3/vmxnet3.c @@ -97,6 +97,35 @@ vmxnet3_set_interface_next_node (vnet_main_t * vnm, u32 hw_if_index, node_index); } +static void +vmxnet3_clear_hw_interface_counters (u32 instance) +{ + vmxnet3_main_t *vmxm = &vmxnet3_main; + vmxnet3_device_t *vd = pool_elt_at_index (vmxm->devices, instance); + vmxnet3_tx_queue *tx = VMXNET3_TX_START (vd); + vmxnet3_rx_queue *rx = VMXNET3_RX_START (vd); + u16 qid; + + /* + * Set the "last_cleared_stats" to the current stats, so that + * things appear to clear from a display perspective. + */ + vmxnet3_reg_write (vd, 1, VMXNET3_REG_CMD, VMXNET3_CMD_GET_STATS); + + vec_foreach_index (qid, vd->txqs) + { + vmxnet3_tx_stats *txs = vec_elt_at_index (vd->tx_stats, qid); + clib_memcpy (txs, &tx->stats, sizeof (*txs)); + tx++; + } + vec_foreach_index (qid, vd->rxqs) + { + vmxnet3_rx_stats *rxs = vec_elt_at_index (vd->rx_stats, qid); + clib_memcpy (rxs, &rx->stats, sizeof (*rxs)); + rx++; + } +} + static char *vmxnet3_tx_func_error_strings[] = { #define _(n,s) s, foreach_vmxnet3_tx_func_error @@ -110,6 +139,7 @@ VNET_DEVICE_CLASS (vmxnet3_device_class,) = .format_device = format_vmxnet3_device, .format_device_name = format_vmxnet3_device_name, .admin_up_down_function = vmxnet3_interface_admin_up_down, + .clear_counters = vmxnet3_clear_hw_interface_counters, .rx_mode_change_function = vmxnet3_interface_rx_mode_change, .rx_redirect_to_node = vmxnet3_set_interface_next_node, .tx_function_n_errors = VMXNET3_TX_N_ERROR, @@ -139,37 +169,47 @@ vmxnet3_write_mac (vmxnet3_device_t * vd) static clib_error_t * vmxnet3_provision_driver_shared (vlib_main_t * vm, vmxnet3_device_t * vd) { - vmxnet3_main_t *vmxm = &vmxnet3_main; vmxnet3_shared *shared; - vmxnet3_queues *q; u64 shared_dma; - clib_error_t *error; - u16 qid = 0, rid; - vmxnet3_rxq_t *rxq = vec_elt_at_index (vd->rxqs, qid); - vmxnet3_txq_t *txq = vec_elt_at_index (vd->txqs, qid); + u16 qid, rid; + vmxnet3_tx_queue *tx = VMXNET3_TX_START (vd); + vmxnet3_rx_queue *rx = VMXNET3_RX_START (vd); - vd->dma = vlib_physmem_alloc_aligned (vm, vmxm->physmem_region, &error, - sizeof (*vd->dma), 512); - if (error) - return error; + vd->driver_shared = + vlib_physmem_alloc_aligned_on_numa (vm, sizeof (*vd->driver_shared), 512, + vd->numa_node); + if (vd->driver_shared == 0) + return vlib_physmem_last_error (vm); - clib_memset (vd->dma, 0, sizeof (*vd->dma)); + clib_memset (vd->driver_shared, 0, sizeof (*vd->driver_shared)); - q = &vd->dma->queues; - q->tx.cfg.desc_address = vmxnet3_dma_addr (vm, vd, txq->tx_desc); - q->tx.cfg.comp_address = vmxnet3_dma_addr (vm, vd, txq->tx_comp); - q->tx.cfg.num_desc = txq->size; - q->tx.cfg.num_comp = txq->size; - for (rid = 0; rid < VMXNET3_RX_RING_SIZE; rid++) - { - q->rx.cfg.desc_address[rid] = vmxnet3_dma_addr (vm, vd, + vec_foreach_index (qid, vd->txqs) + { + vmxnet3_txq_t *txq = vec_elt_at_index (vd->txqs, qid); + + tx->cfg.desc_address = vmxnet3_dma_addr (vm, vd, txq->tx_desc); + tx->cfg.comp_address = vmxnet3_dma_addr (vm, vd, txq->tx_comp); + tx->cfg.num_desc = txq->size; + tx->cfg.num_comp = txq->size; + tx++; + } + + vec_foreach_index (qid, vd->rxqs) + { + vmxnet3_rxq_t *rxq = vec_elt_at_index (vd->rxqs, qid); + + for (rid = 0; rid < VMXNET3_RX_RING_SIZE; rid++) + { + rx->cfg.desc_address[rid] = vmxnet3_dma_addr (vm, vd, rxq->rx_desc[rid]); - q->rx.cfg.num_desc[rid] = rxq->size; - } - q->rx.cfg.comp_address = vmxnet3_dma_addr (vm, vd, rxq->rx_comp); - q->rx.cfg.num_comp = rxq->size; + rx->cfg.num_desc[rid] = rxq->size; + } + rx->cfg.comp_address = vmxnet3_dma_addr (vm, vd, rxq->rx_comp); + rx->cfg.num_comp = rxq->size; + rx++; + } - shared = &vd->dma->shared; + shared = vd->driver_shared; shared->magic = VMXNET3_SHARED_MAGIC; shared->misc.version = VMXNET3_VERSION_MAGIC; if (sizeof (void *) == 4) @@ -179,8 +219,9 @@ vmxnet3_provision_driver_shared (vlib_main_t * vm, vmxnet3_device_t * vd) shared->misc.guest_info |= VMXNET3_GOS_TYPE_LINUX; shared->misc.version_support = VMXNET3_VERSION_SELECT; shared->misc.upt_version_support = VMXNET3_UPT_VERSION_SELECT; - shared->misc.queue_desc_address = vmxnet3_dma_addr (vm, vd, q); - shared->misc.queue_desc_len = sizeof (*q); + shared->misc.queue_desc_address = vmxnet3_dma_addr (vm, vd, vd->queues); + shared->misc.queue_desc_len = sizeof (*tx) * vd->num_tx_queues + + sizeof (*rx) * vd->num_rx_queues; shared->misc.mtu = VMXNET3_MTU; shared->misc.num_tx_queues = vd->num_tx_queues; shared->misc.num_rx_queues = vd->num_rx_queues; @@ -188,7 +229,7 @@ vmxnet3_provision_driver_shared (vlib_main_t * vm, vmxnet3_device_t * vd) shared->interrupt.event_intr_index = 1; shared->interrupt.control = VMXNET3_IC_DISABLE_ALL; shared->rx_filter.mode = VMXNET3_RXMODE_UCAST | VMXNET3_RXMODE_BCAST | - VMXNET3_RXMODE_ALL_MULTI; + VMXNET3_RXMODE_ALL_MULTI | VMXNET3_RXMODE_PROMISC; shared_dma = vmxnet3_dma_addr (vm, vd, shared); vmxnet3_reg_write (vd, 1, VMXNET3_REG_DSAL, shared_dma); @@ -201,7 +242,7 @@ static inline void vmxnet3_enable_interrupt (vmxnet3_device_t * vd) { int i; - vmxnet3_shared *shared = &vd->dma->shared; + vmxnet3_shared *shared = vd->driver_shared; shared->interrupt.control &= ~VMXNET3_IC_DISABLE_ALL; for (i = 0; i < vd->num_intrs; i++) @@ -212,7 +253,7 @@ static inline void vmxnet3_disable_interrupt (vmxnet3_device_t * vd) { int i; - vmxnet3_shared *shared = &vd->dma->shared; + vmxnet3_shared *shared = vd->driver_shared; shared->interrupt.control |= VMXNET3_IC_DISABLE_ALL; for (i = 0; i < vd->num_intrs; i++) @@ -222,30 +263,34 @@ vmxnet3_disable_interrupt (vmxnet3_device_t * vd) static clib_error_t * vmxnet3_rxq_init (vlib_main_t * vm, vmxnet3_device_t * vd, u16 qid, u16 qsz) { - vmxnet3_main_t *vmxm = &vmxnet3_main; vmxnet3_rxq_t *rxq; - clib_error_t *error; + vmxnet3_rx_stats *rxs; u16 rid; + vec_validate (vd->rx_stats, qid); + rxs = vec_elt_at_index (vd->rx_stats, qid); + clib_memset (rxs, 0, sizeof (*rxs)); + vec_validate_aligned (vd->rxqs, qid, CLIB_CACHE_LINE_BYTES); rxq = vec_elt_at_index (vd->rxqs, qid); clib_memset (rxq, 0, sizeof (*rxq)); rxq->size = qsz; for (rid = 0; rid < VMXNET3_RX_RING_SIZE; rid++) { - rxq->rx_desc[rid] = - vlib_physmem_alloc_aligned (vm, vmxm->physmem_region, - &error, qsz * sizeof (*rxq->rx_desc[rid]), - 512); - if (error) - return error; + rxq->rx_desc[rid] = vlib_physmem_alloc_aligned_on_numa + (vm, qsz * sizeof (*rxq->rx_desc[rid]), 512, vd->numa_node); + + if (rxq->rx_desc[rid] == 0) + return vlib_physmem_last_error (vm); + clib_memset (rxq->rx_desc[rid], 0, qsz * sizeof (*rxq->rx_desc[rid])); } - rxq->rx_comp = vlib_physmem_alloc_aligned (vm, vmxm->physmem_region, &error, - qsz * sizeof (*rxq->rx_comp), - 512); - if (error) - return error; + rxq->rx_comp = + vlib_physmem_alloc_aligned_on_numa (vm, qsz * sizeof (*rxq->rx_comp), 512, + vd->numa_node); + if (rxq->rx_comp == 0) + return vlib_physmem_last_error (vm); + clib_memset (rxq->rx_comp, 0, qsz * sizeof (*rxq->rx_comp)); for (rid = 0; rid < VMXNET3_RX_RING_SIZE; rid++) { @@ -264,9 +309,9 @@ vmxnet3_rxq_init (vlib_main_t * vm, vmxnet3_device_t * vd, u16 qid, u16 qsz) static clib_error_t * vmxnet3_txq_init (vlib_main_t * vm, vmxnet3_device_t * vd, u16 qid, u16 qsz) { - vmxnet3_main_t *vmxm = &vmxnet3_main; vmxnet3_txq_t *txq; - clib_error_t *error; + vmxnet3_tx_stats *txs; + u32 size; if (qid >= vd->num_tx_queues) { @@ -278,22 +323,31 @@ vmxnet3_txq_init (vlib_main_t * vm, vmxnet3_device_t * vd, u16 qid, u16 qsz) return 0; } + 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->tx_desc = vlib_physmem_alloc_aligned (vm, vmxm->physmem_region, &error, - qsz * sizeof (*txq->tx_desc), - 512); - if (error) - return error; - clib_memset (txq->tx_desc, 0, qsz * sizeof (*txq->tx_desc)); - txq->tx_comp = vlib_physmem_alloc_aligned (vm, vmxm->physmem_region, &error, - qsz * sizeof (*txq->tx_comp), - 512); - if (error) - return error; - clib_memset (txq->tx_comp, 0, qsz * sizeof (*txq->tx_comp)); + txq->reg_txprod = qid * 8 + VMXNET3_REG_TXPROD; + + size = qsz * sizeof (*txq->tx_desc); + txq->tx_desc = + vlib_physmem_alloc_aligned_on_numa (vm, size, 512, vd->numa_node); + if (txq->tx_desc == 0) + return vlib_physmem_last_error (vm); + + memset (txq->tx_desc, 0, size); + + size = qsz * sizeof (*txq->tx_comp); + txq->tx_comp = + vlib_physmem_alloc_aligned_on_numa (vm, size, 512, vd->numa_node); + if (txq->tx_comp == 0) + return vlib_physmem_last_error (vm); + + clib_memset (txq->tx_comp, 0, size); vec_validate_aligned (txq->tx_ring.bufs, txq->size, CLIB_CACHE_LINE_BYTES); txq->tx_ring.gen = VMXNET3_TXF_GEN; txq->tx_comp_ring.gen = VMXNET3_TXCF_GEN; @@ -306,20 +360,15 @@ vmxnet3_device_init (vlib_main_t * vm, vmxnet3_device_t * vd, vmxnet3_create_if_args_t * args) { clib_error_t *error = 0; - u32 ret, i; - vmxnet3_main_t *vmxm = &vmxnet3_main; + u32 ret, i, size; vlib_thread_main_t *tm = vlib_get_thread_main (); - vd->num_tx_queues = 1; - vd->num_rx_queues = 1; - vd->num_intrs = 2; - /* Quiesce the device */ vmxnet3_reg_write (vd, 1, VMXNET3_REG_CMD, VMXNET3_CMD_QUIESCE_DEV); ret = vmxnet3_reg_read (vd, 1, VMXNET3_REG_CMD); if (ret != 0) { - error = clib_error_return (0, "error on quisecing device rc (%u)", ret); + error = clib_error_return (0, "error on quiescing device rc (%u)", ret); return error; } @@ -336,14 +385,16 @@ vmxnet3_device_init (vlib_main_t * vm, vmxnet3_device_t * vd, vd->version = count_leading_zeros (ret); vd->version = uword_bits - vd->version; - if (vd->version == 0 || vd->version > 3) + if (vd->version == 0) { error = clib_error_return (0, "unsupported hardware version %u", vd->version); return error; } - vmxnet3_reg_write (vd, 1, VMXNET3_REG_VRRS, 1 << (vd->version - 1)); + /* cap support version to 3 */ + vmxnet3_reg_write (vd, 1, VMXNET3_REG_VRRS, + 1 << (clib_min (3, vd->version) - 1)); ret = vmxnet3_reg_read (vd, 1, VMXNET3_REG_UVRS); if (ret & 1) @@ -372,16 +423,15 @@ vmxnet3_device_init (vlib_main_t * vm, vmxnet3_device_t * vd, ret = vmxnet3_reg_read (vd, 1, VMXNET3_REG_MACH); clib_memcpy (vd->mac_addr + 4, &ret, 2); - if (vmxm->physmem_region_alloc == 0) - { - u32 flags = VLIB_PHYSMEM_F_INIT_MHEAP | VLIB_PHYSMEM_F_HUGETLB; - error = - vlib_physmem_region_alloc (vm, "vmxnet3 descriptors", 4 << 20, 0, - flags, &vmxm->physmem_region); - if (error) - return error; - vmxm->physmem_region_alloc = 1; - } + size = sizeof (vmxnet3_rx_queue) * vd->num_rx_queues + + sizeof (vmxnet3_tx_queue) * vd->num_tx_queues; + + vd->queues = + vlib_physmem_alloc_aligned_on_numa (vm, size, 512, vd->numa_node); + if (vd->queues == 0) + return vlib_physmem_last_error (vm); + + clib_memset (vd->queues, 0, size); error = vmxnet3_rxq_init (vm, vd, 0, args->rxq_size); if (error) @@ -455,6 +505,8 @@ vmxnet3_irq_1_handler (vlib_main_t * vm, vlib_pci_dev_handle_t h, u16 line) { vd->flags |= VMXNET3_DEVICE_F_LINK_UP; vd->link_speed = ret >> 16; + vnet_hw_interface_set_link_speed (vnm, vd->hw_if_index, + vd->link_speed * 1000); vnet_hw_interface_set_flags (vnm, vd->hw_if_index, VNET_HW_INTERFACE_FLAG_LINK_UP); } @@ -475,6 +527,16 @@ vmxnet3_queue_size_valid (u16 qsz) return 1; } +static u8 +vmxnet3_queue_num_valid (u16 num) +{ + vlib_thread_main_t *tm = vlib_get_thread_main (); + + if ((num > VMXNET3_TXQ_MAX) || (num > tm->n_vlib_mains)) + return 0; + return 1; +} + void vmxnet3_create_if (vlib_main_t * vm, vmxnet3_create_if_args_t * args) { @@ -484,6 +546,21 @@ vmxnet3_create_if (vlib_main_t * vm, vmxnet3_create_if_args_t * args) vlib_pci_dev_handle_t h; clib_error_t *error = 0; + if (args->txq_num == 0) + args->txq_num = 1; + if (!vmxnet3_queue_num_valid (args->txq_num)) + { + args->rv = VNET_API_ERROR_INVALID_VALUE; + args->error = + clib_error_return (error, + "number of queues must be <= %u and <= number of " + "CPU's assigned to VPP", VMXNET3_TXQ_MAX); + vlib_log (VLIB_LOG_LEVEL_ERR, vmxm->log_default, "%U: %s", + format_vlib_pci_addr, &args->addr, + "number of queues must be <= %u and <= number of " + "CPU's assigned to VPP", VMXNET3_TXQ_MAX); + return; + } if (args->rxq_size == 0) args->rxq_size = VMXNET3_NUM_RX_DESC; if (args->txq_size == 0) @@ -497,6 +574,9 @@ vmxnet3_create_if (vlib_main_t * vm, vmxnet3_create_if_args_t * args) clib_error_return (error, "queue size must be <= 4096, >= 64, " "and multiples of 64"); + vlib_log (VLIB_LOG_LEVEL_ERR, vmxm->log_default, "%U: %s", + format_vlib_pci_addr, &args->addr, + "queue size must be <= 4096, >= 64, and multiples of 64"); return; } @@ -507,12 +587,15 @@ vmxnet3_create_if (vlib_main_t * vm, vmxnet3_create_if_args_t * args) args->rv = VNET_API_ERROR_INVALID_VALUE; args->error = clib_error_return (error, "PCI address in use"); + vlib_log (VLIB_LOG_LEVEL_ERR, vmxm->log_default, "%U: %s", + format_vlib_pci_addr, &args->addr, "pci address in use"); return; } })); /* *INDENT-ON* */ pool_get (vmxm->devices, vd); + vd->num_tx_queues = args->txq_num; vd->dev_instance = vd - vmxm->devices; vd->per_interface_next_index = ~0; vd->pci_addr = args->addr; @@ -528,37 +611,74 @@ vmxnet3_create_if (vlib_main_t * vm, vmxnet3_create_if_args_t * args) args->error = clib_error_return (error, "pci-addr %U", format_vlib_pci_addr, &args->addr); + vlib_log (VLIB_LOG_LEVEL_ERR, vmxm->log_default, "%U: %s", + format_vlib_pci_addr, &args->addr, + "error encountered on pci device open"); return; } + + /* + * Do not use vmxnet3_log_error prior to this line since the macro + * references vd->pci_dev_handle + */ vd->pci_dev_handle = h; + vd->numa_node = vlib_pci_get_numa_node (vm, h); + vd->num_rx_queues = 1; + vd->num_intrs = 2; vlib_pci_set_private_data (vm, h, vd->dev_instance); if ((error = vlib_pci_bus_master_enable (vm, h))) - goto error; + { + vmxnet3_log_error (vd, "error encountered on pci bus master enable"); + goto error; + } if ((error = vlib_pci_map_region (vm, h, 0, (void **) &vd->bar[0]))) - goto error; + { + vmxnet3_log_error (vd, "error encountered on pci map region for bar 0"); + goto error; + } if ((error = vlib_pci_map_region (vm, h, 1, (void **) &vd->bar[1]))) - goto error; + { + vmxnet3_log_error (vd, "error encountered on pci map region for bar 1"); + goto error; + } if ((error = vlib_pci_register_msix_handler (vm, h, 0, 1, &vmxnet3_irq_0_handler))) - goto error; + { + vmxnet3_log_error (vd, + "error encountered on pci register msix handler 0"); + goto error; + } if ((error = vlib_pci_register_msix_handler (vm, h, 1, 1, &vmxnet3_irq_1_handler))) - goto error; + { + vmxnet3_log_error (vd, + "error encountered on pci register msix handler 1"); + goto error; + } if ((error = vlib_pci_enable_msix_irq (vm, h, 0, 2))) - goto error; + { + vmxnet3_log_error (vd, "error encountered on pci enable msix irq"); + goto error; + } if ((error = vlib_pci_intr_enable (vm, h))) - goto error; + { + vmxnet3_log_error (vd, "error encountered on pci interrupt enable"); + goto error; + } if ((error = vmxnet3_device_init (vm, vd, args))) - goto error; + { + vmxnet3_log_error (vd, "error encountered on device init"); + goto error; + } /* create interface */ error = ethernet_register_interface (vnm, vmxnet3_device_class.index, @@ -566,7 +686,11 @@ vmxnet3_create_if (vlib_main_t * vm, vmxnet3_create_if_args_t * args) &vd->hw_if_index, vmxnet3_flag_change); if (error) - goto error; + { + vmxnet3_log_error (vd, + "error encountered on ethernet register interface"); + goto error; + } vnet_sw_interface_t *sw = vnet_get_hw_sw_interface (vnm, vd->hw_if_index); vd->sw_if_index = sw->sw_if_index; @@ -577,6 +701,8 @@ vmxnet3_create_if (vlib_main_t * vm, vmxnet3_create_if_args_t * args) vnet_hw_interface_set_input_node (vnm, vd->hw_if_index, vmxnet3_input_node.index); vnet_hw_interface_assign_rx_thread (vnm, vd->hw_if_index, 0, ~0); + vnet_hw_interface_set_link_speed (vnm, vd->hw_if_index, + vd->link_speed * 1000); if (vd->flags & VMXNET3_DEVICE_F_LINK_UP) vnet_hw_interface_set_flags (vnm, vd->hw_if_index, VNET_HW_INTERFACE_FLAG_LINK_UP); @@ -629,12 +755,13 @@ vmxnet3_delete_if (vlib_main_t * vm, vmxnet3_device_t * vd) vlib_buffer_free_from_ring (vm, ring->bufs, desc_idx, rxq->size, ring->fill); vec_free (ring->bufs); - vlib_physmem_free (vm, vmxm->physmem_region, rxq->rx_desc[rid]); + vlib_physmem_free (vm, rxq->rx_desc[rid]); } - vlib_physmem_free (vm, vmxm->physmem_region, rxq->rx_comp); + vlib_physmem_free (vm, rxq->rx_comp); } /* *INDENT-ON* */ vec_free (vd->rxqs); + vec_free (vd->rx_stats); /* *INDENT-OFF* */ vec_foreach_index (i, vd->txqs) @@ -654,13 +781,15 @@ vmxnet3_delete_if (vlib_main_t * vm, vmxnet3_device_t * vd) } clib_spinlock_free (&txq->lock); vec_free (txq->tx_ring.bufs); - vlib_physmem_free (vm, vmxm->physmem_region, txq->tx_desc); - vlib_physmem_free (vm, vmxm->physmem_region, txq->tx_comp); + vlib_physmem_free (vm, txq->tx_desc); + vlib_physmem_free (vm, txq->tx_comp); } /* *INDENT-ON* */ vec_free (vd->txqs); + vec_free (vd->tx_stats); - vlib_physmem_free (vm, vmxm->physmem_region, vd->dma); + vlib_physmem_free (vm, vd->driver_shared); + vlib_physmem_free (vm, vd->queues); clib_error_free (vd->error); clib_memset (vd, 0, sizeof (*vd));