build: remove redundant config include

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

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 2a51d96..67840d8 100644 (file)
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -49,7 +49,6 @@
 #include <rte_pmd_bnxt.h>
 #endif
 #include <rte_gro.h>
-#include <rte_config.h>
 
 #include "testpmd.h"
 
@@ -624,6 +623,8 @@ port_infos_display(portid_t port_id)
        printf("Minimum size of RX buffer: %u\n", dev_info.min_rx_bufsize);
        printf("Maximum configurable length of RX packet: %u\n",
                dev_info.max_rx_pktlen);
+       printf("Maximum configurable size of LRO aggregated packet: %u\n",
+               dev_info.max_lro_pkt_size);
        if (dev_info.max_vfs)
                printf("Maximum number of VFs: %u\n", dev_info.max_vfs);
        if (dev_info.max_vmdq_pools)
@@ -1301,7 +1302,7 @@ port_flow_complain(struct rte_flow_error *error)
                errstr = "unknown type";
        else
                errstr = errstrlist[error->type];
-       printf("Caught error type %d (%s): %s%s: %s\n",
+       printf("%s(): Caught PMD error type %d (%s): %s%s: %s\n", __func__,
               error->type, errstr,
               error->cause ? (snprintf(buf, sizeof(buf), "cause: %p, ",
                                        error->cause), buf) : "",
@@ -1439,6 +1440,33 @@ port_flow_flush(portid_t port_id)
        return ret;
 }
 
+/** Dump all flow rules. */
+int
+port_flow_dump(portid_t port_id, const char *file_name)
+{
+       int ret = 0;
+       FILE *file = stdout;
+       struct rte_flow_error error;
+
+       if (file_name && strlen(file_name)) {
+               file = fopen(file_name, "w");
+               if (!file) {
+                       printf("Failed to create file %s: %s\n", file_name,
+                              strerror(errno));
+                       return -errno;
+               }
+       }
+       ret = rte_flow_dev_dump(port_id, file, &error);
+       if (ret) {
+               port_flow_complain(&error);
+               printf("Failed to dump flow: %s\n", strerror(-ret));
+       } else
+               printf("Flow dump finished\n");
+       if (file_name && strlen(file_name))
+               fclose(file);
+       return ret;
+}
+
 /** Query a flow rule. */
 int
 port_flow_query(portid_t port_id, uint32_t rule,
@@ -2393,6 +2421,8 @@ mp_alloc_to_str(uint8_t mode)
                return "xmem";
        case MP_ALLOC_XMEM_HUGE:
                return "xmemhuge";
+       case MP_ALLOC_XBUF:
+               return "xbuf";
        default:
                return "invalid";
        }
@@ -3705,6 +3735,14 @@ mcast_addr_pool_extend(struct rte_port *port)
 
 }
 
+static void
+mcast_addr_pool_append(struct rte_port *port, struct rte_ether_addr *mc_addr)
+{
+       if (mcast_addr_pool_extend(port) != 0)
+               return;
+       rte_ether_addr_copy(mc_addr, &port->mc_addr_pool[port->mc_addr_nb - 1]);
+}
+
 static void
 mcast_addr_pool_remove(struct rte_port *port, uint32_t addr_idx)
 {
@@ -3723,7 +3761,7 @@ mcast_addr_pool_remove(struct rte_port *port, uint32_t addr_idx)
                sizeof(struct rte_ether_addr) * (port->mc_addr_nb - addr_idx));
 }
 
-static void
+static int
 eth_port_multicast_addr_list_set(portid_t port_id)
 {
        struct rte_port *port;
@@ -3732,10 +3770,11 @@ eth_port_multicast_addr_list_set(portid_t port_id)
        port = &ports[port_id];
        diag = rte_eth_dev_set_mc_addr_list(port_id, port->mc_addr_pool,
                                            port->mc_addr_nb);
-       if (diag == 0)
-               return;
-       printf("rte_eth_dev_set_mc_addr_list(port=%d, nb=%u) failed. diag=%d\n",
-              port->mc_addr_nb, port_id, -diag);
+       if (diag < 0)
+               printf("rte_eth_dev_set_mc_addr_list(port=%d, nb=%u) failed. diag=%d\n",
+                       port_id, port->mc_addr_nb, diag);
+
+       return diag;
 }
 
 void
@@ -3760,10 +3799,10 @@ mcast_addr_add(portid_t port_id, struct rte_ether_addr *mc_addr)
                }
        }
 
-       if (mcast_addr_pool_extend(port) != 0)
-               return;
-       rte_ether_addr_copy(mc_addr, &port->mc_addr_pool[i]);
-       eth_port_multicast_addr_list_set(port_id);
+       mcast_addr_pool_append(port, mc_addr);
+       if (eth_port_multicast_addr_list_set(port_id) < 0)
+               /* Rollback on failure, remove the address from the pool */
+               mcast_addr_pool_remove(port, i);
 }
 
 void
@@ -3790,7 +3829,9 @@ mcast_addr_remove(portid_t port_id, struct rte_ether_addr *mc_addr)
        }
 
        mcast_addr_pool_remove(port, i);
-       eth_port_multicast_addr_list_set(port_id);
+       if (eth_port_multicast_addr_list_set(port_id) < 0)
+               /* Rollback on failure, add the address back into the pool */
+               mcast_addr_pool_append(port, mc_addr);
 }
 
 void
@@ -3963,3 +4004,60 @@ port_queue_region_info_display(portid_t port_id, void *buf)
 
        printf("\n\n");
 }
+
+void
+show_macs(portid_t port_id)
+{
+       char buf[RTE_ETHER_ADDR_FMT_SIZE];
+       struct rte_eth_dev_info dev_info;
+       struct rte_ether_addr *addr;
+       uint32_t i, num_macs = 0;
+       struct rte_eth_dev *dev;
+
+       dev = &rte_eth_devices[port_id];
+
+       rte_eth_dev_info_get(port_id, &dev_info);
+
+       for (i = 0; i < dev_info.max_mac_addrs; i++) {
+               addr = &dev->data->mac_addrs[i];
+
+               /* skip zero address */
+               if (rte_is_zero_ether_addr(addr))
+                       continue;
+
+               num_macs++;
+       }
+
+       printf("Number of MAC address added: %d\n", num_macs);
+
+       for (i = 0; i < dev_info.max_mac_addrs; i++) {
+               addr = &dev->data->mac_addrs[i];
+
+               /* skip zero address */
+               if (rte_is_zero_ether_addr(addr))
+                       continue;
+
+               rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, addr);
+               printf("  %s\n", buf);
+       }
+}
+
+void
+show_mcast_macs(portid_t port_id)
+{
+       char buf[RTE_ETHER_ADDR_FMT_SIZE];
+       struct rte_ether_addr *addr;
+       struct rte_port *port;
+       uint32_t i;
+
+       port = &ports[port_id];
+
+       printf("Number of Multicast MAC address added: %d\n", port->mc_addr_nb);
+
+       for (i = 0; i < port->mc_addr_nb; i++) {
+               addr = &port->mc_addr_pool[i];
+
+               rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, addr);
+               printf("  %s\n", buf);
+       }
+}