compress/qat: enable compression on GEN3

[dpdk.git] / drivers / net / virtio / virtio_ethdev.c

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index 864c708..090d946 100644 (file)
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -435,6 +435,7 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t queue_idx)
        int queue_type = virtio_get_queue_type(hw, queue_idx);
        int ret;
        int numa_node = dev->device->numa_node;
+       struct rte_mbuf *fake_mbuf = NULL;
 
        PMD_INIT_LOG(INFO, "setting up queue: %u on NUMA node %d",
                        queue_idx, numa_node);
@@ -507,7 +508,7 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t queue_idx)
                        mz = rte_memzone_lookup(vq_name);
                if (mz == NULL) {
                        ret = -ENOMEM;
-                       goto fail_q_alloc;
+                       goto free_vq;
                }
        }
 
@@ -533,7 +534,7 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t queue_idx)
                                hdr_mz = rte_memzone_lookup(vq_hdr_name);
                        if (hdr_mz == NULL) {
                                ret = -ENOMEM;
-                               goto fail_q_alloc;
+                               goto free_mz;
                        }
                }
        }
@@ -547,13 +548,22 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t queue_idx)
                if (!sw_ring) {
                        PMD_INIT_LOG(ERR, "can not allocate RX soft ring");
                        ret = -ENOMEM;
-                       goto fail_q_alloc;
+                       goto free_hdr_mz;
+               }
+
+               fake_mbuf = rte_zmalloc_socket("sw_ring", sizeof(*fake_mbuf),
+                               RTE_CACHE_LINE_SIZE, numa_node);
+               if (!fake_mbuf) {
+                       PMD_INIT_LOG(ERR, "can not allocate fake mbuf");
+                       ret = -ENOMEM;
+                       goto free_sw_ring;
                }
 
                vq->sw_ring = sw_ring;
                rxvq = &vq->rxq;
                rxvq->port_id = dev->data->port_id;
                rxvq->mz = mz;
+               rxvq->fake_mbuf = fake_mbuf;
        } else if (queue_type == VTNET_TQ) {
                txvq = &vq->txq;
                txvq->port_id = dev->data->port_id;
@@ -604,15 +614,22 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t queue_idx)
 
        if (VIRTIO_OPS(hw)->setup_queue(hw, vq) < 0) {
                PMD_INIT_LOG(ERR, "setup_queue failed");
-               return -EINVAL;
+               ret = -EINVAL;
+               goto clean_vq;
        }
 
        return 0;
 
-fail_q_alloc:
+clean_vq:
+       hw->cvq = NULL;
+       rte_free(fake_mbuf);
+free_sw_ring:
        rte_free(sw_ring);
+free_hdr_mz:
        rte_memzone_free(hdr_mz);
+free_mz:
        rte_memzone_free(mz);
+free_vq:
        rte_free(vq);
 
        return ret;
@@ -636,6 +653,7 @@ virtio_free_queues(struct virtio_hw *hw)
 
                queue_type = virtio_get_queue_type(hw, i);
                if (queue_type == VTNET_RQ) {
+                       rte_free(vq->rxq.fake_mbuf);
                        rte_free(vq->sw_ring);
                        rte_memzone_free(vq->rxq.mz);
                } else if (queue_type == VTNET_TQ) {