From: Jasvinder Singh <jasvinder.singh@intel.com>
To: dev@dpdk.org
Cc: cristian.dumitrescu@intel.com
Subject: [dpdk-dev] [PATCH v5 09/10] net/softnic: meter stats read
Date: Wed, 26 Sep 2018 14:08:53 +0100 [thread overview]
Message-ID: <20180926130854.122474-10-jasvinder.singh@intel.com> (raw)
In-Reply-To: <20180926130854.122474-1-jasvinder.singh@intel.com>
Implement meter object stats read function.
Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
---
drivers/net/softnic/rte_eth_softnic_meter.c | 136 +++++++++++++++++++-
1 file changed, 135 insertions(+), 1 deletion(-)
diff --git a/drivers/net/softnic/rte_eth_softnic_meter.c b/drivers/net/softnic/rte_eth_softnic_meter.c
index 05d54d4d4..73ecf3b16 100644
--- a/drivers/net/softnic/rte_eth_softnic_meter.c
+++ b/drivers/net/softnic/rte_eth_softnic_meter.c
@@ -574,6 +574,140 @@ pmd_mtr_policer_actions_update(struct rte_eth_dev *dev,
return 0;
}
+#define MTR_STATS_PKTS_DEFAULT (RTE_MTR_STATS_N_PKTS_GREEN | \
+ RTE_MTR_STATS_N_PKTS_YELLOW | \
+ RTE_MTR_STATS_N_PKTS_RED | \
+ RTE_MTR_STATS_N_PKTS_DROPPED)
+
+#define MTR_STATS_BYTES_DEFAULT (RTE_MTR_STATS_N_BYTES_GREEN | \
+ RTE_MTR_STATS_N_BYTES_YELLOW | \
+ RTE_MTR_STATS_N_BYTES_RED | \
+ RTE_MTR_STATS_N_BYTES_DROPPED)
+
+/* MTR object stats read */
+static void
+mtr_stats_convert(struct softnic_mtr *m,
+ struct rte_table_action_mtr_counters_tc *in,
+ struct rte_mtr_stats *out,
+ uint64_t *out_mask)
+{
+ memset(&out, 0, sizeof(out));
+ *out_mask = 0;
+
+ if (in->n_packets_valid) {
+ uint32_t i;
+
+ for (i = 0; i < RTE_MTR_COLORS; i++) {
+ if (m->params.action[i] == MTR_POLICER_ACTION_COLOR_GREEN)
+ out->n_pkts[RTE_MTR_GREEN] += in->n_packets[i];
+
+ if (m->params.action[i] == MTR_POLICER_ACTION_COLOR_YELLOW)
+ out->n_pkts[RTE_MTR_YELLOW] += in->n_packets[i];
+
+ if (m->params.action[i] == MTR_POLICER_ACTION_COLOR_RED)
+ out->n_pkts[RTE_MTR_RED] += in->n_packets[i];
+
+ if (m->params.action[i] == MTR_POLICER_ACTION_DROP)
+ out->n_pkts_dropped += in->n_packets[i];
+ }
+
+ *out_mask |= MTR_STATS_PKTS_DEFAULT;
+ }
+
+ if (in->n_bytes_valid) {
+ uint32_t i;
+
+ for (i = 0; i < RTE_MTR_COLORS; i++) {
+ if (m->params.action[i] == MTR_POLICER_ACTION_COLOR_GREEN)
+ out->n_bytes[RTE_MTR_GREEN] += in->n_bytes[i];
+
+ if (m->params.action[i] == MTR_POLICER_ACTION_COLOR_YELLOW)
+ out->n_bytes[RTE_MTR_YELLOW] += in->n_bytes[i];
+
+ if (m->params.action[i] == MTR_POLICER_ACTION_COLOR_RED)
+ out->n_bytes[RTE_MTR_RED] += in->n_bytes[i];
+
+ if (m->params.action[i] == MTR_POLICER_ACTION_DROP)
+ out->n_bytes_dropped += in->n_bytes[i];
+ }
+
+ *out_mask |= MTR_STATS_BYTES_DEFAULT;
+ }
+}
+
+/* MTR object stats read */
+static int
+pmd_mtr_stats_read(struct rte_eth_dev *dev,
+ uint32_t mtr_id,
+ struct rte_mtr_stats *stats,
+ uint64_t *stats_mask,
+ int clear,
+ struct rte_mtr_error *error)
+{
+ struct pmd_internals *p = dev->data->dev_private;
+ struct rte_table_action_mtr_counters counters;
+ struct pipeline *pipeline;
+ struct softnic_table *table;
+ struct softnic_mtr *m;
+ int status;
+
+ /* MTR object id must be valid */
+ m = softnic_mtr_find(p, mtr_id);
+ if (m == NULL)
+ return -rte_mtr_error_set(error,
+ EEXIST,
+ RTE_MTR_ERROR_TYPE_MTR_ID,
+ NULL,
+ "MTR object id not valid");
+
+ /* MTR meter object owner valid? */
+ if (m->flow == NULL) {
+ if (stats != NULL)
+ memset(stats, 0, sizeof(*stats));
+
+ if (stats_mask)
+ *stats_mask = MTR_STATS_PKTS_DEFAULT |
+ MTR_STATS_BYTES_DEFAULT;
+
+ return 0;
+ }
+
+ pipeline = m->flow->pipeline;
+ table = &pipeline->table[m->flow->table_id];
+
+ /* Meter stats read. */
+ status = rte_table_action_meter_read(table->a,
+ m->flow->data,
+ 1,
+ &counters,
+ clear);
+ if (status)
+ return -rte_mtr_error_set(error,
+ EINVAL,
+ RTE_MTR_ERROR_TYPE_UNSPECIFIED,
+ NULL,
+ "Meter stats read failed");
+
+ /* Stats format conversion. */
+ if (stats || stats_mask) {
+ struct rte_mtr_stats s;
+ uint64_t s_mask = 0;
+
+ mtr_stats_convert(m,
+ &counters.stats[0],
+ &s,
+ &s_mask);
+
+ if (stats)
+ memcpy(stats, &s, sizeof(*stats));
+
+ if (stats_mask)
+ *stats_mask = s_mask;
+ }
+
+ return 0;
+}
+
const struct rte_mtr_ops pmd_mtr_ops = {
.capabilities_get = NULL,
@@ -590,5 +724,5 @@ const struct rte_mtr_ops pmd_mtr_ops = {
.policer_actions_update = pmd_mtr_policer_actions_update,
.stats_update = NULL,
- .stats_read = NULL,
+ .stats_read = pmd_mtr_stats_read,
};
--
2.17.1
next prev parent reply other threads:[~2018-09-26 13:09 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-07 18:13 [dpdk-dev] [PATCH 00/10] net/softnic: implement metering and policing API Jasvinder Singh
2018-09-07 18:13 ` [dpdk-dev] [PATCH 01/10] net/softnic: add metering and policing support Jasvinder Singh
2018-09-12 16:41 ` [dpdk-dev] [PATCH v2 00/10] net/softnic: implement metering and policing API Jasvinder Singh
2018-09-12 16:41 ` [dpdk-dev] [PATCH v2 01/10] net/softnic: add metering and policing support Jasvinder Singh
2018-09-14 17:45 ` [dpdk-dev] [PATCH v3 00/10] net/softnic: implement metering and policing API Jasvinder Singh
2018-09-14 17:45 ` [dpdk-dev] [PATCH v3 01/10] net/softnic: add metering and policing support Jasvinder Singh
2018-09-18 16:58 ` [dpdk-dev] [PATCH v4 00/10] net/softnic: implement metering and policing API Jasvinder Singh
2018-09-18 16:58 ` [dpdk-dev] [PATCH v4 01/10] net/softnic: add metering and policing support Jasvinder Singh
2018-09-26 13:08 ` [dpdk-dev] [PATCH v5 00/10] net/softnic: implement metering and policing API Jasvinder Singh
2018-09-26 13:08 ` [dpdk-dev] [PATCH v5 01/10] net/softnic: add metering and policing support Jasvinder Singh
2018-09-26 13:08 ` [dpdk-dev] [PATCH v5 02/10] net/softnic: add meter profile Jasvinder Singh
2018-09-26 13:08 ` [dpdk-dev] [PATCH v5 03/10] net/softnic: delete " Jasvinder Singh
2018-09-26 13:08 ` [dpdk-dev] [PATCH v5 04/10] net/softnic: create meter object Jasvinder Singh
2018-09-26 13:08 ` [dpdk-dev] [PATCH v5 05/10] net/softnic: destroy " Jasvinder Singh
2018-09-26 13:08 ` [dpdk-dev] [PATCH v5 06/10] net/softnic: update meter profile Jasvinder Singh
2018-09-26 13:08 ` [dpdk-dev] [PATCH v5 07/10] net/softnic: update dscp table Jasvinder Singh
2018-09-26 13:08 ` [dpdk-dev] [PATCH v5 08/10] net/softnic: update policer actions Jasvinder Singh
2018-09-26 13:08 ` Jasvinder Singh [this message]
2018-09-26 13:08 ` [dpdk-dev] [PATCH v5 10/10] net/softnic: enable flow rule with meter action Jasvinder Singh
2018-09-28 10:36 ` [dpdk-dev] [PATCH v5 00/10] net/softnic: implement metering and policing API Dumitrescu, Cristian
2018-09-18 16:58 ` [dpdk-dev] [PATCH v4 02/10] net/softnic: add meter profile Jasvinder Singh
2018-09-18 16:58 ` [dpdk-dev] [PATCH v4 03/10] net/softnic: delete " Jasvinder Singh
2018-09-18 16:58 ` [dpdk-dev] [PATCH v4 04/10] net/softnic: create meter object Jasvinder Singh
2018-09-18 16:58 ` [dpdk-dev] [PATCH v4 05/10] net/softnic: destroy " Jasvinder Singh
2018-09-18 16:58 ` [dpdk-dev] [PATCH v4 06/10] net/softnic: update meter profile Jasvinder Singh
2018-09-18 16:58 ` [dpdk-dev] [PATCH v4 07/10] net/softnic: update dscp table Jasvinder Singh
2018-09-18 16:58 ` [dpdk-dev] [PATCH v4 08/10] net/softnic: update policer actions Jasvinder Singh
2018-09-18 16:58 ` [dpdk-dev] [PATCH v4 09/10] net/softnic: meter stats read Jasvinder Singh
2018-09-18 16:58 ` [dpdk-dev] [PATCH v4 10/10] net/softnic: enable flow rule with meter action Jasvinder Singh
2018-09-14 17:45 ` [dpdk-dev] [PATCH v3 02/10] net/softnic: add meter profile Jasvinder Singh
2018-09-14 17:45 ` [dpdk-dev] [PATCH v3 03/10] net/softnic: delete " Jasvinder Singh
2018-09-14 17:45 ` [dpdk-dev] [PATCH v3 04/10] net/softnic: create meter object Jasvinder Singh
2018-09-14 17:45 ` [dpdk-dev] [PATCH v3 05/10] net/softnic: destroy " Jasvinder Singh
2018-09-14 17:45 ` [dpdk-dev] [PATCH v3 06/10] net/softnic: update meter profile Jasvinder Singh
2018-09-14 17:45 ` [dpdk-dev] [PATCH v3 07/10] net/softnic: update dscp table Jasvinder Singh
2018-09-14 17:45 ` [dpdk-dev] [PATCH v3 08/10] net/softnic: update policer actions Jasvinder Singh
2018-09-14 17:45 ` [dpdk-dev] [PATCH v3 09/10] net/softnic: meter stats read Jasvinder Singh
2018-09-14 17:45 ` [dpdk-dev] [PATCH v3 10/10] net/softnic: enable flow rule with meter action Jasvinder Singh
2018-09-12 16:41 ` [dpdk-dev] [PATCH v2 02/10] net/softnic: add meter profile Jasvinder Singh
2018-09-12 16:41 ` [dpdk-dev] [PATCH v2 03/10] net/softnic: delete " Jasvinder Singh
2018-09-12 16:41 ` [dpdk-dev] [PATCH v2 04/10] net/softnic: create meter object Jasvinder Singh
2018-09-12 16:41 ` [dpdk-dev] [PATCH v2 05/10] net/softnic: destroy " Jasvinder Singh
2018-09-12 16:41 ` [dpdk-dev] [PATCH v2 06/10] net/softnic: update meter profile Jasvinder Singh
2018-09-12 16:41 ` [dpdk-dev] [PATCH v2 07/10] net/softnic: update dscp table Jasvinder Singh
2018-09-12 16:41 ` [dpdk-dev] [PATCH v2 08/10] net/softnic: update policer actions Jasvinder Singh
2018-09-12 16:41 ` [dpdk-dev] [PATCH v2 09/10] net/softnic: meter stats read Jasvinder Singh
2018-09-12 16:41 ` [dpdk-dev] [PATCH v2 10/10] net/softnic: enable flow rule with meter action Jasvinder Singh
2018-09-07 18:13 ` [dpdk-dev] [PATCH 02/10] net/softnic: add meter profile Jasvinder Singh
2018-09-07 18:13 ` [dpdk-dev] [PATCH 03/10] net/softnic: delete " Jasvinder Singh
2018-09-07 18:13 ` [dpdk-dev] [PATCH 04/10] net/softnic: create meter object Jasvinder Singh
2018-09-07 18:13 ` [dpdk-dev] [PATCH 05/10] net/softnic: destroy " Jasvinder Singh
2018-09-07 18:13 ` [dpdk-dev] [PATCH 06/10] net/softnic: update meter profile Jasvinder Singh
2018-09-07 18:13 ` [dpdk-dev] [PATCH 07/10] net/softnic: update dscp table Jasvinder Singh
2018-09-07 18:13 ` [dpdk-dev] [PATCH 08/10] net/softnic: update policer actions Jasvinder Singh
2018-09-07 18:13 ` [dpdk-dev] [PATCH 09/10] net/softnic: meter stats read Jasvinder Singh
2018-09-07 18:13 ` [dpdk-dev] [PATCH 10/10] net/softnic: enable meter action using flow rule Jasvinder Singh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180926130854.122474-10-jasvinder.singh@intel.com \
--to=jasvinder.singh@intel.com \
--cc=cristian.dumitrescu@intel.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).