DPDK patches and discussions
 help / color / mirror / Atom feed
From: Michal Jastrzebski <michalx.k.jastrzebski@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v4 05/10] table: added hash_key16 table stats
Date: Mon,  8 Jun 2015 17:00:10 +0200	[thread overview]
Message-ID: <1433775616-6896-20-git-send-email-michalx.k.jastrzebski@intel.com> (raw)
In-Reply-To: <1433775616-6896-1-git-send-email-michalx.k.jastrzebski@intel.com>

From: Maciej Gajdzica <maciejx.t.gajdzica@intel.com>

Added statistics for hash key16 table.

Signed-off-by: Maciej Gajdzica <maciejx.t.gajdzica@intel.com>
---
 lib/librte_table/rte_table_hash_key16.c |   41 +++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/lib/librte_table/rte_table_hash_key16.c b/lib/librte_table/rte_table_hash_key16.c
index f87ea0e..b936323 100644
--- a/lib/librte_table/rte_table_hash_key16.c
+++ b/lib/librte_table/rte_table_hash_key16.c
@@ -46,6 +46,20 @@
 
 #define RTE_BUCKET_ENTRY_VALID						0x1LLU
 
+#ifdef RTE_TABLE_STATS_COLLECT
+
+#define RTE_TABLE_HASH_KEY16_STATS_PKTS_IN_ADD(table, val) \
+	table->stats.n_pkts_in += val
+#define RTE_TABLE_HASH_KEY16_STATS_PKTS_LOOKUP_MISS(table, val) \
+	table->stats.n_pkts_lookup_miss += val
+
+#else
+
+#define RTE_TABLE_HASH_KEY16_STATS_PKTS_IN_ADD(table, val)
+#define RTE_TABLE_HASH_KEY16_STATS_PKTS_LOOKUP_MISS(table, val)
+
+#endif
+
 struct rte_bucket_4_16 {
 	/* Cache line 0 */
 	uint64_t signature[4 + 1];
@@ -61,6 +75,8 @@ struct rte_bucket_4_16 {
 };
 
 struct rte_table_hash {
+	struct rte_table_stats stats;
+
 	/* Input parameters */
 	uint32_t n_buckets;
 	uint32_t n_entries_per_bucket;
@@ -831,6 +847,9 @@ rte_table_hash_lookup_key16_lru(
 	uint32_t pkt11_index, pkt20_index, pkt21_index;
 	uint64_t pkts_mask_out = 0;
 
+	__rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask);
+	RTE_TABLE_HASH_KEY16_STATS_PKTS_IN_ADD(f, n_pkts_in);
+
 	/* Cannot run the pipeline with less than 5 packets */
 	if (__builtin_popcountll(pkts_mask) < 5) {
 		for ( ; pkts_mask; ) {
@@ -845,6 +864,7 @@ rte_table_hash_lookup_key16_lru(
 		}
 
 		*lookup_hit_mask = pkts_mask_out;
+		RTE_TABLE_HASH_KEY16_STATS_PKTS_LOOKUP_MISS(f, n_pkts_in - __builtin_popcountll(pkts_mask_out));
 		return 0;
 	}
 
@@ -934,6 +954,7 @@ rte_table_hash_lookup_key16_lru(
 		bucket20, bucket21, pkts_mask_out, entries, f);
 
 	*lookup_hit_mask = pkts_mask_out;
+	RTE_TABLE_HASH_KEY16_STATS_PKTS_LOOKUP_MISS(f, n_pkts_in - __builtin_popcountll(pkts_mask_out));
 	return 0;
 } /* rte_table_hash_lookup_key16_lru() */
 
@@ -954,6 +975,9 @@ rte_table_hash_lookup_key16_ext(
 	struct rte_bucket_4_16 *buckets[RTE_PORT_IN_BURST_SIZE_MAX];
 	uint64_t *keys[RTE_PORT_IN_BURST_SIZE_MAX];
 
+	__rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask);
+	RTE_TABLE_HASH_KEY16_STATS_PKTS_IN_ADD(f, n_pkts_in);
+
 	/* Cannot run the pipeline with less than 5 packets */
 	if (__builtin_popcountll(pkts_mask) < 5) {
 		for ( ; pkts_mask; ) {
@@ -1080,15 +1104,31 @@ grind_next_buckets:
 	}
 
 	*lookup_hit_mask = pkts_mask_out;
+	RTE_TABLE_HASH_KEY16_STATS_PKTS_LOOKUP_MISS(f, n_pkts_in - __builtin_popcountll(pkts_mask_out));
 	return 0;
 } /* rte_table_hash_lookup_key16_ext() */
 
+static int
+rte_table_hash_key16_stats_read(void *table, struct rte_table_stats *stats, int clear)
+{
+	struct rte_table_hash *t = (struct rte_table_hash *) table;
+
+	if (stats != NULL)
+		memcpy(stats, &t->stats, sizeof(t->stats));
+
+	if (clear)
+		memset(&t->stats, 0, sizeof(t->stats));
+
+	return 0;
+}
+
 struct rte_table_ops rte_table_hash_key16_lru_ops = {
 	.f_create = rte_table_hash_create_key16_lru,
 	.f_free = rte_table_hash_free_key16_lru,
 	.f_add = rte_table_hash_entry_add_key16_lru,
 	.f_delete = rte_table_hash_entry_delete_key16_lru,
 	.f_lookup = rte_table_hash_lookup_key16_lru,
+	.f_stats = rte_table_hash_key16_stats_read,
 };
 
 struct rte_table_ops rte_table_hash_key16_ext_ops = {
@@ -1097,4 +1137,5 @@ struct rte_table_ops rte_table_hash_key16_ext_ops = {
 	.f_add = rte_table_hash_entry_add_key16_ext,
 	.f_delete = rte_table_hash_entry_delete_key16_ext,
 	.f_lookup = rte_table_hash_lookup_key16_ext,
+	.f_stats = rte_table_hash_key16_stats_read,
 };
-- 
1.7.9.5

  parent reply	other threads:[~2015-06-08 15:04 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-08 14:59 [dpdk-dev] [PATCH v4 00/13] port: added port statistics Michal Jastrzebski
2015-06-08 14:59 ` [dpdk-dev] [PATCH v4 01/13] port: added structures for port stats and config option Michal Jastrzebski
2015-06-18 11:03   ` Gajdzica, MaciejX T
2015-06-08 14:59 ` [dpdk-dev] [PATCH v4 02/13] port: added port_ethdev_reader stats Michal Jastrzebski
2015-06-08 14:59 ` [dpdk-dev] [PATCH v4 03/13] port: added port_ethdev_writer stats Michal Jastrzebski
2015-06-08 14:59 ` [dpdk-dev] [PATCH v4 04/13] port: added port_ethdev_writer_nodrop stats Michal Jastrzebski
2015-06-08 14:59 ` [dpdk-dev] [PATCH v4 05/13] port: added port_frag stats Michal Jastrzebski
2015-06-08 14:59 ` [dpdk-dev] [PATCH v4 06/13] port: added port_ras stats Michal Jastrzebski
2015-06-08 14:59 ` [dpdk-dev] [PATCH v4 07/13] port: added port_ring_reader stats Michal Jastrzebski
2015-06-08 14:59 ` [dpdk-dev] [PATCH v4 08/13] port: added port_ring_writer stats Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 09/13] port: added port_ring_writer_nodrop stats Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 10/13] port: added port_sched_reader stats Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 11/13] port: added port_sched_writer stats Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 12/13] port: added port_source stats Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 13/13] port: added port_sink stats Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 00/10] table: added table statistics Michal Jastrzebski
2015-06-08 19:05   ` Dumitrescu, Cristian
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 01/10] table: added structure for storing table stats and config option Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 02/10] table: added acl table stats Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 03/10] table: added array " Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 04/10] table: added hash_ext " Michal Jastrzebski
2015-06-08 15:00 ` Michal Jastrzebski [this message]
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 06/10] table: added hash_key32 " Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 07/10] table: added hash_key8 " Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 08/10] table: added hash_lru " Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 09/10] table: added lpm_ipv6 " Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 10/10] table: added lpm " Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 1/1] pipeline: add statistics for librte_pipeline ports and tables Michal Jastrzebski
2015-06-08 19:07   ` Dumitrescu, Cristian
2015-06-08 19:04 ` [dpdk-dev] [PATCH v4 00/13] port: added port statistics Dumitrescu, Cristian

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=1433775616-6896-20-git-send-email-michalx.k.jastrzebski@intel.com \
    --to=michalx.k.jastrzebski@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).