[dpdk-dev] [PATCH v4] ethdev: add HIGIG2 key field to flow API

[Andrew Rybchenko]

On 10/17/19 7:15 AM, kirankumark at marvell.com wrote:
> From: Kiran Kumar K <kirankumark at marvell.com>
>
> Add new rte_flow_item_higig2_hdr in order to match higig2 header.
> It is a layer 2.5 protocol and used in broadcom switches.

broadcom -> Broadcom

> Header format is based on the following document.
> http://read.pudn.com/downloads558/doc/comm/2301468/HiGig_protocol.pdf
>
> Signed-off-by: Kiran Kumar K <kirankumark at marvell.com>
> ---
> V4 Changes:
> * Removed packed attribute
>
> V3 Changes:
> * Fixed Copyright header
> * Fixed version info in the subject
>
> V2 Changes:
> * Added support in testpmd to parse the higig2 item
> * Moved the higig2 header to new file
> * Added indentation in doc
>
>   app/test-pmd/cmdline_flow.c        |  33 +++++++
>   doc/guides/prog_guide/rte_flow.rst |   8 ++
>   lib/librte_ethdev/rte_flow.c       |   1 +
>   lib/librte_ethdev/rte_flow.h       |   7 ++
>   lib/librte_net/Makefile            |   2 +-
>   lib/librte_net/rte_higig.h         | 138 +++++++++++++++++++++++++++++

meson.build should be updated as well

[snip]

> diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst
> index 1c837ff13..a47266c67 100644
> --- a/doc/guides/prog_guide/rte_flow.rst
> +++ b/doc/guides/prog_guide/rte_flow.rst
> @@ -1289,6 +1289,14 @@ Matches a IP Authentication Header (RFC 4302).
>   - ``seq_num``: counter value increased by 1 on each packet sent.
>   - Default ``mask`` matches spi.
>
> +Item: ``HIGIG2``
> +^^^^^^^^^^^^^^^^^
> +
> +Matches a HIGIG2 header field. It is layer 2.5 protocol and used in
> +broadcom switches.

broadcom -> Broadcom

[snip]

> diff --git a/lib/librte_net/rte_higig.h b/lib/librte_net/rte_higig.h
> new file mode 100644
> index 000000000..220cee827
> --- /dev/null
> +++ b/lib/librte_net/rte_higig.h
> @@ -0,0 +1,138 @@
> +
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(C) 2019 Marvell International Ltd.
> + */
> +
> +#ifndef _RTE_HIGIG2_H_
> +#define _RTE_HIGIG2_H_

It is inconsistent vs header name. Should be _RTE_HIGIG_H_.

> +
> +#include <stdint.h>
> +#include <rte_byteorder.h>
> +
> +#ifdef __cplusplus
> +extern "C" {
> +#endif
> +
> +/**
> + * RTE_FLOW_ITEM_TYPE_HIGIG2
> + * Matches higig2 header.
> + */
> +struct rte_higig2_frc {
> +#if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN
> +	uint32_t ksop:8;
> +	uint32_t tc:4;
> +	uint32_t mcst:1;
> +	uint32_t resv:3;
> +	uint32_t dst_modid:8;
> +	uint32_t dst_pid:8;
> +	uint32_t src_modid:8;
> +	uint32_t src_pid:8;
> +	uint32_t lbid:8;
> +	uint32_t ppd_type:3;
> +	uint32_t resv1:3;
> +	uint32_t dp:2;
> +#elif RTE_BYTE_ORDER == RTE_BIG_ENDIAN
> +	uint32_t ksop:8;
> +	uint32_t resv:3;
> +	uint32_t mcst:1;
> +	uint32_t tc:4;
> +	uint32_t dst_modid:8;
> +	uint32_t dst_pid:8;
> +	uint32_t src_modid:8;
> +	uint32_t src_pid:8;
> +	uint32_t lbid:8;
> +	uint32_t dp:2;
> +	uint32_t resv1:3;
> +	uint32_t ppd_type:3;
> +#endif
> +};
> +
> +struct rte_higig2_ppt_type0 {
> +#if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN
> +	uint32_t mirror:1;
> +	uint32_t mirror_done:1;
> +	uint32_t mirror_only:1;
> +	uint32_t ingress_tagged:1;
> +	uint32_t dst_tgid:3;
> +	uint32_t dst_t:1;
> +	uint32_t vc_label2:4;
> +	uint32_t label_present:1;
> +	uint32_t l3:1;
> +	uint32_t res:2;
> +	uint32_t vc_label1:8;
> +	uint32_t vc_label0:8;
> +	uint32_t vid_high:8;
> +	uint32_t vid_low:8;
> +	uint32_t opcode:3;
> +	uint32_t res1:2;
> +	uint32_t src_t:1;
> +	uint32_t pfm:2;
> +	uint32_t res2:5;
> +	uint32_t hdr_ext_len:3;
> +#elif RTE_BYTE_ORDER == RTE_BIG_ENDIAN
> +	uint32_t dst_t:1;
> +	uint32_t dst_tgid:3;
> +	uint32_t ingress_tagged:1;
> +	uint32_t mirror_only:1;
> +	uint32_t mirror_done:1;
> +	uint32_t mirror:1;
> +	uint32_t res:2;
> +	uint32_t l3:1;
> +	uint32_t label_present:1;
> +	uint32_t vc_label2:4;
> +	uint32_t vc_label1:8;
> +	uint32_t vc_label0:8;
> +	uint32_t vid_high:8;
> +	uint32_t vid_low:8;
> +	uint32_t pfm:2;
> +	uint32_t src_t:1;
> +	uint32_t res1:2;
> +	uint32_t opcode:3;
> +	uint32_t hdr_ext_len:3;
> +	uint32_t res2:5;
> +#endif
> +};
> +
> +struct rte_higig2_ppt_type1 {
> +	uint16_t classification;
> +	uint16_t resv;
> +	uint16_t vid;
> +#if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN
> +	uint16_t opcode:3;
> +	uint16_t resv1:2;
> +	uint16_t src_t:1;
> +	uint16_t pfm:2;
> +	uint16_t resv2:5;
> +	uint16_t hdr_ext_len:3;
> +#elif RTE_BYTE_ORDER == RTE_BIG_ENDIAN
> +	uint16_t pfm:2;
> +	uint16_t src_t:1;
> +	uint16_t resv1:2;
> +	uint16_t opcode:3;
> +	uint16_t hdr_ext_len:3;
> +	uint16_t resv2:5;
> +#endif
> +};
> +
> +RTE_STD_C11
> +struct rte_flow_item_higig2_hdr {
> +	struct rte_higig2_frc fcr;
> +	union {
> +		struct rte_higig2_ppt_type0 ppt0;
> +		struct rte_higig2_ppt_type1 ppt1;
> +	};
> +};
> +
> +/** Default mask for RTE_FLOW_ITEM_TYPE_HIGIG2. */
> +#ifndef __cplusplus
> +static const struct rte_flow_item_higig2_hdr rte_flow_item_higig2_hdr_mask = {
> +	.ppt1.classification = 0xffff,
> +	.ppt1.vid = 0xfff,
> +};
> +#endif
> +
> +#ifdef __cplusplus
> +}
> +#endif
> +
> +#endif /* RTE_HIGIG2_H_ */

Inconsistent as well.