* [dpdk-dev] [PATCH] app/testpmd: fix MPLSoGRE encapsulation
@ 2018-12-04 13:52 Dekel Peled
2018-12-04 21:23 ` Ori Kam
0 siblings, 1 reply; 5+ messages in thread
From: Dekel Peled @ 2018-12-04 13:52 UTC (permalink / raw)
To: wenzhuo.lu, jingjing.wu, bernard.iremonger; +Cc: dev, orika, shahafs, dekelp
In function cmd_set_mplsogre_encap_parsed(), MPLS label value was
set in mplsogre_encap_conf struct without the required offset.
As a result the value was copied incorrectly into
rte_flow_item_mpls struct.
This patch sets MPLS label value in appropriate location at
mplsogre_encap_conf struct, so it is correctly copied to
rte_flow_item_mpls struct.
Fixes: 3e77031be855 ("app/testpmd: add MPLSoGRE encapsulation")
Cc: orika@mellanox.com
Signed-off-by: Dekel Peled <dekelp@mellanox.com>
---
app/test-pmd/cmdline.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 8630be6..3ddc3e0 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -15567,10 +15567,9 @@ static void cmd_set_mplsogre_encap_parsed(void *parsed_result,
struct cmd_set_mplsogre_encap_result *res = parsed_result;
union {
uint32_t mplsogre_label;
- uint8_t label[3];
+ uint8_t label[4];
} id = {
- .mplsogre_label =
- rte_cpu_to_be_32(res->label) & RTE_BE32(0x00ffffff),
+ .mplsogre_label = rte_cpu_to_be_32(res->label<<12),
};
if (strcmp(res->mplsogre, "mplsogre_encap") == 0)
@@ -15583,7 +15582,7 @@ static void cmd_set_mplsogre_encap_parsed(void *parsed_result,
mplsogre_encap_conf.select_ipv4 = 0;
else
return;
- rte_memcpy(mplsogre_encap_conf.label, &id.label[1], 3);
+ rte_memcpy(mplsogre_encap_conf.label, &id.label, 3);
if (mplsogre_encap_conf.select_ipv4) {
IPV4_ADDR_TO_UINT(res->ip_src, mplsogre_encap_conf.ipv4_src);
IPV4_ADDR_TO_UINT(res->ip_dst, mplsogre_encap_conf.ipv4_dst);
--
1.8.3.1
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [dpdk-dev] [PATCH] app/testpmd: fix MPLSoGRE encapsulation
2018-12-04 13:52 [dpdk-dev] [PATCH] app/testpmd: fix MPLSoGRE encapsulation Dekel Peled
@ 2018-12-04 21:23 ` Ori Kam
2018-12-06 8:18 ` Dekel Peled
0 siblings, 1 reply; 5+ messages in thread
From: Ori Kam @ 2018-12-04 21:23 UTC (permalink / raw)
To: Dekel Peled, wenzhuo.lu, jingjing.wu, bernard.iremonger
Cc: dev, Shahaf Shuler, Dekel Peled
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Dekel Peled
> Sent: Tuesday, December 4, 2018 3:52 PM
> To: wenzhuo.lu@intel.com; jingjing.wu@intel.com;
> bernard.iremonger@intel.com
> Cc: dev@dpdk.org; Ori Kam <orika@mellanox.com>; Shahaf Shuler
> <shahafs@mellanox.com>; Dekel Peled <dekelp@mellanox.com>
> Subject: [dpdk-dev] [PATCH] app/testpmd: fix MPLSoGRE encapsulation
>
> In function cmd_set_mplsogre_encap_parsed(), MPLS label value was
> set in mplsogre_encap_conf struct without the required offset.
> As a result the value was copied incorrectly into
> rte_flow_item_mpls struct.
>
> This patch sets MPLS label value in appropriate location at
> mplsogre_encap_conf struct, so it is correctly copied to
> rte_flow_item_mpls struct.
>
> Fixes: 3e77031be855 ("app/testpmd: add MPLSoGRE encapsulation")
> Cc: orika@mellanox.com
>
> Signed-off-by: Dekel Peled <dekelp@mellanox.com>
> ---
> app/test-pmd/cmdline.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> index 8630be6..3ddc3e0 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -15567,10 +15567,9 @@ static void
> cmd_set_mplsogre_encap_parsed(void *parsed_result,
> struct cmd_set_mplsogre_encap_result *res = parsed_result;
> union {
> uint32_t mplsogre_label;
> - uint8_t label[3];
> + uint8_t label[4];
> } id = {
> - .mplsogre_label =
> - rte_cpu_to_be_32(res->label) & RTE_BE32(0x00ffffff),
> + .mplsogre_label = rte_cpu_to_be_32(res->label<<12),
Why did you remove the mask?
> };
>
> if (strcmp(res->mplsogre, "mplsogre_encap") == 0)
> @@ -15583,7 +15582,7 @@ static void cmd_set_mplsogre_encap_parsed(void
> *parsed_result,
> mplsogre_encap_conf.select_ipv4 = 0;
> else
> return;
> - rte_memcpy(mplsogre_encap_conf.label, &id.label[1], 3);
> + rte_memcpy(mplsogre_encap_conf.label, &id.label, 3);
> if (mplsogre_encap_conf.select_ipv4) {
> IPV4_ADDR_TO_UINT(res->ip_src,
> mplsogre_encap_conf.ipv4_src);
> IPV4_ADDR_TO_UINT(res->ip_dst,
> mplsogre_encap_conf.ipv4_dst);
> --
> 1.8.3.1
Best,
Ori
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [dpdk-dev] [PATCH] app/testpmd: fix MPLSoGRE encapsulation
2018-12-04 21:23 ` Ori Kam
@ 2018-12-06 8:18 ` Dekel Peled
2018-12-06 9:38 ` Ori Kam
0 siblings, 1 reply; 5+ messages in thread
From: Dekel Peled @ 2018-12-06 8:18 UTC (permalink / raw)
To: Ori Kam, wenzhuo.lu, jingjing.wu, bernard.iremonger; +Cc: dev, Shahaf Shuler
Thanks, PSB.
> -----Original Message-----
> From: Ori Kam
> Sent: Tuesday, December 4, 2018 11:23 PM
> To: Dekel Peled <dekelp@mellanox.com>; wenzhuo.lu@intel.com;
> jingjing.wu@intel.com; bernard.iremonger@intel.com
> Cc: dev@dpdk.org; Shahaf Shuler <shahafs@mellanox.com>; Dekel Peled
> <dekelp@mellanox.com>
> Subject: RE: [dpdk-dev] [PATCH] app/testpmd: fix MPLSoGRE encapsulation
>
>
>
> > -----Original Message-----
> > From: dev <dev-bounces@dpdk.org> On Behalf Of Dekel Peled
> > Sent: Tuesday, December 4, 2018 3:52 PM
> > To: wenzhuo.lu@intel.com; jingjing.wu@intel.com;
> > bernard.iremonger@intel.com
> > Cc: dev@dpdk.org; Ori Kam <orika@mellanox.com>; Shahaf Shuler
> > <shahafs@mellanox.com>; Dekel Peled <dekelp@mellanox.com>
> > Subject: [dpdk-dev] [PATCH] app/testpmd: fix MPLSoGRE encapsulation
> >
> > In function cmd_set_mplsogre_encap_parsed(), MPLS label value was set
> > in mplsogre_encap_conf struct without the required offset.
> > As a result the value was copied incorrectly into rte_flow_item_mpls
> > struct.
> >
> > This patch sets MPLS label value in appropriate location at
> > mplsogre_encap_conf struct, so it is correctly copied to
> > rte_flow_item_mpls struct.
> >
> > Fixes: 3e77031be855 ("app/testpmd: add MPLSoGRE encapsulation")
> > Cc: orika@mellanox.com
> >
> > Signed-off-by: Dekel Peled <dekelp@mellanox.com>
> > ---
> > app/test-pmd/cmdline.c | 7 +++----
> > 1 file changed, 3 insertions(+), 4 deletions(-)
> >
> > diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index
> > 8630be6..3ddc3e0 100644
> > --- a/app/test-pmd/cmdline.c
> > +++ b/app/test-pmd/cmdline.c
> > @@ -15567,10 +15567,9 @@ static void
> > cmd_set_mplsogre_encap_parsed(void *parsed_result,
> > struct cmd_set_mplsogre_encap_result *res = parsed_result;
> > union {
> > uint32_t mplsogre_label;
> > - uint8_t label[3];
> > + uint8_t label[4];
> > } id = {
> > - .mplsogre_label =
> > - rte_cpu_to_be_32(res->label) &
> RTE_BE32(0x00ffffff),
> > + .mplsogre_label = rte_cpu_to_be_32(res->label<<12),
>
> Why did you remove the mask?
The mask of all valid bits set to 1 is redundant.
After <<12 the 20 valid bits are not changed, and the other 12 bits are set to 0.
>
> > };
> >
> > if (strcmp(res->mplsogre, "mplsogre_encap") == 0) @@ -15583,7
> > +15582,7 @@ static void cmd_set_mplsogre_encap_parsed(void
> > *parsed_result,
> > mplsogre_encap_conf.select_ipv4 = 0;
> > else
> > return;
> > - rte_memcpy(mplsogre_encap_conf.label, &id.label[1], 3);
> > + rte_memcpy(mplsogre_encap_conf.label, &id.label, 3);
> > if (mplsogre_encap_conf.select_ipv4) {
> > IPV4_ADDR_TO_UINT(res->ip_src,
> > mplsogre_encap_conf.ipv4_src);
> > IPV4_ADDR_TO_UINT(res->ip_dst,
> > mplsogre_encap_conf.ipv4_dst);
> > --
> > 1.8.3.1
>
> Best,
> Ori
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [dpdk-dev] [PATCH] app/testpmd: fix MPLSoGRE encapsulation
2018-12-06 8:18 ` Dekel Peled
@ 2018-12-06 9:38 ` Ori Kam
2018-12-11 17:29 ` Ferruh Yigit
0 siblings, 1 reply; 5+ messages in thread
From: Ori Kam @ 2018-12-06 9:38 UTC (permalink / raw)
To: Dekel Peled, wenzhuo.lu, jingjing.wu, bernard.iremonger
Cc: dev, Shahaf Shuler
> -----Original Message-----
> From: Dekel Peled
> Sent: Thursday, December 6, 2018 10:18 AM
> To: Ori Kam <orika@mellanox.com>; wenzhuo.lu@intel.com;
> jingjing.wu@intel.com; bernard.iremonger@intel.com
> Cc: dev@dpdk.org; Shahaf Shuler <shahafs@mellanox.com>
> Subject: RE: [dpdk-dev] [PATCH] app/testpmd: fix MPLSoGRE encapsulation
>
> Thanks, PSB.
>
> > -----Original Message-----
> > From: Ori Kam
> > Sent: Tuesday, December 4, 2018 11:23 PM
> > To: Dekel Peled <dekelp@mellanox.com>; wenzhuo.lu@intel.com;
> > jingjing.wu@intel.com; bernard.iremonger@intel.com
> > Cc: dev@dpdk.org; Shahaf Shuler <shahafs@mellanox.com>; Dekel Peled
> > <dekelp@mellanox.com>
> > Subject: RE: [dpdk-dev] [PATCH] app/testpmd: fix MPLSoGRE encapsulation
> >
> >
> >
> > > -----Original Message-----
> > > From: dev <dev-bounces@dpdk.org> On Behalf Of Dekel Peled
> > > Sent: Tuesday, December 4, 2018 3:52 PM
> > > To: wenzhuo.lu@intel.com; jingjing.wu@intel.com;
> > > bernard.iremonger@intel.com
> > > Cc: dev@dpdk.org; Ori Kam <orika@mellanox.com>; Shahaf Shuler
> > > <shahafs@mellanox.com>; Dekel Peled <dekelp@mellanox.com>
> > > Subject: [dpdk-dev] [PATCH] app/testpmd: fix MPLSoGRE encapsulation
> > >
> > > In function cmd_set_mplsogre_encap_parsed(), MPLS label value was set
> > > in mplsogre_encap_conf struct without the required offset.
> > > As a result the value was copied incorrectly into rte_flow_item_mpls
> > > struct.
> > >
> > > This patch sets MPLS label value in appropriate location at
> > > mplsogre_encap_conf struct, so it is correctly copied to
> > > rte_flow_item_mpls struct.
> > >
> > > Fixes: 3e77031be855 ("app/testpmd: add MPLSoGRE encapsulation")
> > > Cc: orika@mellanox.com
> > >
> > > Signed-off-by: Dekel Peled <dekelp@mellanox.com>
> > > ---
> > > app/test-pmd/cmdline.c | 7 +++----
> > > 1 file changed, 3 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index
> > > 8630be6..3ddc3e0 100644
> > > --- a/app/test-pmd/cmdline.c
> > > +++ b/app/test-pmd/cmdline.c
> > > @@ -15567,10 +15567,9 @@ static void
> > > cmd_set_mplsogre_encap_parsed(void *parsed_result,
> > > struct cmd_set_mplsogre_encap_result *res = parsed_result;
> > > union {
> > > uint32_t mplsogre_label;
> > > - uint8_t label[3];
> > > + uint8_t label[4];
> > > } id = {
> > > - .mplsogre_label =
> > > - rte_cpu_to_be_32(res->label) &
> > RTE_BE32(0x00ffffff),
> > > + .mplsogre_label = rte_cpu_to_be_32(res->label<<12),
> >
> > Why did you remove the mask?
>
> The mask of all valid bits set to 1 is redundant.
> After <<12 the 20 valid bits are not changed, and the other 12 bits are set to 0.
>
> >
> > > };
> > >
> > > if (strcmp(res->mplsogre, "mplsogre_encap") == 0) @@ -15583,7
> > > +15582,7 @@ static void cmd_set_mplsogre_encap_parsed(void
> > > *parsed_result,
> > > mplsogre_encap_conf.select_ipv4 = 0;
> > > else
> > > return;
> > > - rte_memcpy(mplsogre_encap_conf.label, &id.label[1], 3);
> > > + rte_memcpy(mplsogre_encap_conf.label, &id.label, 3);
> > > if (mplsogre_encap_conf.select_ipv4) {
> > > IPV4_ADDR_TO_UINT(res->ip_src,
> > > mplsogre_encap_conf.ipv4_src);
> > > IPV4_ADDR_TO_UINT(res->ip_dst,
> > > mplsogre_encap_conf.ipv4_dst);
> > > --
> > > 1.8.3.1
> >
> > Best,
> > Ori
Acked-by: Ori Kam <orika@mellanox.com>
Thanks,
Ori
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [dpdk-dev] [PATCH] app/testpmd: fix MPLSoGRE encapsulation
2018-12-06 9:38 ` Ori Kam
@ 2018-12-11 17:29 ` Ferruh Yigit
0 siblings, 0 replies; 5+ messages in thread
From: Ferruh Yigit @ 2018-12-11 17:29 UTC (permalink / raw)
To: Ori Kam, Dekel Peled, wenzhuo.lu, jingjing.wu, bernard.iremonger
Cc: dev, Shahaf Shuler
On 12/6/2018 9:38 AM, Ori Kam wrote:
<...>
>>>> Subject: [dpdk-dev] [PATCH] app/testpmd: fix MPLSoGRE encapsulation
>>>>
>>>> In function cmd_set_mplsogre_encap_parsed(), MPLS label value was set
>>>> in mplsogre_encap_conf struct without the required offset.
>>>> As a result the value was copied incorrectly into rte_flow_item_mpls
>>>> struct.
>>>>
>>>> This patch sets MPLS label value in appropriate location at
>>>> mplsogre_encap_conf struct, so it is correctly copied to
>>>> rte_flow_item_mpls struct.
>>>>
>>>> Fixes: 3e77031be855 ("app/testpmd: add MPLSoGRE encapsulation")
>>>> Cc: orika@mellanox.com
>>>>
>>>> Signed-off-by: Dekel Peled <dekelp@mellanox.com>
>
> Acked-by: Ori Kam <orika@mellanox.com>
Applied to dpdk-next-net/master, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-12-11 17:29 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-04 13:52 [dpdk-dev] [PATCH] app/testpmd: fix MPLSoGRE encapsulation Dekel Peled
2018-12-04 21:23 ` Ori Kam
2018-12-06 8:18 ` Dekel Peled
2018-12-06 9:38 ` Ori Kam
2018-12-11 17:29 ` 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).