From: Adrien Mazarguil <adrien.mazarguil@6wind.com>
To: Beilei Xing <beilei.xing@intel.com>
Cc: jingjing.wu@intel.com, helin.zhang@intel.com, dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH 1/3] app/testpmd: support MPLS for generic filter
Date: Fri, 3 Mar 2017 12:09:26 +0100 [thread overview]
Message-ID: <20170303110926.GY3790@6wind.com> (raw)
In-Reply-To: <1488534236-29904-2-git-send-email-beilei.xing@intel.com>
Hi Beilei,
I think the commit title should reflect that this commit adds support for
GRE and MPLS items to rte_flow, testpmd changes are only a consequence.
On Fri, Mar 03, 2017 at 05:43:54PM +0800, Beilei Xing wrote:
> This patch adds MPLS support for generic filter
> API.
>
> Signed-off-by: Beilei Xing <beilei.xing@intel.com>
> ---
> app/test-pmd/cmdline_flow.c | 55 +++++++++++++++++++++++++++++++++++++++++++++
> app/test-pmd/config.c | 2 ++
> lib/librte_ether/rte_flow.h | 40 +++++++++++++++++++++++++++++++++
> 3 files changed, 97 insertions(+)
>
> diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
> index ff98690..241bda1 100644
> --- a/app/test-pmd/cmdline_flow.c
> +++ b/app/test-pmd/cmdline_flow.c
> @@ -159,6 +159,11 @@ enum index {
> ITEM_SCTP_CKSUM,
> ITEM_VXLAN,
> ITEM_VXLAN_VNI,
> + ITEM_MPLS,
> + ITEM_MPLS_LABEL,
> + ITEM_GRE,
> + ITEM_GRE_FLAGS,
> + ITEM_GRE_PROTO,
>
> /* Validate/create actions. */
> ACTIONS,
> @@ -432,6 +437,8 @@ static const enum index next_item[] = {
> ITEM_TCP,
> ITEM_SCTP,
> ITEM_VXLAN,
> + ITEM_MPLS,
> + ITEM_GRE,
> ZERO,
> };
>
> @@ -538,6 +545,19 @@ static const enum index item_vxlan[] = {
> ZERO,
> };
>
> +static const enum index item_mpls[] = {
> + ITEM_MPLS_LABEL,
> + ITEM_NEXT,
> + ZERO,
> +};
> +
> +static const enum index item_gre[] = {
> + ITEM_GRE_FLAGS,
> + ITEM_GRE_PROTO,
> + ITEM_NEXT,
> + ZERO,
> +};
> +
> static const enum index next_action[] = {
> ACTION_END,
> ACTION_VOID,
> @@ -1279,6 +1299,41 @@ static const struct token token_list[] = {
> .next = NEXT(item_vxlan, NEXT_ENTRY(UNSIGNED), item_param),
> .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vxlan, vni)),
> },
> + [ITEM_MPLS] = {
> + .name = "mpls",
> + .help = "match MPLS header",
> + .priv = PRIV_ITEM(MPLS, sizeof(struct rte_flow_item_mpls)),
> + .next = NEXT(item_mpls),
> + .call = parse_vc,
> + },
> + [ITEM_MPLS_LABEL] = {
> + .name = "label",
> + .help = "MPLS label",
> + .next = NEXT(item_mpls, NEXT_ENTRY(UNSIGNED), item_param),
> + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_mpls,
> + label_tc_s_ttl)),
> + },
> + [ITEM_GRE] = {
> + .name = "gre",
> + .help = "match GRE header",
> + .priv = PRIV_ITEM(GRE, sizeof(struct rte_flow_item_gre)),
> + .next = NEXT(item_gre),
> + .call = parse_vc,
> + },
> + [ITEM_GRE_FLAGS] = {
> + .name = "c_rsvd0_ver",
> + .help = "GRE c_rsvd0_ver",
> + .next = NEXT(item_gre, NEXT_ENTRY(UNSIGNED), item_param),
> + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gre,
> + c_rsvd0_ver)),
> + },
> + [ITEM_GRE_PROTO] = {
> + .name = "protocol",
> + .help = "GRE protocol type",
> + .next = NEXT(item_gre, NEXT_ENTRY(UNSIGNED), item_param),
> + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gre,
> + protocol)),
> + },
Testpmd documentation must be updated accordingly, see:
doc/guides/testpmd_app_ug/testpmd_funcs.rst
> /* Validate/create actions. */
> [ACTIONS] = {
> .name = "actions",
> diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
> index 80491fc..c042765 100644
> --- a/app/test-pmd/config.c
> +++ b/app/test-pmd/config.c
> @@ -963,6 +963,8 @@ static const struct {
> MK_FLOW_ITEM(TCP, sizeof(struct rte_flow_item_tcp)),
> MK_FLOW_ITEM(SCTP, sizeof(struct rte_flow_item_sctp)),
> MK_FLOW_ITEM(VXLAN, sizeof(struct rte_flow_item_vxlan)),
> + MK_FLOW_ITEM(MPLS, sizeof(struct rte_flow_item_mpls)),
> + MK_FLOW_ITEM(GRE, sizeof(struct rte_flow_item_gre)),
> };
>
> /** Compute storage space needed by item specification. */
> diff --git a/lib/librte_ether/rte_flow.h b/lib/librte_ether/rte_flow.h
> index 171a569..c845953 100644
> --- a/lib/librte_ether/rte_flow.h
> +++ b/lib/librte_ether/rte_flow.h
> @@ -282,6 +282,20 @@ enum rte_flow_item_type {
> * See struct rte_flow_item_nvgre.
> */
> RTE_FLOW_ITEM_TYPE_NVGRE,
> +
> + /**
> + * Matches a MPLS header.
> + *
> + * See struct rte_flow_item_mpls.
> + */
> + RTE_FLOW_ITEM_TYPE_MPLS,
> +
> + /**
> + * Matches a GRE header.
> + *
> + * See struct rte_flow_item_gre.
> + */
> + RTE_FLOW_ITEM_TYPE_GRE,
> };
API documentation must be updated accordingly, see:
doc/guides/prog_guide/rte_flow.rst
Same comments about RTE_FLOW_ITEM_TYPE_NVGRE added by another series. You
should mention there's a dependency between them.
>
> /**
> @@ -599,6 +613,32 @@ struct rte_flow_item_nvgre {
> };
>
> /**
> + * RTE_FLOW_ITEM_TYPE_MPLS.
> + *
> + * Matches a MPLS header.
> + */
> + struct rte_flow_item_mpls {
> + /**
> + * Lable (20b), TC (3b), Bottom of Stack (1b), TTL (8b).
> + */
> + uint32_t label_tc_s_ttl;
> + };
Wrong indentation.
> +
> +/**
> + * RTE_FLOW_ITEM_TYPE_GRE.
> + *
> + * Matches a GRE header.
> + */
> +struct rte_flow_item_gre {
> + /**
> + * Checksum (1b), reserved 0 (12b), version (3b).
> + * Refer to RFC 2784.
> + */
> + uint16_t c_rsvd0_ver;
> + uint16_t protocol; /**< Protocol type. */
> +};
> +
> +/**
> * Matching pattern item definition.
> *
> * A pattern is formed by stacking items starting from the lowest protocol
> --
> 2.5.5
>
This patch looks otherwise good.
--
Adrien Mazarguil
6WIND
next prev parent reply other threads:[~2017-03-03 11:09 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-03 9:43 [dpdk-dev] [PATCH 0/3] enable MPLS cloud filter Beilei Xing
2017-03-03 9:43 ` [dpdk-dev] [PATCH 1/3] app/testpmd: support MPLS for generic filter Beilei Xing
2017-03-03 11:09 ` Adrien Mazarguil [this message]
2017-03-06 2:39 ` Xing, Beilei
2017-03-03 9:43 ` [dpdk-dev] [PATCH 2/3] net/i40e: add MPLS parsing function Beilei Xing
2017-03-03 9:43 ` [dpdk-dev] [PATCH 3/3] net/i40e: enable cloud filter for MPLS Beilei Xing
2017-03-08 16:05 ` Ferruh Yigit
2017-03-09 3:57 ` Xing, Beilei
2017-03-09 11:13 ` Iremonger, Bernard
2017-03-09 11:39 ` Xing, Beilei
2017-03-09 11:53 ` Iremonger, Bernard
2017-03-09 12:06 ` Xing, Beilei
2017-03-09 13:48 ` Iremonger, Bernard
2017-03-23 10:57 ` [dpdk-dev] [PATCH v2 0/3] add support for MPLS tunnel filter Beilei Xing
2017-03-23 10:57 ` [dpdk-dev] [PATCH v2 1/3] app/testpmd: add support for MPLS and GRE items Beilei Xing
2017-03-23 19:39 ` Adrien Mazarguil
2017-03-24 2:17 ` Xing, Beilei
2017-03-24 10:00 ` Adrien Mazarguil
2017-03-23 10:57 ` [dpdk-dev] [PATCH v2 2/3] net/i40e: add MPLS parsing function Beilei Xing
2017-03-23 10:57 ` [dpdk-dev] [PATCH v2 3/3] net/i40e: enable tunnel filter for MPLS Beilei Xing
2017-03-28 6:40 ` [dpdk-dev] [PATCH v3 0/4] add support for MPLS tunnel filter Beilei Xing
2017-03-28 6:40 ` [dpdk-dev] [PATCH v3 1/4] ethdev: add MPLS and GRE items Beilei Xing
2017-03-28 12:28 ` Adrien Mazarguil
2017-03-28 6:40 ` [dpdk-dev] [PATCH v3 2/4] app/testpmd: add MPLS and GRE fields to flow command Beilei Xing
2017-03-28 12:29 ` Adrien Mazarguil
2017-03-28 6:40 ` [dpdk-dev] [PATCH v3 3/4] net/i40e: add MPLS parsing function Beilei Xing
2017-03-28 6:40 ` [dpdk-dev] [PATCH v3 4/4] net/i40e: enable tunnel filter for MPLS Beilei Xing
2017-03-30 4:07 ` [dpdk-dev] [PATCH v4 0/4] add support for MPLS tunnel filter Beilei Xing
2017-03-30 4:07 ` [dpdk-dev] [PATCH v4 1/4] ethdev: add MPLS and GRE items Beilei Xing
2017-03-30 4:07 ` [dpdk-dev] [PATCH v4 2/4] app/testpmd: add MPLS and GRE fields to flow command Beilei Xing
2017-03-30 4:07 ` [dpdk-dev] [PATCH v4 3/4] net/i40e: add MPLS parsing function Beilei Xing
2017-03-30 6:04 ` Wu, Jingjing
2017-03-30 6:35 ` Xing, Beilei
2017-03-30 4:07 ` [dpdk-dev] [PATCH v4 4/4] net/i40e: enable tunnel filter for MPLS Beilei Xing
2017-03-30 6:16 ` Wu, Jingjing
2017-03-30 6:20 ` Xing, Beilei
2017-03-30 6:56 ` [dpdk-dev] [PATCH v5 0/4] add support for MPLS tunnel filter Beilei Xing
2017-03-30 6:56 ` [dpdk-dev] [PATCH v5 1/4] ethdev: add MPLS and GRE items Beilei Xing
2017-03-30 6:56 ` [dpdk-dev] [PATCH v5 2/4] app/testpmd: add MPLS and GRE fields to flow command Beilei Xing
2017-03-30 6:56 ` [dpdk-dev] [PATCH v5 3/4] net/i40e: add MPLS parsing function Beilei Xing
2017-03-30 8:22 ` Wu, Jingjing
2017-03-30 6:56 ` [dpdk-dev] [PATCH v5 4/4] net/i40e: enable tunnel filter for MPLS Beilei Xing
2017-03-30 8:22 ` Wu, Jingjing
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=20170303110926.GY3790@6wind.com \
--to=adrien.mazarguil@6wind.com \
--cc=beilei.xing@intel.com \
--cc=dev@dpdk.org \
--cc=helin.zhang@intel.com \
--cc=jingjing.wu@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).