Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/62728/?format=api
{ "id": 62728, "url": "http://patches.dpdk.org/api/patches/62728/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1573184965-49691-15-git-send-email-suanmingm@mellanox.com/", "project": { "id": 1, "url": "http://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": "<1573184965-49691-15-git-send-email-suanmingm@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1573184965-49691-15-git-send-email-suanmingm@mellanox.com", "date": "2019-11-08T03:49:20", "name": "[v2,14/19] net/mlx5: add meter statistics read and update", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "6399f0188563453e7eaea19bb8c00daf559b140f", "submitter": { "id": 1358, "url": "http://patches.dpdk.org/api/people/1358/?format=api", "name": "Suanming Mou", "email": "suanmingm@mellanox.com" }, "delegate": { "id": 3268, "url": "http://patches.dpdk.org/api/users/3268/?format=api", "username": "rasland", "first_name": "Raslan", "last_name": "Darawsheh", "email": "rasland@nvidia.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1573184965-49691-15-git-send-email-suanmingm@mellanox.com/mbox/", "series": [ { "id": 7343, "url": "http://patches.dpdk.org/api/series/7343/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=7343", "date": "2019-11-08T03:49:07", "name": "net/mlx5: support meter", "version": 2, "mbox": "http://patches.dpdk.org/series/7343/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/62728/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/62728/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 2AD1CA04AB;\n\tFri, 8 Nov 2019 04:51:55 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 289F01C02C;\n\tFri, 8 Nov 2019 04:50:05 +0100 (CET)", "from git-send-mailer.rdmz.labs.mlnx (unknown [37.142.13.130])\n by dpdk.org (Postfix) with ESMTP id 817061BF64\n for <dev@dpdk.org>; Fri, 8 Nov 2019 04:49:33 +0100 (CET)" ], "From": "Suanming Mou <suanmingm@mellanox.com>", "To": "viacheslavo@mellanox.com,\n\tmatan@mellanox.com", "Cc": "orika@mellanox.com,\n\trasland@mellanox.com,\n\tdev@dpdk.org", "Date": "Fri, 8 Nov 2019 05:49:20 +0200", "Message-Id": "<1573184965-49691-15-git-send-email-suanmingm@mellanox.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1573184965-49691-1-git-send-email-suanmingm@mellanox.com>", "References": "<1573053090-179521-1-git-send-email-suanmingm@mellanox.com>\n <1573184965-49691-1-git-send-email-suanmingm@mellanox.com>", "Subject": "[dpdk-dev] [PATCH v2 14/19] net/mlx5: add meter statistics read and\n\tupdate", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "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": "This commit add the meter statistics read and update to check the meter\nstatistics.\n\nNew internal functions in rte_mtr_ops callback:\n1. stats_update()\n2. stats_read()\n\nSigned-off-by: Suanming Mou <suanmingm@mellanox.com>\n---\n drivers/net/mlx5/mlx5_flow_meter.c | 140 ++++++++++++++++++++++++++++++++++++-\n 1 file changed, 138 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c\nindex 7645d92..c39e703 100644\n--- a/drivers/net/mlx5/mlx5_flow_meter.c\n+++ b/drivers/net/mlx5/mlx5_flow_meter.c\n@@ -614,6 +614,7 @@\n \tTAILQ_INSERT_TAIL(fms, fm, next);\n \tfm->active_state = 1; /* Config meter starts as active. */\n \tfm->shared = !!shared;\n+\tfm->policer_stats.stats_mask = params->stats_mask;\n \tfm->profile->ref_cnt++;\n \treturn 0;\n error:\n@@ -890,6 +891,141 @@\n \treturn 0;\n }\n \n+/**\n+ * Callback to update meter stats mask.\n+ *\n+ * @param[in] dev\n+ * Pointer to Ethernet device.\n+ * @param[in] meter_id\n+ * Meter id.\n+ * @param[in] stats_mask\n+ * To be updated stats_mask.\n+ * @param[out] error\n+ * Pointer to rte meter error structure.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n+ */\n+static int\n+mlx5_flow_meter_stats_update(struct rte_eth_dev *dev,\n+\t\t\t uint32_t meter_id,\n+\t\t\t uint64_t stats_mask,\n+\t\t\t struct rte_mtr_error *error)\n+{\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_flow_meter *fm;\n+\n+\tif (!priv->mtr_en)\n+\t\treturn -rte_mtr_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,\n+\t\t\t\t\t \"Meter is not support\");\n+\t/* Meter object must exist. */\n+\tfm = mlx5_flow_meter_find(priv, meter_id);\n+\tif (fm == NULL)\n+\t\treturn -rte_mtr_error_set(error, ENOENT,\n+\t\t\t\t\t RTE_MTR_ERROR_TYPE_MTR_ID,\n+\t\t\t\t\t NULL, \"Meter object id not valid.\");\n+\tfm->policer_stats.stats_mask = stats_mask;\n+\treturn 0;\n+}\n+\n+/**\n+ * Callback to read meter statistics.\n+ *\n+ * @param[in] dev\n+ * Pointer to Ethernet device.\n+ * @param[in] meter_id\n+ * Meter id.\n+ * @param[out] stats\n+ * Pointer to store the statistics.\n+ * @param[out] stats_mask\n+ * Pointer to store the stats_mask.\n+ * @param[in] clear\n+ * Statistic to be cleared after read or not.\n+ * @param[out] error\n+ * Pointer to rte meter error structure.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n+ */\n+static int\n+mlx5_flow_meter_stats_read(struct rte_eth_dev *dev,\n+\t\t\t uint32_t meter_id,\n+\t\t\t struct rte_mtr_stats *stats,\n+\t\t\t uint64_t *stats_mask,\n+\t\t\t int clear,\n+\t\t\t struct rte_mtr_error *error)\n+{\n+\tstatic uint64_t meter2mask[RTE_MTR_DROPPED + 1] = {\n+\t\tRTE_MTR_STATS_N_PKTS_GREEN | RTE_MTR_STATS_N_BYTES_GREEN,\n+\t\tRTE_MTR_STATS_N_PKTS_YELLOW | RTE_MTR_STATS_N_BYTES_YELLOW,\n+\t\tRTE_MTR_STATS_N_PKTS_RED | RTE_MTR_STATS_N_BYTES_RED,\n+\t\tRTE_MTR_STATS_N_PKTS_DROPPED | RTE_MTR_STATS_N_BYTES_DROPPED\n+\t};\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_flow_meter *fm;\n+\tstruct mlx5_flow_policer_stats *ps;\n+\tuint64_t pkts_dropped = 0;\n+\tuint64_t bytes_dropped = 0;\n+\tuint64_t pkts;\n+\tuint64_t bytes;\n+\tint i;\n+\tint ret = 0;\n+\n+\tif (!priv->mtr_en)\n+\t\treturn -rte_mtr_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,\n+\t\t\t\t\t \"Meter is not support\");\n+\t/* Meter object must exist. */\n+\tfm = mlx5_flow_meter_find(priv, meter_id);\n+\tif (fm == NULL)\n+\t\treturn -rte_mtr_error_set(error, ENOENT,\n+\t\t\t\t\t RTE_MTR_ERROR_TYPE_MTR_ID,\n+\t\t\t\t\t NULL, \"Meter object id not valid.\");\n+\tps = &fm->policer_stats;\n+\t*stats_mask = ps->stats_mask;\n+\tfor (i = 0; i < RTE_MTR_DROPPED; i++) {\n+\t\tif (*stats_mask & meter2mask[i]) {\n+\t\t\tret = mlx5_counter_query(dev, ps->cnt[i], clear, &pkts,\n+\t\t\t\t\t\t &bytes);\n+\t\t\tif (ret)\n+\t\t\t\tgoto error;\n+\t\t\tif (fm->params.action[i] == MTR_POLICER_ACTION_DROP) {\n+\t\t\t\tpkts_dropped += pkts;\n+\t\t\t\tbytes_dropped += bytes;\n+\t\t\t}\n+\t\t\t/* If need to read the packets, set it. */\n+\t\t\tif ((1 << i) & (*stats_mask & meter2mask[i]))\n+\t\t\t\tstats->n_pkts[i] = pkts;\n+\t\t\t/* If need to read the bytes, set it. */\n+\t\t\tif ((1 << (RTE_MTR_DROPPED + 1 + i)) &\n+\t\t\t (*stats_mask & meter2mask[i]))\n+\t\t\t\tstats->n_bytes[i] = bytes;\n+\t\t}\n+\t}\n+\t/* Dropped packets/bytes are treated differently. */\n+\tif (*stats_mask & meter2mask[i]) {\n+\t\tret = mlx5_counter_query(dev, ps->cnt[i], clear, &pkts,\n+\t\t\t\t\t &bytes);\n+\t\tif (ret)\n+\t\t\tgoto error;\n+\t\tpkts += pkts_dropped;\n+\t\tbytes += bytes_dropped;\n+\t\t/* If need to read the packets, set it. */\n+\t\tif ((*stats_mask & meter2mask[i]) &\n+\t\t RTE_MTR_STATS_N_PKTS_DROPPED)\n+\t\t\tstats->n_pkts_dropped = pkts;\n+\t\t/* If need to read the bytes, set it. */\n+\t\tif ((*stats_mask & meter2mask[i]) &\n+\t\t RTE_MTR_STATS_N_BYTES_DROPPED)\n+\t\t\tstats->n_bytes_dropped = bytes;\n+\t}\n+\treturn 0;\n+error:\n+\treturn -rte_mtr_error_set(error, ret, RTE_MTR_ERROR_TYPE_STATS, NULL,\n+\t\t\t\t \"Failed to read policer counters.\");\n+}\n+\n static const struct rte_mtr_ops mlx5_flow_mtr_ops = {\n \t.capabilities_get = mlx5_flow_mtr_cap_get,\n \t.meter_profile_add = mlx5_flow_meter_profile_add,\n@@ -901,8 +1037,8 @@\n \t.meter_profile_update = mlx5_flow_meter_profile_update,\n \t.meter_dscp_table_update = NULL,\n \t.policer_actions_update = NULL,\n-\t.stats_update = NULL,\n-\t.stats_read = NULL,\n+\t.stats_update = mlx5_flow_meter_stats_update,\n+\t.stats_read = mlx5_flow_meter_stats_read,\n };\n \n /**\n", "prefixes": [ "v2", "14/19" ] }