Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/99739/?format=api
https://patches.dpdk.org/api/patches/99739/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210927082223.757436-22-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": "<20210927082223.757436-22-skori@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210927082223.757436-22-skori@marvell.com", "date": "2021-09-27T08:22:18", "name": "[v2,22/27] net/cnxk: support ops to create meter", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "4af49d7d5bd678e5429e8a4346d23274ca417f90", "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/20210927082223.757436-22-skori@marvell.com/mbox/", "series": [ { "id": 19182, "url": "https://patches.dpdk.org/api/series/19182/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=19182", "date": "2021-09-27T08:21:57", "name": "[v2,01/27] common/cnxk: update policer MBOX APIs and HW definitions", "version": 2, "mbox": "https://patches.dpdk.org/series/19182/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/99739/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/99739/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 757A3A0547;\n\tMon, 27 Sep 2021 10:25:10 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 3FD5A4117C;\n\tMon, 27 Sep 2021 10:23:24 +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 0F72B4117C\n for <dev@dpdk.org>; Mon, 27 Sep 2021 10:23:22 +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 18QKMvKH019136\n for <dev@dpdk.org>; Mon, 27 Sep 2021 01:23:22 -0700", "from dc5-exch02.marvell.com ([199.233.59.182])\n by mx0b-0016f401.pphosted.com with ESMTP id 3bavvuhtv6-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n for <dev@dpdk.org>; Mon, 27 Sep 2021 01:23:22 -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, 27 Sep 2021 01:23:20 -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, 27 Sep 2021 01:23:20 -0700", "from localhost.localdomain (unknown [10.28.34.25])\n by maili.marvell.com (Postfix) with ESMTP id 8D7AE3F7040;\n Mon, 27 Sep 2021 01:23:18 -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=qYsLKiU0mrc0QmSo48qnJ3GAYSo3TE62KDjSROt/vow=;\n b=eN6+sdWycZoEhhq44Pg/k/vzjdQX7SkTgWn3SLyPnzHuf94YDozEL+Mu9hLiAgH078fY\n ++ACa1WXvJ4QseKYdeBDwVCPREBtufIYTIpxgfUbIggqWYV7cqs/dOS+sB6Dh/EIz7fT\n 9SZqVtML8a2BTYRAsiqC2BPYJkff7uLXkC17Def3t+ikwuyHWsI7xeGSjvxzYac+Pf4x\n UqVFrUNNtTVYeUOpKL/YNP8WrhD2SdmvYMF7KoyhakBHqHLenTSxaRvPex7jGZijm04u\n 9i8bUYQ4o0GRaArvmHLGfw7OzaDbEJpxNgWgIYM6XieWvLbg29i+qgMrkZ0npdjGKl3z YA==", "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, 27 Sep 2021 13:52:18 +0530", "Message-ID": "<20210927082223.757436-22-skori@marvell.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20210927082223.757436-1-skori@marvell.com>", "References": "<20210927082223.757436-1-skori@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-ORIG-GUID": "a47e1xUKUWmiFNizPx3RlPSPOAAfctI8", "X-Proofpoint-GUID": "a47e1xUKUWmiFNizPx3RlPSPOAAfctI8", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.391,FMLib:17.0.607.475\n definitions=2021-09-27_02,2021-09-24_02,2020-04-07_01", "Subject": "[dpdk-dev] [PATCH v2 22/27] 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 CN10K platform.\n\nSigned-off-by: Sunil Kumar Kori <skori@marvell.com>\nSigned-off-by: Rakesh Kudurumalla <rkudurumalla@marvell.com>\n---\nv2:\n - Rebase support on latest DPDK\n - Handled multilevel chaining for linear hierarchy\n - Review comments incorporated\n\n drivers/net/cnxk/cn10k_ethdev_mtr.c | 76 +++++++++++++++++++++++++++++\n drivers/net/cnxk/cnxk_ethdev.c | 1 +\n drivers/net/cnxk/cnxk_ethdev.h | 22 +++++++++\n 3 files changed, 99 insertions(+)", "diff": "diff --git a/drivers/net/cnxk/cn10k_ethdev_mtr.c b/drivers/net/cnxk/cn10k_ethdev_mtr.c\nindex 46f0bdd5fc..9a8459d919 100644\n--- a/drivers/net/cnxk/cn10k_ethdev_mtr.c\n+++ b/drivers/net/cnxk/cn10k_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,69 @@ cn10k_nix_mtr_policy_delete(struct rte_eth_dev *eth_dev, uint32_t policy_id,\n \treturn 0;\n }\n \n+static int\n+cn10k_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+\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 == NULL) {\n+\t\tmtr = plt_zmalloc(sizeof(struct cnxk_meter_node), ROC_ALIGN);\n+\t\tif (mtr == NULL) {\n+\t\t\treturn -rte_mtr_error_set(error, ENOMEM,\n+\t\t\t\tRTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,\n+\t\t\t\t\"Meter memory alloc failed.\");\n+\t\t} else {\n+\t\t\tmtr->id = mtr_id;\n+\t\t\tmtr->profile = profile;\n+\t\t\tmtr->policy = policy;\n+\t\t\tmtr->params = *params;\n+\t\t\tmtr->bpf_id = ROC_NIX_BPF_ID_INVALID;\n+\t\t\tmtr->prev_id = ROC_NIX_BPF_ID_INVALID;\n+\t\t\tmtr->next_id = ROC_NIX_BPF_ID_INVALID;\n+\t\t\tmtr->is_prev = false;\n+\t\t\tmtr->is_next = false;\n+\t\t\tmtr->level = ROC_NIX_BPF_LEVEL_IDX_INVALID;\n+\t\t}\n+\t} else {\n+\t\treturn -rte_mtr_error_set(error, EEXIST,\n+\t\t\t\t\t RTE_MTR_ERROR_TYPE_MTR_ID,\n+\t\t\t\t\t NULL, \"Meter already exist\");\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 = cn10k_nix_mtr_capabilities_get,\n \t.meter_profile_add = cn10k_nix_mtr_profile_add,\n@@ -381,6 +456,7 @@ const struct rte_mtr_ops nix_mtr_ops = {\n \t.meter_policy_validate = cn10k_nix_mtr_policy_validate,\n \t.meter_policy_add = cn10k_nix_mtr_policy_add,\n \t.meter_policy_delete = cn10k_nix_mtr_policy_delete,\n+\t.create = cn10k_nix_mtr_create,\n };\n \n int\ndiff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c\nindex 9e75060513..4c12715756 100644\n--- a/drivers/net/cnxk/cnxk_ethdev.c\n+++ b/drivers/net/cnxk/cnxk_ethdev.c\n@@ -509,6 +509,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 4e45061c86..0ad06f1536 100644\n--- a/drivers/net/cnxk/cnxk_ethdev.h\n+++ b/drivers/net/cnxk/cnxk_ethdev.h\n@@ -145,6 +145,25 @@ struct cnxk_timesync_info {\n \tuint64_t *tx_tstamp;\n } __plt_cache_aligned;\n \n+struct cnxk_meter_node {\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; /**< Prev mtr id for chaining */\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+\tuint32_t ref_cnt;\n+};\n+\n struct action_rss {\n \tenum rte_eth_hash_function func;\n \tuint32_t level;\n@@ -183,6 +202,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 struct cnxk_eth_dev {\n \t/* ROC NIX */\n@@ -252,8 +272,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;\n", "prefixes": [ "v2", "22/27" ] }{ "id": 99739, "url": "