[dpdk-dev] [PATCH] net/dpaa2: fix RSS distribution size field

[dpdk-dev] [PATCH] net/dpaa2: fix RSS distribution size field

[Hemant Agrawal]

RSS distribution field is U64, while the DPAA2 code
was using integer value, which is causing a issue
for MPLS having bit position 33.
This patch fixes the code to use unsigned long long.

Fixes: 1832bc8ee8d4 ("net/dpaa2: support MPLS distribution")
Cc: apeksha.gupta@nxp.com

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/net/dpaa2/base/dpaa2_hw_dpni.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/dpaa2/base/dpaa2_hw_dpni.c b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c
index 9d1565369d..b901b4342f 100644
--- a/drivers/net/dpaa2/base/dpaa2_hw_dpni.c
+++ b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c
@@ -203,7 +203,7 @@ dpaa2_distset_to_dpkg_profile_cfg(
 	memset(kg_cfg, 0, sizeof(struct dpkg_profile_cfg));
 	while (req_dist_set) {
 		if (req_dist_set % 2 != 0) {
-			dist_field = 1U << loop;
+			dist_field = 1ULL << loop;
 			switch (dist_field) {
 			case ETH_RSS_L2_PAYLOAD:
 
-- 
2.17.1

[dpdk-dev] [PATCH] app/testpmd: fix missing MPLS tokens for RSS

[Hemant Agrawal]

This patch adds missing MPLS tokens in for RSS config.

Fixes: d810252857c9 ("ethdev: add MPLS RSS offload type")
Cc: hemant.agrawal@nxp.com

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 app/test-pmd/cmdline.c | 4 ++--
 app/test-pmd/config.c  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 14110eb2e4..f272179041 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -2423,7 +2423,7 @@ cmdline_parse_token_string_t cmd_config_rss_hash_key_rss_type =
 				 "ipv6-tcp-ex#ipv6-udp-ex#"
 				 "l3-src-only#l3-dst-only#l4-src-only#l4-dst-only#"
 				 "l2-src-only#l2-dst-only#s-vlan#c-vlan#"
-				 "l2tpv3#esp#ah#pfcp#pppoe#gtpu#ecpri");
+				 "l2tpv3#esp#ah#pfcp#pppoe#gtpu#ecpri#mpls");
 cmdline_parse_token_string_t cmd_config_rss_hash_key_value =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, key, NULL);
 
@@ -2436,7 +2436,7 @@ cmdline_parse_inst_t cmd_config_rss_hash_key = {
 		"l2-payload|ipv6-ex|ipv6-tcp-ex|ipv6-udp-ex|"
 		"l3-src-only|l3-dst-only|l4-src-only|l4-dst-only|"
 		"l2-src-only|l2-dst-only|s-vlan|c-vlan|"
-		"l2tpv3|esp|ah|pfcp|pppoe|gtpu|ecpri "
+		"l2tpv3|esp|ah|pfcp|pppoe|gtpu|ecpri|mpls "
 		"<string of hex digits (variable length, NIC dependent)>",
 	.tokens = {
 		(void *)&cmd_config_rss_hash_key_port,
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index ef0b9784d0..a5e82b7a97 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -87,7 +87,7 @@ const struct rss_type_info rss_type_table[] = {
 	{ "all", ETH_RSS_ETH | ETH_RSS_VLAN | ETH_RSS_IP | ETH_RSS_TCP |
 		ETH_RSS_UDP | ETH_RSS_SCTP | ETH_RSS_L2_PAYLOAD |
 		ETH_RSS_L2TPV3 | ETH_RSS_ESP | ETH_RSS_AH | ETH_RSS_PFCP |
-		ETH_RSS_GTPU | ETH_RSS_ECPRI},
+		ETH_RSS_GTPU | ETH_RSS_ECPRI | ETH_RSS_MPLS},
 	{ "none", 0 },
 	{ "eth", ETH_RSS_ETH },
 	{ "l2-src-only", ETH_RSS_L2_SRC_ONLY },
@@ -137,6 +137,7 @@ const struct rss_type_info rss_type_table[] = {
 	{ "pppoe", ETH_RSS_PPPOE },
 	{ "gtpu", ETH_RSS_GTPU },
 	{ "ecpri", ETH_RSS_ECPRI },
+	{ "mpls", ETH_RSS_MPLS },
 	{ NULL, 0 },
 };
 
-- 
2.17.1

Re: [dpdk-dev] [PATCH] net/dpaa2: fix RSS distribution size field

[Ferruh Yigit]

On 4/8/2021 10:17 AM, Hemant Agrawal wrote:
> RSS distribution field is U64, while the DPAA2 code
> was using integer value, which is causing a issue
> for MPLS having bit position 33.
> This patch fixes the code to use unsigned long long.
> 
> Fixes: 1832bc8ee8d4 ("net/dpaa2: support MPLS distribution")
> Cc: apeksha.gupta@nxp.com
> 
> Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>

     Cc: stable@dpdk.org

Applied to dpdk-next-net/main, thanks.

Re: [dpdk-dev] [PATCH] app/testpmd: fix missing MPLS tokens for RSS

[Ferruh Yigit]

On 4/8/2021 10:17 AM, Hemant Agrawal wrote:
> This patch adds missing MPLS tokens in for RSS config.
> 
> Fixes: d810252857c9 ("ethdev: add MPLS RSS offload type")
> Cc: hemant.agrawal@nxp.com
> 
> Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>

Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

Applied to dpdk-next-net/main, thanks.

[dpdk-dev] [PATCH] net/dpaa2: fix RSS distribution size field

[Hemant Agrawal]

RSS distribution field is U64, while the DPAA2 code
was using integer value, which is causing a issue
for MPLS having bit position 33.
This patch fixes the code to use unsigned long long.

Fixes: 1832bc8ee8d4 ("net/dpaa2: support MPLS distribution")
Cc: apeksha.gupta@nxp.com

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/net/dpaa2/base/dpaa2_hw_dpni.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/dpaa2/base/dpaa2_hw_dpni.c b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c
index 9d1565369d..b901b4342f 100644
--- a/drivers/net/dpaa2/base/dpaa2_hw_dpni.c
+++ b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c
@@ -203,7 +203,7 @@ dpaa2_distset_to_dpkg_profile_cfg(
 	memset(kg_cfg, 0, sizeof(struct dpkg_profile_cfg));
 	while (req_dist_set) {
 		if (req_dist_set % 2 != 0) {
-			dist_field = 1U << loop;
+			dist_field = 1ULL << loop;
 			switch (dist_field) {
 			case ETH_RSS_L2_PAYLOAD:
 
-- 
2.17.1