d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

virtio: remove unused virtqueue name

Browse Source 
vq_name is only used when setting up queue, and does not need
to be saved.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Alan Carew <alan.carew@intel.com>
This commit is contained in:
Stephen Hemminger 2014-06-13 18:06:23 -07:00 committed by Thomas Monjalon
parent 11efa9f07c
commit f37cdfde46
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/librte_pmd_virtio/virtio_ethdev.c
View File

@ -271,20 +271,17 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
dev->data->port_id, queue_idx); dev->data->port_id, queue_idx);
vq = rte_zmalloc(vq_name, sizeof(struct virtqueue) + vq = rte_zmalloc(vq_name, sizeof(struct virtqueue) +
vq_size * sizeof(struct vq_desc_extra), CACHE_LINE_SIZE); vq_size * sizeof(struct vq_desc_extra), CACHE_LINE_SIZE);
memcpy(vq->vq_name, vq_name, sizeof(vq->vq_name));
} else if (queue_type == VTNET_TQ) { } else if (queue_type == VTNET_TQ) {
snprintf(vq_name, sizeof(vq_name), "port%d_tvq%d", snprintf(vq_name, sizeof(vq_name), "port%d_tvq%d",
dev->data->port_id, queue_idx); dev->data->port_id, queue_idx);
vq = rte_zmalloc(vq_name, sizeof(struct virtqueue) + vq = rte_zmalloc(vq_name, sizeof(struct virtqueue) +
vq_size * sizeof(struct vq_desc_extra), CACHE_LINE_SIZE); vq_size * sizeof(struct vq_desc_extra), CACHE_LINE_SIZE);
memcpy(vq->vq_name, vq_name, sizeof(vq->vq_name));
} else if (queue_type == VTNET_CQ) { } else if (queue_type == VTNET_CQ) {
snprintf(vq_name, sizeof(vq_name), "port%d_cvq", snprintf(vq_name, sizeof(vq_name), "port%d_cvq",
dev->data->port_id); dev->data->port_id);
vq = rte_zmalloc(vq_name, sizeof(struct virtqueue) + vq = rte_zmalloc(vq_name, sizeof(struct virtqueue) +
vq_size * sizeof(struct vq_desc_extra), vq_size * sizeof(struct vq_desc_extra),
CACHE_LINE_SIZE); CACHE_LINE_SIZE);
memcpy(vq->vq_name, vq_name, sizeof(vq->vq_name));
} }
if (vq == NULL) { if (vq == NULL) {
PMD_INIT_LOG(ERR, "%s: Can not allocate virtqueue", __func__); PMD_INIT_LOG(ERR, "%s: Can not allocate virtqueue", __func__);

14
lib/librte_pmd_virtio/virtio_rxtx.c
View File

@ -233,13 +233,13 @@ rte_rxmbuf_alloc(struct rte_mempool *mp)
} }
static void static void
virtio_dev_vring_start(struct rte_eth_dev *dev, struct virtqueue *vq, int queue_type) virtio_dev_vring_start(struct virtqueue *vq, int queue_type)
{ {
struct rte_mbuf *m; struct rte_mbuf *m;
int i, nbufs, error, size = vq->vq_nentries; int i, nbufs, error, size = vq->vq_nentries;
struct vring *vr = &vq->vq_ring; struct vring *vr = &vq->vq_ring;
uint8_t *ring_mem = vq->vq_ring_virt_mem; uint8_t *ring_mem = vq->vq_ring_virt_mem;
char vq_name[VIRTQUEUE_MAX_NAME_SZ];
PMD_INIT_FUNC_TRACE(); PMD_INIT_FUNC_TRACE();
/* /*
@ -264,10 +264,6 @@ virtio_dev_vring_start(struct rte_eth_dev *dev, struct virtqueue *vq, int queue_
*/ */
virtqueue_disable_intr(vq); virtqueue_disable_intr(vq);
snprintf(vq_name, sizeof(vq_name), "port_%d_rx_vq",
dev->data->port_id);
PMD_INIT_LOG(DEBUG, "vq name: %s", vq->vq_name);
/* Only rx virtqueue needs mbufs to be allocated at initialization */ /* Only rx virtqueue needs mbufs to be allocated at initialization */
if (queue_type == VTNET_RQ) { if (queue_type == VTNET_RQ) {
if (vq->mpool == NULL) if (vq->mpool == NULL)
@ -321,7 +317,7 @@ virtio_dev_cq_start(struct rte_eth_dev *dev)
struct virtio_hw *hw struct virtio_hw *hw
= VIRTIO_DEV_PRIVATE_TO_HW(dev->data->dev_private); = VIRTIO_DEV_PRIVATE_TO_HW(dev->data->dev_private);
virtio_dev_vring_start(dev, hw->cvq, VTNET_CQ); virtio_dev_vring_start(hw->cvq, VTNET_CQ);
VIRTQUEUE_DUMP((struct virtqueue *)hw->cvq); VIRTQUEUE_DUMP((struct virtqueue *)hw->cvq);
} }
@ -341,13 +337,13 @@ virtio_dev_rxtx_start(struct rte_eth_dev *dev)
/* Start rx vring. */ /* Start rx vring. */
for (i = 0; i < dev->data->nb_rx_queues; i++) { for (i = 0; i < dev->data->nb_rx_queues; i++) {
virtio_dev_vring_start(dev, dev->data->rx_queues[i], VTNET_RQ); virtio_dev_vring_start(dev->data->rx_queues[i], VTNET_RQ);
VIRTQUEUE_DUMP((struct virtqueue *)dev->data->rx_queues[i]); VIRTQUEUE_DUMP((struct virtqueue *)dev->data->rx_queues[i]);
} }
/* Start tx vring. */ /* Start tx vring. */
for (i = 0; i < dev->data->nb_tx_queues; i++) { for (i = 0; i < dev->data->nb_tx_queues; i++) {
virtio_dev_vring_start(dev, dev->data->tx_queues[i], VTNET_TQ); virtio_dev_vring_start(dev->data->tx_queues[i], VTNET_TQ);
VIRTQUEUE_DUMP((struct virtqueue *)dev->data->tx_queues[i]); VIRTQUEUE_DUMP((struct virtqueue *)dev->data->tx_queues[i]);
} }
} }

1
lib/librte_pmd_virtio/virtqueue.h
View File

@ -122,7 +122,6 @@ struct virtio_pmd_ctrl {
}; };
struct virtqueue { struct virtqueue {
char vq_name[VIRTQUEUE_MAX_NAME_SZ];
struct virtio_hw *hw; /**< virtio_hw structure pointer. */ struct virtio_hw *hw; /**< virtio_hw structure pointer. */
const struct rte_memzone *mz; /**< mem zone to populate RX ring. */ const struct rte_memzone *mz; /**< mem zone to populate RX ring. */
const struct rte_memzone *virtio_net_hdr_mz; /**< memzone to populate hdr. */ const struct rte_memzone *virtio_net_hdr_mz; /**< memzone to populate hdr. */