* [dpdk-dev] [PATCH 1/2] ethdev: add MPLS RSS offload type
@ 2021-01-20 6:22 Hemant Agrawal
2021-01-20 6:22 ` [dpdk-dev] [PATCH 2/2] net/dpaa2: support MPLS distribution Hemant Agrawal
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Hemant Agrawal @ 2021-01-20 6:22 UTC (permalink / raw)
To: dev, ferruh.yigit; +Cc: Hemant Agrawal
This patch defines new RSS offload types for MPLS. The distribution
will on the basis of MPLS tag.
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
app/test-pmd/cmdline.c | 4 +++-
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 2 +-
lib/librte_ethdev/rte_ethdev.h | 4 +++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 89034c8b72..01cc79b12c 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -2220,6 +2220,8 @@ cmd_config_rss_parsed(void *parsed_result,
rss_conf.rss_hf = ETH_RSS_GTPU;
else if (!strcmp(res->value, "ecpri"))
rss_conf.rss_hf = ETH_RSS_ECPRI;
+ else if (!strcmp(res->value, "mpls"))
+ rss_conf.rss_hf = ETH_RSS_MPLS;
else if (!strcmp(res->value, "none"))
rss_conf.rss_hf = 0;
else if (!strcmp(res->value, "level-default")) {
@@ -2290,7 +2292,7 @@ cmdline_parse_inst_t cmd_config_rss = {
.data = NULL,
.help_str = "port config all rss "
"all|default|eth|vlan|ip|tcp|udp|sctp|ether|port|vxlan|geneve|"
- "nvgre|vxlan-gpe|l2tpv3|esp|ah|pfcp|ecpri|none|level-default|"
+ "nvgre|vxlan-gpe|l2tpv3|esp|ah|pfcp|ecpri|mpls|none|level-default|"
"level-outer|level-inner|<flowtype_id>",
.tokens = {
(void *)&cmd_config_rss_port,
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 458f25bb63..3ccc9fc300 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -2270,7 +2270,7 @@ port config - RSS
Set the RSS (Receive Side Scaling) mode on or off::
- testpmd> port config all rss (all|default|eth|vlan|ip|tcp|udp|sctp|ether|port|vxlan|geneve|nvgre|vxlan-gpe|l2tpv3|esp|ah|pfcp|ecpri|none)
+ testpmd> port config all rss (all|default|eth|vlan|ip|tcp|udp|sctp|ether|port|vxlan|geneve|nvgre|vxlan-gpe|l2tpv3|esp|ah|pfcp|ecpri|mpls|none)
RSS is on by default.
diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
index eb299955d4..7c0b6eda8f 100644
--- a/lib/librte_ethdev/rte_ethdev.h
+++ b/lib/librte_ethdev/rte_ethdev.h
@@ -527,6 +527,7 @@ struct rte_eth_rss_conf {
#define ETH_RSS_PFCP (1ULL << 30)
#define ETH_RSS_PPPOE (1ULL << 31)
#define ETH_RSS_ECPRI (1ULL << 32)
+#define ETH_RSS_MPLS (1ULL << 33)
/*
* We use the following macros to combine with above ETH_RSS_* for
@@ -758,7 +759,8 @@ rte_eth_rss_hf_refine(uint64_t rss_hf)
ETH_RSS_PORT | \
ETH_RSS_VXLAN | \
ETH_RSS_GENEVE | \
- ETH_RSS_NVGRE)
+ ETH_RSS_NVGRE | \
+ ETH_RSS_MPLS)
/*
* Definitions used for redirection table entry size.
--
2.17.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [dpdk-dev] [PATCH 2/2] net/dpaa2: support MPLS distribution
2021-01-20 6:22 [dpdk-dev] [PATCH 1/2] ethdev: add MPLS RSS offload type Hemant Agrawal
@ 2021-01-20 6:22 ` Hemant Agrawal
2021-01-27 12:05 ` Ferruh Yigit
2021-01-27 11:59 ` [dpdk-dev] [PATCH 1/2] ethdev: add MPLS RSS offload type Ferruh Yigit
2021-01-27 12:26 ` Ferruh Yigit
2 siblings, 1 reply; 5+ messages in thread
From: Hemant Agrawal @ 2021-01-20 6:22 UTC (permalink / raw)
To: dev, ferruh.yigit; +Cc: Apeksha Gupta
From: Apeksha Gupta <apeksha.gupta@nxp.com>
add support for MPLS based distribution is supported.
Signed-off-by: Apeksha Gupta <apeksha.gupta@nxp.com>
---
drivers/net/dpaa2/base/dpaa2_hw_dpni.c | 45 ++++++++++++++++++++++++--
drivers/net/dpaa2/dpaa2_ethdev.h | 3 +-
drivers/net/dpaa2/dpaa2_rxtx.c | 4 +++
drivers/net/dpaa2/mc/fsl_net.h | 5 +++
4 files changed, 53 insertions(+), 4 deletions(-)
diff --git a/drivers/net/dpaa2/base/dpaa2_hw_dpni.c b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c
index 25b1d2bb6d..e543b73981 100644
--- a/drivers/net/dpaa2/base/dpaa2_hw_dpni.c
+++ b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved.
- * Copyright 2016-2019 NXP
+ * Copyright 2016-2021 NXP
*
*/
@@ -194,9 +194,11 @@ dpaa2_distset_to_dpkg_profile_cfg(
uint64_t req_dist_set,
struct dpkg_profile_cfg *kg_cfg)
{
- uint32_t loop = 0, i = 0, dist_field = 0;
+ uint32_t loop = 0, i = 0;
+ uint64_t dist_field = 0;
int l2_configured = 0, l3_configured = 0;
int l4_configured = 0, sctp_configured = 0;
+ int mpls_configured = 0;
memset(kg_cfg, 0, sizeof(struct dpkg_profile_cfg));
while (req_dist_set) {
@@ -220,6 +222,43 @@ dpaa2_distset_to_dpkg_profile_cfg(
i++;
break;
+ case ETH_RSS_MPLS:
+
+ if (mpls_configured)
+ break;
+ mpls_configured = 1;
+
+ kg_cfg->extracts[i].extract.from_hdr.prot =
+ NET_PROT_MPLS;
+ kg_cfg->extracts[i].extract.from_hdr.field =
+ NH_FLD_MPLS_MPLSL_1;
+ kg_cfg->extracts[i].type =
+ DPKG_EXTRACT_FROM_HDR;
+ kg_cfg->extracts[i].extract.from_hdr.type =
+ DPKG_FULL_FIELD;
+ i++;
+
+ kg_cfg->extracts[i].extract.from_hdr.prot =
+ NET_PROT_MPLS;
+ kg_cfg->extracts[i].extract.from_hdr.field =
+ NH_FLD_MPLS_MPLSL_2;
+ kg_cfg->extracts[i].type =
+ DPKG_EXTRACT_FROM_HDR;
+ kg_cfg->extracts[i].extract.from_hdr.type =
+ DPKG_FULL_FIELD;
+ i++;
+
+ kg_cfg->extracts[i].extract.from_hdr.prot =
+ NET_PROT_MPLS;
+ kg_cfg->extracts[i].extract.from_hdr.field =
+ NH_FLD_MPLS_MPLSL_N;
+ kg_cfg->extracts[i].type =
+ DPKG_EXTRACT_FROM_HDR;
+ kg_cfg->extracts[i].extract.from_hdr.type =
+ DPKG_FULL_FIELD;
+ i++;
+ break;
+
case ETH_RSS_IPV4:
case ETH_RSS_FRAG_IPV4:
case ETH_RSS_NONFRAG_IPV4_OTHER:
@@ -326,7 +365,7 @@ dpaa2_distset_to_dpkg_profile_cfg(
default:
DPAA2_PMD_WARN(
- "Unsupported flow dist option %x",
+ "unsupported flow dist option 0x%" PRIx64,
dist_field);
return -EINVAL;
}
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h
index cacb11bd3e..bb49fa9a38 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.h
+++ b/drivers/net/dpaa2/dpaa2_ethdev.h
@@ -65,7 +65,8 @@
ETH_RSS_IP | \
ETH_RSS_UDP | \
ETH_RSS_TCP | \
- ETH_RSS_SCTP)
+ ETH_RSS_SCTP | \
+ ETH_RSS_MPLS)
/* LX2 FRC Parsed values (Little Endian) */
#define DPAA2_PKT_TYPE_ETHER 0x0060
diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c
index 9cca6d16c3..6b4526cd2d 100644
--- a/drivers/net/dpaa2/dpaa2_rxtx.c
+++ b/drivers/net/dpaa2/dpaa2_rxtx.c
@@ -166,6 +166,10 @@ dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf,
goto parse_done;
}
+ if (BIT_ISSET_AT_POS(annotation->word3, L2_MPLS_1_PRESENT |
+ L2_MPLS_N_PRESENT))
+ pkt_type |= RTE_PTYPE_L2_ETHER_MPLS;
+
if (BIT_ISSET_AT_POS(annotation->word4, L3_IPV4_1_PRESENT |
L3_IPV4_N_PRESENT)) {
pkt_type |= RTE_PTYPE_L3_IPV4;
diff --git a/drivers/net/dpaa2/mc/fsl_net.h b/drivers/net/dpaa2/mc/fsl_net.h
index 3eaad2f717..2d26d5d6c3 100644
--- a/drivers/net/dpaa2/mc/fsl_net.h
+++ b/drivers/net/dpaa2/mc/fsl_net.h
@@ -343,6 +343,11 @@
/*************************** GTP fields ************************************/
#define NH_FLD_GTP_TEID (1)
+/*************************** MPLS fields ************************************/
+#define NH_FLD_MPLS_MPLSL_1 (1)
+#define NH_FLD_MPLS_MPLSL_2 (NH_FLD_MPLS_MPLSL_1 << 1)
+#define NH_FLD_MPLS_MPLSL_N (NH_FLD_MPLS_MPLSL_1 << 2)
+
/* Protocol options */
/* Ethernet options */
--
2.17.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [dpdk-dev] [PATCH 1/2] ethdev: add MPLS RSS offload type
2021-01-20 6:22 [dpdk-dev] [PATCH 1/2] ethdev: add MPLS RSS offload type Hemant Agrawal
2021-01-20 6:22 ` [dpdk-dev] [PATCH 2/2] net/dpaa2: support MPLS distribution Hemant Agrawal
@ 2021-01-27 11:59 ` Ferruh Yigit
2021-01-27 12:26 ` Ferruh Yigit
2 siblings, 0 replies; 5+ messages in thread
From: Ferruh Yigit @ 2021-01-27 11:59 UTC (permalink / raw)
To: Hemant Agrawal, dev
On 1/20/2021 6:22 AM, Hemant Agrawal wrote:
> This patch defines new RSS offload types for MPLS. The distribution
> will on the basis of MPLS tag.
>
> Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
> ---
> app/test-pmd/cmdline.c | 4 +++-
> doc/guides/testpmd_app_ug/testpmd_funcs.rst | 2 +-
> lib/librte_ethdev/rte_ethdev.h | 4 +++-
> 3 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> index 89034c8b72..01cc79b12c 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -2220,6 +2220,8 @@ cmd_config_rss_parsed(void *parsed_result,
> rss_conf.rss_hf = ETH_RSS_GTPU;
> else if (!strcmp(res->value, "ecpri"))
> rss_conf.rss_hf = ETH_RSS_ECPRI;
> + else if (!strcmp(res->value, "mpls"))
> + rss_conf.rss_hf = ETH_RSS_MPLS;
> else if (!strcmp(res->value, "none"))
> rss_conf.rss_hf = 0;
> else if (!strcmp(res->value, "level-default")) {
> @@ -2290,7 +2292,7 @@ cmdline_parse_inst_t cmd_config_rss = {
> .data = NULL,
> .help_str = "port config all rss "
> "all|default|eth|vlan|ip|tcp|udp|sctp|ether|port|vxlan|geneve|"
> - "nvgre|vxlan-gpe|l2tpv3|esp|ah|pfcp|ecpri|none|level-default|"
> + "nvgre|vxlan-gpe|l2tpv3|esp|ah|pfcp|ecpri|mpls|none|level-default|"
> "level-outer|level-inner|<flowtype_id>",
It should be added to the help string too, in 'cmd_help_long_parsed()', I can do
it in next-net, no new version required for this.
> .tokens = {
> (void *)&cmd_config_rss_port,
> diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> index 458f25bb63..3ccc9fc300 100644
> --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> @@ -2270,7 +2270,7 @@ port config - RSS
>
> Set the RSS (Receive Side Scaling) mode on or off::
>
> - testpmd> port config all rss (all|default|eth|vlan|ip|tcp|udp|sctp|ether|port|vxlan|geneve|nvgre|vxlan-gpe|l2tpv3|esp|ah|pfcp|ecpri|none)
> + testpmd> port config all rss (all|default|eth|vlan|ip|tcp|udp|sctp|ether|port|vxlan|geneve|nvgre|vxlan-gpe|l2tpv3|esp|ah|pfcp|ecpri|mpls|none)
>
> RSS is on by default.
>
> diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
> index eb299955d4..7c0b6eda8f 100644
> --- a/lib/librte_ethdev/rte_ethdev.h
> +++ b/lib/librte_ethdev/rte_ethdev.h
> @@ -527,6 +527,7 @@ struct rte_eth_rss_conf {
> #define ETH_RSS_PFCP (1ULL << 30)
> #define ETH_RSS_PPPOE (1ULL << 31)
> #define ETH_RSS_ECPRI (1ULL << 32)
> +#define ETH_RSS_MPLS (1ULL << 33)
>
> /*
> * We use the following macros to combine with above ETH_RSS_* for
> @@ -758,7 +759,8 @@ rte_eth_rss_hf_refine(uint64_t rss_hf)
> ETH_RSS_PORT | \
> ETH_RSS_VXLAN | \
> ETH_RSS_GENEVE | \
> - ETH_RSS_NVGRE)
> + ETH_RSS_NVGRE | \
> + ETH_RSS_MPLS)
>
> /*
> * Definitions used for redirection table entry size.
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [dpdk-dev] [PATCH 2/2] net/dpaa2: support MPLS distribution
2021-01-20 6:22 ` [dpdk-dev] [PATCH 2/2] net/dpaa2: support MPLS distribution Hemant Agrawal
@ 2021-01-27 12:05 ` Ferruh Yigit
0 siblings, 0 replies; 5+ messages in thread
From: Ferruh Yigit @ 2021-01-27 12:05 UTC (permalink / raw)
To: Hemant Agrawal, dev; +Cc: Apeksha Gupta
On 1/20/2021 6:22 AM, Hemant Agrawal wrote:
> From: Apeksha Gupta <apeksha.gupta@nxp.com>
>
> add support for MPLS based distribution is supported.
>
> Signed-off-by: Apeksha Gupta <apeksha.gupta@nxp.com>
Hi Hemant,
The driver patch is from non maintainer of the driver, since you sent the patch
I assume you are OK with it and I am adding your explicit ack:
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Please let me know if the patch is not reviewed by you or you are not agree with
the ack, I can drop the patch.
Thanks,
ferruh
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [dpdk-dev] [PATCH 1/2] ethdev: add MPLS RSS offload type
2021-01-20 6:22 [dpdk-dev] [PATCH 1/2] ethdev: add MPLS RSS offload type Hemant Agrawal
2021-01-20 6:22 ` [dpdk-dev] [PATCH 2/2] net/dpaa2: support MPLS distribution Hemant Agrawal
2021-01-27 11:59 ` [dpdk-dev] [PATCH 1/2] ethdev: add MPLS RSS offload type Ferruh Yigit
@ 2021-01-27 12:26 ` Ferruh Yigit
2 siblings, 0 replies; 5+ messages in thread
From: Ferruh Yigit @ 2021-01-27 12:26 UTC (permalink / raw)
To: Hemant Agrawal, dev
On 1/20/2021 6:22 AM, Hemant Agrawal wrote:
> This patch defines new RSS offload types for MPLS. The distribution
> will on the basis of MPLS tag.
>
> Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
Series applied to dpdk-next-net/main, thanks.
(testpmd cmd_help_long_parsed() updated while merging)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-01-27 12:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-20 6:22 [dpdk-dev] [PATCH 1/2] ethdev: add MPLS RSS offload type Hemant Agrawal
2021-01-20 6:22 ` [dpdk-dev] [PATCH 2/2] net/dpaa2: support MPLS distribution Hemant Agrawal
2021-01-27 12:05 ` Ferruh Yigit
2021-01-27 11:59 ` [dpdk-dev] [PATCH 1/2] ethdev: add MPLS RSS offload type Ferruh Yigit
2021-01-27 12:26 ` Ferruh Yigit
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).