mempool: introduce helpers for populate and required size

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

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 0f6e279..38acbc5 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -27,7 +27,6 @@
 #include <rte_log.h>
 #include <rte_debug.h>
 #include <rte_cycles.h>
-#include <rte_malloc_heap.h>
 #include <rte_memory.h>
 #include <rte_memcpy.h>
 #include <rte_launch.h>
@@ -478,41 +477,6 @@ uint8_t bitrate_enabled;
 struct gro_status gro_ports[RTE_MAX_ETHPORTS];
 uint8_t gro_flush_cycles = GRO_DEFAULT_FLUSH_CYCLES;
 
-struct vxlan_encap_conf vxlan_encap_conf = {
-       .select_ipv4 = 1,
-       .select_vlan = 0,
-       .select_tos_ttl = 0,
-       .vni = "\x00\x00\x00",
-       .udp_src = 0,
-       .udp_dst = RTE_BE16(4789),
-       .ipv4_src = RTE_IPV4(127, 0, 0, 1),
-       .ipv4_dst = RTE_IPV4(255, 255, 255, 255),
-       .ipv6_src = "\x00\x00\x00\x00\x00\x00\x00\x00"
-               "\x00\x00\x00\x00\x00\x00\x00\x01",
-       .ipv6_dst = "\x00\x00\x00\x00\x00\x00\x00\x00"
-               "\x00\x00\x00\x00\x00\x00\x11\x11",
-       .vlan_tci = 0,
-       .ip_tos = 0,
-       .ip_ttl = 255,
-       .eth_src = "\x00\x00\x00\x00\x00\x00",
-       .eth_dst = "\xff\xff\xff\xff\xff\xff",
-};
-
-struct nvgre_encap_conf nvgre_encap_conf = {
-       .select_ipv4 = 1,
-       .select_vlan = 0,
-       .tni = "\x00\x00\x00",
-       .ipv4_src = RTE_IPV4(127, 0, 0, 1),
-       .ipv4_dst = RTE_IPV4(255, 255, 255, 255),
-       .ipv6_src = "\x00\x00\x00\x00\x00\x00\x00\x00"
-               "\x00\x00\x00\x00\x00\x00\x00\x01",
-       .ipv6_dst = "\x00\x00\x00\x00\x00\x00\x00\x00"
-               "\x00\x00\x00\x00\x00\x00\x11\x11",
-       .vlan_tci = 0,
-       .eth_src = "\x00\x00\x00\x00\x00\x00",
-       .eth_dst = "\xff\xff\xff\xff\xff\xff",
-};
-
 /* Forward function declarations */
 static void setup_attached_port(portid_t pi);
 static void map_port_queue_stats_mapping_registers(portid_t pi,
@@ -2209,8 +2173,8 @@ start_port(portid_t pid)
                        RTE_PORT_HANDLING, RTE_PORT_STARTED) == 0)
                        printf("Port %d can not be set into started\n", pi);
 
-               rte_eth_macaddr_get(pi, &mac_addr);
-               printf("Port %d: %02X:%02X:%02X:%02X:%02X:%02X\n", pi,
+               if (eth_macaddr_get_print_err(pi, &mac_addr) == 0)
+                       printf("Port %d: %02X:%02X:%02X:%02X:%02X:%02X\n", pi,
                                mac_addr.addr_bytes[0], mac_addr.addr_bytes[1],
                                mac_addr.addr_bytes[2], mac_addr.addr_bytes[3],
                                mac_addr.addr_bytes[4], mac_addr.addr_bytes[5]);
@@ -2361,6 +2325,12 @@ reset_port(portid_t pid)
        if (port_id_is_invalid(pid, ENABLED_WARN))
                return;
 
+       if ((pid == (portid_t)RTE_PORT_ALL && !all_ports_stopped()) ||
+               (pid != (portid_t)RTE_PORT_ALL && !port_is_stopped(pid))) {
+               printf("Can not reset port(s), please stop port(s) first.\n");
+               return;
+       }
+
        printf("Resetting ports...\n");
 
        RTE_ETH_FOREACH_DEV(pi) {
@@ -2984,7 +2954,9 @@ init_port_config(void)
 
                rxtx_port_config(port);
 
-               rte_eth_macaddr_get(pid, &port->eth_addr);
+               ret = eth_macaddr_get_print_err(pid, &port->eth_addr);
+               if (ret != 0)
+                       return;
 
                map_port_queue_stats_mapping_registers(pid, port);
 #if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS
@@ -3187,7 +3159,10 @@ init_port_dcb_config(portid_t pid,
        for (i = 0; i < RTE_DIM(vlan_tags); i++)
                rx_vft_set(pid, vlan_tags[i], 1);
 
-       rte_eth_macaddr_get(pid, &rte_port->eth_addr);
+       retval = eth_macaddr_get_print_err(pid, &rte_port->eth_addr);
+       if (retval != 0)
+               return retval;
+
        map_port_queue_stats_mapping_registers(pid, rte_port);
 
        rte_port->dcb_flag = 1;