Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/55709/?format=api
{ "id": 55709, "url": "http://patches.dpdk.org/api/patches/55709/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190630180609.36705-41-jerinj@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": "<20190630180609.36705-41-jerinj@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190630180609.36705-41-jerinj@marvell.com", "date": "2019-06-30T18:05:52", "name": "[v2,40/57] net/octeontx2: add flow destroy ops support", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "df96806d1120fccd6dc2060fa2b6737aa8c86d86", "submitter": { "id": 1188, "url": "http://patches.dpdk.org/api/people/1188/?format=api", "name": "Jerin Jacob Kollanukkaran", "email": "jerinj@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/20190630180609.36705-41-jerinj@marvell.com/mbox/", "series": [ { "id": 5236, "url": "http://patches.dpdk.org/api/series/5236/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=5236", "date": "2019-06-30T18:05:12", "name": "OCTEON TX2 Ethdev driver", "version": 2, "mbox": "http://patches.dpdk.org/series/5236/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/55709/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/55709/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 B30AC1BB32;\n\tSun, 30 Jun 2019 20:10:24 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n\t[67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 4C6671B9D1\n\tfor <dev@dpdk.org>; Sun, 30 Jun 2019 20:08:36 +0200 (CEST)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n\tby mx0a-0016f401.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id\n\tx5UI6dmQ028335 for <dev@dpdk.org>; Sun, 30 Jun 2019 11:08:35 -0700", "from sc-exch04.marvell.com ([199.233.58.184])\n\tby mx0a-0016f401.pphosted.com with ESMTP id 2te5bn4gms-1\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n\tfor <dev@dpdk.org>; Sun, 30 Jun 2019 11:08:35 -0700", "from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH04.marvell.com\n\t(10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1367.3;\n\tSun, 30 Jun 2019 11:08:34 -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, 30 Jun 2019 11:08:34 -0700", "from jerin-lab.marvell.com (jerin-lab.marvell.com [10.28.34.14])\n\tby maili.marvell.com (Postfix) with ESMTP id B4FC63F703F;\n\tSun, 30 Jun 2019 11:08:32 -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 : in-reply-to : references : mime-version\n\t: content-transfer-encoding : content-type; s=pfpt0818;\n\tbh=WFL34scTm1lXgrJ6lmypqTR81NhenUUIETPBJOpbuhA=;\n\tb=jlfl4dMk+9OuhHMnWi7W5gQIrYEyF+TKsBEJzcF6CNu0AK8MgNpcsfH03FJeApkl+rWP\n\tTNu0V8NcmvbxduhD3AQi5ukZHWN0HHltYLxv5+/RcuxyF6suZXwDwiyXwBaybfGnS14/\n\t9Mq4ZdQEu1Iw8OduWjJ3NOUi5uB3rWFZ8z/CdoarMkf8oU5WFnE2y2fVa9FF0lWPoaLl\n\tMkbaU7t2ZIjwRRZBG8rlGecCPvPzFhzlZblQ25b5ZJRWBLq7WqhuwITdYWtKYkO+uRSp\n\t9qole7HreoaxzjccPbDsh7RfrhjAZ/hR2qj3RqKD0OI0UPJIxKNOY9FBZoAdr7F4YkRA\n\t+w== ", "From": "<jerinj@marvell.com>", "To": "<dev@dpdk.org>, Jerin Jacob <jerinj@marvell.com>, Nithin Dabilpuram\n\t<ndabilpuram@marvell.com>, Kiran Kumar K <kirankumark@marvell.com>", "CC": "Vivek Sharma <viveksharma@marvell.com>", "Date": "Sun, 30 Jun 2019 23:35:52 +0530", "Message-ID": "<20190630180609.36705-41-jerinj@marvell.com>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190630180609.36705-1-jerinj@marvell.com>", "References": "<20190602152434.23996-1-jerinj@marvell.com>\n\t<20190630180609.36705-1-jerinj@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:, ,\n\tdefinitions=2019-06-30_08:, , signatures=0", "Subject": "[dpdk-dev] [PATCH v2 40/57] net/octeontx2: add flow destroy ops\n\tsupport", "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 few more flow operations like flow_destroy, flow_isolate\nand flow_flush.\n\nSigned-off-by: Kiran Kumar K <kirankumark@marvell.com>\nSigned-off-by: Vivek Sharma <viveksharma@marvell.com>\n---\n drivers/net/octeontx2/otx2_flow.c | 206 ++++++++++++++++++++++++++++++\n drivers/net/octeontx2/otx2_rx.h | 3 +\n 2 files changed, 209 insertions(+)", "diff": "diff --git a/drivers/net/octeontx2/otx2_flow.c b/drivers/net/octeontx2/otx2_flow.c\nindex 896aef00a..24bde623d 100644\n--- a/drivers/net/octeontx2/otx2_flow.c\n+++ b/drivers/net/octeontx2/otx2_flow.c\n@@ -5,6 +5,48 @@\n #include \"otx2_ethdev.h\"\n #include \"otx2_flow.h\"\n \n+int\n+otx2_flow_free_all_resources(struct otx2_eth_dev *hw)\n+{\n+\tstruct otx2_npc_flow_info *npc = &hw->npc_flow;\n+\tstruct otx2_mbox *mbox = hw->mbox;\n+\tstruct otx2_mcam_ents_info *info;\n+\tstruct rte_bitmap *bmap;\n+\tstruct rte_flow *flow;\n+\tint entry_count = 0;\n+\tint rc, idx;\n+\n+\tfor (idx = 0; idx < npc->flow_max_priority; idx++) {\n+\t\tinfo = &npc->flow_entry_info[idx];\n+\t\tentry_count += info->live_ent;\n+\t}\n+\n+\tif (entry_count == 0)\n+\t\treturn 0;\n+\n+\t/* Free all MCAM entries allocated */\n+\trc = otx2_flow_mcam_free_all_entries(mbox);\n+\n+\t/* Free any MCAM counters and delete flow list */\n+\tfor (idx = 0; idx < npc->flow_max_priority; idx++) {\n+\t\twhile ((flow = TAILQ_FIRST(&npc->flow_list[idx])) != NULL) {\n+\t\t\tif (flow->ctr_id != NPC_COUNTER_NONE)\n+\t\t\t\trc |= otx2_flow_mcam_free_counter(mbox,\n+\t\t\t\t\t\t\t flow->ctr_id);\n+\n+\t\t\tTAILQ_REMOVE(&npc->flow_list[idx], flow, next);\n+\t\t\trte_free(flow);\n+\t\t\tbmap = npc->live_entries[flow->priority];\n+\t\t\trte_bitmap_clear(bmap, flow->mcam_id);\n+\t\t}\n+\t\tinfo = &npc->flow_entry_info[idx];\n+\t\tinfo->free_ent = 0;\n+\t\tinfo->live_ent = 0;\n+\t}\n+\treturn rc;\n+}\n+\n+\n static int\n flow_program_npc(struct otx2_parse_state *pst, struct otx2_mbox *mbox,\n \t\t struct otx2_npc_flow_info *flow_info)\n@@ -237,6 +279,27 @@ flow_program_rss_action(struct rte_eth_dev *eth_dev,\n \treturn 0;\n }\n \n+static int\n+flow_free_rss_action(struct rte_eth_dev *eth_dev,\n+\t\t struct rte_flow *flow)\n+{\n+\tstruct otx2_eth_dev *dev = eth_dev->data->dev_private;\n+\tstruct otx2_npc_flow_info *npc = &dev->npc_flow;\n+\tuint32_t rss_grp;\n+\n+\tif (flow->npc_action & NIX_RX_ACTIONOP_RSS) {\n+\t\trss_grp = (flow->npc_action >> NIX_RSS_ACT_GRP_OFFSET) &\n+\t\t\tNIX_RSS_ACT_GRP_MASK;\n+\t\tif (rss_grp == 0 || rss_grp >= npc->rss_grps)\n+\t\t\treturn -EINVAL;\n+\n+\t\trte_bitmap_clear(npc->rss_grp_entries, rss_grp);\n+\t}\n+\n+\treturn 0;\n+}\n+\n+\n static int\n flow_parse_meta_items(__rte_unused struct otx2_parse_state *pst)\n {\n@@ -445,7 +508,150 @@ otx2_flow_create(struct rte_eth_dev *dev,\n \treturn NULL;\n }\n \n+static int\n+otx2_flow_destroy(struct rte_eth_dev *dev,\n+\t\t struct rte_flow *flow,\n+\t\t struct rte_flow_error *error)\n+{\n+\tstruct otx2_eth_dev *hw = dev->data->dev_private;\n+\tstruct otx2_npc_flow_info *npc = &hw->npc_flow;\n+\tstruct otx2_mbox *mbox = hw->mbox;\n+\tstruct rte_bitmap *bmap;\n+\tuint16_t match_id;\n+\tint rc;\n+\n+\tmatch_id = (flow->npc_action >> NIX_RX_ACT_MATCH_OFFSET) &\n+\t\tNIX_RX_ACT_MATCH_MASK;\n+\n+\tif (match_id && match_id < OTX2_FLOW_ACTION_FLAG_DEFAULT) {\n+\t\tif (rte_atomic32_read(&npc->mark_actions) == 0)\n+\t\t\treturn -EINVAL;\n+\n+\t\t/* Clear mark offload flag if there are no more mark actions */\n+\t\tif (rte_atomic32_sub_return(&npc->mark_actions, 1) == 0)\n+\t\t\thw->rx_offload_flags &= ~NIX_RX_OFFLOAD_MARK_UPDATE_F;\n+\t}\n+\n+\trc = flow_free_rss_action(dev, flow);\n+\tif (rc != 0) {\n+\t\trte_flow_error_set(error, EIO,\n+\t\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\t NULL,\n+\t\t\t\t \"Failed to free rss action\");\n+\t}\n+\n+\trc = otx2_flow_mcam_free_entry(mbox, flow->mcam_id);\n+\tif (rc != 0) {\n+\t\trte_flow_error_set(error, EIO,\n+\t\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\t NULL,\n+\t\t\t\t \"Failed to destroy filter\");\n+\t}\n+\n+\tTAILQ_REMOVE(&npc->flow_list[flow->priority], flow, next);\n+\n+\tbmap = npc->live_entries[flow->priority];\n+\trte_bitmap_clear(bmap, flow->mcam_id);\n+\n+\trte_free(flow);\n+\treturn 0;\n+}\n+\n+static int\n+otx2_flow_flush(struct rte_eth_dev *dev,\n+\t\tstruct rte_flow_error *error)\n+{\n+\tstruct otx2_eth_dev *hw = dev->data->dev_private;\n+\tint rc;\n+\n+\trc = otx2_flow_free_all_resources(hw);\n+\tif (rc) {\n+\t\totx2_err(\"Error when deleting NPC MCAM entries \"\n+\t\t\t\t\", counters\");\n+\t\trte_flow_error_set(error, EIO,\n+\t\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\t NULL,\n+\t\t\t\t \"Failed to flush filter\");\n+\t\treturn -rte_errno;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+otx2_flow_isolate(struct rte_eth_dev *dev __rte_unused,\n+\t\t int enable __rte_unused,\n+\t\t struct rte_flow_error *error)\n+{\n+\t/*\n+\t * If we support, we need to un-install the default mcam\n+\t * entry for this port.\n+\t */\n+\n+\trte_flow_error_set(error, ENOTSUP,\n+\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t NULL,\n+\t\t\t \"Flow isolation not supported\");\n+\n+\treturn -rte_errno;\n+}\n+\n+static int\n+otx2_flow_query(struct rte_eth_dev *dev,\n+\t\tstruct rte_flow *flow,\n+\t\tconst struct rte_flow_action *action,\n+\t\tvoid *data,\n+\t\tstruct rte_flow_error *error)\n+{\n+\tstruct otx2_eth_dev *hw = dev->data->dev_private;\n+\tstruct rte_flow_query_count *query = data;\n+\tstruct otx2_mbox *mbox = hw->mbox;\n+\tconst char *errmsg = NULL;\n+\tint errcode = ENOTSUP;\n+\tint rc;\n+\n+\tif (action->type != RTE_FLOW_ACTION_TYPE_COUNT) {\n+\t\terrmsg = \"Only COUNT is supported in query\";\n+\t\tgoto err_exit;\n+\t}\n+\n+\tif (flow->ctr_id == NPC_COUNTER_NONE) {\n+\t\terrmsg = \"Counter is not available\";\n+\t\tgoto err_exit;\n+\t}\n+\n+\trc = otx2_flow_mcam_read_counter(mbox, flow->ctr_id, &query->hits);\n+\tif (rc != 0) {\n+\t\terrcode = EIO;\n+\t\terrmsg = \"Error reading flow counter\";\n+\t\tgoto err_exit;\n+\t}\n+\tquery->hits_set = 1;\n+\tquery->bytes_set = 0;\n+\n+\tif (query->reset)\n+\t\trc = otx2_flow_mcam_clear_counter(mbox, flow->ctr_id);\n+\tif (rc != 0) {\n+\t\terrcode = EIO;\n+\t\terrmsg = \"Error clearing flow counter\";\n+\t\tgoto err_exit;\n+\t}\n+\n+\treturn 0;\n+\n+err_exit:\n+\trte_flow_error_set(error, errcode,\n+\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t NULL,\n+\t\t\t errmsg);\n+\treturn -rte_errno;\n+}\n+\n const struct rte_flow_ops otx2_flow_ops = {\n \t.validate = otx2_flow_validate,\n \t.create = otx2_flow_create,\n+\t.destroy = otx2_flow_destroy,\n+\t.flush = otx2_flow_flush,\n+\t.query = otx2_flow_query,\n+\t.isolate = otx2_flow_isolate,\n };\ndiff --git a/drivers/net/octeontx2/otx2_rx.h b/drivers/net/octeontx2/otx2_rx.h\nindex db79451b9..e18e04658 100644\n--- a/drivers/net/octeontx2/otx2_rx.h\n+++ b/drivers/net/octeontx2/otx2_rx.h\n@@ -5,6 +5,9 @@\n #ifndef __OTX2_RX_H__\n #define __OTX2_RX_H__\n \n+/* Default mark value used when none is provided. */\n+#define OTX2_FLOW_ACTION_FLAG_DEFAULT\t0xffff\n+\n #define PTYPE_WIDTH 12\n #define PTYPE_NON_TUNNEL_ARRAY_SZ\tBIT(PTYPE_WIDTH)\n #define PTYPE_TUNNEL_ARRAY_SZ\t\tBIT(PTYPE_WIDTH)\n", "prefixes": [ "v2", "40/57" ] }