Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/101107/?format=api
{ "id": 101107, "url": "https://patches.dpdk.org/api/patches/101107/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20211011155057.302142-29-skori@marvell.com/", "project": { "id": 1, "url": "https://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": "<20211011155057.302142-29-skori@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20211011155057.302142-29-skori@marvell.com", "date": "2021-10-11T15:50:56", "name": "[v4,28/28] net/cnxk: support meter action to flow destroy", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "951ca1a1b2d55d6b00596351d273ee67700baf1b", "submitter": { "id": 1318, "url": "https://patches.dpdk.org/api/people/1318/?format=api", "name": "Sunil Kumar Kori", "email": "skori@marvell.com" }, "delegate": { "id": 310, "url": "https://patches.dpdk.org/api/users/310/?format=api", "username": "jerin", "first_name": "Jerin", "last_name": "Jacob", "email": "jerinj@marvell.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20211011155057.302142-29-skori@marvell.com/mbox/", "series": [ { "id": 19528, "url": "https://patches.dpdk.org/api/series/19528/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=19528", "date": "2021-10-11T15:50:28", "name": "Support ingress policer", "version": 4, "mbox": "https://patches.dpdk.org/series/19528/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/101107/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/101107/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 2236DA034F;\n\tMon, 11 Oct 2021 17:54:06 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 72B334117A;\n\tMon, 11 Oct 2021 17:52:14 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com\n [67.231.156.173])\n by mails.dpdk.org (Postfix) with ESMTP id 58950411F3\n for <dev@dpdk.org>; Mon, 11 Oct 2021 17:52:11 +0200 (CEST)", "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 SMTP id 19BEHauq030539\n for <dev@dpdk.org>; Mon, 11 Oct 2021 08:52:10 -0700", "from dc5-exch01.marvell.com ([199.233.59.181])\n by mx0b-0016f401.pphosted.com with ESMTP id 3bmpv4rc57-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n for <dev@dpdk.org>; Mon, 11 Oct 2021 08:52:10 -0700", "from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.18;\n Mon, 11 Oct 2021 08:52:08 -0700", "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; Mon, 11 Oct 2021 08:52:08 -0700", "from localhost.localdomain (unknown [10.28.34.25])\n by maili.marvell.com (Postfix) with ESMTP id C65C83F7079;\n Mon, 11 Oct 2021 08:52:06 -0700 (PDT)" ], "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=VLd8NzPL0SFrkmCr7OBctD/3y+41eD5Tux0PPzgtCNQ=;\n b=eYwzC7i2hCIp1WKx9pzqntlJbM5qV8cGSC88r1zrMGvFRluw7LHsJqs+q/SAJcPt3Gpz\n s9aoEaWMO9UDjJSpH7Kx0V8USr2gJRdvhi4SxNYNCWHSp8o3uXN+mFSz2574Gecb+/Y5\n i3iWSilp5NiEZmszvL7wnkp65nyKp5At0+QApRYAPlsGMdDxRm3n+mUPDdtZhWjjXuca\n 79Uf7RTHMfWlmHLfjaCjztoRJK/R6idi0JFilNG6UrI6Uf8PLxCGCArFydwRw4kzprh7\n BI68pLSZHTe5hjPGsr9Z/rXu/b3KH/0/U5CWJuGBFWF/t6mWmtDF2Z/amBUYE8y+IAOA 0w==", "From": "<skori@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>, Rakesh Kudurumalla <rkudurumalla@marvell.com>", "Date": "Mon, 11 Oct 2021 21:20:56 +0530", "Message-ID": "<20211011155057.302142-29-skori@marvell.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20211011155057.302142-1-skori@marvell.com>", "References": "<20210930090844.1059326-1-skori@marvell.com>\n <20211011155057.302142-1-skori@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-ORIG-GUID": "iQkHK4EzcDem59dWutT_oL3Tx_xMLwl9", "X-Proofpoint-GUID": "iQkHK4EzcDem59dWutT_oL3Tx_xMLwl9", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475\n definitions=2021-10-11_05,2021-10-11_01,2020-04-07_01", "Subject": "[dpdk-dev] [PATCH v4 28/28] net/cnxk: support meter action to flow\n destroy", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Sunil Kumar Kori <skori@marvell.com>\n\nMeters are configured per flow using rte_flow_create API.\nPatch adds support for destroy operation for meter action\napplied on the flow.\n\nSigned-off-by: Sunil Kumar Kori <skori@marvell.com>\nSigned-off-by: Rakesh Kudurumalla <rkudurumalla@marvell.com>\n---\nv4:\n - Rebase support on dpdk-next-net-mrvl branch\n - Handled meter action during flow destroy\n - Handled meter cleanup during port shutdown\n \nv3:\n - Rebase support on latest DPDK\n - Handled multilevel chaining for tree hierarchy\n - Fix naming convention\nv2:\n - Rebase support on latest DPDK\n - Handled multilevel chaining for linear hierarchy\n - Review comments incorporated\n\n drivers/net/cnxk/cn10k_rte_flow.c | 22 +++++++++++++++-\n drivers/net/cnxk/cnxk_ethdev.c | 40 ++++++++++++++++++++++++++++++\n drivers/net/cnxk/cnxk_ethdev.h | 2 ++\n drivers/net/cnxk/cnxk_ethdev_mtr.c | 7 ++++++\n 4 files changed, 70 insertions(+), 1 deletion(-)", "diff": "diff --git a/drivers/net/cnxk/cn10k_rte_flow.c b/drivers/net/cnxk/cn10k_rte_flow.c\nindex 00c0b172e4..8c87452934 100644\n--- a/drivers/net/cnxk/cn10k_rte_flow.c\n+++ b/drivers/net/cnxk/cn10k_rte_flow.c\n@@ -12,6 +12,14 @@ cn10k_mtr_connect(struct rte_eth_dev *eth_dev, uint32_t mtr_id)\n \treturn nix_mtr_connect(eth_dev, mtr_id);\n }\n \n+static int\n+cn10k_mtr_destroy(struct rte_eth_dev *eth_dev, uint32_t mtr_id)\n+{\n+\tstruct rte_mtr_error mtr_error;\n+\n+\treturn nix_mtr_destroy(eth_dev, mtr_id, &mtr_error);\n+}\n+\n static int\n cn10k_mtr_configure(struct rte_eth_dev *eth_dev,\n \t\t const struct rte_flow_action actions[])\n@@ -215,6 +223,8 @@ cn10k_flow_destroy(struct rte_eth_dev *eth_dev, struct rte_flow *rte_flow,\n \tstruct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);\n \tint mark_actions = 0, vtag_actions = 0;\n \tstruct roc_npc *npc = &dev->npc;\n+\tuint32_t mtr_id;\n+\tint rc;\n \n \tmark_actions = roc_npc_mark_actions_get(npc);\n \tif (mark_actions) {\n@@ -237,5 +247,15 @@ cn10k_flow_destroy(struct rte_eth_dev *eth_dev, struct rte_flow *rte_flow,\n \t\t}\n \t}\n \n-\treturn cnxk_flow_destroy(eth_dev, flow, error);\n+\tmtr_id = flow->mtr_id;\n+\trc = cnxk_flow_destroy(eth_dev, flow, error);\n+\tif (!rc) {\n+\t\trc = cn10k_mtr_destroy(eth_dev, mtr_id);\n+\t\tif (rc) {\n+\t\t\trte_flow_error_set(error, ENXIO,\n+\t\t\t\tRTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,\n+\t\t\t\t\"Meter attached to this flow does not exist\");\n+\t\t}\n+\t}\n+\treturn rc;\n }\ndiff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c\nindex 2bb33d8f2d..69bd58ae45 100644\n--- a/drivers/net/cnxk/cnxk_ethdev.c\n+++ b/drivers/net/cnxk/cnxk_ethdev.c\n@@ -141,6 +141,38 @@ nix_security_setup(struct cnxk_eth_dev *dev)\n \treturn rc;\n }\n \n+static int\n+nix_meter_fini(struct cnxk_eth_dev *dev)\n+{\n+\tstruct cnxk_meter_node *next_mtr = NULL;\n+\tstruct roc_nix_bpf_objs profs = {0};\n+\tstruct cnxk_meter_node *mtr = NULL;\n+\tstruct cnxk_mtr *fms = &dev->mtr;\n+\tstruct roc_nix *nix = &dev->nix;\n+\tstruct roc_nix_rq *rq;\n+\tuint32_t i;\n+\tint rc;\n+\n+\tRTE_TAILQ_FOREACH_SAFE(mtr, fms, next, next_mtr) {\n+\t\tfor (i = 0; i < mtr->rq_num; i++) {\n+\t\t\trq = &dev->rqs[mtr->rq_id[i]];\n+\t\t\trc |= roc_nix_bpf_ena_dis(nix, mtr->bpf_id, rq, false);\n+\t\t}\n+\n+\t\tprofs.level = mtr->level;\n+\t\tprofs.count = 1;\n+\t\tprofs.ids[0] = mtr->bpf_id;\n+\t\trc = roc_nix_bpf_free(nix, &profs, 1);\n+\n+\t\tif (rc)\n+\t\t\treturn rc;\n+\n+\t\tTAILQ_REMOVE(fms, mtr, next);\n+\t\tplt_free(mtr);\n+\t}\n+\treturn 0;\n+}\n+\n static int\n nix_security_release(struct cnxk_eth_dev *dev)\n {\n@@ -1012,6 +1044,11 @@ cnxk_nix_configure(struct rte_eth_dev *eth_dev)\n \t\tif (rc)\n \t\t\tgoto fail_configure;\n \n+\t\t/* Disable and free rte_meter entries */\n+\t\trc = nix_meter_fini(dev);\n+\t\tif (rc)\n+\t\t\tgoto fail_configure;\n+\n \t\t/* Cleanup security support */\n \t\trc = nix_security_release(dev);\n \t\tif (rc)\n@@ -1668,6 +1705,9 @@ cnxk_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool reset)\n \n \troc_nix_npc_rx_ena_dis(nix, false);\n \n+\t/* Disable and free rte_meter entries */\n+\tnix_meter_fini(dev);\n+\n \t/* Disable and free rte_flow entries */\n \troc_npc_fini(&dev->npc);\n \ndiff --git a/drivers/net/cnxk/cnxk_ethdev.h b/drivers/net/cnxk/cnxk_ethdev.h\nindex 7e13956572..2d4b073985 100644\n--- a/drivers/net/cnxk/cnxk_ethdev.h\n+++ b/drivers/net/cnxk/cnxk_ethdev.h\n@@ -589,6 +589,8 @@ int nix_mtr_level_update(struct rte_eth_dev *eth_dev, uint32_t id,\n \t\t\t uint32_t level);\n int nix_mtr_configure(struct rte_eth_dev *eth_dev, uint32_t id);\n int nix_mtr_connect(struct rte_eth_dev *eth_dev, uint32_t id);\n+int nix_mtr_destroy(struct rte_eth_dev *eth_dev, uint32_t id,\n+\t\t struct rte_mtr_error *error);\n int nix_mtr_color_action_validate(struct rte_eth_dev *eth_dev, uint32_t id,\n \t\t\t\t uint32_t *prev_id, uint32_t *next_id,\n \t\t\t\t struct cnxk_mtr_policy_node *policy,\ndiff --git a/drivers/net/cnxk/cnxk_ethdev_mtr.c b/drivers/net/cnxk/cnxk_ethdev_mtr.c\nindex 7fde992d0f..bfae145f7c 100644\n--- a/drivers/net/cnxk/cnxk_ethdev_mtr.c\n+++ b/drivers/net/cnxk/cnxk_ethdev_mtr.c\n@@ -1054,6 +1054,13 @@ nix_dscp_table_map(struct cnxk_meter_node *mtr,\n \t}\n }\n \n+int\n+nix_mtr_destroy(struct rte_eth_dev *eth_dev, uint32_t id,\n+\t\tstruct rte_mtr_error *error)\n+{\n+\treturn cnxk_nix_mtr_destroy(eth_dev, id, error);\n+}\n+\n int\n nix_mtr_connect(struct rte_eth_dev *eth_dev, uint32_t id)\n {\n", "prefixes": [ "v4", "28/28" ] }