From: Ori Kam <orika@mellanox.com>
To: Dekel Peled <dekelp@mellanox.com>,
"wenzhuo.lu@intel.com" <wenzhuo.lu@intel.com>,
"jingjing.wu@intel.com" <jingjing.wu@intel.com>,
"bernard.iremonger@intel.com" <bernard.iremonger@intel.com>
Cc: "dev@dpdk.org" <dev@dpdk.org>,
Shahaf Shuler <shahafs@mellanox.com>,
Dekel Peled <dekelp@mellanox.com>
Subject: Re: [dpdk-dev] [PATCH] app/testpmd: fix MPLSoGRE encapsulation
Date: Tue, 4 Dec 2018 21:23:29 +0000 [thread overview]
Message-ID: <HE1PR05MB343582A5EDB8D6025472D635DBAF0@HE1PR05MB3435.eurprd05.prod.outlook.com> (raw)
In-Reply-To: <1543931522-58709-1-git-send-email-dekelp@mellanox.com>
> -----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
next prev parent reply other threads:[~2018-12-04 21:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-04 13:52 Dekel Peled
2018-12-04 21:23 ` Ori Kam [this message]
2018-12-06 8:18 ` Dekel Peled
2018-12-06 9:38 ` Ori Kam
2018-12-11 17:29 ` Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=HE1PR05MB343582A5EDB8D6025472D635DBAF0@HE1PR05MB3435.eurprd05.prod.outlook.com \
--to=orika@mellanox.com \
--cc=bernard.iremonger@intel.com \
--cc=dekelp@mellanox.com \
--cc=dev@dpdk.org \
--cc=jingjing.wu@intel.com \
--cc=shahafs@mellanox.com \
--cc=wenzhuo.lu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).