[v3,1/3] ethdev: add NSH key field to flow API
Checks
Commit Message
From: Kiran Kumar K <kirankumark@marvell.com>
Add new rte_flow_item_nsh in order to match the network service header
based on RFC 8300.
Signed-off-by: Kiran Kumar K <kirankumark@marvell.com>
---
V3 changes:
* Fixed checkpatch issue
V2 changes:
* updated supported items in doc
doc/guides/prog_guide/rte_flow.rst | 18 ++++++++++++++
lib/librte_ethdev/rte_flow.c | 1 +
lib/librte_ethdev/rte_flow.h | 39 ++++++++++++++++++++++++++++++
3 files changed, 58 insertions(+)
--
2.17.1
Comments
On 7/25/2019 10:03 AM, kirankumark@marvell.com wrote:
> From: Kiran Kumar K <kirankumark@marvell.com>
>
> Add new rte_flow_item_nsh in order to match the network service header
> based on RFC 8300.
>
> Signed-off-by: Kiran Kumar K <kirankumark@marvell.com>
Hi Adrien, Ori,
Any concern/objection on the patchset [1], if not will be merged in next a few days.
Thanks,
ferruh
[1]
https://patches.dpdk.org/user/todo/dpdk/?series=5739
ethdev: add NSH key field to flow API
ethdev: add IGMP key field to flow API
ethdev: add AH key field to flow API
On 9/30/2019 4:45 PM, Yigit, Ferruh wrote:
> On 7/25/2019 10:03 AM, kirankumark@marvell.com wrote:
>> From: Kiran Kumar K <kirankumark@marvell.com>
>>
>> Add new rte_flow_item_nsh in order to match the network service header
>> based on RFC 8300.
>>
>> Signed-off-by: Kiran Kumar K <kirankumark@marvell.com>
>
> Hi Adrien, Ori,
>
> Any concern/objection on the patchset [1], if not will be merged in next a few days.
>
> Thanks,
> ferruh
>
> [1]
> https://patches.dpdk.org/user/todo/dpdk/?series=5739
> ethdev: add NSH key field to flow API
> ethdev: add IGMP key field to flow API
> ethdev: add AH key field to flow API
>
For series,
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
Series applied to dpdk-next-net/master, thanks.
@@ -1219,6 +1219,24 @@ Matches an application specific 32 bit metadata item.
| ``mask`` | ``data`` | bit-mask applies to "spec" and "last" |
+----------+----------+---------------------------------------+
+Item: ``NSH``
+^^^^^^^^^^^^^^^^^^^
+
+Matches a network service header (RFC 8300).
+
+- ``version``: normally 0x0 (2 bits).
+- ``oam_pkt``: indicate oam packet (1 bit).
+- ``reserved``: reserved bit (1 bit).
+- ``ttl``: maximum SFF hopes (6 bits).
+- ``length``: total length in 4 bytes words (6 bits).
+- ``reserved1``: reserved1 bits (4 bits).
+- ``mdtype``: ndicates format of NSH header (4 bits).
+- ``next_proto``: indicates protocol type of encap data (8 bits).
+- ``spi``: service path identifier (3 bytes).
+- ``sindex``: service index (1 byte).
+- Default ``mask`` matches mdtype, next_proto, spi, sindex.
+
+
Actions
~~~~~~~
@@ -75,6 +75,7 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = {
MK_FLOW_ITEM(MARK, sizeof(struct rte_flow_item_mark)),
MK_FLOW_ITEM(META, sizeof(struct rte_flow_item_meta)),
MK_FLOW_ITEM(GRE_KEY, sizeof(rte_be32_t)),
+ MK_FLOW_ITEM(NSH, sizeof(struct rte_flow_item_nsh)),
};
/** Generate flow_action[] entry. */
@@ -434,6 +434,13 @@ enum rte_flow_item_type {
* @code rte_be32_t * @endcode
*/
RTE_FLOW_ITEM_TYPE_GRE_KEY,
+
+ /**
+ * Matches Network service header (NSH).
+ * See struct rte_flow_item_nsh.
+ *
+ */
+ RTE_FLOW_ITEM_TYPE_NSH,
};
/**
@@ -1214,6 +1221,38 @@ struct rte_flow_item_mark {
uint32_t id; /**< Integer value to match against. */
};
+/**
+ * @warning
+ * @b EXPERIMENTAL: this structure may change without prior notice
+ *
+ * RTE_FLOW_ITEM_TYPE_NSH
+ *
+ * Match network service header (NSH), RFC 8300
+ *
+ */
+struct rte_flow_item_nsh {
+ uint32_t version:2;
+ uint32_t oam_pkt:1;
+ uint32_t reserved:1;
+ uint32_t ttl:6;
+ uint32_t length:6;
+ uint32_t reserved1:4;
+ uint32_t mdtype:4;
+ uint32_t next_proto:8;
+ uint32_t spi:24;
+ uint32_t sindex:8;
+};
+
+/** Default mask for RTE_FLOW_ITEM_TYPE_NSH. */
+#ifndef __cplusplus
+static const struct rte_flow_item_nsh rte_flow_item_nsh_mask = {
+ .mdtype = 0xf,
+ .next_proto = 0xff,
+ .spi = 0xffffff,
+ .sindex = 0xff,
+};
+#endif
+
/**
* Matching pattern item definition.
*