Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/101105/?format=api
https://patches.dpdk.org/api/patches/101105/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20211011155057.302142-27-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-27-skori@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20211011155057.302142-27-skori@marvell.com", "date": "2021-10-11T15:50:54", "name": "[v4,26/28] net/cnxk: support ops to read/update meter stats", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "16130c5284d045fb612247a017aaf9a47b4947cb", "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-27-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/101105/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/101105/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 858D4A034F;\n\tMon, 11 Oct 2021 17:53:52 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 025524117E;\n\tMon, 11 Oct 2021 17:52:08 +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 2A34C4118A\n for <dev@dpdk.org>; Mon, 11 Oct 2021 17:52:06 +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 19BE6enn030297\n for <dev@dpdk.org>; Mon, 11 Oct 2021 08:52:05 -0700", "from dc5-exch02.marvell.com ([199.233.59.182])\n by mx0a-0016f401.pphosted.com with ESMTP id 3bmpqt0gnr-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:05 -0700", "from DC5-EXCH01.marvell.com (10.69.176.38) 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:52:03 -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:52:03 -0700", "from localhost.localdomain (unknown [10.28.34.25])\n by maili.marvell.com (Postfix) with ESMTP id ED5C23F7080;\n Mon, 11 Oct 2021 08:52:01 -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=lepYoaiPyxl1aVF6WuNQM8HekfX4IlC0PVetBFXmS1A=;\n b=EFc3uQZmLanPqcTYJn6xg8D9U3TAPx10KYaVNTkZDDxkUZ7LWz/cTXXVAFKIyHtUNQh7\n ivEAi+cCsirlVSyT4440RHNy783bKMcmWc+xSeReuHIb9LWH71QCXCLJriKZXxmW7tnU\n KNW3wlgUGv9/wpwzh+vWR0kLj5gWzSRvuQJLqaEtP4FEQYNpH9q27BCV33YktGI+sGnD\n f4ST84YZg7i+APp+j6i5RwpUnVINj9T4FALLauMUoh5oShzCcNZvWYtbPSKDcdjtE69K\n O+Rznx5l5ZLtyIcIMT7QOIxhyUH2hpwZ1eUcwHSzOU8F5V4X093nwfhI3EEL1hnrFWRC jA==", "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:54 +0530", "Message-ID": "<20211011155057.302142-27-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": "V2IYt0zRfN4Jom91XuNO1YDaJ5rNmCgF", "X-Proofpoint-GUID": "V2IYt0zRfN4Jom91XuNO1YDaJ5rNmCgF", "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 26/28] net/cnxk: support ops to read/update\n meter stats", "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 read and update stats corresponding to\ngiven 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_mtr.c | 141 +++++++++++++++++++++++++++++\n 1 file changed, 141 insertions(+)", "diff": "diff --git a/drivers/net/cnxk/cnxk_ethdev_mtr.c b/drivers/net/cnxk/cnxk_ethdev_mtr.c\nindex be902ad47d..08af3f628a 100644\n--- a/drivers/net/cnxk/cnxk_ethdev_mtr.c\n+++ b/drivers/net/cnxk/cnxk_ethdev_mtr.c\n@@ -8,6 +8,21 @@\n #define NIX_MTR_COUNT_MAX 73 /* 64(leaf) + 8(mid) + 1(top) */\n #define NIX_MTR_COUNT_PER_FLOW 3 /* 1(leaf) + 1(mid) + 1(top) */\n \n+#define NIX_BPF_STATS_MASK_ALL \\\n+\t{ \\\n+\t\tROC_NIX_BPF_GREEN_PKT_F_PASS | ROC_NIX_BPF_GREEN_OCTS_F_PASS | \\\n+\t\t\tROC_NIX_BPF_GREEN_PKT_F_DROP | \\\n+\t\t\tROC_NIX_BPF_GREEN_OCTS_F_DROP | \\\n+\t\t\tROC_NIX_BPF_YELLOW_PKT_F_PASS | \\\n+\t\t\tROC_NIX_BPF_YELLOW_OCTS_F_PASS | \\\n+\t\t\tROC_NIX_BPF_YELLOW_PKT_F_DROP | \\\n+\t\t\tROC_NIX_BPF_YELLOW_OCTS_F_DROP | \\\n+\t\t\tROC_NIX_BPF_RED_PKT_F_PASS | \\\n+\t\t\tROC_NIX_BPF_RED_OCTS_F_PASS | \\\n+\t\t\tROC_NIX_BPF_RED_PKT_F_DROP | \\\n+\t\t\tROC_NIX_BPF_RED_OCTS_F_DROP \\\n+\t}\n+\n static const enum roc_nix_bpf_level_flag lvl_map[] = {ROC_NIX_BPF_LEVEL_F_LEAF,\n \t\t\t\t\t\t ROC_NIX_BPF_LEVEL_F_MID,\n \t\t\t\t\t\t ROC_NIX_BPF_LEVEL_F_TOP};\n@@ -663,6 +678,130 @@ cnxk_nix_mtr_dscp_table_update(struct rte_eth_dev *eth_dev, uint32_t mtr_id,\n \treturn rc;\n }\n \n+static int\n+cnxk_nix_mtr_stats_update(struct rte_eth_dev *eth_dev, uint32_t mtr_id,\n+\t\t\t uint64_t stats_mask, struct rte_mtr_error *error)\n+{\n+\tstruct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);\n+\tstruct cnxk_meter_node *mtr;\n+\n+\tif (!stats_mask)\n+\t\treturn -rte_mtr_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_MTR_ERROR_TYPE_MTR_PARAMS, NULL,\n+\t\t\t\t\t \"no bit is set to stats mask\");\n+\n+\tmtr = nix_mtr_find(dev, mtr_id);\n+\tif (mtr == NULL) {\n+\t\treturn -rte_mtr_error_set(error, ENOENT,\n+\t\t\t\t\t RTE_MTR_ERROR_TYPE_MTR_ID, NULL,\n+\t\t\t\t\t \"Meter object not found\");\n+\t}\n+\n+\tmtr->params.stats_mask = stats_mask;\n+\treturn 0;\n+}\n+\n+static int\n+cnxk_nix_mtr_stats_read(struct rte_eth_dev *eth_dev, uint32_t mtr_id,\n+\t\t\t struct rte_mtr_stats *stats, uint64_t *stats_mask,\n+\t\t\t int clear, struct rte_mtr_error *error)\n+{\n+\tuint8_t yellow_pkt_pass, yellow_octs_pass, yellow_pkt_drop;\n+\tuint8_t green_octs_drop, yellow_octs_drop, red_octs_drop;\n+\tuint8_t green_pkt_pass, green_octs_pass, green_pkt_drop;\n+\tstruct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);\n+\tuint8_t red_pkt_pass, red_octs_pass, red_pkt_drop;\n+\tuint64_t bpf_stats[ROC_NIX_BPF_STATS_MAX] = {0};\n+\tuint64_t mask = NIX_BPF_STATS_MASK_ALL;\n+\tstruct roc_nix *nix = &dev->nix;\n+\tstruct cnxk_meter_node *mtr;\n+\tint rc;\n+\n+\tif (!stats)\n+\t\treturn -rte_mtr_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_MTR_ERROR_TYPE_MTR_PARAMS, NULL,\n+\t\t\t\t\t \"stats pointer is NULL\");\n+\n+\tmtr = nix_mtr_find(dev, mtr_id);\n+\tif (mtr == NULL) {\n+\t\treturn -rte_mtr_error_set(error, ENOENT,\n+\t\t\t\t\t RTE_MTR_ERROR_TYPE_MTR_ID, NULL,\n+\t\t\t\t\t \"Meter object not found\");\n+\t}\n+\n+\trc = roc_nix_bpf_stats_read(nix, mtr->bpf_id, mask, lvl_map[mtr->level],\n+\t\t\t\t bpf_stats);\n+\tif (rc) {\n+\t\trte_mtr_error_set(error, rc, RTE_MTR_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\t NULL, NULL);\n+\t\tgoto exit;\n+\t}\n+\n+\tgreen_pkt_pass = roc_nix_bpf_stats_to_idx(ROC_NIX_BPF_GREEN_PKT_F_PASS);\n+\tgreen_octs_pass =\n+\t\troc_nix_bpf_stats_to_idx(ROC_NIX_BPF_GREEN_OCTS_F_PASS);\n+\tgreen_pkt_drop = roc_nix_bpf_stats_to_idx(ROC_NIX_BPF_GREEN_PKT_F_DROP);\n+\tgreen_octs_drop =\n+\t\troc_nix_bpf_stats_to_idx(ROC_NIX_BPF_GREEN_OCTS_F_DROP);\n+\tyellow_pkt_pass =\n+\t\troc_nix_bpf_stats_to_idx(ROC_NIX_BPF_YELLOW_PKT_F_PASS);\n+\tyellow_octs_pass =\n+\t\troc_nix_bpf_stats_to_idx(ROC_NIX_BPF_YELLOW_OCTS_F_PASS);\n+\tyellow_pkt_drop =\n+\t\troc_nix_bpf_stats_to_idx(ROC_NIX_BPF_YELLOW_PKT_F_DROP);\n+\tyellow_octs_drop =\n+\t\troc_nix_bpf_stats_to_idx(ROC_NIX_BPF_YELLOW_OCTS_F_DROP);\n+\tred_pkt_pass = roc_nix_bpf_stats_to_idx(ROC_NIX_BPF_RED_PKT_F_PASS);\n+\tred_octs_pass = roc_nix_bpf_stats_to_idx(ROC_NIX_BPF_RED_OCTS_F_PASS);\n+\tred_pkt_drop = roc_nix_bpf_stats_to_idx(ROC_NIX_BPF_RED_PKT_F_DROP);\n+\tred_octs_drop = roc_nix_bpf_stats_to_idx(ROC_NIX_BPF_RED_OCTS_F_DROP);\n+\n+\tif (mtr->params.stats_mask & RTE_MTR_STATS_N_PKTS_GREEN)\n+\t\tstats->n_pkts[RTE_COLOR_GREEN] = bpf_stats[green_pkt_pass];\n+\n+\tif (mtr->params.stats_mask & RTE_MTR_STATS_N_PKTS_YELLOW)\n+\t\tstats->n_pkts[RTE_COLOR_YELLOW] = bpf_stats[yellow_pkt_pass];\n+\n+\tif (mtr->params.stats_mask & RTE_MTR_STATS_N_PKTS_RED)\n+\t\tstats->n_pkts[RTE_COLOR_RED] = bpf_stats[red_pkt_pass];\n+\n+\tif (mtr->params.stats_mask & RTE_MTR_STATS_N_BYTES_GREEN)\n+\t\tstats->n_bytes[RTE_COLOR_GREEN] = bpf_stats[green_octs_pass];\n+\n+\tif (mtr->params.stats_mask & RTE_MTR_STATS_N_BYTES_YELLOW)\n+\t\tstats->n_bytes[RTE_COLOR_YELLOW] = bpf_stats[yellow_octs_pass];\n+\n+\tif (mtr->params.stats_mask & RTE_MTR_STATS_N_BYTES_RED)\n+\t\tstats->n_bytes[RTE_COLOR_RED] = bpf_stats[red_octs_pass];\n+\n+\tif (mtr->params.stats_mask & RTE_MTR_STATS_N_PKTS_DROPPED)\n+\t\tstats->n_pkts_dropped = bpf_stats[green_pkt_drop] +\n+\t\t\t\t\tbpf_stats[yellow_pkt_drop] +\n+\t\t\t\t\tbpf_stats[red_pkt_drop];\n+\n+\tif (mtr->params.stats_mask & RTE_MTR_STATS_N_BYTES_DROPPED)\n+\t\tstats->n_bytes_dropped = bpf_stats[green_octs_drop] +\n+\t\t\t\t\t bpf_stats[yellow_octs_drop] +\n+\t\t\t\t\t bpf_stats[red_octs_drop];\n+\n+\tif (stats_mask)\n+\t\t*stats_mask = mtr->params.stats_mask;\n+\n+\tif (clear) {\n+\t\trc = roc_nix_bpf_stats_reset(nix, mtr->bpf_id, mask,\n+\t\t\t\t\t lvl_map[mtr->level]);\n+\t\tif (rc) {\n+\t\t\trte_mtr_error_set(error, rc,\n+\t\t\t\t\t RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,\n+\t\t\t\t\t NULL);\n+\t\t\tgoto exit;\n+\t\t}\n+\t}\n+\n+exit:\n+\treturn rc;\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@@ -675,6 +814,8 @@ const struct rte_mtr_ops nix_mtr_ops = {\n \t.meter_enable = cnxk_nix_mtr_enable,\n \t.meter_disable = cnxk_nix_mtr_disable,\n \t.meter_dscp_table_update = cnxk_nix_mtr_dscp_table_update,\n+\t.stats_update = cnxk_nix_mtr_stats_update,\n+\t.stats_read = cnxk_nix_mtr_stats_read,\n };\n \n int\n", "prefixes": [ "v4", "26/28" ] }{ "id": 101105, "url": "