app/testpmd: add 5-tuple swap forwarding engine
[dpdk.git] / app / test-pmd / config.c
index 7501310..fcbe6b6 100644 (file)
@@ -119,6 +119,12 @@ const struct rss_type_info rss_type_table[] = {
        { "tcp", ETH_RSS_TCP },
        { "sctp", ETH_RSS_SCTP },
        { "tunnel", ETH_RSS_TUNNEL },
+       { "l3-pre32", RTE_ETH_RSS_L3_PRE32 },
+       { "l3-pre40", RTE_ETH_RSS_L3_PRE40 },
+       { "l3-pre48", RTE_ETH_RSS_L3_PRE48 },
+       { "l3-pre56", RTE_ETH_RSS_L3_PRE56 },
+       { "l3-pre64", RTE_ETH_RSS_L3_PRE64 },
+       { "l3-pre96", RTE_ETH_RSS_L3_PRE96 },
        { "l3-src-only", ETH_RSS_L3_SRC_ONLY },
        { "l3-dst-only", ETH_RSS_L3_DST_ONLY },
        { "l4-src-only", ETH_RSS_L4_SRC_ONLY },
@@ -1046,6 +1052,15 @@ port_offload_cap_display(portid_t port_id)
                        printf("off\n");
        }
 
+       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP) {
+               printf("Tx scheduling on timestamp:    ");
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
 }
 
 int
@@ -1395,6 +1410,56 @@ port_flow_complain(struct rte_flow_error *error)
        return -err;
 }
 
+static void
+rss_config_display(struct rte_flow_action_rss *rss_conf)
+{
+       uint8_t i;
+
+       if (rss_conf == NULL) {
+               printf("Invalid rule\n");
+               return;
+       }
+
+       printf("RSS:\n"
+              " queues: ");
+       if (rss_conf->queue_num == 0)
+               printf("none\n");
+       for (i = 0; i < rss_conf->queue_num; i++)
+               printf("%d\n", rss_conf->queue[i]);
+
+       printf(" function: ");
+       switch (rss_conf->func) {
+       case RTE_ETH_HASH_FUNCTION_DEFAULT:
+               printf("default\n");
+               break;
+       case RTE_ETH_HASH_FUNCTION_TOEPLITZ:
+               printf("toeplitz\n");
+               break;
+       case RTE_ETH_HASH_FUNCTION_SIMPLE_XOR:
+               printf("simple_xor\n");
+               break;
+       case RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ:
+               printf("symmetric_toeplitz\n");
+               break;
+       default:
+               printf("Unknown function\n");
+               return;
+       }
+
+       printf(" types:\n");
+       if (rss_conf->types == 0) {
+               printf("  none\n");
+               return;
+       }
+       for (i = 0; rss_type_table[i].str; i++) {
+               if ((rss_conf->types &
+                   rss_type_table[i].rss_type) ==
+                   rss_type_table[i].rss_type &&
+                   rss_type_table[i].rss_type != 0)
+                       printf("  %s\n", rss_type_table[i].str);
+       }
+}
+
 /** Validate flow rule. */
 int
 port_flow_validate(portid_t port_id,
@@ -1581,6 +1646,7 @@ port_flow_query(portid_t port_id, uint32_t rule,
        const char *name;
        union {
                struct rte_flow_query_count count;
+               struct rte_flow_action_rss rss_conf;
        } query;
        int ret;
 
@@ -1602,6 +1668,7 @@ port_flow_query(portid_t port_id, uint32_t rule,
                return port_flow_complain(&error);
        switch (action->type) {
        case RTE_FLOW_ACTION_TYPE_COUNT:
+       case RTE_FLOW_ACTION_TYPE_RSS:
                break;
        default:
                printf("Cannot query action type %d (%s)\n",
@@ -1626,6 +1693,9 @@ port_flow_query(portid_t port_id, uint32_t rule,
                       query.count.hits,
                       query.count.bytes);
                break;
+       case RTE_FLOW_ACTION_TYPE_RSS:
+               rss_config_display(&query.rss_conf);
+               break;
        default:
                printf("Cannot display result for action type %d (%s)\n",
                       action->type, name);
@@ -2504,55 +2574,6 @@ icmp_echo_config_setup(void)
        }
 }
 
-#if defined RTE_LIBRTE_PMD_SOFTNIC
-static void
-softnic_fwd_config_setup(void)
-{
-       struct rte_port *port;
-       portid_t pid, softnic_portid;
-       queueid_t i;
-       uint8_t softnic_enable = 0;
-
-       RTE_ETH_FOREACH_DEV(pid) {
-                       port = &ports[pid];
-                       const char *driver = port->dev_info.driver_name;
-
-                       if (strcmp(driver, "net_softnic") == 0) {
-                               softnic_portid = pid;
-                               softnic_enable = 1;
-                               break;
-                       }
-       }
-
-       if (softnic_enable == 0) {
-               printf("Softnic mode not configured(%s)!\n", __func__);
-               return;
-       }
-
-       cur_fwd_config.nb_fwd_ports = 1;
-       cur_fwd_config.nb_fwd_streams = (streamid_t) nb_rxq;
-
-       /* Re-initialize forwarding streams */
-       init_fwd_streams();
-
-       /*
-        * In the softnic forwarding test, the number of forwarding cores
-        * is set to one and remaining are used for softnic packet processing.
-        */
-       cur_fwd_config.nb_fwd_lcores = 1;
-       setup_fwd_config_of_each_lcore(&cur_fwd_config);
-
-       for (i = 0; i < cur_fwd_config.nb_fwd_streams; i++) {
-               fwd_streams[i]->rx_port   = softnic_portid;
-               fwd_streams[i]->rx_queue  = i;
-               fwd_streams[i]->tx_port   = softnic_portid;
-               fwd_streams[i]->tx_queue  = i;
-               fwd_streams[i]->peer_addr = fwd_streams[i]->tx_port;
-               fwd_streams[i]->retry_enabled = retry_enabled;
-       }
-}
-#endif
-
 void
 fwd_config_setup(void)
 {
@@ -2562,13 +2583,6 @@ fwd_config_setup(void)
                return;
        }
 
-#if defined RTE_LIBRTE_PMD_SOFTNIC
-       if (strcmp(cur_fwd_eng->fwd_mode_name, "softnic") == 0) {
-               softnic_fwd_config_setup();
-               return;
-       }
-#endif
-
        if ((nb_rxq > 1) && (nb_txq > 1)){
                if (dcb_config)
                        dcb_fwd_config_setup();
@@ -3011,6 +3025,58 @@ set_tx_pkt_segments(unsigned *seg_lengths, unsigned nb_segs)
        tx_pkt_nb_segs = (uint8_t) nb_segs;
 }
 
+void
+show_tx_pkt_times(void)
+{
+       printf("Interburst gap: %u\n", tx_pkt_times_inter);
+       printf("Intraburst gap: %u\n", tx_pkt_times_intra);
+}
+
+void
+set_tx_pkt_times(unsigned int *tx_times)
+{
+       uint16_t port_id;
+       int offload_found = 0;
+       int offset;
+       int flag;
+
+       static const struct rte_mbuf_dynfield desc_offs = {
+               .name = RTE_MBUF_DYNFIELD_TIMESTAMP_NAME,
+               .size = sizeof(uint64_t),
+               .align = __alignof__(uint64_t),
+       };
+       static const struct rte_mbuf_dynflag desc_flag = {
+               .name = RTE_MBUF_DYNFLAG_TX_TIMESTAMP_NAME,
+       };
+
+       RTE_ETH_FOREACH_DEV(port_id) {
+               struct rte_eth_dev_info dev_info = { 0 };
+               int ret;
+
+               ret = rte_eth_dev_info_get(port_id, &dev_info);
+               if (ret == 0 && dev_info.tx_offload_capa &
+                               DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP) {
+                       offload_found = 1;
+                       break;
+               }
+       }
+       if (!offload_found) {
+               printf("No device supporting Tx timestamp scheduling found, "
+                      "dynamic flag and field not registered\n");
+               return;
+       }
+       offset = rte_mbuf_dynfield_register(&desc_offs);
+       if (offset < 0 && rte_errno != EEXIST)
+               printf("Dynamic timestamp field registration error: %d",
+                      rte_errno);
+       flag = rte_mbuf_dynflag_register(&desc_flag);
+       if (flag < 0 && rte_errno != EEXIST)
+               printf("Dynamic timestamp flag registration error: %d",
+                      rte_errno);
+       tx_pkt_times_inter = tx_times[0];
+       tx_pkt_times_intra = tx_times[1];
+}
+
 void
 setup_gro(const char *onoff, portid_t port_id)
 {
@@ -3746,30 +3812,65 @@ print_fdir_flow_type(uint32_t flow_types_mask)
        printf("\n");
 }
 
+static int
+get_fdir_info(portid_t port_id, struct rte_eth_fdir_info *fdir_info,
+                   struct rte_eth_fdir_stats *fdir_stat)
+{
+       int ret;
+
+       ret = rte_eth_dev_filter_supported(port_id, RTE_ETH_FILTER_FDIR);
+       if (!ret) {
+               rte_eth_dev_filter_ctrl(port_id, RTE_ETH_FILTER_FDIR,
+                              RTE_ETH_FILTER_INFO, fdir_info);
+               rte_eth_dev_filter_ctrl(port_id, RTE_ETH_FILTER_FDIR,
+                              RTE_ETH_FILTER_STATS, fdir_stat);
+               return 0;
+       }
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       if (ret == -ENOTSUP) {
+               ret = rte_pmd_i40e_get_fdir_info(port_id, fdir_info);
+               if (!ret)
+                       ret = rte_pmd_i40e_get_fdir_stats(port_id, fdir_stat);
+       }
+#endif
+#ifdef RTE_LIBRTE_IXGBE_PMD
+       if (ret == -ENOTSUP) {
+               ret = rte_pmd_ixgbe_get_fdir_info(port_id, fdir_info);
+               if (!ret)
+                       ret = rte_pmd_ixgbe_get_fdir_stats(port_id, fdir_stat);
+       }
+#endif
+       switch (ret) {
+       case 0:
+               break;
+       case -ENOTSUP:
+               printf("\n FDIR is not supported on port %-2d\n",
+                       port_id);
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+               break;
+       }
+       return ret;
+}
+
 void
 fdir_get_infos(portid_t port_id)
 {
        struct rte_eth_fdir_stats fdir_stat;
        struct rte_eth_fdir_info fdir_info;
-       int ret;
 
        static const char *fdir_stats_border = "########################";
 
        if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
-       ret = rte_eth_dev_filter_supported(port_id, RTE_ETH_FILTER_FDIR);
-       if (ret < 0) {
-               printf("\n FDIR is not supported on port %-2d\n",
-                       port_id);
-               return;
-       }
 
        memset(&fdir_info, 0, sizeof(fdir_info));
-       rte_eth_dev_filter_ctrl(port_id, RTE_ETH_FILTER_FDIR,
-                              RTE_ETH_FILTER_INFO, &fdir_info);
        memset(&fdir_stat, 0, sizeof(fdir_stat));
-       rte_eth_dev_filter_ctrl(port_id, RTE_ETH_FILTER_FDIR,
-                              RTE_ETH_FILTER_STATS, &fdir_stat);
+       if (get_fdir_info(port_id, &fdir_info, &fdir_stat))
+               return;
+
        printf("\n  %s FDIR infos for port %-2d     %s\n",
               fdir_stats_border, port_id, fdir_stats_border);
        printf("  MODE: ");