examples/ip_frag: fix use of ethdev internal device array

[dpdk.git] / app / test-pmd / testpmd.c

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 4f2a431..3ed3523 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1101,6 +1101,8 @@ init_config(void)
        uint8_t port_per_socket[RTE_MAX_NUMA_NODES];
        struct rte_gro_param gro_param;
        uint32_t gso_types;
+       uint16_t data_size;
+       bool warning = 0;
        int k;
 
        memset(port_per_socket,0,RTE_MAX_NUMA_NODES);
@@ -1168,8 +1170,28 @@ init_config(void)
                port->need_reconfig = 1;
                port->need_reconfig_queues = 1;
                port->tx_metadata = 0;
+
+               /* Check for maximum number of segments per MTU. Accordingly
+                * update the mbuf data size.
+                */
+               if (port->dev_info.rx_desc_lim.nb_mtu_seg_max != UINT16_MAX &&
+                               port->dev_info.rx_desc_lim.nb_mtu_seg_max != 0) {
+                       data_size = rx_mode.max_rx_pkt_len /
+                               port->dev_info.rx_desc_lim.nb_mtu_seg_max;
+
+                       if ((data_size + RTE_PKTMBUF_HEADROOM) >
+                                                       mbuf_data_size) {
+                               mbuf_data_size = data_size +
+                                                RTE_PKTMBUF_HEADROOM;
+                               warning = 1;
+                       }
+               }
        }
 
+       if (warning)
+               TESTPMD_LOG(WARNING, "Configured mbuf size %hu\n",
+                           mbuf_data_size);
+
        /*
         * Create pools of mbuf.
         * If NUMA support is disabled, create a single pool of mbuf in
@@ -2361,7 +2383,7 @@ attach_port(char *identifier)
                return;
        }
 
-       if (rte_dev_probe(identifier) != 0) {
+       if (rte_dev_probe(identifier) < 0) {
                TESTPMD_LOG(ERR, "Failed to attach port %s\n", identifier);
                return;
        }
@@ -2431,7 +2453,7 @@ detach_port_device(portid_t port_id)
                        port_flow_flush(port_id);
        }
 
-       if (rte_dev_remove(dev) != 0) {
+       if (rte_dev_remove(dev) < 0) {
                TESTPMD_LOG(ERR, "Failed to detach device %s\n", dev->name);
                return;
        }
@@ -2456,7 +2478,6 @@ detach_port_device(portid_t port_id)
 void
 pmd_test_exit(void)
 {
-       struct rte_device *device;
        portid_t pt_id;
        int ret;
        int i;
@@ -2482,18 +2503,6 @@ pmd_test_exit(void)
                        printf("\nShutting down port %d...\n", pt_id);
                        fflush(stdout);
                        close_port(pt_id);
-
-                       /*
-                        * This is a workaround to fix a virtio-user issue that
-                        * requires to call clean-up routine to remove existing
-                        * socket.
-                        * This workaround valid only for testpmd, needs a fix
-                        * valid for all applications.
-                        * TODO: Implement proper resource cleanup
-                        */
-                       device = rte_eth_devices[pt_id].device;
-                       if (device && !strcmp(device->driver->name, "net_virtio_user"))
-                               detach_port_device(pt_id);
                }
        }
 
@@ -2815,7 +2824,8 @@ rxtx_port_config(struct rte_port *port)
        for (qid = 0; qid < nb_rxq; qid++) {
                offloads = port->rx_conf[qid].offloads;
                port->rx_conf[qid] = port->dev_info.default_rxconf;
-               port->rx_conf[qid].offloads |= offloads;
+               if (offloads != 0)
+                       port->rx_conf[qid].offloads = offloads;
 
                /* Check if any Rx parameters have been passed */
                if (rx_pthresh != RTE_PMD_PARAM_UNSET)
@@ -2839,7 +2849,8 @@ rxtx_port_config(struct rte_port *port)
        for (qid = 0; qid < nb_txq; qid++) {
                offloads = port->tx_conf[qid].offloads;
                port->tx_conf[qid] = port->dev_info.default_txconf;
-               port->tx_conf[qid].offloads |= offloads;
+               if (offloads != 0)
+                       port->tx_conf[qid].offloads = offloads;
 
                /* Check if any Tx parameters have been passed */
                if (tx_pthresh != RTE_PMD_PARAM_UNSET)