ethdev: free all common data when releasing port

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

diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
index 08fa4bd..420364b 100644 (file)
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -358,8 +358,12 @@ static const char *valid_args[] = {
        VIRTIO_USER_ARG_QUEUE_SIZE,
 #define VIRTIO_USER_ARG_INTERFACE_NAME "iface"
        VIRTIO_USER_ARG_INTERFACE_NAME,
-#define VIRTIO_USER_ARG_SERVER_MODE "server"
+#define VIRTIO_USER_ARG_SERVER_MODE    "server"
        VIRTIO_USER_ARG_SERVER_MODE,
+#define VIRTIO_USER_ARG_MRG_RXBUF      "mrg_rxbuf"
+       VIRTIO_USER_ARG_MRG_RXBUF,
+#define VIRTIO_USER_ARG_IN_ORDER       "in_order"
+       VIRTIO_USER_ARG_IN_ORDER,
        NULL
 };
 
@@ -418,7 +422,6 @@ virtio_user_eth_dev_alloc(struct rte_vdev_device *vdev)
        if (!dev) {
                PMD_INIT_LOG(ERR, "malloc virtio_user_dev failed");
                rte_eth_dev_release_port(eth_dev);
-               rte_free(hw);
                return NULL;
        }
 
@@ -432,7 +435,6 @@ virtio_user_eth_dev_alloc(struct rte_vdev_device *vdev)
        hw->use_msix = 1;
        hw->modern   = 0;
        hw->use_simple_rx = 0;
-       hw->use_simple_tx = 0;
        hw->use_inorder_rx = 0;
        hw->use_inorder_tx = 0;
        hw->virtio_user_dev = dev;
@@ -446,7 +448,6 @@ virtio_user_eth_dev_free(struct rte_eth_dev *eth_dev)
        struct virtio_hw *hw = data->dev_private;
 
        rte_free(hw->virtio_user_dev);
-       rte_free(hw);
        rte_eth_dev_release_port(eth_dev);
 }
 
@@ -464,6 +465,8 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
        uint64_t cq = VIRTIO_USER_DEF_CQ_EN;
        uint64_t queue_size = VIRTIO_USER_DEF_Q_SZ;
        uint64_t server_mode = VIRTIO_USER_DEF_SERVER_MODE;
+       uint64_t mrg_rxbuf = 1;
+       uint64_t in_order = 1;
        char *path = NULL;
        char *ifname = NULL;
        char *mac_addr = NULL;
@@ -563,6 +566,24 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
                goto end;
        }
 
+       if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_MRG_RXBUF) == 1) {
+               if (rte_kvargs_process(kvlist, VIRTIO_USER_ARG_MRG_RXBUF,
+                                      &get_integer_arg, &mrg_rxbuf) < 0) {
+                       PMD_INIT_LOG(ERR, "error to parse %s",
+                                    VIRTIO_USER_ARG_MRG_RXBUF);
+                       goto end;
+               }
+       }
+
+       if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_IN_ORDER) == 1) {
+               if (rte_kvargs_process(kvlist, VIRTIO_USER_ARG_IN_ORDER,
+                                      &get_integer_arg, &in_order) < 0) {
+                       PMD_INIT_LOG(ERR, "error to parse %s",
+                                    VIRTIO_USER_ARG_IN_ORDER);
+                       goto end;
+               }
+       }
+
        if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
                struct virtio_user_dev *vu_dev;
 
@@ -579,7 +600,8 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
                else
                        vu_dev->is_server = false;
                if (virtio_user_dev_init(hw->virtio_user_dev, path, queues, cq,
-                                queue_size, mac_addr, &ifname) < 0) {
+                                queue_size, mac_addr, &ifname, mrg_rxbuf,
+                                in_order) < 0) {
                        PMD_INIT_LOG(ERR, "virtio_user_dev_init fails");
                        virtio_user_eth_dev_free(eth_dev);
                        goto end;
@@ -638,7 +660,6 @@ virtio_user_pmd_remove(struct rte_vdev_device *vdev)
        dev = hw->virtio_user_dev;
        virtio_user_dev_uninit(dev);
 
-       rte_free(eth_dev->data->dev_private);
        rte_eth_dev_release_port(eth_dev);
 
        return 0;
@@ -657,4 +678,7 @@ RTE_PMD_REGISTER_PARAM_STRING(net_virtio_user,
        "cq=<int> "
        "queue_size=<int> "
        "queues=<int> "
-       "iface=<string>");
+       "iface=<string> "
+       "server=<0|1> "
+       "mrg_rxbuf=<0|1> "
+       "in_order=<0|1>");