7d8194517a
Sync some patches for hns3 PMD, telemetry and testpmd. And main modifications are as follows: - backport some bugfixes for hns3 - revert Tx performance optimization for hns3 - add Rx/Tx descriptor dump feature for hns3 - refactor some RSS commands for testpmd - add ethdev telemetry private dump - add dmadev telemetry - sync telemetry lib Signed-off-by: Huisong Li <lihuisong@huawei.com> (cherry picked from commit 4f06d27eff9aa99c2e2073ac74328893990ed8ed)
100 lines
3.6 KiB
Diff
100 lines
3.6 KiB
Diff
From 00a08212bf6e1c96e491353183d3db9ffbcf3463 Mon Sep 17 00:00:00 2001
|
|
From: Huisong Li <lihuisong@huawei.com>
|
|
Date: Fri, 21 Oct 2022 15:36:53 +0800
|
|
Subject: [PATCH 177/189] app/testpmd: reorder RSS type table
|
|
|
|
There are group and individual types in rss_type_table[]. However, group
|
|
types are very scattered, and individual types are not arranged based on
|
|
the bit number order in 'RTE_ETH_RSS_xxx'. For a clear distribution of
|
|
types and better maintenance, this patch reorders this table.
|
|
|
|
Signed-off-by: Huisong Li <lihuisong@huawei.com>
|
|
Acked-by: Ferruh Yigit <ferruh.yigit@xilinx.com>
|
|
---
|
|
app/test-pmd/config.c | 47 +++++++++++++++++++++++--------------------
|
|
1 file changed, 25 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
|
|
index 873cca6f3e..f8cd135970 100644
|
|
--- a/app/test-pmd/config.c
|
|
+++ b/app/test-pmd/config.c
|
|
@@ -85,17 +85,20 @@ static const struct {
|
|
};
|
|
|
|
const struct rss_type_info rss_type_table[] = {
|
|
+ /* Group types */
|
|
{ "all", RTE_ETH_RSS_ETH | RTE_ETH_RSS_VLAN | RTE_ETH_RSS_IP | RTE_ETH_RSS_TCP |
|
|
RTE_ETH_RSS_UDP | RTE_ETH_RSS_SCTP | RTE_ETH_RSS_L2_PAYLOAD |
|
|
RTE_ETH_RSS_L2TPV3 | RTE_ETH_RSS_ESP | RTE_ETH_RSS_AH | RTE_ETH_RSS_PFCP |
|
|
RTE_ETH_RSS_GTPU | RTE_ETH_RSS_ECPRI | RTE_ETH_RSS_MPLS},
|
|
{ "none", 0 },
|
|
- { "eth", RTE_ETH_RSS_ETH },
|
|
- { "l2-src-only", RTE_ETH_RSS_L2_SRC_ONLY },
|
|
- { "l2-dst-only", RTE_ETH_RSS_L2_DST_ONLY },
|
|
+ { "ip", RTE_ETH_RSS_IP },
|
|
+ { "udp", RTE_ETH_RSS_UDP },
|
|
+ { "tcp", RTE_ETH_RSS_TCP },
|
|
+ { "sctp", RTE_ETH_RSS_SCTP },
|
|
+ { "tunnel", RTE_ETH_RSS_TUNNEL },
|
|
{ "vlan", RTE_ETH_RSS_VLAN },
|
|
- { "s-vlan", RTE_ETH_RSS_S_VLAN },
|
|
- { "c-vlan", RTE_ETH_RSS_C_VLAN },
|
|
+
|
|
+ /* Individual type */
|
|
{ "ipv4", RTE_ETH_RSS_IPV4 },
|
|
{ "ipv4-frag", RTE_ETH_RSS_FRAG_IPV4 },
|
|
{ "ipv4-tcp", RTE_ETH_RSS_NONFRAG_IPV4_TCP },
|
|
@@ -116,32 +119,32 @@ const struct rss_type_info rss_type_table[] = {
|
|
{ "vxlan", RTE_ETH_RSS_VXLAN },
|
|
{ "geneve", RTE_ETH_RSS_GENEVE },
|
|
{ "nvgre", RTE_ETH_RSS_NVGRE },
|
|
- { "ip", RTE_ETH_RSS_IP },
|
|
- { "udp", RTE_ETH_RSS_UDP },
|
|
- { "tcp", RTE_ETH_RSS_TCP },
|
|
- { "sctp", RTE_ETH_RSS_SCTP },
|
|
- { "tunnel", RTE_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", RTE_ETH_RSS_L3_SRC_ONLY },
|
|
- { "l3-dst-only", RTE_ETH_RSS_L3_DST_ONLY },
|
|
- { "l4-src-only", RTE_ETH_RSS_L4_SRC_ONLY },
|
|
- { "l4-dst-only", RTE_ETH_RSS_L4_DST_ONLY },
|
|
+ { "gtpu", RTE_ETH_RSS_GTPU },
|
|
+ { "eth", RTE_ETH_RSS_ETH },
|
|
+ { "s-vlan", RTE_ETH_RSS_S_VLAN },
|
|
+ { "c-vlan", RTE_ETH_RSS_C_VLAN },
|
|
{ "esp", RTE_ETH_RSS_ESP },
|
|
{ "ah", RTE_ETH_RSS_AH },
|
|
{ "l2tpv3", RTE_ETH_RSS_L2TPV3 },
|
|
{ "pfcp", RTE_ETH_RSS_PFCP },
|
|
{ "pppoe", RTE_ETH_RSS_PPPOE },
|
|
- { "gtpu", RTE_ETH_RSS_GTPU },
|
|
{ "ecpri", RTE_ETH_RSS_ECPRI },
|
|
{ "mpls", RTE_ETH_RSS_MPLS },
|
|
{ "ipv4-chksum", RTE_ETH_RSS_IPV4_CHKSUM },
|
|
{ "l4-chksum", RTE_ETH_RSS_L4_CHKSUM },
|
|
- { NULL, 0 },
|
|
+ { "l3-pre96", RTE_ETH_RSS_L3_PRE96 },
|
|
+ { "l3-pre64", RTE_ETH_RSS_L3_PRE64 },
|
|
+ { "l3-pre56", RTE_ETH_RSS_L3_PRE56 },
|
|
+ { "l3-pre48", RTE_ETH_RSS_L3_PRE48 },
|
|
+ { "l3-pre40", RTE_ETH_RSS_L3_PRE40 },
|
|
+ { "l3-pre32", RTE_ETH_RSS_L3_PRE32 },
|
|
+ { "l2-dst-only", RTE_ETH_RSS_L2_DST_ONLY },
|
|
+ { "l2-src-only", RTE_ETH_RSS_L2_SRC_ONLY },
|
|
+ { "l4-dst-only", RTE_ETH_RSS_L4_DST_ONLY },
|
|
+ { "l4-src-only", RTE_ETH_RSS_L4_SRC_ONLY },
|
|
+ { "l3-dst-only", RTE_ETH_RSS_L3_DST_ONLY },
|
|
+ { "l3-src-only", RTE_ETH_RSS_L3_SRC_ONLY },
|
|
+ { NULL, 0},
|
|
};
|
|
|
|
static const struct {
|
|
--
|
|
2.23.0
|
|
|