Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/56421/?format=api
{ "id": 56421, "url": "http://patches.dpdk.org/api/patches/56421/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190715050555.26128-1-kirankumark@marvell.com/", "project": { "id": 1, "url": "http://patches.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": "<20190715050555.26128-1-kirankumark@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190715050555.26128-1-kirankumark@marvell.com", "date": "2019-07-15T05:05:55", "name": "net/octeontx2: add flags based extraction support", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "29269484c5399d9a6b8729a66483d0a2d1f334b0", "submitter": { "id": 1260, "url": "http://patches.dpdk.org/api/people/1260/?format=api", "name": "Kiran Kumar Kokkilagadda", "email": "kirankumark@marvell.com" }, "delegate": { "id": 310, "url": "http://patches.dpdk.org/api/users/310/?format=api", "username": "jerin", "first_name": "Jerin", "last_name": "Jacob", "email": "jerinj@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20190715050555.26128-1-kirankumark@marvell.com/mbox/", "series": [ { "id": 5486, "url": "http://patches.dpdk.org/api/series/5486/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=5486", "date": "2019-07-15T05:05:55", "name": "net/octeontx2: add flags based extraction support", "version": 1, "mbox": "http://patches.dpdk.org/series/5486/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/56421/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/56421/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 65312325F;\n\tMon, 15 Jul 2019 07:06:04 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n\t[67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 8D2703256\n\tfor <dev@dpdk.org>; Mon, 15 Jul 2019 07:06:02 +0200 (CEST)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n\tby mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id\n\tx6F50t9c004310 for <dev@dpdk.org>; Sun, 14 Jul 2019 22:06:01 -0700", "from sc-exch02.marvell.com ([199.233.58.182])\n\tby mx0a-0016f401.pphosted.com with ESMTP id 2tqcnpp4kb-1\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n\tfor <dev@dpdk.org>; Sun, 14 Jul 2019 22:06:01 -0700", "from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH02.marvell.com\n\t(10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1367.3;\n\tSun, 14 Jul 2019 22:06:00 -0700", "from maili.marvell.com (10.93.176.43) by SC-EXCH03.marvell.com\n\t(10.93.176.83) with Microsoft SMTP Server id 15.0.1367.3 via Frontend\n\tTransport; Sun, 14 Jul 2019 22:06:00 -0700", "from localhost.localdomain (unknown [10.28.34.15])\n\tby maili.marvell.com (Postfix) with ESMTP id 71A393F703F;\n\tSun, 14 Jul 2019 22:05:59 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n\th=from : to : cc :\n\tsubject : date : message-id : mime-version : content-type; s=pfpt0818;\n\tbh=8iMTvkwu8mfJpPxzMS1f53mRXi+dHXXUuhi46rweEPU=;\n\tb=jRr0QYQ7MIpuP3xI10FhYH5DTCdq96pQW9fO3W7UFQSyL2xFwbpLxe2a0uwsbP71WgYr\n\t1ObYdPbwvvnpgSNi6WRb1jHCAapTFD8uEXAO+oYKveBbWHOc2i4k8Ci7ou24xm3Sl7ni\n\tlMVdKsKvNYKUDVNfonu0nW59G7wkzN9xRDo2Az+8At/fR9jwKGlvjJWM2Pa7o3y3Y9Mn\n\tvx4lKHe0qODCHgm/WnQhA5Xfjh7DfC8JpjPbaOTp2b4cbCD8pdgBe4L9R1j6WmyvialG\n\tzU9aDWs60UNXTrBo8xU4+Wr5fkpvh12dIrJIm9q46qQI9fGd7/uweFbYGAg7W20i/AAr\n\tMA== ", "From": "<kirankumark@marvell.com>", "To": "<dev@dpdk.org>", "CC": "Kiran Kumar K <kirankumark@marvell.com>", "Date": "Mon, 15 Jul 2019 10:35:55 +0530", "Message-ID": "<20190715050555.26128-1-kirankumark@marvell.com>", "X-Mailer": "git-send-email 2.17.1", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:5.22.84,1.0.8\n\tdefinitions=2019-07-15_01:2019-07-12,2019-07-15 signatures=0", "Subject": "[dpdk-dev] [PATCH] net/octeontx2: add flags based extraction support", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Kiran Kumar K <kirankumark@marvell.com>\n\nAdding support for flags based extraction in octeontx2 Flow.\nPatch supports extracting data greater than 32 bytes using lflags.\nWhen flags based extraction is enabled, lower 4 bits will be\nconsidered (16 flags) for indexing the flags, and will be used\nfor extraction.\n\nSigned-off-by: Kiran Kumar K <kirankumark@marvell.com>\n---\n drivers/net/octeontx2/otx2_flow.c | 1 +\n drivers/net/octeontx2/otx2_flow.h | 1 +\n drivers/net/octeontx2/otx2_flow_utils.c | 237 ++++++++++++++----------\n 3 files changed, 145 insertions(+), 94 deletions(-)", "diff": "diff --git a/drivers/net/octeontx2/otx2_flow.c b/drivers/net/octeontx2/otx2_flow.c\nindex 982100df4..c463075cb 100644\n--- a/drivers/net/octeontx2/otx2_flow.c\n+++ b/drivers/net/octeontx2/otx2_flow.c\n@@ -684,6 +684,7 @@ flow_update_kex_info(struct npc_xtract_info *xtract_info,\n \txtract_info->hdr_off = (val >> HDR_OFF_SHIFT) & 0xff;\n \txtract_info->key_off = val & 0x3f;\n \txtract_info->enable = ((val >> 7) & 0x1);\n+\txtract_info->flags_enable = ((val >> 6) & 0x1);\n }\n \n static void\ndiff --git a/drivers/net/octeontx2/otx2_flow.h b/drivers/net/octeontx2/otx2_flow.h\nindex a27ceeb1a..ab068b088 100644\n--- a/drivers/net/octeontx2/otx2_flow.h\n+++ b/drivers/net/octeontx2/otx2_flow.h\n@@ -89,6 +89,7 @@ struct npc_xtract_info {\n \tuint8_t hdr_off; /* Byte offset of proto hdr: extract_src */\n \tuint8_t key_off; /* Byte offset in MCAM key where data is placed */\n \tuint8_t enable; /* Extraction enabled or disabled */\n+\tuint8_t flags_enable; /* Flags extraction enabled */\n };\n \n /* Information for a given {LAYER, LTYPE} */\ndiff --git a/drivers/net/octeontx2/otx2_flow_utils.c b/drivers/net/octeontx2/otx2_flow_utils.c\nindex 8a0fe7615..14625c9ad 100644\n--- a/drivers/net/octeontx2/otx2_flow_utils.c\n+++ b/drivers/net/octeontx2/otx2_flow_utils.c\n@@ -124,13 +124,37 @@ flow_mem_is_zero(const void *mem, int len)\n \treturn 1;\n }\n \n+static void\n+flow_set_hw_mask(struct otx2_flow_item_info *info,\n+\t\t struct npc_xtract_info *xinfo,\n+\t\t char *hw_mask)\n+{\n+\tint max_off, offset;\n+\tint j;\n+\n+\tif (xinfo->enable == 0)\n+\t\treturn;\n+\n+\tif (xinfo->hdr_off < info->hw_hdr_len)\n+\t\treturn;\n+\n+\tmax_off = xinfo->hdr_off + xinfo->len - info->hw_hdr_len;\n+\n+\tif (max_off > info->len)\n+\t\tmax_off = info->len;\n+\n+\toffset = xinfo->hdr_off - info->hw_hdr_len;\n+\tfor (j = offset; j < max_off; j++)\n+\t\thw_mask[j] = 0xff;\n+}\n+\n void\n otx2_flow_get_hw_supp_mask(struct otx2_parse_state *pst,\n \t\t\t struct otx2_flow_item_info *info, int lid, int lt)\n {\n-\tstruct npc_xtract_info *xinfo;\n+\tstruct npc_xtract_info *xinfo, *lfinfo;\n \tchar *hw_mask = info->hw_mask;\n-\tint max_off, offset;\n+\tint lf_cfg;\n \tint i, j;\n \tint intf;\n \n@@ -139,21 +163,106 @@ otx2_flow_get_hw_supp_mask(struct otx2_parse_state *pst,\n \tmemset(hw_mask, 0, info->len);\n \n \tfor (i = 0; i < NPC_MAX_LD; i++) {\n-\t\tif (xinfo[i].hdr_off < info->hw_hdr_len)\n-\t\t\tcontinue;\n+\t\tflow_set_hw_mask(info, &xinfo[i], hw_mask);\n+\t}\n \n-\t\tmax_off = xinfo[i].hdr_off + xinfo[i].len - info->hw_hdr_len;\n+\tfor (i = 0; i < NPC_MAX_LD; i++) {\n \n-\t\tif (xinfo[i].enable == 0)\n+\t\tif (xinfo[i].flags_enable == 0)\n \t\t\tcontinue;\n \n-\t\tif (max_off > info->len)\n-\t\t\tmax_off = info->len;\n+\t\tlf_cfg = pst->npc->prx_lfcfg[i].i;\n+\t\tif (lf_cfg == lid) {\n+\t\t\tfor (j = 0; j < NPC_MAX_LFL; j++) {\n+\t\t\t\tlfinfo = pst->npc->prx_fxcfg[intf]\n+\t\t\t\t\t[i][j].xtract;\n+\t\t\t\tflow_set_hw_mask(info, &lfinfo[0], hw_mask);\n+\t\t\t}\n+\t\t}\n+\t}\n+}\n+\n+static int\n+flow_update_extraction_data(struct otx2_parse_state *pst,\n+\t\t\t struct otx2_flow_item_info *info,\n+\t\t\t struct npc_xtract_info *xinfo)\n+{\n+\tuint8_t int_info_mask[NPC_MAX_EXTRACT_DATA_LEN];\n+\tuint8_t int_info[NPC_MAX_EXTRACT_DATA_LEN];\n+\tstruct npc_xtract_info *x;\n+\tint k, idx, hdr_off;\n+\tint len = 0;\n+\n+\tx = xinfo;\n+\tlen = x->len;\n+\thdr_off = x->hdr_off;\n+\n+\tif (hdr_off < info->hw_hdr_len)\n+\t\treturn 0;\n+\n+\tif (x->enable == 0)\n+\t\treturn 0;\n+\n+\totx2_npc_dbg(\"x->hdr_off = %d, len = %d, info->len = %d,\"\n+\t\t \"x->key_off = %d\", x->hdr_off, len, info->len,\n+\t\t x->key_off);\n+\n+\thdr_off -= info->hw_hdr_len;\n+\n+\tif (hdr_off + len > info->len)\n+\t\tlen = info->len - hdr_off;\n \n-\t\toffset = xinfo[i].hdr_off - info->hw_hdr_len;\n-\t\tfor (j = offset; j < max_off; j++)\n-\t\t\thw_mask[j] = 0xff;\n+\t/* Check for over-write of previous layer */\n+\tif (!flow_mem_is_zero(pst->mcam_mask + x->key_off,\n+\t\t\t len)) {\n+\t\t/* Cannot support this data match */\n+\t\trte_flow_error_set(pst->error, ENOTSUP,\n+\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\t pst->pattern,\n+\t\t\t\t \"Extraction unsupported\");\n+\t\treturn -rte_errno;\n+\t}\n+\n+\tlen = flow_check_copysz((OTX2_MAX_MCAM_WIDTH_DWORDS * 8)\n+\t\t\t\t- x->key_off,\n+\t\t\t\tlen);\n+\tif (len < 0) {\n+\t\trte_flow_error_set(pst->error, ENOTSUP,\n+\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\t pst->pattern,\n+\t\t\t\t \"Internal Error\");\n+\t\treturn -rte_errno;\n \t}\n+\n+\t/* Need to reverse complete structure so that dest addr is at\n+\t * MSB so as to program the MCAM using mcam_data & mcam_mask\n+\t * arrays\n+\t */\n+\tflow_prep_mcam_ldata(int_info,\n+\t\t\t (const uint8_t *)info->spec + hdr_off,\n+\t\t\t x->len);\n+\tflow_prep_mcam_ldata(int_info_mask,\n+\t\t\t (const uint8_t *)info->mask + hdr_off,\n+\t\t\t x->len);\n+\n+\totx2_npc_dbg(\"Spec: \");\n+\tfor (k = 0; k < info->len; k++)\n+\t\totx2_npc_dbg(\"0x%.2x \",\n+\t\t\t ((const uint8_t *)info->spec)[k]);\n+\n+\totx2_npc_dbg(\"Int_info: \");\n+\tfor (k = 0; k < info->len; k++)\n+\t\totx2_npc_dbg(\"0x%.2x \", int_info[k]);\n+\n+\tmemcpy(pst->mcam_mask + x->key_off, int_info_mask, len);\n+\tmemcpy(pst->mcam_data + x->key_off, int_info, len);\n+\n+\totx2_npc_dbg(\"Parse state mcam data & mask\");\n+\tfor (idx = 0; idx < len ; idx++)\n+\t\totx2_npc_dbg(\"data[%d]: 0x%x, mask[%d]: 0x%x\", idx,\n+\t\t\t *(pst->mcam_data + idx + x->key_off), idx,\n+\t\t\t *(pst->mcam_mask + idx + x->key_off));\n+\treturn 0;\n }\n \n int\n@@ -161,12 +270,10 @@ otx2_flow_update_parse_state(struct otx2_parse_state *pst,\n \t\t\t struct otx2_flow_item_info *info, int lid, int lt,\n \t\t\t uint8_t flags)\n {\n-\tuint8_t int_info_mask[NPC_MAX_EXTRACT_DATA_LEN];\n-\tuint8_t int_info[NPC_MAX_EXTRACT_DATA_LEN];\n \tstruct npc_lid_lt_xtract_info *xinfo;\n-\tint len = 0;\n-\tint intf;\n-\tint i;\n+\tstruct npc_xtract_info *lfinfo;\n+\tint intf, lf_cfg;\n+\tint i, j, rc = 0;\n \n \totx2_npc_dbg(\"Parse state function info mask total %s\",\n \t\t (const uint8_t *)info->mask);\n@@ -181,93 +288,35 @@ otx2_flow_update_parse_state(struct otx2_parse_state *pst,\n \tif (xinfo->is_terminating)\n \t\tpst->terminate = 1;\n \n-\t/* Need to check if flags are supported but in latest\n-\t * KPU profile, flags are used as enumeration! No way,\n-\t * it can be validated unless MBOX is changed to return\n-\t * set of valid values out of 2**8 possible values.\n-\t */\n-\tif (info->spec == NULL) {\t/* Nothing to match */\n+\tif (info->spec == NULL) {\n \t\totx2_npc_dbg(\"Info spec NULL\");\n \t\tgoto done;\n \t}\n \n-\t/* Copy spec and mask into mcam match string, mask.\n-\t * Since both RTE FLOW and OTX2 MCAM use network-endianness\n-\t * for data, we are saved from nasty conversions.\n-\t */\n \tfor (i = 0; i < NPC_MAX_LD; i++) {\n-\t\tstruct npc_xtract_info *x;\n-\t\tint k, idx, hdr_off;\n-\n-\t\tx = &xinfo->xtract[i];\n-\t\tlen = x->len;\n-\t\thdr_off = x->hdr_off;\n-\n-\t\tif (hdr_off < info->hw_hdr_len)\n-\t\t\tcontinue;\n+\t\trc = flow_update_extraction_data(pst, info, &xinfo->xtract[i]);\n+\t\tif (rc != 0)\n+\t\t\treturn rc;\n+\t}\n \n-\t\tif (x->enable == 0)\n+\tfor (i = 0; i < NPC_MAX_LD; i++) {\n+\t\tif (xinfo->xtract[i].flags_enable == 0)\n \t\t\tcontinue;\n \n-\t\totx2_npc_dbg(\"x->hdr_off = %d, len = %d, info->len = %d,\"\n-\t\t\t \"x->key_off = %d\", x->hdr_off, len, info->len,\n-\t\t\t x->key_off);\n-\n-\t\thdr_off -= info->hw_hdr_len;\n-\n-\t\tif (hdr_off + len > info->len)\n-\t\t\tlen = info->len - hdr_off;\n-\n-\t\t/* Check for over-write of previous layer */\n-\t\tif (!flow_mem_is_zero(pst->mcam_mask + x->key_off,\n-\t\t\t\t len)) {\n-\t\t\t/* Cannot support this data match */\n-\t\t\trte_flow_error_set(pst->error, ENOTSUP,\n-\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n-\t\t\t\t\t pst->pattern,\n-\t\t\t\t\t \"Extraction unsupported\");\n-\t\t\treturn -rte_errno;\n-\t\t}\n-\n-\t\tlen = flow_check_copysz((OTX2_MAX_MCAM_WIDTH_DWORDS * 8)\n-\t\t\t\t\t- x->key_off,\n-\t\t\t\t\tlen);\n-\t\tif (len < 0) {\n-\t\t\trte_flow_error_set(pst->error, ENOTSUP,\n-\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n-\t\t\t\t\t pst->pattern,\n-\t\t\t\t\t \"Internal Error\");\n-\t\t\treturn -rte_errno;\n+\t\tlf_cfg = pst->npc->prx_lfcfg[i].i;\n+\t\tif (lf_cfg == lid) {\n+\t\t\tfor (j = 0; j < NPC_MAX_LFL; j++) {\n+\t\t\t\tlfinfo = pst->npc->prx_fxcfg[intf]\n+\t\t\t\t\t[i][j].xtract;\n+\t\t\t\trc = flow_update_extraction_data(pst, info,\n+\t\t\t\t\t\t\t\t &lfinfo[0]);\n+\t\t\t\tif (rc != 0)\n+\t\t\t\t\treturn rc;\n+\n+\t\t\t\tif (lfinfo[0].enable)\n+\t\t\t\t\tpst->flags[lid] = j;\n+\t\t\t}\n \t\t}\n-\n-\t\t/* Need to reverse complete structure so that dest addr is at\n-\t\t * MSB so as to program the MCAM using mcam_data & mcam_mask\n-\t\t * arrays\n-\t\t */\n-\t\tflow_prep_mcam_ldata(int_info,\n-\t\t\t\t (const uint8_t *)info->spec + hdr_off,\n-\t\t\t\t x->len);\n-\t\tflow_prep_mcam_ldata(int_info_mask,\n-\t\t\t\t (const uint8_t *)info->mask + hdr_off,\n-\t\t\t\t x->len);\n-\n-\t\totx2_npc_dbg(\"Spec: \");\n-\t\tfor (k = 0; k < info->len; k++)\n-\t\t\totx2_npc_dbg(\"0x%.2x \",\n-\t\t\t\t ((const uint8_t *)info->spec)[k]);\n-\n-\t\totx2_npc_dbg(\"Int_info: \");\n-\t\tfor (k = 0; k < info->len; k++)\n-\t\t\totx2_npc_dbg(\"0x%.2x \", int_info[k]);\n-\n-\t\tmemcpy(pst->mcam_mask + x->key_off, int_info_mask, len);\n-\t\tmemcpy(pst->mcam_data + x->key_off, int_info, len);\n-\n-\t\totx2_npc_dbg(\"Parse state mcam data & mask\");\n-\t\tfor (idx = 0; idx < len ; idx++)\n-\t\t\totx2_npc_dbg(\"data[%d]: 0x%x, mask[%d]: 0x%x\", idx,\n-\t\t\t\t *(pst->mcam_data + idx + x->key_off), idx,\n-\t\t\t\t *(pst->mcam_mask + idx + x->key_off));\n \t}\n \n done:\n", "prefixes": [] }