app/testpmd: support RSS config in flow query

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

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 7501310..53a9b97 100644 (file)
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1395,6 +1395,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 +1631,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 +1653,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 +1678,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);
@@ -3746,30 +3801,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: ");