ethdev: increase port id range

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

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index aa35505..0b2be2e 100644 (file)
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -36,7 +36,6 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdarg.h>
 #include <stdint.h>
 #include <inttypes.h>
 
@@ -71,6 +70,7 @@
 #ifdef RTE_LIBRTE_BNXT_PMD
 #include <rte_pmd_bnxt.h>
 #endif
+#include <rte_gro.h>
 
 #include "testpmd.h"
 
@@ -203,8 +203,10 @@ nic_stats_display(portid_t port_id)
        if (diff_cycles > 0)
                diff_cycles = prev_cycles[port_id] - diff_cycles;
 
-       diff_pkts_rx = stats.ipackets - prev_pkts_rx[port_id];
-       diff_pkts_tx = stats.opackets - prev_pkts_tx[port_id];
+       diff_pkts_rx = (stats.ipackets > prev_pkts_rx[port_id]) ?
+               (stats.ipackets - prev_pkts_rx[port_id]) : 0;
+       diff_pkts_tx = (stats.opackets > prev_pkts_tx[port_id]) ?
+               (stats.opackets - prev_pkts_tx[port_id]) : 0;
        prev_pkts_rx[port_id] = stats.ipackets;
        prev_pkts_tx[port_id] = stats.opackets;
        mpps_rx = diff_cycles > 0 ?
@@ -358,7 +360,7 @@ rx_queue_infos_display(portid_t port_id, uint16_t queue_id)
 
        rc = rte_eth_rx_queue_info_get(port_id, queue_id, &qinfo);
        if (rc != 0) {
-               printf("Failed to retrieve information for port: %hhu, "
+               printf("Failed to retrieve information for port: %u, "
                        "RX queue: %hu\nerror desc: %s(%d)\n",
                        port_id, queue_id, strerror(-rc), rc);
                return;
@@ -391,7 +393,7 @@ tx_queue_infos_display(portid_t port_id, uint16_t queue_id)
 
        rc = rte_eth_tx_queue_info_get(port_id, queue_id, &qinfo);
        if (rc != 0) {
-               printf("Failed to retrieve information for port: %hhu, "
+               printf("Failed to retrieve information for port: %u, "
                        "TX queue: %hu\nerror desc: %s(%d)\n",
                        port_id, queue_id, strerror(-rc), rc);
                return;
@@ -498,12 +500,15 @@ port_infos_display(portid_t port_id)
                char *p;
 
                printf("Supported flow types:\n");
-               for (i = RTE_ETH_FLOW_UNKNOWN + 1; i < RTE_ETH_FLOW_MAX;
-                                                               i++) {
+               for (i = RTE_ETH_FLOW_UNKNOWN + 1;
+                    i < sizeof(dev_info.flow_type_rss_offloads) * CHAR_BIT; i++) {
                        if (!(dev_info.flow_type_rss_offloads & (1ULL << i)))
                                continue;
                        p = flowtype_to_str(i);
-                       printf("  %s\n", (p ? p : "unknown"));
+                       if (p)
+                               printf("  %s\n", p);
+                       else
+                               printf("  user defined %d\n", i);
                }
        }
 
@@ -947,6 +952,9 @@ static const struct {
        MK_FLOW_ITEM(MPLS, sizeof(struct rte_flow_item_mpls)),
        MK_FLOW_ITEM(GRE, sizeof(struct rte_flow_item_gre)),
        MK_FLOW_ITEM(FUZZY, sizeof(struct rte_flow_item_fuzzy)),
+       MK_FLOW_ITEM(GTP, sizeof(struct rte_flow_item_gtp)),
+       MK_FLOW_ITEM(GTPC, sizeof(struct rte_flow_item_gtp)),
+       MK_FLOW_ITEM(GTPU, sizeof(struct rte_flow_item_gtp)),
 };
 
 /** Compute storage space needed by item specification. */
@@ -954,8 +962,10 @@ static void
 flow_item_spec_size(const struct rte_flow_item *item,
                    size_t *size, size_t *pad)
 {
-       if (!item->spec)
+       if (!item->spec) {
+               *size = 0;
                goto empty;
+       }
        switch (item->type) {
                union {
                        const struct rte_flow_item_raw *raw;
@@ -967,10 +977,10 @@ flow_item_spec_size(const struct rte_flow_item *item,
                        spec.raw->length * sizeof(*spec.raw->pattern);
                break;
        default:
-empty:
-               *size = 0;
+               *size = flow_item[item->type].size;
                break;
        }
+empty:
        *pad = RTE_ALIGN_CEIL(*size, sizeof(double)) - *size;
 }
 
@@ -1005,8 +1015,10 @@ static void
 flow_action_conf_size(const struct rte_flow_action *action,
                      size_t *size, size_t *pad)
 {
-       if (!action->conf)
+       if (!action->conf) {
+               *size = 0;
                goto empty;
+       }
        switch (action->type) {
                union {
                        const struct rte_flow_action_rss *rss;
@@ -1018,10 +1030,10 @@ flow_action_conf_size(const struct rte_flow_action *action,
                        conf.rss->num * sizeof(*conf.rss->queue);
                break;
        default:
-empty:
-               *size = 0;
+               *size = flow_action[action->type].size;
                break;
        }
+empty:
        *pad = RTE_ALIGN_CEIL(*size, sizeof(double)) - *size;
 }
 
@@ -2415,6 +2427,41 @@ set_tx_pkt_segments(unsigned *seg_lengths, unsigned nb_segs)
        tx_pkt_nb_segs = (uint8_t) nb_segs;
 }
 
+void
+setup_gro(const char *mode, uint8_t port_id)
+{
+       if (!rte_eth_dev_is_valid_port(port_id)) {
+               printf("invalid port id %u\n", port_id);
+               return;
+       }
+       if (test_done == 0) {
+               printf("Before enable/disable GRO,"
+                               " please stop forwarding first\n");
+               return;
+       }
+       if (strcmp(mode, "on") == 0) {
+               if (gro_ports[port_id].enable) {
+                       printf("port %u has enabled GRO\n", port_id);
+                       return;
+               }
+               gro_ports[port_id].enable = 1;
+               gro_ports[port_id].param.gro_types = RTE_GRO_TCP_IPV4;
+
+               if (gro_ports[port_id].param.max_flow_num == 0)
+                       gro_ports[port_id].param.max_flow_num =
+                               GRO_DEFAULT_FLOW_NUM;
+               if (gro_ports[port_id].param.max_item_per_flow == 0)
+                       gro_ports[port_id].param.max_item_per_flow =
+                               GRO_DEFAULT_ITEM_NUM_PER_FLOW;
+       } else {
+               if (gro_ports[port_id].enable == 0) {
+                       printf("port %u has disabled GRO\n", port_id);
+                       return;
+               }
+               gro_ports[port_id].enable = 0;
+       }
+}
+
 char*
 list_pkt_forwarding_modes(void)
 {
@@ -2965,7 +3012,7 @@ fdir_set_flex_mask(portid_t port_id, struct rte_eth_fdir_flex_mask *cfg)
                        return;
                }
        }
-       (void)rte_memcpy(&flex_conf->flex_mask[idx],
+       rte_memcpy(&flex_conf->flex_mask[idx],
                         cfg,
                         sizeof(struct rte_eth_fdir_flex_mask));
 }
@@ -2995,7 +3042,7 @@ fdir_set_flex_payload(portid_t port_id, struct rte_eth_flex_payload_cfg *cfg)
                        return;
                }
        }
-       (void)rte_memcpy(&flex_conf->flex_set[idx],
+       rte_memcpy(&flex_conf->flex_set[idx],
                         cfg,
                         sizeof(struct rte_eth_flex_payload_cfg));
 
@@ -3309,6 +3356,27 @@ open_ddp_package_file(const char *file_path, uint32_t *size)
        return buf;
 }
 
+int
+save_ddp_package_file(const char *file_path, uint8_t *buf, uint32_t size)
+{
+       FILE *fh = fopen(file_path, "wb");
+
+       if (fh == NULL) {
+               printf("%s: Failed to open %s\n", __func__, file_path);
+               return -1;
+       }
+
+       if (fwrite(buf, 1, size, fh) != size) {
+               fclose(fh);
+               printf("%s: File write operation failed\n", __func__);
+               return -1;
+       }
+
+       fclose(fh);
+
+       return 0;
+}
+
 int
 close_ddp_package_file(uint8_t *buf)
 {