On 1/16/2017 1:03 PM, Adrien Mazarguil wrote: > Hi, > > On Fri, Jan 13, 2017 at 04:13:08PM +0800, Wei Zhao wrote: >> check if the rule is a L2 tunnel rule, and get the L2 tunnel info. >> >> Signed-off-by: Wei Zhao <wei.zh...@intel.com> >> Signed-off-by: Wenzhuo Lu <wenzhuo...@intel.com> >> --- >> drivers/net/ixgbe/ixgbe_ethdev.c | 3 +- >> drivers/net/ixgbe/ixgbe_flow.c | 216 >> +++++++++++++++++++++++++++++++++++++++ >> lib/librte_ether/rte_flow.h | 48 +++++++++ >> 3 files changed, 266 insertions(+), 1 deletion(-) > [...] >> diff --git a/lib/librte_ether/rte_flow.h b/lib/librte_ether/rte_flow.h >> index 98084ac..7142479 100644 >> --- a/lib/librte_ether/rte_flow.h >> +++ b/lib/librte_ether/rte_flow.h >> @@ -268,6 +268,20 @@ enum rte_flow_item_type { >> * See struct rte_flow_item_vxlan. >> */ >> RTE_FLOW_ITEM_TYPE_VXLAN, >> + >> + /** >> + * Matches a E_TAG header. >> + * >> + * See struct rte_flow_item_e_tag. >> + */ >> + RTE_FLOW_ITEM_TYPE_E_TAG, >> + >> + /** >> + * Matches a NVGRE header. >> + * >> + * See struct rte_flow_item_nvgre. >> + */ >> + RTE_FLOW_ITEM_TYPE_NVGRE, >> }; >> >> /** >> @@ -454,6 +468,40 @@ struct rte_flow_item_vxlan { >> }; >> >> /** >> + * RTE_FLOW_ITEM_TYPE_E_TAG. >> + * >> + * Matches a E-tag header. >> + */ >> +struct rte_flow_item_e_tag { >> + uint16_t tpid; /**< Tag protocol identifier (0x893F). */ >> + /** E-Tag control information (E-TCI). */ >> + /**< E-PCP (3b), E-DEI (1b), ingress E-CID base (12b). */ >> + uint16_t epcp_edei_in_ecid_b; >> + /**< Reserved (2b), GRP (2b), E-CID base (12b). */ >> + uint16_t rsvd_grp_ecid_b; >> + uint8_t in_ecid_e; /**< Ingress E-CID ext. */ >> + uint8_t ecid_e; /**< E-CID ext. */ >> +}; >> + >> +/** >> + * RTE_FLOW_ITEM_TYPE_NVGRE. >> + * >> + * Matches a NVGRE header. >> + */ >> +struct rte_flow_item_nvgre { >> + /** >> + * Checksum (1b), undefined (1b), key bit (1b), sequence number (1b), >> + * reserved 0 (9b), version (3b). >> + * >> + * \c_k_s_rsvd0_ver must have value 0x2000 according to RFC 7637. >> + */ >> + uint16_t c_k_s_rsvd0_ver; >> + uint16_t protocol; /**< Protocol type (0x6558). */ >> + uint8_t tni[3]; /**< Virtual subnet ID. */ >> + uint8_t flow_id; /**< Flow ID. */ >> +}; >> + >> +/** >> * Matching pattern item definition. >> * >> * A pattern is formed by stacking items starting from the lowest protocol >> -- >> 2.5.5 >> > > OK for these definitions, however API documentation > (doc/guides/prog_guide/rte_flow.rst) must be kept up to date, and it would > be great if testpmd support for these new items was added simultaneously > (changes in app/test-pmd/cmdline.c, app/test-pmd/cmdline_flow.c and > doc/guides/testpmd_app_ug/testpmd_funcs.rst). > > How about putting all rte_flow changes (API & testpmd) in their own separate > patch?
I thought it can be more useful to have library and its user updated in same patch, gives more context. But missed rte_flow documentation ... > > You could use VLAN PCP/DEI/VID definitions as an example to expose partial > bit-fields (e.g. epcp_edei_in_ecid_b) in testpmd, see: > > 1419fd5a6c9f ("app/testpmd: add protocol fields to flow command") > > Now if re-spinning this series yet again is too much work, you can go ahead > with this commit as long as you do not forget to submit the rest later, > thanks. > Is following todo list complete: 1- update rte_flow document, doc/guides/prog_guide/rte_flow.rst, document two new item types: E_TAG & NVGRE. 2- Add testpmd sample implementation and documentation. Hi Wei, Would you mind working on a patch to cover above items? Thanks, ferruh