app/testpmd: add or delete flow director filter

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

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 255f82d..749a23f 100644 (file)
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -99,13 +99,9 @@
 static void
 print_ethaddr(const char *name, struct ether_addr *eth_addr)
 {
-       printf("%s%02X:%02X:%02X:%02X:%02X:%02X", name,
-              (unsigned int)eth_addr->addr_bytes[0],
-              (unsigned int)eth_addr->addr_bytes[1],
-              (unsigned int)eth_addr->addr_bytes[2],
-              (unsigned int)eth_addr->addr_bytes[3],
-              (unsigned int)eth_addr->addr_bytes[4],
-              (unsigned int)eth_addr->addr_bytes[5]);
+       char buf[ETHER_ADDR_FMT_SIZE];
+       ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
+       printf("%s%s", name, buf);
 }
 
 void
@@ -199,6 +195,40 @@ nic_stats_clear(portid_t port_id)
        printf("\n  NIC statistics for port %d cleared\n", port_id);
 }
 
+void
+nic_xstats_display(portid_t port_id)
+{
+       struct rte_eth_xstats *xstats;
+       int len, ret, i;
+
+       printf("###### NIC extended statistics for port %-2d\n", port_id);
+
+       len = rte_eth_xstats_get(port_id, NULL, 0);
+       if (len < 0) {
+               printf("Cannot get xstats count\n");
+               return;
+       }
+       xstats = malloc(sizeof(xstats[0]) * len);
+       if (xstats == NULL) {
+               printf("Cannot allocate memory for xstats\n");
+               return;
+       }
+       ret = rte_eth_xstats_get(port_id, xstats, len);
+       if (ret < 0 || ret > len) {
+               printf("Cannot get xstats\n");
+               free(xstats);
+               return;
+       }
+       for (i = 0; i < len; i++)
+               printf("%s: %"PRIu64"\n", xstats[i].name, xstats[i].value);
+       free(xstats);
+}
+
+void
+nic_xstats_clear(portid_t port_id)
+{
+       rte_eth_xstats_reset(port_id);
+}
 
 void
 nic_stats_mapping_display(portid_t port_id)
@@ -252,7 +282,9 @@ void
 port_infos_display(portid_t port_id)
 {
        struct rte_port *port;
+       struct ether_addr mac_addr;
        struct rte_eth_link link;
+       struct rte_eth_dev_info dev_info;
        int vlan_offload;
        struct rte_mempool * mp;
        static const char *info_border = "*********************";
@@ -265,7 +297,8 @@ port_infos_display(portid_t port_id)
        rte_eth_link_get_nowait(port_id, &link);
        printf("\n%s Infos for port %-2d %s\n",
               info_border, port_id, info_border);
-       print_ethaddr("MAC address: ", &port->eth_addr);
+       rte_eth_macaddr_get(port_id, &mac_addr);
+       print_ethaddr("MAC address: ", &mac_addr);
        printf("\nConnect to socket: %u", port->socket_id);
 
        if (port_numa[port_id] != NUMA_NO_CONFIG) {
@@ -307,9 +340,14 @@ port_infos_display(portid_t port_id)
                else
                        printf("  qinq(extend) off \n");
        }
+
+       memset(&dev_info, 0, sizeof(dev_info));
+       rte_eth_dev_info_get(port_id, &dev_info);
+       if (dev_info.reta_size > 0)
+               printf("Redirection table size: %u\n", dev_info.reta_size);
 }
 
-static int
+int
 port_id_is_invalid(portid_t port_id)
 {
        if (port_id < nb_ports)
@@ -519,7 +557,7 @@ port_mtu_set(portid_t port_id, uint16_t mtu)
 /*
  * RX/TX ring descriptors display functions.
  */
-static int
+int
 rx_queue_id_is_invalid(queueid_t rxq_id)
 {
        if (rxq_id < nb_rxq)
@@ -528,7 +566,7 @@ rx_queue_id_is_invalid(queueid_t rxq_id)
        return 1;
 }
 
-static int
+int
 tx_queue_id_is_invalid(queueid_t txq_id)
 {
        if (txq_id < nb_txq)
@@ -563,7 +601,7 @@ ring_dma_zone_lookup(const char *ring_name, uint8_t port_id, uint16_t q_id)
        char mz_name[RTE_MEMZONE_NAMESIZE];
        const struct rte_memzone *mz;
 
-       rte_snprintf(mz_name, sizeof(mz_name), "%s_%s_%d_%d",
+       snprintf(mz_name, sizeof(mz_name), "%s_%s_%d_%d",
                 ports[port_id].dev_info.driver_name, ring_name, port_id, q_id);
        mz = rte_memzone_lookup(mz_name);
        if (mz == NULL)
@@ -726,36 +764,29 @@ rxtx_config_display(void)
 }
 
 void
-port_rss_reta_info(portid_t port_id,struct rte_eth_rss_reta *reta_conf)
+port_rss_reta_info(portid_t port_id,
+                  struct rte_eth_rss_reta_entry64 *reta_conf,
+                  uint16_t nb_entries)
 {
-       uint8_t i,j;
+       uint16_t i, idx, shift;
        int ret;
 
        if (port_id_is_invalid(port_id))
                return;
 
-       ret = rte_eth_dev_rss_reta_query(port_id, reta_conf);
+       ret = rte_eth_dev_rss_reta_query(port_id, reta_conf, nb_entries);
        if (ret != 0) {
                printf("Failed to get RSS RETA info, return code = %d\n", ret);
                return;
        }
 
-       if (reta_conf->mask_lo != 0) {
-               for (i = 0; i< ETH_RSS_RETA_NUM_ENTRIES/2; i++) {
-                       if (reta_conf->mask_lo & (uint64_t)(1ULL << i))
-                               printf("RSS RETA configuration: hash index=%d,"
-                                       "queue=%d\n",i,reta_conf->reta[i]);
-               }
-       }
-
-       if (reta_conf->mask_hi != 0) {
-               for (i = 0; i< ETH_RSS_RETA_NUM_ENTRIES/2; i++) {
-                       if(reta_conf->mask_hi & (uint64_t)(1ULL << i)) {
-                               j = (uint8_t)(i + ETH_RSS_RETA_NUM_ENTRIES/2);
-                               printf("RSS RETA configuration: hash index=%d,"
-                                       "queue=%d\n",j,reta_conf->reta[j]);
-                       }
-               }
+       for (i = 0; i < nb_entries; i++) {
+               idx = i / RTE_RETA_GROUP_SIZE;
+               shift = i % RTE_RETA_GROUP_SIZE;
+               if (!(reta_conf[idx].mask & (1ULL << shift)))
+                       continue;
+               printf("RSS RETA configuration: hash index=%u, queue=%u\n",
+                                       i, reta_conf[idx].reta[shift]);
        }
 }
 
@@ -1712,14 +1743,14 @@ set_qmap(portid_t port_id, uint8_t is_rx, uint16_t queue_id, uint8_t map_value)
 }
 
 void
-tx_cksum_set(portid_t port_id, uint8_t cksum_mask)
+tx_cksum_set(portid_t port_id, uint64_t ol_flags)
 {
-       uint16_t tx_ol_flags;
+       uint64_t tx_ol_flags;
        if (port_id_is_invalid(port_id))
                return;
-       /* Clear last 4 bits and then set L3/4 checksum mask again */
-       tx_ol_flags = (uint16_t) (ports[port_id].tx_ol_flags & 0xFFF0);
-       ports[port_id].tx_ol_flags = (uint16_t) ((cksum_mask & 0xf) | tx_ol_flags);
+       /* Clear last 8 bits and then set L3/4 checksum mask again */
+       tx_ol_flags = ports[port_id].tx_ol_flags & (~0x0FFull);
+       ports[port_id].tx_ol_flags = ((ol_flags & 0xff) | tx_ol_flags);
 }
 
 void