Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/105551/?format=api
{ "id": 105551, "url": "http://patchwork.dpdk.org/api/patches/105551/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20220103055709.82768-4-psatheesh@marvell.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20220103055709.82768-4-psatheesh@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220103055709.82768-4-psatheesh@marvell.com", "date": "2022-01-03T05:57:09", "name": "[4/4] common/cnxk: support extensions attributes in IPv6 item", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "10789b3ea4a6b5b9d6a762c3f3906017f4e5302d", "submitter": { "id": 1663, "url": "http://patchwork.dpdk.org/api/people/1663/?format=api", "name": "Satheesh Paul Antonysamy", "email": "psatheesh@marvell.com" }, "delegate": { "id": 310, "url": "http://patchwork.dpdk.org/api/users/310/?format=api", "username": "jerin", "first_name": "Jerin", "last_name": "Jacob", "email": "jerinj@marvell.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20220103055709.82768-4-psatheesh@marvell.com/mbox/", "series": [ { "id": 21047, "url": "http://patchwork.dpdk.org/api/series/21047/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=21047", "date": "2022-01-03T05:57:06", "name": "[1/4] drivers: add support for switch header type pre L2", "version": 1, "mbox": "http://patchwork.dpdk.org/series/21047/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/105551/comments/", "check": "warning", "checks": "http://patchwork.dpdk.org/api/patches/105551/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 8507CA0350;\n\tMon, 3 Jan 2022 06:57:50 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 5CFC74114F;\n\tMon, 3 Jan 2022 06:57:42 +0100 (CET)", "from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com\n [67.231.156.173])\n by mails.dpdk.org (Postfix) with ESMTP id CE3D14003C\n for <dev@dpdk.org>; Mon, 3 Jan 2022 06:57:38 +0100 (CET)", "from pps.filterd (m0045851.ppops.net [127.0.0.1])\n by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id\n 202MENtu027084\n for <dev@dpdk.org>; Sun, 2 Jan 2022 21:57:38 -0800", "from dc5-exch02.marvell.com ([199.233.59.182])\n by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3daqbrkxwh-3\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n for <dev@dpdk.org>; Sun, 02 Jan 2022 21:57:38 -0800", "from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18;\n Sun, 2 Jan 2022 21:57:34 -0800", "from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend\n Transport; Sun, 2 Jan 2022 21:57:34 -0800", "from localhost.localdomain (unknown [10.28.34.33])\n by maili.marvell.com (Postfix) with ESMTP id 0690F3F7051;\n Sun, 2 Jan 2022 21:57:31 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-transfer-encoding : content-type; s=pfpt0220;\n bh=x0eB4SZ8coiWYT6JO8a3SjyFlZbOnzW7EqjxjnbnpBM=;\n b=R3sfqW141UkcxUeddrXNnpNSnb3ihY2kGTaNbVzmGu3cbZTrvvfgGtd8gAMGfD3IRPJJ\n L+YU5XrRM9/YGNwSHEPH+kDLxpkUIHsXTNHsb9O9/P0I02TXX0jC8nSqEX+Z24kspwPZ\n /Ufc48xN8tlhxDrqSVES39EVQ9zpDJjf0ZuFRZO5Bsf+oJOLd1qDrGhX0Pd/Zh4B+Ldy\n D8OMoW3n897uqO8fDsJakcLrCv5DyamFWvC7VpjubxNU+AUz73XwZfUtSeqwHkhZnz9p\n mA4iKcZ7SHtQkuULgBm1pYQNinDqJbbdH/wrttWn3jm7f+UlC+HYKsxg6/Wg79uzCMqD CQ==", "From": "<psatheesh@marvell.com>", "To": "Nithin Dabilpuram <ndabilpuram@marvell.com>, Kiran Kumar K\n <kirankumark@marvell.com>, Sunil Kumar Kori <skori@marvell.com>, Satha Rao\n <skoteshwar@marvell.com>", "CC": "<dev@dpdk.org>, Satheesh Paul <psatheesh@marvell.com>,\n sa_ip-toolkits-Jenkins <sa_ip-toolkits-jenkins@marvell.com>", "Subject": "[dpdk-dev] [PATCH 4/4] common/cnxk: support extensions attributes in\n IPv6 item", "Date": "Mon, 3 Jan 2022 11:27:09 +0530", "Message-ID": "<20220103055709.82768-4-psatheesh@marvell.com>", "X-Mailer": "git-send-email 2.25.4", "In-Reply-To": "<20220103055709.82768-1-psatheesh@marvell.com>", "References": "<20220103055709.82768-1-psatheesh@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-GUID": "VIR5ZcZyIG32K7nl8Zg_0d_T8LC1tIbV", "X-Proofpoint-ORIG-GUID": "VIR5ZcZyIG32K7nl8Zg_0d_T8LC1tIbV", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513\n definitions=2022-01-03_02,2022-01-01_01,2021-12-02_01", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "From: Satheesh Paul <psatheesh@marvell.com>\n\nSupport matching existence of specific extension headers\nafter RTE_FLOW_ITEM_TYPE_IPV6 item.\n\nSigned-off-by: Satheesh Paul <psatheesh@marvell.com>\nChange-Id: I8c7d58af242d6d991b718787a6c9b8e79c6ff409\nReviewed-on: https://sj1git1.cavium.com/c/IP/SW/dataplane/dpdk/+/66900\nTested-by: sa_ip-toolkits-Jenkins <sa_ip-toolkits-jenkins@marvell.com>\nReviewed-by: Kiran Kumar Kokkilagadda <kirankumark@marvell.com>\nReviewed-on: https://sj1git1.cavium.com/c/IP/SW/dataplane/dpdk/+/67409\n---\n drivers/common/cnxk/hw/npc.h | 17 ++++++++\n drivers/common/cnxk/roc_npc.h | 33 +++++++++++++++\n drivers/common/cnxk/roc_npc_mcam.c | 47 ++++++++++++++++++++-\n drivers/common/cnxk/roc_npc_parse.c | 65 +++++++++++++++++++++++++++--\n drivers/common/cnxk/roc_npc_priv.h | 6 +++\n 5 files changed, 162 insertions(+), 6 deletions(-)", "diff": "diff --git a/drivers/common/cnxk/hw/npc.h b/drivers/common/cnxk/hw/npc.h\nindex 6f896de9f0..b8218e25af 100644\n--- a/drivers/common/cnxk/hw/npc.h\n+++ b/drivers/common/cnxk/hw/npc.h\n@@ -320,6 +320,23 @@ enum npc_kpu_lc_uflag {\n \tNPC_F_LC_U_IP6_FRAG = 0x40,\n };\n \n+enum npc_kpu_lc_lflag {\n+\tNPC_F_LC_L_IP_IN_IP = 1,\n+\tNPC_F_LC_L_6TO4,\n+\tNPC_F_LC_L_MPLS_IN_IP,\n+\tNPC_F_LC_L_IP6_TUN_IP6,\n+\tNPC_F_LC_L_IP6_MPLS_IN_IP,\n+\tNPC_F_LC_L_MPLS_4_LABELS,\n+\tNPC_F_LC_L_MPLS_3_LABELS,\n+\tNPC_F_LC_L_MPLS_2_LABELS,\n+\tNPC_F_LC_L_EXT_HOP,\n+\tNPC_F_LC_L_EXT_DEST,\n+\tNPC_F_LC_L_EXT_ROUT,\n+\tNPC_F_LC_L_EXT_MOBILITY,\n+\tNPC_F_LC_L_EXT_HOSTID,\n+\tNPC_F_LC_L_EXT_SHIM6,\n+};\n+\n /* Structures definitions */\n struct npc_kpu_profile_cam {\n \tuint8_t state;\ndiff --git a/drivers/common/cnxk/roc_npc.h b/drivers/common/cnxk/roc_npc.h\nindex 634c67e6f6..2098810ee3 100644\n--- a/drivers/common/cnxk/roc_npc.h\n+++ b/drivers/common/cnxk/roc_npc.h\n@@ -112,6 +112,39 @@ struct roc_npc_flow_item_vlan {\n \tuint32_t reserved : 31; /**< Reserved, must be zero. */\n };\n \n+struct roc_ipv6_hdr {\n+\tuint32_t vtc_flow; /**< IP version, traffic class & flow label. */\n+\tuint16_t payload_len; /**< IP payload size, including ext. headers */\n+\tuint8_t proto;\t /**< Protocol, next header. */\n+\tuint8_t hop_limits; /**< Hop limits. */\n+\tuint8_t src_addr[16]; /**< IP address of source host. */\n+\tuint8_t dst_addr[16]; /**< IP address of destination host(s). */\n+} __plt_packed;\n+\n+struct roc_npc_flow_item_ipv6 {\n+\tstruct roc_ipv6_hdr hdr; /**< IPv6 header definition. */\n+\tuint32_t has_hop_ext : 1;\n+\t/**< Header contains Hop-by-Hop Options extension header. */\n+\tuint32_t has_route_ext : 1;\n+\t/**< Header contains Routing extension header. */\n+\tuint32_t has_frag_ext : 1;\n+\t/**< Header contains Fragment extension header. */\n+\tuint32_t has_auth_ext : 1;\n+\t/**< Header contains Authentication extension header. */\n+\tuint32_t has_esp_ext : 1;\n+\t/**< Header contains Encapsulation Security Payload extension header. */\n+\tuint32_t has_dest_ext : 1;\n+\t/**< Header contains Destination Options extension header. */\n+\tuint32_t has_mobil_ext : 1;\n+\t/**< Header contains Mobility extension header. */\n+\tuint32_t has_hip_ext : 1;\n+\t/**< Header contains Host Identity Protocol extension header. */\n+\tuint32_t has_shim6_ext : 1;\n+\t/**< Header contains Shim6 Protocol extension header. */\n+\tuint32_t reserved : 23;\n+\t/**< Reserved for future extension headers, must be zero. */\n+};\n+\n #define ROC_NPC_MAX_ACTION_COUNT 19\n \n enum roc_npc_action_type {\ndiff --git a/drivers/common/cnxk/roc_npc_mcam.c b/drivers/common/cnxk/roc_npc_mcam.c\nindex 2349317c5c..da5815ada0 100644\n--- a/drivers/common/cnxk/roc_npc_mcam.c\n+++ b/drivers/common/cnxk/roc_npc_mcam.c\n@@ -283,8 +283,8 @@ npc_get_kex_capability(struct npc *npc)\n \t/* Custom L3 frame: varied offset and lengths */\n \tkex_cap.bit.custom_l3 =\n \t\tnpc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_CUSTOM0, 0, 0);\n-\tkex_cap.bit.custom_l3 |=\n-\t\tnpc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_CUSTOM1, 0, 0);\n+\tkex_cap.bit.custom_l3 |= (uint64_t)npc_is_kex_enabled(\n+\t\tnpc, NPC_LID_LC, NPC_LT_LC_CUSTOM1, 0, 0);\n \t/* SCTP sport : offset 0B, len 2B */\n \tkex_cap.bit.sctp_sport = npc_is_kex_enabled(\n \t\tnpc, NPC_LID_LD, NPC_LT_LD_SCTP, 0 * 8, 2 * 8);\n@@ -635,6 +635,46 @@ npc_set_vlan_ltype(struct npc_parse_state *pst)\n \tpst->flow->mcam_mask[0] |= (0xeULL << lb_offset);\n }\n \n+static void\n+npc_set_ipv6ext_ltype_mask(struct npc_parse_state *pst)\n+{\n+\tuint8_t lc_offset, lcflag_offset;\n+\tuint64_t val, mask;\n+\n+\tlc_offset =\n+\t\t__builtin_popcount(pst->npc->keyx_supp_nmask[pst->nix_intf] &\n+\t\t\t\t ((1ULL << NPC_LTYPE_LC_OFFSET) - 1));\n+\tlc_offset *= 4;\n+\n+\tmask = ~((0xfULL << lc_offset));\n+\tpst->flow->mcam_data[0] &= mask;\n+\tpst->flow->mcam_mask[0] &= mask;\n+\t/* NPC_LT_LC_IP6: 0b0100, NPC_LT_LC_IP6_EXT: 0b0101\n+\t * Set LC layertype/mask as 0b0100/0b1110 to match both.\n+\t */\n+\tval = ((uint64_t)(NPC_LT_LC_IP6 & NPC_LT_LC_IP6_EXT)) << lc_offset;\n+\tpst->flow->mcam_data[0] |= val;\n+\tpst->flow->mcam_mask[0] |= (0xeULL << lc_offset);\n+\n+\t/* If LC LFLAG is non-zero, set the LC LFLAG mask to 0xF. In general\n+\t * case flag mask is set same as the value in data. For example, to\n+\t * match 3 VLANs, flags have to match a range of values. But, for IPv6\n+\t * extended attributes matching, we need an exact match. Hence, set the\n+\t * mask as 0xF. This is done only if LC LFLAG value is non-zero,\n+\t * because for AH and ESP, LC LFLAG is zero and we don't want to match\n+\t * zero in LFLAG.\n+\t */\n+\tlcflag_offset =\n+\t\t__builtin_popcount(pst->npc->keyx_supp_nmask[pst->nix_intf] &\n+\t\t\t\t ((1ULL << NPC_LFLAG_LC_OFFSET) - 1));\n+\tlcflag_offset *= 4;\n+\n+\tmask = (0xfULL << lcflag_offset);\n+\tval = pst->flow->mcam_data[0] & mask;\n+\tif (val)\n+\t\tpst->flow->mcam_mask[0] |= mask;\n+}\n+\n int\n npc_program_mcam(struct npc *npc, struct npc_parse_state *pst, bool mcam_alloc)\n {\n@@ -709,6 +749,9 @@ npc_program_mcam(struct npc *npc, struct npc_parse_state *pst, bool mcam_alloc)\n \tif (pst->set_vlan_ltype_mask)\n \t\tnpc_set_vlan_ltype(pst);\n \n+\tif (pst->set_ipv6ext_ltype_mask)\n+\t\tnpc_set_ipv6ext_ltype_mask(pst);\n+\n \tif (pst->is_vf) {\n \t\t(void)mbox_alloc_msg_npc_read_base_steer_rule(npc->mbox);\n \t\trc = mbox_process_msg(npc->mbox, (void *)&base_rule_rsp);\ndiff --git a/drivers/common/cnxk/roc_npc_parse.c b/drivers/common/cnxk/roc_npc_parse.c\nindex 75724661da..1f21693369 100644\n--- a/drivers/common/cnxk/roc_npc_parse.c\n+++ b/drivers/common/cnxk/roc_npc_parse.c\n@@ -480,16 +480,69 @@ npc_check_lc_ip_tunnel(struct npc_parse_state *pst)\n \t\tpst->tunnel = 1;\n }\n \n+static int\n+npc_handle_ipv6ext_attr(const struct roc_npc_flow_item_ipv6 *ipv6_spec,\n+\t\t\tstruct npc_parse_state *pst, uint8_t *flags)\n+{\n+\tint flags_count = 0;\n+\n+\tif (ipv6_spec->has_hop_ext) {\n+\t\t*flags = NPC_F_LC_L_EXT_HOP;\n+\t\tflags_count++;\n+\t}\n+\tif (ipv6_spec->has_route_ext) {\n+\t\t*flags = NPC_F_LC_L_EXT_ROUT;\n+\t\tflags_count++;\n+\t}\n+\tif (ipv6_spec->has_frag_ext) {\n+\t\t*flags = NPC_F_LC_U_IP6_FRAG;\n+\t\tflags_count++;\n+\t}\n+\tif (ipv6_spec->has_dest_ext) {\n+\t\t*flags = NPC_F_LC_L_EXT_DEST;\n+\t\tflags_count++;\n+\t}\n+\tif (ipv6_spec->has_mobil_ext) {\n+\t\t*flags = NPC_F_LC_L_EXT_MOBILITY;\n+\t\tflags_count++;\n+\t}\n+\tif (ipv6_spec->has_hip_ext) {\n+\t\t*flags = NPC_F_LC_L_EXT_HOSTID;\n+\t\tflags_count++;\n+\t}\n+\tif (ipv6_spec->has_shim6_ext) {\n+\t\t*flags = NPC_F_LC_L_EXT_SHIM6;\n+\t\tflags_count++;\n+\t}\n+\tif (ipv6_spec->has_auth_ext) {\n+\t\tpst->lt[NPC_LID_LD] = NPC_LT_LD_AH;\n+\t\tflags_count++;\n+\t}\n+\tif (ipv6_spec->has_esp_ext) {\n+\t\tpst->lt[NPC_LID_LE] = NPC_LT_LE_ESP;\n+\t\tflags_count++;\n+\t}\n+\n+\tif (flags_count > 1)\n+\t\treturn -EINVAL;\n+\n+\tif (flags_count)\n+\t\tpst->set_ipv6ext_ltype_mask = true;\n+\n+\treturn 0;\n+}\n+\n int\n npc_parse_lc(struct npc_parse_state *pst)\n {\n+\tconst struct roc_npc_flow_item_ipv6 *ipv6_spec;\n \tconst struct roc_npc_flow_item_raw *raw_spec;\n \tuint8_t raw_spec_buf[NPC_MAX_RAW_ITEM_LEN];\n \tuint8_t raw_mask_buf[NPC_MAX_RAW_ITEM_LEN];\n \tuint8_t hw_mask[NPC_MAX_EXTRACT_HW_LEN];\n \tstruct npc_parse_item_info info;\n-\tint lid, lt, len = 0;\n-\tint rc;\n+\tint rc, lid, lt, len = 0;\n+\tuint8_t flags = 0;\n \n \tif (pst->pattern->type == ROC_NPC_ITEM_TYPE_MPLS)\n \t\treturn npc_parse_mpls(pst, NPC_LID_LC);\n@@ -506,9 +559,13 @@ npc_parse_lc(struct npc_parse_state *pst)\n \t\tinfo.len = pst->pattern->size;\n \t\tbreak;\n \tcase ROC_NPC_ITEM_TYPE_IPV6:\n+\t\tipv6_spec = pst->pattern->spec;\n \t\tlid = NPC_LID_LC;\n \t\tlt = NPC_LT_LC_IP6;\n-\t\tinfo.len = pst->pattern->size;\n+\t\trc = npc_handle_ipv6ext_attr(ipv6_spec, pst, &flags);\n+\t\tif (rc)\n+\t\t\treturn rc;\n+\t\tinfo.len = sizeof(ipv6_spec->hdr);\n \t\tbreak;\n \tcase ROC_NPC_ITEM_TYPE_ARP_ETH_IPV4:\n \t\tlt = NPC_LT_LC_ARP;\n@@ -558,7 +615,7 @@ npc_parse_lc(struct npc_parse_state *pst)\n \tif (rc != 0)\n \t\treturn rc;\n \n-\treturn npc_update_parse_state(pst, &info, lid, lt, 0);\n+\treturn npc_update_parse_state(pst, &info, lid, lt, flags);\n }\n \n int\ndiff --git a/drivers/common/cnxk/roc_npc_priv.h b/drivers/common/cnxk/roc_npc_priv.h\nindex ef7985f4cf..44d61ba641 100644\n--- a/drivers/common/cnxk/roc_npc_priv.h\n+++ b/drivers/common/cnxk/roc_npc_priv.h\n@@ -71,6 +71,11 @@\n /* LB OFFSET : START + LA (2b flags + 1b ltype) + LB (2b flags) */\n #define NPC_LTYPE_LB_OFFSET (NPC_LTYPE_OFFSET_START + 5)\n #define NPC_LFLAG_LB_OFFSET (NPC_LTYPE_OFFSET_START + 3)\n+/* LC OFFSET : START + LA (2b flags + 1b ltype) + LB (2b flags + 1b ltype) + LC\n+ * (2b flags)\n+ */\n+#define NPC_LFLAG_LC_OFFSET (NPC_LTYPE_OFFSET_START + 6)\n+#define NPC_LTYPE_LC_OFFSET (NPC_LTYPE_OFFSET_START + 8)\n \n struct npc_action_vtag_info {\n \tuint16_t vlan_id;\n@@ -183,6 +188,7 @@ struct npc_parse_state {\n \tbool is_vf;\n \t/* adjust ltype in MCAM to match at least one vlan */\n \tbool set_vlan_ltype_mask;\n+\tbool set_ipv6ext_ltype_mask;\n };\n \n enum npc_kpu_parser_flag {\n", "prefixes": [ "4/4" ] }