[dpdk-dev] [PATCH] net/vmxnet3: fix queue size changes

[Jan Blunck]

On Wed, Mar 15, 2017 at 1:35 PM, Charles (Chas) Williams
<ciwillia at brocade.com> wrote:
> If the user reconfigures the queue size, then the previously allocated
> memzone may potentially be too small.  Release the memzone when a queue
> is released and allocate a new one each time a queue is setup.
>
> While here convert to rte_eth_dma_zone_reserve() which does basically
> the same things as the private function.
>
> Fixes: dfaff37fc46d ("vmxnet3: import new vmxnet3 poll mode driver implementation")
>
> Signed-off-by: Chas Williams <ciwillia at brocade.com>
> ---
>  drivers/net/vmxnet3/vmxnet3_ring.h |  2 ++
>  drivers/net/vmxnet3/vmxnet3_rxtx.c | 37 +++++++++++--------------------------
>  2 files changed, 13 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/net/vmxnet3/vmxnet3_ring.h b/drivers/net/vmxnet3/vmxnet3_ring.h
> index 0ce46c5..d2e8323 100644
> --- a/drivers/net/vmxnet3/vmxnet3_ring.h
> +++ b/drivers/net/vmxnet3/vmxnet3_ring.h
> @@ -141,6 +141,7 @@ typedef struct vmxnet3_tx_queue {
>         uint32_t                     qid;
>         struct Vmxnet3_TxQueueDesc   *shared;
>         struct vmxnet3_txq_stats     stats;
> +       const struct rte_memzone     *mz;
>         bool                         stopped;
>         uint16_t                     queue_id;      /**< Device TX queue index. */
>         uint8_t                      port_id;       /**< Device port identifier. */
> @@ -175,6 +176,7 @@ typedef struct vmxnet3_rx_queue {
>         struct rte_mbuf             *start_seg;
>         struct rte_mbuf             *last_seg;
>         struct vmxnet3_rxq_stats    stats;
> +       const struct rte_memzone    *mz;
>         bool                        stopped;
>         uint16_t                    queue_id;      /**< Device RX queue index. */
>         uint8_t                     port_id;       /**< Device port identifier. */
> diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
> index 6649c3f..e865c67 100644
> --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
> +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
> @@ -201,6 +201,8 @@ vmxnet3_dev_tx_queue_release(void *txq)
>                 vmxnet3_tx_cmd_ring_release_mbufs(&tq->cmd_ring);
>                 /* Release the cmd_ring */
>                 vmxnet3_cmd_ring_release(&tq->cmd_ring);
> +               /* Release the memzone */
> +               rte_memzone_free(tq->mz);
>         }
>  }
>
> @@ -218,6 +220,9 @@ vmxnet3_dev_rx_queue_release(void *rxq)
>                 /* Release both the cmd_rings */
>                 for (i = 0; i < VMXNET3_RX_CMDRING_SIZE; i++)
>                         vmxnet3_cmd_ring_release(&rq->cmd_ring[i]);
> +
> +               /* Release the memzone */
> +               rte_memzone_free(rq->mz);
>         }
>  }
>
> @@ -891,30 +896,6 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
>         return nb_rx;
>  }
>
> -/*
> - * Create memzone for device rings. malloc can't be used as the physical address is
> - * needed. If the memzone is already created, then this function returns a ptr
> - * to the old one.
> - */
> -static const struct rte_memzone *
> -ring_dma_zone_reserve(struct rte_eth_dev *dev, const char *ring_name,
> -                     uint16_t queue_id, uint32_t ring_size, int socket_id)
> -{
> -       char z_name[RTE_MEMZONE_NAMESIZE];
> -       const struct rte_memzone *mz;
> -
> -       snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d",
> -                dev->driver->pci_drv.driver.name, ring_name,
> -                dev->data->port_id, queue_id);
> -
> -       mz = rte_memzone_lookup(z_name);
> -       if (mz)
> -               return mz;
> -
> -       return rte_memzone_reserve_aligned(z_name, ring_size,
> -                                          socket_id, 0, VMXNET3_RING_BA_ALIGN);
> -}
> -
>  int
>  vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev,
>                            uint16_t queue_idx,
> @@ -983,11 +964,13 @@ vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev,
>         size += sizeof(struct Vmxnet3_TxCompDesc) * comp_ring->size;
>         size += txq->txdata_desc_size * data_ring->size;
>
> -       mz = ring_dma_zone_reserve(dev, "txdesc", queue_idx, size, socket_id);
> +       mz = rte_eth_dma_zone_reserve(dev, "txdesc", queue_idx, size,
> +                                     VMXNET3_RING_BA_ALIGN, socket_id);
>         if (mz == NULL) {
>                 PMD_INIT_LOG(ERR, "ERROR: Creating queue descriptors zone");
>                 return -ENOMEM;
>         }
> +       txq->mz = mz;
>         memset(mz->addr, 0, mz->len);
>
>         /* cmd_ring initialization */
> @@ -1092,11 +1075,13 @@ vmxnet3_dev_rx_queue_setup(struct rte_eth_dev *dev,
>         if (VMXNET3_VERSION_GE_3(hw) && rxq->data_desc_size)
>                 size += rxq->data_desc_size * data_ring->size;
>
> -       mz = ring_dma_zone_reserve(dev, "rxdesc", queue_idx, size, socket_id);
> +       mz = rte_eth_dma_zone_reserve(dev, "rxdesc", queue_idx, size,
> +                                     VMXNET3_RING_BA_ALIGN, socket_id);
>         if (mz == NULL) {
>                 PMD_INIT_LOG(ERR, "ERROR: Creating queue descriptors zone");
>                 return -ENOMEM;
>         }
> +       rxq->mz = mz;
>         memset(mz->addr, 0, mz->len);
>
>         /* cmd_ring0 initialization */
> --
> 2.1.4
>

Acked-by: Jan Blunck <jblunck at infradead.org>