From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 7D202108A for ; Mon, 6 Mar 2017 03:39:16 +0100 (CET) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Mar 2017 18:39:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,251,1484035200"; d="scan'208";a="1118827770" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga001.fm.intel.com with ESMTP; 05 Mar 2017 18:39:14 -0800 Received: from fmsmsx112.amr.corp.intel.com (10.18.116.6) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.248.2; Sun, 5 Mar 2017 18:39:14 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX112.amr.corp.intel.com (10.18.116.6) with Microsoft SMTP Server (TLS) id 14.3.248.2; Sun, 5 Mar 2017 18:39:14 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.177]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.204]) with mapi id 14.03.0248.002; Mon, 6 Mar 2017 10:39:10 +0800 From: "Xing, Beilei" To: Adrien Mazarguil CC: "Wu, Jingjing" , "Zhang, Helin" , "dev@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH 1/3] app/testpmd: support MPLS for generic filter Thread-Index: AQHSlAL3rFSffo7ehEukSkAYsn6qraGCbxsAgAStvjA= Date: Mon, 6 Mar 2017 02:39:09 +0000 Message-ID: <94479800C636CB44BD422CB454846E01315A53DA@SHSMSX101.ccr.corp.intel.com> References: <1488534236-29904-1-git-send-email-beilei.xing@intel.com> <1488534236-29904-2-git-send-email-beilei.xing@intel.com> <20170303110926.GY3790@6wind.com> In-Reply-To: <20170303110926.GY3790@6wind.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH 1/3] app/testpmd: support MPLS for generic filter X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Mar 2017 02:39:17 -0000 Hi Adrien, > -----Original Message----- > From: Adrien Mazarguil [mailto:adrien.mazarguil@6wind.com] > Sent: Friday, March 3, 2017 7:09 PM > To: Xing, Beilei > Cc: Wu, Jingjing ; Zhang, Helin > ; dev@dpdk.org > Subject: Re: [dpdk-dev] [PATCH 1/3] app/testpmd: support MPLS for generic > filter >=20 > Hi Beilei, >=20 > 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. Thanks for the comments. I will change the title in the next version. >=20 > 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 > > --- > > 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[] =3D { > > ITEM_TCP, > > ITEM_SCTP, > > ITEM_VXLAN, > > + ITEM_MPLS, > > + ITEM_GRE, > > ZERO, > > }; > > > > @@ -538,6 +545,19 @@ static const enum index item_vxlan[] =3D { > > ZERO, > > }; > > > > +static const enum index item_mpls[] =3D { > > + ITEM_MPLS_LABEL, > > + ITEM_NEXT, > > + ZERO, > > +}; > > + > > +static const enum index item_gre[] =3D { > > + ITEM_GRE_FLAGS, > > + ITEM_GRE_PROTO, > > + ITEM_NEXT, > > + ZERO, > > +}; > > + > > static const enum index next_action[] =3D { > > ACTION_END, > > ACTION_VOID, > > @@ -1279,6 +1299,41 @@ static const struct token token_list[] =3D { > > .next =3D NEXT(item_vxlan, NEXT_ENTRY(UNSIGNED), > item_param), > > .args =3D ARGS(ARGS_ENTRY_HTON(struct > rte_flow_item_vxlan, vni)), > > }, > > + [ITEM_MPLS] =3D { > > + .name =3D "mpls", > > + .help =3D "match MPLS header", > > + .priv =3D PRIV_ITEM(MPLS, sizeof(struct rte_flow_item_mpls)), > > + .next =3D NEXT(item_mpls), > > + .call =3D parse_vc, > > + }, > > + [ITEM_MPLS_LABEL] =3D { > > + .name =3D "label", > > + .help =3D "MPLS label", > > + .next =3D NEXT(item_mpls, NEXT_ENTRY(UNSIGNED), > item_param), > > + .args =3D ARGS(ARGS_ENTRY_HTON(struct > rte_flow_item_mpls, > > + label_tc_s_ttl)), > > + }, > > + [ITEM_GRE] =3D { > > + .name =3D "gre", > > + .help =3D "match GRE header", > > + .priv =3D PRIV_ITEM(GRE, sizeof(struct rte_flow_item_gre)), > > + .next =3D NEXT(item_gre), > > + .call =3D parse_vc, > > + }, > > + [ITEM_GRE_FLAGS] =3D { > > + .name =3D "c_rsvd0_ver", > > + .help =3D "GRE c_rsvd0_ver", > > + .next =3D NEXT(item_gre, NEXT_ENTRY(UNSIGNED), > item_param), > > + .args =3D ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gre, > > + c_rsvd0_ver)), > > + }, > > + [ITEM_GRE_PROTO] =3D { > > + .name =3D "protocol", > > + .help =3D "GRE protocol type", > > + .next =3D NEXT(item_gre, NEXT_ENTRY(UNSIGNED), > item_param), > > + .args =3D ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gre, > > + protocol)), > > + }, >=20 > Testpmd documentation must be updated accordingly, see: >=20 > doc/guides/testpmd_app_ug/testpmd_funcs.rst >=20 > > /* Validate/create actions. */ > > [ACTIONS] =3D { > > .name =3D "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, > > }; >=20 > API documentation must be updated accordingly, see: >=20 > doc/guides/prog_guide/rte_flow.rst >=20 > Same comments about RTE_FLOW_ITEM_TYPE_NVGRE added by another > series. You should mention there's a dependency between them. >=20 > > > > /** > > @@ -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; > > + }; >=20 > Wrong indentation. >=20 > > + > > +/** > > + * 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 > > >=20 > This patch looks otherwise good. >=20 > -- > Adrien Mazarguil > 6WIND