common/cnxk: add IPv6 routing ext flow type for cnxk
PATCH 1/2 common/cnxk: add IPv6 routing ext flow type for cnxk
From: Kiran Kumar K <[email protected]>
Adding support to parse IPV6 routing ext flow type for cnxk.
--- drivers/common/cnxk/roc_npc.h | 17 +++++++++++++++++ drivers/common/cnxk/roc_npc_mcam_dump.c | 3 +++ drivers/common/cnxk/roc_npc_parse.c | 15 +++++++++++++-- 3 files changed, 33 insertions(+), 2 deletions(-)
drivers/common/cnxk/roc_npc.h +17 -0
@@ -40,6 +40,7 @@ enum roc_npc_item_type {ROC_NPC_ITEM_TYPE_RAW ,ROC_NPC_ITEM_TYPE_MARK ,ROC_NPC_ITEM_TYPE_TX_QUEUE , +ROC_NPC_ITEM_TYPE_IPV6_ROUTING_EXT , ROC_NPC_ITEM_TYPE_END, };
@@ -131,6 +132,22 @@ struct roc_ipv6_fragment_ext {uint32_t id;/**< Packet ID */ } __plt_packed; +struct roc_ipv6_routing_ext { +uint8_t next_hdr;/**< Protocol, next header. */ +uint8_t hdr_len;/**< Header length. */ +uint8_t type;/**< Extension header type. */ +uint8_t segments_left;/**< Valid segments number. */ +union { +uint32_t flags;/**< Packet control data per type. */ +struct { +uint8_t last_entry;/**< The last_entry field of SRH */ +uint8_t flag;/**< Packet flag. */ +uint16_t tag;/**< Packet tag. */ + }; + }; +/* Next are 128-bit IPv6 address fields to describe segments. */ +} __plt_packed; +struct roc_flow_item_ipv6_ext {uint8_t next_hdr;/**< Next header. */ };
drivers/common/cnxk/roc_npc_mcam_dump.c +3 -0
@@ -645,6 +645,7 @@ npc_flow_hw_mcam_entry_dump(FILE *file, struct npc *npc, struct roc_npc_flow *flstruct nix_inl_dev *inl_dev =NULL ;struct idev_cfg *idev;struct mbox *mbox; +uint8_t enabled;int rc =0 , i; idev =idev_get_cfg ();
@@ -673,6 +674,7 @@ npc_flow_hw_mcam_entry_dump(FILE *file, struct npc *npc, struct roc_npc_flow *flmbox_memcpy (mcam_data, mcam_read_rsp->entry_data.kw,sizeof (mcam_data));mbox_memcpy (mcam_mask, mcam_read_rsp->entry_data.kw_mask,sizeof (mcam_data)); + enabled = mcam_read_rsp->enable;fprintf (file,"HW MCAM Data :\n" );
@@ -680,6 +682,7 @@ npc_flow_hw_mcam_entry_dump(FILE *file, struct npc *npc, struct roc_npc_flow *flfprintf (file,"\tDW%d :%016lX\n" , i, mcam_data[i]);fprintf (file,"\tDW%d_Mask:%016lX\n" , i, mcam_mask[i]); } +fprintf (file,"\tEnabled = 0x%x\n" , enabled);fprintf (file,"\n" );mbox_put (mbox);
drivers/common/cnxk/roc_npc_parse.c +13 -2
@@ -719,8 +719,8 @@ npc_handle_ipv6ext_attr(const struct roc_npc_flow_item_ipv6 *ipv6_spec,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 )]; +uint8_t ipv6_hdr_mask[2 *sizeof (struct roc_ipv6_hdr )]; +uint8_t ipv6_hdr_buf[2 *sizeof (struct roc_ipv6_hdr )];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 ;
@@ -804,6 +804,16 @@ npc_process_ipv6_item(struct npc_parse_state *pst) sizeof(struct roc_ipv6_fragment_ext));break ; + }else if (pattern->type ==ROC_NPC_ITEM_TYPE_IPV6_ROUTING_EXT ) { + item_count++; + ltype =NPC_LT_LC_IP6_EXT ; + parse_info.len =sizeof (struct roc_ipv6_hdr ) + pattern->size; + +if (pattern->spec) +memcpy (ipv6_hdr_buf + offset, pattern->spec, pattern->size); +if (pattern->mask) +memcpy (ipv6_hdr_mask + offset, pattern->mask, pattern->size); +break ; } pattern++;
@@ -867,6 +877,7 @@ npc_parse_lc(struct npc_parse_state *pst)case ROC_NPC_ITEM_TYPE_IPV6 :case ROC_NPC_ITEM_TYPE_IPV6_EXT :case ROC_NPC_ITEM_TYPE_IPV6_FRAG_EXT : +case ROC_NPC_ITEM_TYPE_IPV6_ROUTING_EXT :return npc_process_ipv6_item (pst);case ROC_NPC_ITEM_TYPE_ARP_ETH_IPV4 : lt =NPC_LT_LC_ARP ;
Signature · 1 line
2.39.2
PATCH 2/2 net/cnxk: adding IPv6 routing ext flow type for cnxk
From: Satheesh Paul <[email protected]>
Adding support to parse RTE_FLOW_ITEM_TYPE_IPV6_ROUTING_EXT rte_flow type for cnxk device.
--- doc/guides/nics/features/cnxk.ini | 1 + doc/guides/nics/features/cnxk_vf.ini | 1 + drivers/net/cnxk/cnxk_flow.c | 2 ++ 3 files changed, 4 insertions(+)
doc/guides/nics/features/cnxk.ini +1 -0
@@ -67,6 +67,7 @@ ipv4 = Y ipv6 = Y ipv6_ext = Y ipv6_frag_ext = Y +ipv6_routing_ext = Y mark = Y mpls = Y nvgre = Y
doc/guides/nics/features/cnxk_vf.ini +1 -0
@@ -58,6 +58,7 @@ ipv4 = Y ipv6 = Y ipv6_ext = Y ipv6_frag_ext = Y +ipv6_routing_ext = Y mark = Y mpls = Y nvgre = Y
drivers/net/cnxk/cnxk_flow.c +2 -0
@@ -59,6 +59,8 @@ const struct cnxk_rte_flow_term_info term[] = { sizeof(struct rte_flow_item_raw)}, [RTE_FLOW_ITEM_TYPE_MARK] = {ROC_NPC_ITEM_TYPE_MARK, sizeof(struct rte_flow_item_mark)}, + [RTE_FLOW_ITEM_TYPE_IPV6_ROUTING_EXT] = {ROC_NPC_ITEM_TYPE_IPV6_ROUTING_EXT, + sizeof(struct rte_flow_item_ipv6_routing_ext)}, [RTE_FLOW_ITEM_TYPE_TX_QUEUE] = {ROC_NPC_ITEM_TYPE_TX_QUEUE, sizeof(struct rte_flow_item_tx_queue)}};
Signature · 1 line
2.39.2
Quoted 8 lines · On Mon, Jul 3, 2023 at 10:40 AM <[email protected]> wrote:
From: Kiran Kumar K <[email protected]>
Adding support to parse IPV6 routing ext flow type for cnxk.
Signed-off-by Kiran Kumar K <[email protected]>Reviewed-by Satheesh Paul <[email protected]>Tested-by Jerin Jacob <[email protected]>
Updated the git commit as follows and applied to
dpdk-next-net-mrvl/for-next-net. Thanks
Author: Satheesh Paul <[email protected]> Date: Mon Jul 3 10:40:26 2023 +0530
net/cnxk: support IPv6 routing ext flow type
Support to parse RTE_FLOW_ITEM_TYPE_IPV6_ROUTING_EXT rte_flow type for cnxk device.
commit 830d75fd19d9508237b69c66ffc0711671345f32
Author: Kiran Kumar K <[email protected]> Date: Mon Jul 3 10:40:25 2023 +0530
common/cnxk: support IPv6 routing ext flow type
Support to parse IPV6 routing ext flow type.