[v2] app/testpmd: fix MPLSoUDP encapsulation
Checks
Commit Message
In function cmd_set_mplsoudp_encap_parsed(), MPLS label value was
set in mplsoudp_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
mplsoudp_encap_conf struct, so it is correctly copied to
rte_flow_item_mpls struct.
Fixes: a1191d39cb57 ("app/testpmd: add MPLSoUDP encapsulation")
Cc: orika@mellanox.com
Signed-off-by: Dekel Peled <dekelp@mellanox.com>
---
v2: Update code fix and elaborate patch log for clarity.
---
---
app/test-pmd/cmdline.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
Comments
> -----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 v2] app/testpmd: fix MPLSoUDP encapsulation
>
> In function cmd_set_mplsoudp_encap_parsed(), MPLS label value was
> set in mplsoudp_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
> mplsoudp_encap_conf struct, so it is correctly copied to
> rte_flow_item_mpls struct.
>
> Fixes: a1191d39cb57 ("app/testpmd: add MPLSoUDP encapsulation")
> Cc: orika@mellanox.com
>
> Signed-off-by: Dekel Peled <dekelp@mellanox.com>
>
> ---
> v2: Update code fix and elaborate patch log for clarity.
> ---
> ---
> 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 1275074..8630be6 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -15804,10 +15804,9 @@ static void
> cmd_set_mplsoudp_encap_parsed(void *parsed_result,
> struct cmd_set_mplsoudp_encap_result *res = parsed_result;
> union {
> uint32_t mplsoudp_label;
> - uint8_t label[3];
> + uint8_t label[4];
> } id = {
> - .mplsoudp_label =
> - rte_cpu_to_be_32(res->label) & RTE_BE32(0x00ffffff),
> + .mplsoudp_label = rte_cpu_to_be_32(res->label<<12),
Why did you remove the mask?
> };
>
> if (strcmp(res->mplsoudp, "mplsoudp_encap") == 0)
> @@ -15820,7 +15819,7 @@ static void cmd_set_mplsoudp_encap_parsed(void
> *parsed_result,
> mplsoudp_encap_conf.select_ipv4 = 0;
> else
> return;
> - rte_memcpy(mplsoudp_encap_conf.label, &id.label[1], 3);
> + rte_memcpy(mplsoudp_encap_conf.label, &id.label, 3);
> mplsoudp_encap_conf.udp_src = rte_cpu_to_be_16(res->udp_src);
> mplsoudp_encap_conf.udp_dst = rte_cpu_to_be_16(res->udp_dst);
> if (mplsoudp_encap_conf.select_ipv4) {
> --
> 1.8.3.1
Best,
Ori
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 v2] app/testpmd: fix MPLSoUDP
> 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 v2] app/testpmd: fix MPLSoUDP encapsulation
> >
> > In function cmd_set_mplsoudp_encap_parsed(), MPLS label value was set
> > in mplsoudp_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
> > mplsoudp_encap_conf struct, so it is correctly copied to
> > rte_flow_item_mpls struct.
> >
> > Fixes: a1191d39cb57 ("app/testpmd: add MPLSoUDP encapsulation")
> > Cc: orika@mellanox.com
> >
> > Signed-off-by: Dekel Peled <dekelp@mellanox.com>
> >
> > ---
> > v2: Update code fix and elaborate patch log for clarity.
> > ---
> > ---
> > 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
> > 1275074..8630be6 100644
> > --- a/app/test-pmd/cmdline.c
> > +++ b/app/test-pmd/cmdline.c
> > @@ -15804,10 +15804,9 @@ static void
> > cmd_set_mplsoudp_encap_parsed(void *parsed_result,
> > struct cmd_set_mplsoudp_encap_result *res = parsed_result;
> > union {
> > uint32_t mplsoudp_label;
> > - uint8_t label[3];
> > + uint8_t label[4];
> > } id = {
> > - .mplsoudp_label =
> > - rte_cpu_to_be_32(res->label) &
> RTE_BE32(0x00ffffff),
> > + .mplsoudp_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->mplsoudp, "mplsoudp_encap") == 0) @@ -15820,7
> > +15819,7 @@ static void cmd_set_mplsoudp_encap_parsed(void
> > *parsed_result,
> > mplsoudp_encap_conf.select_ipv4 = 0;
> > else
> > return;
> > - rte_memcpy(mplsoudp_encap_conf.label, &id.label[1], 3);
> > + rte_memcpy(mplsoudp_encap_conf.label, &id.label, 3);
> > mplsoudp_encap_conf.udp_src = rte_cpu_to_be_16(res->udp_src);
> > mplsoudp_encap_conf.udp_dst = rte_cpu_to_be_16(res->udp_dst);
> > if (mplsoudp_encap_conf.select_ipv4) {
> > --
> > 1.8.3.1
>
> Best,
> Ori
> -----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 v2] app/testpmd: fix MPLSoUDP 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 v2] app/testpmd: fix MPLSoUDP
> > 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 v2] app/testpmd: fix MPLSoUDP encapsulation
> > >
> > > In function cmd_set_mplsoudp_encap_parsed(), MPLS label value was set
> > > in mplsoudp_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
> > > mplsoudp_encap_conf struct, so it is correctly copied to
> > > rte_flow_item_mpls struct.
> > >
> > > Fixes: a1191d39cb57 ("app/testpmd: add MPLSoUDP encapsulation")
> > > Cc: orika@mellanox.com
> > >
> > > Signed-off-by: Dekel Peled <dekelp@mellanox.com>
> > >
> > > ---
> > > v2: Update code fix and elaborate patch log for clarity.
> > > ---
> > > ---
> > > 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
> > > 1275074..8630be6 100644
> > > --- a/app/test-pmd/cmdline.c
> > > +++ b/app/test-pmd/cmdline.c
> > > @@ -15804,10 +15804,9 @@ static void
> > > cmd_set_mplsoudp_encap_parsed(void *parsed_result,
> > > struct cmd_set_mplsoudp_encap_result *res = parsed_result;
> > > union {
> > > uint32_t mplsoudp_label;
> > > - uint8_t label[3];
> > > + uint8_t label[4];
> > > } id = {
> > > - .mplsoudp_label =
> > > - rte_cpu_to_be_32(res->label) &
> > RTE_BE32(0x00ffffff),
> > > + .mplsoudp_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->mplsoudp, "mplsoudp_encap") == 0) @@ -15820,7
> > > +15819,7 @@ static void cmd_set_mplsoudp_encap_parsed(void
> > > *parsed_result,
> > > mplsoudp_encap_conf.select_ipv4 = 0;
> > > else
> > > return;
> > > - rte_memcpy(mplsoudp_encap_conf.label, &id.label[1], 3);
> > > + rte_memcpy(mplsoudp_encap_conf.label, &id.label, 3);
> > > mplsoudp_encap_conf.udp_src = rte_cpu_to_be_16(res->udp_src);
> > > mplsoudp_encap_conf.udp_dst = rte_cpu_to_be_16(res->udp_dst);
> > > if (mplsoudp_encap_conf.select_ipv4) {
> > > --
> > > 1.8.3.1
> >
> > Best,
> > Ori
Acked-by: Ori Kam <orika@mellanox.com>
Thanks,
Ori
On 12/6/2018 9:38 AM, Ori Kam wrote:
<...>
>>>> Subject: [dpdk-dev] [PATCH v2] app/testpmd: fix MPLSoUDP encapsulation
>>>>
>>>> In function cmd_set_mplsoudp_encap_parsed(), MPLS label value was set
>>>> in mplsoudp_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
>>>> mplsoudp_encap_conf struct, so it is correctly copied to
>>>> rte_flow_item_mpls struct.
>>>>
>>>> Fixes: a1191d39cb57 ("app/testpmd: add MPLSoUDP 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.
@@ -15804,10 +15804,9 @@ static void cmd_set_mplsoudp_encap_parsed(void *parsed_result,
struct cmd_set_mplsoudp_encap_result *res = parsed_result;
union {
uint32_t mplsoudp_label;
- uint8_t label[3];
+ uint8_t label[4];
} id = {
- .mplsoudp_label =
- rte_cpu_to_be_32(res->label) & RTE_BE32(0x00ffffff),
+ .mplsoudp_label = rte_cpu_to_be_32(res->label<<12),
};
if (strcmp(res->mplsoudp, "mplsoudp_encap") == 0)
@@ -15820,7 +15819,7 @@ static void cmd_set_mplsoudp_encap_parsed(void *parsed_result,
mplsoudp_encap_conf.select_ipv4 = 0;
else
return;
- rte_memcpy(mplsoudp_encap_conf.label, &id.label[1], 3);
+ rte_memcpy(mplsoudp_encap_conf.label, &id.label, 3);
mplsoudp_encap_conf.udp_src = rte_cpu_to_be_16(res->udp_src);
mplsoudp_encap_conf.udp_dst = rte_cpu_to_be_16(res->udp_dst);
if (mplsoudp_encap_conf.select_ipv4) {