From: "Xueming(Steven) Li" <xuemingl@nvidia.com>
To: "psatheesh@marvell.com" <psatheesh@marvell.com>,
Nithin Dabilpuram <ndabilpuram@marvell.com>,
Kiran Kumar K <kirankumark@marvell.com>,
Sunil Kumar Kori <skori@marvell.com>,
Satha Rao <skoteshwar@marvell.com>
Cc: "stable@dpdk.org" <stable@dpdk.org>
Subject: RE: [PATCH 22.11] common/cnxk: fix IPv6 extension header parsing
Date: Tue, 18 Apr 2023 06:22:55 +0000 [thread overview]
Message-ID: <DM4PR12MB53734934D7743695E2D539A5A19D9@DM4PR12MB5373.namprd12.prod.outlook.com> (raw)
In-Reply-To: <20230410054625.1363658-1-psatheesh@marvell.com>
Thanks, patch applied.
> -----Original Message-----
> From: psatheesh@marvell.com <psatheesh@marvell.com>
> Sent: 4/10/2023 13:46
> To: Nithin Dabilpuram <ndabilpuram@marvell.com>; Kiran Kumar K
> <kirankumark@marvell.com>; Sunil Kumar Kori <skori@marvell.com>; Satha
> Rao <skoteshwar@marvell.com>
> Cc: stable@dpdk.org; Satheesh Paul <psatheesh@marvell.com>
> Subject: [PATCH 22.11] common/cnxk: fix IPv6 extension header parsing
>
> From: Satheesh Paul <psatheesh@marvell.com>
>
> [ upstream commit 0a6a4437631de7b41352326123b366f31cf7d0f7 ]
>
> RTE_FLOW_ITEM_TYPE_IPV6_EXT and
> RTE_FLOW_ITEM_TYPE_IPV6_FRAG_EXT pattern items can be specified
> following a RTE_FLOW_ITEM_TYPE_IPV6.
> Modified layer C parsing logic to handle this.
>
> Fixes: a800675b06f9 ("net/cnxk: support IPv6 fragment flow pattern item")
>
> Signed-off-by: Satheesh Paul <psatheesh@marvell.com>
> ---
> drivers/common/cnxk/roc_npc.h | 11 +++
> drivers/common/cnxk/roc_npc_parse.c | 143 +++++++++++++++++++++++-----
> 2 files changed, 130 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/common/cnxk/roc_npc.h
> b/drivers/common/cnxk/roc_npc.h index 1b4e5521cb..60f9c5d634 100644
> --- a/drivers/common/cnxk/roc_npc.h
> +++ b/drivers/common/cnxk/roc_npc.h
> @@ -123,6 +123,17 @@ struct roc_ipv6_hdr {
> uint8_t dst_addr[16]; /**< IP address of destination host(s). */ }
> __plt_packed;
>
> +struct roc_ipv6_fragment_ext {
> + uint8_t next_header; /**< Next header type */
> + uint8_t reserved; /**< Reserved */
> + uint16_t frag_data; /**< All fragmentation data */
> + uint32_t id; /**< Packet ID */
> +} __plt_packed;
> +
> +struct roc_flow_item_ipv6_ext {
> + uint8_t next_hdr; /**< Next header. */ };
> +
> struct roc_npc_flow_item_ipv6 {
> struct roc_ipv6_hdr hdr; /**< IPv6 header definition. */
> uint32_t has_hop_ext : 1;
> diff --git a/drivers/common/cnxk/roc_npc_parse.c
> b/drivers/common/cnxk/roc_npc_parse.c
> index 670f920117..6d834aae11 100644
> --- a/drivers/common/cnxk/roc_npc_parse.c
> +++ b/drivers/common/cnxk/roc_npc_parse.c
> @@ -662,10 +662,125 @@ npc_handle_ipv6ext_attr(const struct
> roc_npc_flow_item_ipv6 *ipv6_spec,
> return 0;
> }
>
> +static int
> +npc_process_ipv6_item(struct npc_parse_state *pst) {
> + uint8_t ipv6_hdr_mask[sizeof(struct roc_ipv6_hdr) + sizeof(struct
> roc_ipv6_fragment_ext)];
> + uint8_t ipv6_hdr_buf[sizeof(struct roc_ipv6_hdr) + sizeof(struct
> roc_ipv6_fragment_ext)];
> + const struct roc_npc_flow_item_ipv6 *ipv6_spec, *ipv6_mask;
> + const struct roc_npc_item_info *pattern = pst->pattern;
> + int offset = 0, rc = 0, lid, item_count = 0;
> + struct npc_parse_item_info parse_info;
> + char hw_mask[NPC_MAX_EXTRACT_HW_LEN];
> + uint8_t flags = 0, ltype;
> +
> + memset(ipv6_hdr_buf, 0, sizeof(ipv6_hdr_buf));
> + memset(ipv6_hdr_mask, 0, sizeof(ipv6_hdr_mask));
> +
> + ipv6_spec = pst->pattern->spec;
> + ipv6_mask = pst->pattern->mask;
> +
> + parse_info.def_mask = NULL;
> + parse_info.spec = ipv6_hdr_buf;
> + parse_info.mask = ipv6_hdr_mask;
> + parse_info.def_mask = NULL;
> + parse_info.hw_hdr_len = 0;
> + parse_info.len = sizeof(ipv6_spec->hdr);
> +
> + pst->set_ipv6ext_ltype_mask = true;
> +
> + lid = NPC_LID_LC;
> + ltype = NPC_LT_LC_IP6;
> +
> + if (pattern->type == ROC_NPC_ITEM_TYPE_IPV6) {
> + item_count++;
> + if (ipv6_spec) {
> + memcpy(ipv6_hdr_buf, &ipv6_spec->hdr,
> sizeof(struct roc_ipv6_hdr));
> + rc = npc_handle_ipv6ext_attr(ipv6_spec, pst, &flags);
> + if (rc)
> + return rc;
> + }
> + if (ipv6_mask)
> + memcpy(ipv6_hdr_mask, &ipv6_mask->hdr,
> sizeof(struct roc_ipv6_hdr));
> + }
> +
> + offset = sizeof(struct roc_ipv6_hdr);
> +
> + while (pattern->type != ROC_NPC_ITEM_TYPE_END) {
> + /* Don't support ranges */
> + if (pattern->last != NULL)
> + return NPC_ERR_INVALID_RANGE;
> +
> + /* If spec is NULL, both mask and last must be NULL, this
> + * makes it to match ANY value (eq to mask = 0).
> + * Setting either mask or last without spec is
> + * an error
> + */
> + if (pattern->spec == NULL) {
> + if (pattern->last != NULL && pattern->mask != NULL)
> + return NPC_ERR_INVALID_SPEC;
> + }
> + /* Either one ROC_NPC_ITEM_TYPE_IPV6_EXT or
> + * one ROC_NPC_ITEM_TYPE_IPV6_FRAG_EXT is supported
> + * following an ROC_NPC_ITEM_TYPE_IPV6 item.
> + */
> + if (pattern->type == ROC_NPC_ITEM_TYPE_IPV6_EXT) {
> + item_count++;
> + ltype = NPC_LT_LC_IP6_EXT;
> + parse_info.len =
> + sizeof(struct roc_ipv6_hdr) + sizeof(struct
> roc_flow_item_ipv6_ext);
> + if (pattern->spec)
> + memcpy(ipv6_hdr_buf + offset, pattern->spec,
> + sizeof(struct roc_flow_item_ipv6_ext));
> + if (pattern->mask)
> + memcpy(ipv6_hdr_mask + offset, pattern-
> >mask,
> + sizeof(struct roc_flow_item_ipv6_ext));
> + break;
> + } else if (pattern->type ==
> ROC_NPC_ITEM_TYPE_IPV6_FRAG_EXT) {
> + item_count++;
> + ltype = NPC_LT_LC_IP6_EXT;
> + flags = NPC_F_LC_U_IP6_FRAG;
> + parse_info.len =
> + sizeof(struct roc_ipv6_hdr) + sizeof(struct
> roc_ipv6_fragment_ext);
> + if (pattern->spec)
> + memcpy(ipv6_hdr_buf + offset, pattern->spec,
> + sizeof(struct roc_ipv6_fragment_ext));
> + if (pattern->mask)
> + memcpy(ipv6_hdr_mask + offset, pattern-
> >mask,
> + sizeof(struct roc_ipv6_fragment_ext));
> +
> + break;
> + }
> +
> + pattern++;
> + pattern = npc_parse_skip_void_and_any_items(pattern);
> + }
> +
> + memset(hw_mask, 0, sizeof(hw_mask));
> +
> + parse_info.hw_mask = &hw_mask;
> + npc_get_hw_supp_mask(pst, &parse_info, lid, ltype);
> +
> + rc = npc_mask_is_supported(parse_info.mask, parse_info.hw_mask,
> parse_info.len);
> + if (!rc)
> + return NPC_ERR_INVALID_MASK;
> +
> + rc = npc_update_parse_state(pst, &parse_info, lid, ltype, flags);
> + if (rc)
> + return rc;
> +
> + /* npc_update_parse_state() increments pattern once.
> + * Check if additional increment is required.
> + */
> + if (item_count == 2)
> + pst->pattern++;
> +
> + return 0;
> +}
> +
> int
> npc_parse_lc(struct npc_parse_state *pst) {
> - const struct roc_npc_flow_item_ipv6 *ipv6_spec;
> const struct roc_npc_flow_item_raw *raw_spec;
> uint8_t raw_spec_buf[NPC_MAX_RAW_ITEM_LEN];
> uint8_t raw_mask_buf[NPC_MAX_RAW_ITEM_LEN];
> @@ -690,32 +805,12 @@ npc_parse_lc(struct npc_parse_state *pst)
> info.len = pst->pattern->size;
> break;
> case ROC_NPC_ITEM_TYPE_IPV6:
> - ipv6_spec = pst->pattern->spec;
> - lid = NPC_LID_LC;
> - lt = NPC_LT_LC_IP6;
> - if (ipv6_spec) {
> - rc = npc_handle_ipv6ext_attr(ipv6_spec, pst, &flags);
> - if (rc)
> - return rc;
> - }
> - info.len = sizeof(ipv6_spec->hdr);
> - break;
> - case ROC_NPC_ITEM_TYPE_ARP_ETH_IPV4:
> - lt = NPC_LT_LC_ARP;
> - info.len = pst->pattern->size;
> - break;
> case ROC_NPC_ITEM_TYPE_IPV6_EXT:
> - lid = NPC_LID_LC;
> - lt = NPC_LT_LC_IP6_EXT;
> - info.len = pst->pattern->size;
> - info.hw_hdr_len = 40;
> - break;
> case ROC_NPC_ITEM_TYPE_IPV6_FRAG_EXT:
> - lid = NPC_LID_LC;
> - lt = NPC_LT_LC_IP6_EXT;
> - flags = NPC_F_LC_U_IP6_FRAG;
> + return npc_process_ipv6_item(pst);
> + case ROC_NPC_ITEM_TYPE_ARP_ETH_IPV4:
> + lt = NPC_LT_LC_ARP;
> info.len = pst->pattern->size;
> - info.hw_hdr_len = 40;
> break;
> case ROC_NPC_ITEM_TYPE_L3_CUSTOM:
> lt = NPC_LT_LC_CUSTOM0;
> --
> 2.39.2
prev parent reply other threads:[~2023-04-18 6:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-10 5:46 psatheesh
2023-04-18 6:22 ` Xueming(Steven) Li [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DM4PR12MB53734934D7743695E2D539A5A19D9@DM4PR12MB5373.namprd12.prod.outlook.com \
--to=xuemingl@nvidia.com \
--cc=kirankumark@marvell.com \
--cc=ndabilpuram@marvell.com \
--cc=psatheesh@marvell.com \
--cc=skori@marvell.com \
--cc=skoteshwar@marvell.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).