Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/101096/?format=api
{ "id": 101096, "url": "https://patches.dpdk.org/api/patches/101096/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20211011155057.302142-18-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-18-skori@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20211011155057.302142-18-skori@marvell.com", "date": "2021-10-11T15:50:45", "name": "[v4,17/28] net/cnxk: support ops to create meter profile", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "76e6c9023674dfc13f80e0504c62cb72625c190f", "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-18-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/101096/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/101096/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 EF42DA034F;\n\tMon, 11 Oct 2021 17:52:57 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 7B4E4411B8;\n\tMon, 11 Oct 2021 17:51:46 +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 02ED7411B8\n for <dev@dpdk.org>; Mon, 11 Oct 2021 17:51:44 +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 19BEHcPu030591\n for <dev@dpdk.org>; Mon, 11 Oct 2021 08:51:44 -0700", "from dc5-exch01.marvell.com ([199.233.59.181])\n by mx0b-0016f401.pphosted.com with ESMTP id 3bmpv4rc3f-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:44 -0700", "from DC5-EXCH01.marvell.com (10.69.176.38) 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:51:42 -0700", "from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.18 via Frontend\n Transport; Mon, 11 Oct 2021 08:51:42 -0700", "from localhost.localdomain (unknown [10.28.34.25])\n by maili.marvell.com (Postfix) with ESMTP id 595C93F707B;\n Mon, 11 Oct 2021 08:51:40 -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=kdLbDzhIi/gvdiFO0AsDkVdXlE/GOAAlN8djGmfu8xk=;\n b=A4pgns7jLF2n0LZvidkuMcnA4hNPbxdK6aM3j/+BrckK0b83o2i1JugfrP0GE4ujjF9e\n HzGUU9O4E3qy/PZ7JABeha++jhz1K7W/hb4XES8r7MzQYpKG7Ub/cJ3FqKcX59v89KCX\n 9fTKEI7XdJ0eaAj9FdXtx5u8sQRwQSQTYqcVIoOXnOCX7KeuEiNGxCnCfxcBtmTd5B8Q\n mSg+y5wrHHP5yV5KYdqo3EWeCGyLXm/hDnUAiAy0U6ztamlVaIURDrvU2jUKR9UjMSPR\n EG4pVp87d3hWEQ7Xf4TQbQia9kPuuTD1Wi+MJ0w8tPf9hsBY/NNfL1YDbKuBFDcKZIOk Wg==", "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:45 +0530", "Message-ID": "<20211011155057.302142-18-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": "9CizhHsZ700PoCUNcvTXyoW4qgPiTaKI", "X-Proofpoint-GUID": "9CizhHsZ700PoCUNcvTXyoW4qgPiTaKI", "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 17/28] net/cnxk: support ops to create meter\n profile", "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 add meter profile 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 | 14 +++\n drivers/net/cnxk/cnxk_ethdev.h | 13 +++\n drivers/net/cnxk/cnxk_ethdev_mtr.c | 138 +++++++++++++++++++++++++++++\n 3 files changed, 165 insertions(+)", "diff": "diff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c\nindex f694abd71d..d748d5da04 100644\n--- a/drivers/net/cnxk/cnxk_ethdev.c\n+++ b/drivers/net/cnxk/cnxk_ethdev.c\n@@ -701,6 +701,14 @@ nix_free_queue_mem(struct cnxk_eth_dev *dev)\n \tdev->sqs = NULL;\n }\n \n+static int\n+nix_ingress_policer_setup(struct cnxk_eth_dev *dev)\n+{\n+\tTAILQ_INIT(&dev->mtr_profiles);\n+\n+\treturn 0;\n+}\n+\n static int\n nix_rss_default_setup(struct cnxk_eth_dev *dev)\n {\n@@ -1113,6 +1121,12 @@ cnxk_nix_configure(struct rte_eth_dev *eth_dev)\n \t\tgoto free_nix_lf;\n \t}\n \n+\trc = nix_ingress_policer_setup(dev);\n+\tif (rc) {\n+\t\tplt_err(\"Failed to setup ingress policer rc=%d\", rc);\n+\t\tgoto free_nix_lf;\n+\t}\n+\n \trc = roc_nix_tm_hierarchy_enable(nix, ROC_NIX_TM_DEFAULT, false);\n \tif (rc) {\n \t\tplt_err(\"Failed to enable default tm hierarchy, rc=%d\", rc);\ndiff --git a/drivers/net/cnxk/cnxk_ethdev.h b/drivers/net/cnxk/cnxk_ethdev.h\nindex 7a585b9dcf..c076208d77 100644\n--- a/drivers/net/cnxk/cnxk_ethdev.h\n+++ b/drivers/net/cnxk/cnxk_ethdev.h\n@@ -13,6 +13,7 @@\n #include <rte_mbuf.h>\n #include <rte_mbuf_pool_ops.h>\n #include <rte_mempool.h>\n+#include <rte_mtr_driver.h>\n #include <rte_security.h>\n #include <rte_security_driver.h>\n #include <rte_tailq.h>\n@@ -158,6 +159,15 @@ struct cnxk_timesync_info {\n \tuint64_t *tx_tstamp;\n } __plt_cache_aligned;\n \n+struct cnxk_mtr_profile_node {\n+\tTAILQ_ENTRY(cnxk_mtr_profile_node) next;\n+\tstruct rte_mtr_meter_profile profile; /**< Profile detail. */\n+\tuint32_t ref_cnt;\t\t /**< Use count. */\n+\tuint32_t id;\t\t\t /**< Profile id. */\n+};\n+\n+TAILQ_HEAD(cnxk_mtr_profiles, cnxk_mtr_profile_node);\n+\n /* Security session private data */\n struct cnxk_eth_sec_sess {\n \t/* List entry */\n@@ -303,6 +313,9 @@ struct cnxk_eth_dev {\n \tdouble clk_freq_mult;\n \tuint64_t clk_delta;\n \n+\t/* Ingress policer */\n+\tstruct cnxk_mtr_profiles mtr_profiles;\n+\n \t/* Rx burst for cleanup(Only Primary) */\n \teth_rx_burst_t rx_pkt_burst_no_offload;\n \ndiff --git a/drivers/net/cnxk/cnxk_ethdev_mtr.c b/drivers/net/cnxk/cnxk_ethdev_mtr.c\nindex 12013f26c2..bab03ebe95 100644\n--- a/drivers/net/cnxk/cnxk_ethdev_mtr.c\n+++ b/drivers/net/cnxk/cnxk_ethdev_mtr.c\n@@ -37,6 +37,106 @@ 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_mtr_profile_node *\n+nix_mtr_profile_find(struct cnxk_eth_dev *dev, uint32_t profile_id)\n+{\n+\tstruct cnxk_mtr_profiles *fmps = &dev->mtr_profiles;\n+\tstruct cnxk_mtr_profile_node *fmp;\n+\n+\tTAILQ_FOREACH(fmp, fmps, next)\n+\t\tif (profile_id == fmp->id)\n+\t\t\treturn fmp;\n+\n+\treturn NULL;\n+}\n+\n+static int\n+nix_mtr_profile_validate(struct cnxk_eth_dev *dev, uint32_t profile_id,\n+\t\t\t struct rte_mtr_meter_profile *profile,\n+\t\t\t struct rte_mtr_error *error)\n+{\n+\tint rc = 0;\n+\n+\tPLT_SET_USED(dev);\n+\n+\tif (profile == NULL)\n+\t\treturn -rte_mtr_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_MTR_ERROR_TYPE_METER_PROFILE,\n+\t\t\t\t\t NULL, \"Meter profile is null.\");\n+\n+\tif (profile_id == UINT32_MAX)\n+\t\treturn -rte_mtr_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_MTR_ERROR_TYPE_METER_PROFILE_ID,\n+\t\t\t\t\t NULL, \"Meter profile id not valid.\");\n+\n+\tswitch (profile->alg) {\n+\tcase RTE_MTR_SRTCM_RFC2697:\n+\t\tif (profile->srtcm_rfc2697.cir > mtr_capa.meter_rate_max)\n+\t\t\trc = -rte_mtr_error_set(error, EINVAL,\n+\t\t\t\tRTE_MTR_ERROR_TYPE_METER_PROFILE, NULL,\n+\t\t\t\t\"CIR exceeds max meter rate\");\n+\n+\t\tif (profile->srtcm_rfc2697.cbs > NIX_BPF_BURST_MAX)\n+\t\t\trc = -rte_mtr_error_set(error, EINVAL,\n+\t\t\t\tRTE_MTR_ERROR_TYPE_METER_PROFILE, NULL,\n+\t\t\t\t\"CBS exceeds max meter burst size\");\n+\n+\t\tif (profile->srtcm_rfc2697.ebs > NIX_BPF_BURST_MAX)\n+\t\t\trc = -rte_mtr_error_set(error, EINVAL,\n+\t\t\t\tRTE_MTR_ERROR_TYPE_METER_PROFILE, NULL,\n+\t\t\t\t\"EBS exceeds max meter burst size\");\n+\t\tbreak;\n+\n+\tcase RTE_MTR_TRTCM_RFC2698:\n+\t\tif (profile->trtcm_rfc2698.cir > mtr_capa.meter_rate_max)\n+\t\t\trc = -rte_mtr_error_set(error, EINVAL,\n+\t\t\t\tRTE_MTR_ERROR_TYPE_METER_PROFILE, NULL,\n+\t\t\t\t\"CIR exceeds max meter rate\");\n+\n+\t\tif (profile->trtcm_rfc2698.pir > mtr_capa.meter_rate_max)\n+\t\t\trc = -rte_mtr_error_set(error, EINVAL,\n+\t\t\t\tRTE_MTR_ERROR_TYPE_METER_PROFILE, NULL,\n+\t\t\t\t\"PIR exceeds max meter rate\");\n+\n+\t\tif (profile->trtcm_rfc2698.cbs > NIX_BPF_BURST_MAX)\n+\t\t\trc = -rte_mtr_error_set(error, EINVAL,\n+\t\t\t\tRTE_MTR_ERROR_TYPE_METER_PROFILE, NULL,\n+\t\t\t\t\"CBS exceeds max meter burst size\");\n+\n+\t\tif (profile->trtcm_rfc2698.pbs > NIX_BPF_BURST_MAX)\n+\t\t\trc = -rte_mtr_error_set(error, EINVAL,\n+\t\t\t\tRTE_MTR_ERROR_TYPE_METER_PROFILE, NULL,\n+\t\t\t\t\"PBS exceeds max meter burst size\");\n+\t\tbreak;\n+\n+\tcase RTE_MTR_TRTCM_RFC4115:\n+\t\tif ((profile->trtcm_rfc4115.cir + profile->trtcm_rfc4115.eir) >\n+\t\t mtr_capa.meter_rate_max)\n+\t\t\trc = -rte_mtr_error_set(error, EINVAL,\n+\t\t\t\tRTE_MTR_ERROR_TYPE_METER_PROFILE, NULL,\n+\t\t\t\t\"PIR + EIR exceeds max rate\");\n+\n+\t\tif (profile->trtcm_rfc4115.cbs > NIX_BPF_BURST_MAX)\n+\t\t\trc = -rte_mtr_error_set(error, EINVAL,\n+\t\t\t\tRTE_MTR_ERROR_TYPE_METER_PROFILE, NULL,\n+\t\t\t\t\"CBS exceeds max meter burst size\");\n+\n+\t\tif (profile->trtcm_rfc4115.ebs > NIX_BPF_BURST_MAX)\n+\t\t\trc = -rte_mtr_error_set(error, EINVAL,\n+\t\t\t\tRTE_MTR_ERROR_TYPE_METER_PROFILE, NULL,\n+\t\t\t\t\"PBS exceeds max meter burst size\");\n+\t\tbreak;\n+\n+\tdefault:\n+\t\trc = -rte_mtr_error_set(error, EINVAL,\n+\t\t\t\t\tRTE_MTR_ERROR_TYPE_METER_PROFILE, NULL,\n+\t\t\t\t\t\"alg is invalid\");\n+\t\tbreak;\n+\t}\n+\n+\treturn rc;\n+}\n+\n static int\n cnxk_nix_mtr_capabilities_get(struct rte_eth_dev *dev,\n \t\t\t struct rte_mtr_capabilities *capa,\n@@ -52,8 +152,46 @@ cnxk_nix_mtr_capabilities_get(struct rte_eth_dev *dev,\n \treturn 0;\n }\n \n+static int\n+cnxk_nix_mtr_profile_add(struct rte_eth_dev *eth_dev, uint32_t profile_id,\n+\t\t\t struct rte_mtr_meter_profile *profile,\n+\t\t\t struct rte_mtr_error *error)\n+{\n+\tstruct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);\n+\tstruct cnxk_mtr_profiles *fmps = &dev->mtr_profiles;\n+\tstruct cnxk_mtr_profile_node *fmp;\n+\tint ret;\n+\n+\t/* Check input params. */\n+\tret = nix_mtr_profile_validate(dev, profile_id, profile, error);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tfmp = nix_mtr_profile_find(dev, profile_id);\n+\tif (fmp) {\n+\t\treturn -rte_mtr_error_set(error, EEXIST,\n+\t\t\t\t\t RTE_MTR_ERROR_TYPE_METER_PROFILE_ID,\n+\t\t\t\t\t NULL, \"Profile already exist\");\n+\t}\n+\n+\tfmp = plt_zmalloc(sizeof(struct cnxk_mtr_profile_node), ROC_ALIGN);\n+\tif (fmp == 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 profile memory \"\n+\t\t\t\t\t \"alloc failed.\");\n+\n+\tfmp->id = profile_id;\n+\tfmp->profile = *profile;\n+\n+\tTAILQ_INSERT_TAIL(fmps, fmp, next);\n+\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 };\n \n int\n", "prefixes": [ "v4", "17/28" ] }