Hi Sean,
> -----Original Message-----
> From: Sean Zhang (Networking SW) <xiazh...@nvidia.com>
> Sent: Wednesday, January 26, 2022 10:44 AM
> Subject: [v1 3/4] app/testpmd: add gre_option item command
>
> Add gre_option command for matching optional fields(checksum/key/sequence)
> in GRE header. The item must follow gre item, and the item does not
> change the flags in gre item, the application should set the flags in
> gre item correspondingly.
> Application can still use gre_key item 'gre_key value is xx' for key
> matching, the effect is the same with using 'gre_option key is xx'.
>
> The examples for gre_option are as follows:
>
> To match on checksum field with value 0x11:
> testpmd> ... pattern / eth / gre c_bit is 1 / gre_option checksum is
> 0x11 / end ..
>
> To match on checksum field with value 0x11 and any value of key:
> testpmd> ... pattern / eth / gre c_bit is 1 k_bit is 1 / gre_option
> checksum is 0x11 / end ..
>
> To match on checksum field with value 0x11 and no key field in packet:
> testpmd> ... pattern / eth / gre c_bit is 1 k_bit is 0 / gre_option
> checksum is 0x11 / end ..
>
> The invalid patterns for gre_option are as follows:
>
> testpmd> ... pattern / eth / gre / gre_option checksum is 0x11 / end ..
> (c_bit in gre item not present)
> testpmd> ... pattern / eth / gre c_bit is 0 / gre_option checksum is 0x11 /
> end .. (c_bit is unset for gre item, but checksum is
> specified by gre_option item)
>
> Signed-off-by: Sean Zhang <xiazh...@nvidia.com>
> ---
> app/test-pmd/cmdline_flow.c | 59
> +++++++++++++++++++++++++++++
> doc/guides/testpmd_app_ug/testpmd_funcs.rst | 6 +++
> 2 files changed, 65 insertions(+)
>
> diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
> index 5c2bba4..b7aacac 100644
> --- a/app/test-pmd/cmdline_flow.c
> +++ b/app/test-pmd/cmdline_flow.c
> @@ -271,6 +271,10 @@ enum index {
> ITEM_META_DATA,
> ITEM_GRE_KEY,
> ITEM_GRE_KEY_VALUE,
> + ITEM_GRE_OPTION,
> + ITEM_GRE_OPTION_CHECKSUM,
> + ITEM_GRE_OPTION_KEY,
> + ITEM_GRE_OPTION_SEQUENCE,
> ITEM_GTP_PSC,
> ITEM_GTP_PSC_QFI,
> ITEM_GTP_PSC_PDU_T,
> @@ -1042,6 +1046,7 @@ struct parse_action_priv {
> ITEM_ICMP6_ND_OPT_TLA_ETH,
> ITEM_META,
> ITEM_GRE_KEY,
> + ITEM_GRE_OPTION,
> ITEM_GTP_PSC,
> ITEM_PPPOES,
> ITEM_PPPOED,
> @@ -1232,6 +1237,14 @@ struct parse_action_priv {
> ZERO,
> };
>
> +static const enum index item_gre_option[] = {
> + ITEM_GRE_OPTION_CHECKSUM,
> + ITEM_GRE_OPTION_KEY,
> + ITEM_GRE_OPTION_SEQUENCE,
> + ITEM_NEXT,
> + ZERO,
> +};
> +
> static const enum index item_gtp[] = {
> ITEM_GTP_FLAGS,
> ITEM_GTP_MSG_TYPE,
> @@ -3479,6 +3492,38 @@ static int comp_set_modify_field_id(struct context *,
> const struct token *,
> item_param),
> .args = ARGS(ARG_ENTRY_HTON(rte_be32_t)),
> },
> + [ITEM_GRE_OPTION] = {
> + .name = "gre_option",
> + .help = "match GRE optional fields",
> + .priv = PRIV_ITEM(GRE_OPTION,
> + sizeof(struct rte_flow_item_gre_opt)),
> + .next = NEXT(item_gre_option),
> + .call = parse_vc,
> + },
> + [ITEM_GRE_OPTION_CHECKSUM] = {
> + .name = "checksum",
> + .help = "match GRE checksum",
> + .next = NEXT(item_gre_option, NEXT_ENTRY(COMMON_UNSIGNED),
> + item_param),
> + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gre_opt,
> + checksum)),
> + },
> + [ITEM_GRE_OPTION_KEY] = {
> + .name = "key",
> + .help = "match GRE key",
> + .next = NEXT(item_gre_option, NEXT_ENTRY(COMMON_UNSIGNED),
> + item_param),
> + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gre_opt,
> + key)),
> + },
> + [ITEM_GRE_OPTION_SEQUENCE] = {
> + .name = "sequence",
> + .help = "match GRE sequence",
> + .next = NEXT(item_gre_option, NEXT_ENTRY(COMMON_UNSIGNED),
> + item_param),
> + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gre_opt,
> + sequence)),
> + },
> [ITEM_GTP_PSC] = {
> .name = "gtp_psc",
> .help = "match GTP extension header with type 0x85",
> @@ -9235,6 +9280,20 @@ static int comp_set_modify_field_id(struct context *,
> const struct token *,
> ((const struct rte_flow_item_flex *)
> item->spec)->length : 0;
> break;
> + case RTE_FLOW_ITEM_TYPE_GRE_OPTION:
> + size = 0;
> + if (item->spec) {
> + const struct rte_flow_item_gre_opt
> + *opt = item->spec;
> + if (opt->checksum.checksum)
> + size += 4;
> + if (opt->key.key)
> + size += 4;
> + if (opt->sequence.sequence)
> + size += 4;
> + }
> + proto = 0x2F;
> + break;
> default:
> fprintf(stderr, "Error - Not supported item\n");
> goto error;
> diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> index 94792d8..751503e 100644
> --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> @@ -3714,6 +3714,12 @@ This section lists supported pattern items and their
> attributes, if any.
>
> - ``value {unsigned}``: key value.
>
> +- ``gre_option``: match GRE optional fields(checksum/key/sequence).
> +
> + - ``checksum {unsigned}``: checksum value.
> + - ``key {unsigned}``: key value.
> + - ``sequence {unsigned}``: sequence number value.
> +
> - ``fuzzy``: fuzzy pattern match, expect faster than default.
>
> - ``thresh {unsigned}``: accuracy threshold.
> --
> 1.8.3.1
Acked-by: Ori Kam <or...@nvidia.com>
Best,
Ori
