From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id DE3195A73 for ; Mon, 30 Mar 2015 14:02:26 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 30 Mar 2015 05:02:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,493,1422950400"; d="scan'208";a="706102179" Received: from unknown (HELO Sent) ([10.217.248.233]) by orsmga002.jf.intel.com with SMTP; 30 Mar 2015 05:02:25 -0700 Received: by Sent (sSMTP sendmail emulation); Mon, 30 Mar 2015 13:58:16 +0200 From: Maciej Gajdzica To: dev@dpdk.org Date: Mon, 30 Mar 2015 13:42:15 +0200 Message-Id: <1427715737-29252-9-git-send-email-maciejx.t.gajdzica@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427715737-29252-1-git-send-email-maciejx.t.gajdzica@intel.com> References: <1427715737-29252-1-git-send-email-maciejx.t.gajdzica@intel.com> Subject: [dpdk-dev] [PATCH 08/10] table: added hash_lru table stats X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Mar 2015 12:02:27 -0000 --- config/common_bsdapp | 1 + config/common_linuxapp | 1 + lib/librte_table/rte_table_hash_lru.c | 44 +++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/config/common_bsdapp b/config/common_bsdapp index 7708b1c..8206d22 100644 --- a/config/common_bsdapp +++ b/config/common_bsdapp @@ -405,6 +405,7 @@ CONFIG_RTE_TABLE_HASH_EXT_STATS_COLLECT=n CONFIG_RTE_TABLE_HASH_KEY16_STATS_COLLECT=n CONFIG_RTE_TABLE_HASH_KEY32_STATS_COLLECT=n CONFIG_RTE_TABLE_HASH_KEY8_STATS_COLLECT=n +CONFIG_RTE_TABLE_HASH_LRU_STATS_COLLECT=n # # Compile librte_pipeline diff --git a/config/common_linuxapp b/config/common_linuxapp index e5debf9..c607077 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -412,6 +412,7 @@ CONFIG_RTE_TABLE_HASH_EXT_STATS_COLLECT=n CONFIG_RTE_TABLE_HASH_KEY16_STATS_COLLECT=n CONFIG_RTE_TABLE_HASH_KEY32_STATS_COLLECT=n CONFIG_RTE_TABLE_HASH_KEY8_STATS_COLLECT=n +CONFIG_RTE_TABLE_HASH_LRU_STATS_COLLECT=n # # Compile librte_pipeline diff --git a/lib/librte_table/rte_table_hash_lru.c b/lib/librte_table/rte_table_hash_lru.c index c9a8afd..2f2156c 100644 --- a/lib/librte_table/rte_table_hash_lru.c +++ b/lib/librte_table/rte_table_hash_lru.c @@ -45,6 +45,20 @@ #define KEYS_PER_BUCKET 4 +#ifdef RTE_TABLE_HASH_LRU_STATS_COLLECT + +#define RTE_TABLE_HASH_LRU_STATS_PKTS_IN_ADD(table, val) \ + table->stats.n_pkts_in += val +#define RTE_TABLE_HASH_LRU_STATS_PKTS_LOOKUP_MISS(table, val) \ + table->stats.n_pkts_lookup_miss += val + +#else + +#define RTE_TABLE_HASH_LRU_STATS_PKTS_IN_ADD(table, val) +#define RTE_TABLE_HASH_LRU_STATS_PKTS_LOOKUP_MISS(table, val) + +#endif + struct bucket { union { struct bucket *next; @@ -63,6 +77,8 @@ struct grinder { }; struct rte_table_hash { + struct rte_table_stats stats; + /* Input parameters */ uint32_t key_size; uint32_t entry_size; @@ -368,6 +384,9 @@ static int rte_table_hash_lru_lookup_unoptimized( struct rte_table_hash *t = (struct rte_table_hash *) table; uint64_t pkts_mask_out = 0; + __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask); + RTE_TABLE_HASH_LRU_STATS_PKTS_IN_ADD(t, n_pkts_in); + for ( ; pkts_mask; ) { struct bucket *bkt; struct rte_mbuf *pkt; @@ -412,6 +431,7 @@ static int rte_table_hash_lru_lookup_unoptimized( } *lookup_hit_mask = pkts_mask_out; + RTE_TABLE_HASH_LRU_STATS_PKTS_LOOKUP_MISS(t, n_pkts_in - __builtin_popcountll(pkts_mask_out)); return 0; } @@ -804,6 +824,9 @@ static int rte_table_hash_lru_lookup( uint64_t pkts_mask_out = 0, pkts_mask_match_many = 0; int status = 0; + __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask); + RTE_TABLE_HASH_LRU_STATS_PKTS_IN_ADD(t, n_pkts_in); + /* Cannot run the pipeline with less than 7 packets */ if (__builtin_popcountll(pkts_mask) < 7) return rte_table_hash_lru_lookup_unoptimized(table, pkts, @@ -916,6 +939,7 @@ static int rte_table_hash_lru_lookup( } *lookup_hit_mask = pkts_mask_out; + RTE_TABLE_HASH_LRU_STATS_PKTS_LOOKUP_MISS(t, n_pkts_in - __builtin_popcountll(pkts_mask_out)); return status; } @@ -933,6 +957,9 @@ static int rte_table_hash_lru_lookup_dosig( uint64_t pkts_mask_out = 0, pkts_mask_match_many = 0; int status = 0; + __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask); + RTE_TABLE_HASH_LRU_STATS_PKTS_IN_ADD(t, n_pkts_in); + /* Cannot run the pipeline with less than 7 packets */ if (__builtin_popcountll(pkts_mask) < 7) return rte_table_hash_lru_lookup_unoptimized(table, pkts, @@ -1045,15 +1072,31 @@ static int rte_table_hash_lru_lookup_dosig( } *lookup_hit_mask = pkts_mask_out; + RTE_TABLE_HASH_LRU_STATS_PKTS_LOOKUP_MISS(t, n_pkts_in - __builtin_popcountll(pkts_mask_out)); return status; } +static int +rte_table_hash_lru_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_lru_ops = { .f_create = rte_table_hash_lru_create, .f_free = rte_table_hash_lru_free, .f_add = rte_table_hash_lru_entry_add, .f_delete = rte_table_hash_lru_entry_delete, .f_lookup = rte_table_hash_lru_lookup, + .f_stats = rte_table_hash_lru_stats_read, }; struct rte_table_ops rte_table_hash_lru_dosig_ops = { @@ -1062,4 +1105,5 @@ struct rte_table_ops rte_table_hash_lru_dosig_ops = { .f_add = rte_table_hash_lru_entry_add, .f_delete = rte_table_hash_lru_entry_delete, .f_lookup = rte_table_hash_lru_lookup_dosig, + .f_stats = rte_table_hash_lru_stats_read, }; -- 1.7.9.5