Thanks, PSB. > -----Original Message----- > From: Ori Kam > Sent: Tuesday, December 4, 2018 11:23 PM > To: Dekel Peled <dek...@mellanox.com>; wenzhuo...@intel.com; > jingjing...@intel.com; bernard.iremon...@intel.com > Cc: dev@dpdk.org; Shahaf Shuler <shah...@mellanox.com>; Dekel Peled > <dek...@mellanox.com> > Subject: RE: [dpdk-dev] [PATCH] app/testpmd: fix MPLSoGRE encapsulation > > > > > -----Original Message----- > > From: dev <dev-boun...@dpdk.org> On Behalf Of Dekel Peled > > Sent: Tuesday, December 4, 2018 3:52 PM > > To: wenzhuo...@intel.com; jingjing...@intel.com; > > bernard.iremon...@intel.com > > Cc: dev@dpdk.org; Ori Kam <or...@mellanox.com>; Shahaf Shuler > > <shah...@mellanox.com>; Dekel Peled <dek...@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: or...@mellanox.com > > > > Signed-off-by: Dekel Peled <dek...@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