Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/101101/?format=api
{ "id": 101101, "url": "https://patches.dpdk.org/api/patches/101101/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20211011155057.302142-23-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-23-skori@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20211011155057.302142-23-skori@marvell.com", "date": "2021-10-11T15:50:50", "name": "[v4,22/28] net/cnxk: support ops to create meter", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ac66ea3e12bfebefcfb998b4e50a3df819dbd751", "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-23-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/101101/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/101101/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 E388EA034F;\n\tMon, 11 Oct 2021 17:53:27 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 4BE48411CE;\n\tMon, 11 Oct 2021 17:51:57 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n [67.231.148.174])\n by mails.dpdk.org (Postfix) with ESMTP id 82FFA411CE\n for <dev@dpdk.org>; Mon, 11 Oct 2021 17:51:56 +0200 (CEST)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n by mx0a-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 19BE6epo030302\n for <dev@dpdk.org>; Mon, 11 Oct 2021 08:51:55 -0700", "from dc5-exch02.marvell.com ([199.233.59.182])\n by mx0a-0016f401.pphosted.com with ESMTP id 3bmpqt0gmq-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n for <dev@dpdk.org>; Mon, 11 Oct 2021 08:51:55 -0700", "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 Mon, 11 Oct 2021 08:51:54 -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:51:54 -0700", "from localhost.localdomain (unknown [10.28.34.25])\n by maili.marvell.com (Postfix) with ESMTP id 5CD9D3F705B;\n Mon, 11 Oct 2021 08:51:52 -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=OWEfpMo600YNS35/JtA2vqj7UyViVKNH+w+uq4Ghilk=;\n b=KyjcA2xd1XPiyPWhGorrTA9r0vk0u1b8w/SQehtB8SzU2evTwwNfqeFoBLNJoU1VLiGL\n sKyuJNuuoMafFOhras3INZD0KZi8GUWUf+MElPw7QkHTLcnx9bD1gwpj1+ggT0ggeD3j\n QjOQZvK0nHro2cK8DsNWu/ia3Zxu0DRmB/NCNMjcVvf3E5oP0sLdoHGTgBk4255Qq7kh\n Wg5MAD0L9cqWAaEVYWW834dWmhW4vX0XgpS6qLG2YscxOA4KxNTvX81XYj4LAK9gHRvp\n xg5pY2n4Sd6AzFiTQ94ubVpej/s+BPiNrMVv1lBX8fVxGyN7LtwBw7PESaprfWTyIMID 3Q==", "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:50 +0530", "Message-ID": "<20211011155057.302142-23-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": "LAT4N0ojcLzhftEWAe52bO32aS3iXr3V", "X-Proofpoint-GUID": "LAT4N0ojcLzhftEWAe52bO32aS3iXr3V", "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 22/28] net/cnxk: support ops to create meter", "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\nImplement API to create meter instance for CNXK platform.\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/cnxk_ethdev.c | 1 +\n drivers/net/cnxk/cnxk_ethdev.h | 25 ++++++++\n drivers/net/cnxk/cnxk_ethdev_mtr.c | 93 ++++++++++++++++++++++++++++++\n 3 files changed, 119 insertions(+)", "diff": "diff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c\nindex 6295fa0557..2bb33d8f2d 100644\n--- a/drivers/net/cnxk/cnxk_ethdev.c\n+++ b/drivers/net/cnxk/cnxk_ethdev.c\n@@ -706,6 +706,7 @@ nix_ingress_policer_setup(struct cnxk_eth_dev *dev)\n {\n \tTAILQ_INIT(&dev->mtr_profiles);\n \tTAILQ_INIT(&dev->mtr_policy);\n+\tTAILQ_INIT(&dev->mtr);\n \n \treturn 0;\n }\ndiff --git a/drivers/net/cnxk/cnxk_ethdev.h b/drivers/net/cnxk/cnxk_ethdev.h\nindex 4cdce5dfd0..10adeeec82 100644\n--- a/drivers/net/cnxk/cnxk_ethdev.h\n+++ b/drivers/net/cnxk/cnxk_ethdev.h\n@@ -159,6 +159,28 @@ struct cnxk_timesync_info {\n \tuint64_t *tx_tstamp;\n } __plt_cache_aligned;\n \n+struct cnxk_meter_node {\n+#define MAX_PRV_MTR_NODES 10\n+\tTAILQ_ENTRY(cnxk_meter_node) next;\n+\t/**< Pointer to the next flow meter structure. */\n+\tuint32_t id; /**< Usr mtr id. */\n+\tstruct cnxk_mtr_profile_node *profile;\n+\tstruct cnxk_mtr_policy_node *policy;\n+\tuint32_t bpf_id; /**< Hw mtr id. */\n+\tuint32_t rq_num;\n+\tuint32_t *rq_id;\n+\tuint16_t level;\n+\tuint32_t prev_id[MAX_PRV_MTR_NODES]; /**< Prev mtr id for chaining */\n+\tuint32_t prev_cnt;\n+\tuint32_t next_id; /**< Next mtr id for chaining */\n+\tbool is_prev;\n+\tbool is_next;\n+\tstruct rte_mtr_params params;\n+\tstruct roc_nix_bpf_objs profs;\n+\tbool is_used;\n+\tuint32_t ref_cnt;\n+};\n+\n struct action_rss {\n \tenum rte_eth_hash_function func;\n \tuint32_t level;\n@@ -197,6 +219,7 @@ struct cnxk_mtr_profile_node {\n \n TAILQ_HEAD(cnxk_mtr_profiles, cnxk_mtr_profile_node);\n TAILQ_HEAD(cnxk_mtr_policy, cnxk_mtr_policy_node);\n+TAILQ_HEAD(cnxk_mtr, cnxk_meter_node);\n \n /* Security session private data */\n struct cnxk_eth_sec_sess {\n@@ -344,8 +367,10 @@ struct cnxk_eth_dev {\n \tuint64_t clk_delta;\n \n \t/* Ingress policer */\n+\tenum roc_nix_bpf_color precolor_tbl[ROC_NIX_BPF_PRE_COLOR_MAX];\n \tstruct cnxk_mtr_profiles mtr_profiles;\n \tstruct cnxk_mtr_policy mtr_policy;\n+\tstruct cnxk_mtr mtr;\n \n \t/* Rx burst for cleanup(Only Primary) */\n \teth_rx_burst_t rx_pkt_burst_no_offload;\ndiff --git a/drivers/net/cnxk/cnxk_ethdev_mtr.c b/drivers/net/cnxk/cnxk_ethdev_mtr.c\nindex c3739749fc..b258de0253 100644\n--- a/drivers/net/cnxk/cnxk_ethdev_mtr.c\n+++ b/drivers/net/cnxk/cnxk_ethdev_mtr.c\n@@ -37,6 +37,18 @@ static struct rte_mtr_capabilities mtr_capa = {\n \t\t RTE_MTR_STATS_N_BYTES_YELLOW | RTE_MTR_STATS_N_BYTES_RED |\n \t\t RTE_MTR_STATS_N_BYTES_DROPPED};\n \n+static struct cnxk_meter_node *\n+nix_mtr_find(struct cnxk_eth_dev *dev, uint32_t meter_id)\n+{\n+\tstruct cnxk_mtr *fms = &dev->mtr;\n+\tstruct cnxk_meter_node *fm;\n+\n+\tTAILQ_FOREACH(fm, fms, next)\n+\t\tif (meter_id == fm->id)\n+\t\t\treturn fm;\n+\treturn NULL;\n+}\n+\n static struct cnxk_mtr_profile_node *\n nix_mtr_profile_find(struct cnxk_eth_dev *dev, uint32_t profile_id)\n {\n@@ -374,6 +386,86 @@ cnxk_nix_mtr_policy_delete(struct rte_eth_dev *eth_dev, uint32_t policy_id,\n \treturn 0;\n }\n \n+static int\n+cnxk_nix_mtr_create(struct rte_eth_dev *eth_dev, uint32_t mtr_id,\n+\t\t struct rte_mtr_params *params, int shared,\n+\t\t struct rte_mtr_error *error)\n+{\n+\tstruct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);\n+\tstruct cnxk_mtr_profile_node *profile;\n+\tstruct cnxk_mtr_policy_node *policy;\n+\tstruct cnxk_mtr *fm = &dev->mtr;\n+\tstruct cnxk_meter_node *mtr;\n+\tint i;\n+\n+\tRTE_SET_USED(shared);\n+\n+\tif (params == NULL)\n+\t\treturn -rte_mtr_error_set(error, ENOENT,\n+\t\t\t\t\t RTE_MTR_ERROR_TYPE_MTR_PARAMS, NULL,\n+\t\t\t\t\t \"Meter params are invalid.\");\n+\n+\tprofile = nix_mtr_profile_find(dev, params->meter_profile_id);\n+\tif (profile == NULL)\n+\t\treturn -rte_mtr_error_set(error, ENOENT,\n+\t\t\t\t\t RTE_MTR_ERROR_TYPE_METER_PROFILE_ID,\n+\t\t\t\t\t ¶ms->meter_profile_id,\n+\t\t\t\t\t \"Meter profile is invalid.\");\n+\n+\tpolicy = nix_mtr_policy_find(dev, params->meter_policy_id);\n+\tif (policy == NULL)\n+\t\treturn -rte_mtr_error_set(error, ENOENT,\n+\t\t\t\t\t RTE_MTR_ERROR_TYPE_METER_POLICY_ID,\n+\t\t\t\t\t ¶ms->meter_policy_id,\n+\t\t\t\t\t \"Meter policy is invalid.\");\n+\n+\tmtr = nix_mtr_find(dev, mtr_id);\n+\tif (mtr) {\n+\t\treturn -rte_mtr_error_set(error, EEXIST,\n+\t\t\t\t\t RTE_MTR_ERROR_TYPE_MTR_ID, NULL,\n+\t\t\t\t\t \"Meter already exist\");\n+\t}\n+\n+\tmtr = plt_zmalloc(sizeof(struct cnxk_meter_node), ROC_ALIGN);\n+\tif (mtr == NULL) {\n+\t\treturn -rte_mtr_error_set(error, ENOMEM,\n+\t\t\t\t\t RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,\n+\t\t\t\t\t \"Meter memory alloc failed.\");\n+\t}\n+\n+\tmtr->id = mtr_id;\n+\tmtr->profile = profile;\n+\tmtr->policy = policy;\n+\tmtr->params = *params;\n+\tmtr->bpf_id = ROC_NIX_BPF_ID_INVALID;\n+\tmtr->prev_cnt = 0;\n+\tfor (i = 0; i < MAX_PRV_MTR_NODES; i++)\n+\t\tmtr->prev_id[i] = ROC_NIX_BPF_ID_INVALID;\n+\n+\tmtr->next_id = ROC_NIX_BPF_ID_INVALID;\n+\tmtr->is_next = false;\n+\tmtr->level = ROC_NIX_BPF_LEVEL_IDX_INVALID;\n+\n+\tif (params->dscp_table) {\n+\t\tmtr->params.dscp_table = plt_zmalloc(ROC_NIX_BPF_PRE_COLOR_MAX,\n+\t\t\t\t\t\t ROC_ALIGN);\n+\t\tif (mtr->params.dscp_table == NULL) {\n+\t\t\tplt_free(mtr);\n+\t\t\treturn -rte_mtr_error_set(error, ENOMEM,\n+\t\t\t\t\tRTE_MTR_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\t\tNULL, \"Memory alloc failed.\");\n+\t\t}\n+\n+\t\tfor (i = 0; i < ROC_NIX_BPF_PRE_COLOR_MAX; i++)\n+\t\t\tmtr->params.dscp_table[i] = params->dscp_table[i];\n+\t}\n+\n+\tprofile->ref_cnt++;\n+\tpolicy->ref_cnt++;\n+\tTAILQ_INSERT_TAIL(fm, mtr, next);\n+\treturn 0;\n+}\n+\n const struct rte_mtr_ops nix_mtr_ops = {\n \t.capabilities_get = cnxk_nix_mtr_capabilities_get,\n \t.meter_profile_add = cnxk_nix_mtr_profile_add,\n@@ -381,6 +473,7 @@ const struct rte_mtr_ops nix_mtr_ops = {\n \t.meter_policy_validate = cnxk_nix_mtr_policy_validate,\n \t.meter_policy_add = cnxk_nix_mtr_policy_add,\n \t.meter_policy_delete = cnxk_nix_mtr_policy_delete,\n+\t.create = cnxk_nix_mtr_create,\n };\n \n int\n", "prefixes": [ "v4", "22/28" ] }