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 47F247DF8 for ; Mon, 30 Mar 2015 13:55:49 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 30 Mar 2015 04:55:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,493,1422950400"; d="scan'208";a="706099085" Received: from unknown (HELO Sent) ([10.217.248.233]) by orsmga002.jf.intel.com with SMTP; 30 Mar 2015 04:55:46 -0700 Received: by Sent (sSMTP sendmail emulation); Mon, 30 Mar 2015 13:55:53 +0200 From: Maciej Gajdzica To: dev@dpdk.org Date: Mon, 30 Mar 2015 13:42:13 +0200 Message-Id: <1427715737-29252-7-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 06/10] table: added hash_key32 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 11:55:50 -0000 --- config/common_bsdapp | 1 + config/common_linuxapp | 1 + lib/librte_table/rte_table_hash_key32.c | 41 +++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+) diff --git a/config/common_bsdapp b/config/common_bsdapp index 2f92f69..a77e422 100644 --- a/config/common_bsdapp +++ b/config/common_bsdapp @@ -403,6 +403,7 @@ CONFIG_RTE_TABLE_ACL_STATS_COLLECT=n CONFIG_RTE_TABLE_ARRAY_STATS_COLLECT=n CONFIG_RTE_TABLE_HASH_EXT_STATS_COLLECT=n CONFIG_RTE_TABLE_HASH_KEY16_STATS_COLLECT=n +CONFIG_RTE_TABLE_HASH_KEY32_STATS_COLLECT=n # # Compile librte_pipeline diff --git a/config/common_linuxapp b/config/common_linuxapp index 918bbaf..dfe60aa 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -410,6 +410,7 @@ CONFIG_RTE_TABLE_ACL_STATS_COLLECT=n CONFIG_RTE_TABLE_ARRAY_STATS_COLLECT=n CONFIG_RTE_TABLE_HASH_EXT_STATS_COLLECT=n CONFIG_RTE_TABLE_HASH_KEY16_STATS_COLLECT=n +CONFIG_RTE_TABLE_HASH_KEY32_STATS_COLLECT=n # # Compile librte_pipeline diff --git a/lib/librte_table/rte_table_hash_key32.c b/lib/librte_table/rte_table_hash_key32.c index da0ce6a..56e0512 100644 --- a/lib/librte_table/rte_table_hash_key32.c +++ b/lib/librte_table/rte_table_hash_key32.c @@ -46,6 +46,20 @@ #define RTE_BUCKET_ENTRY_VALID 0x1LLU +#ifdef RTE_TABLE_HASH_KEY32_STATS_COLLECT + +#define RTE_TABLE_HASH_KEY32_STATS_PKTS_IN_ADD(table, val) \ + table->stats.n_pkts_in += val +#define RTE_TABLE_HASH_KEY32_STATS_PKTS_LOOKUP_MISS(table, val) \ + table->stats.n_pkts_lookup_miss += val + +#else + +#define RTE_TABLE_HASH_KEY32_STATS_PKTS_IN_ADD(table, val) +#define RTE_TABLE_HASH_KEY32_STATS_PKTS_LOOKUP_MISS(table, val) + +#endif + struct rte_bucket_4_32 { /* Cache line 0 */ uint64_t signature[4 + 1]; @@ -61,6 +75,8 @@ struct rte_bucket_4_32 { }; struct rte_table_hash { + struct rte_table_stats stats; + /* Input parameters */ uint32_t n_buckets; uint32_t n_entries_per_bucket; @@ -851,6 +867,9 @@ rte_table_hash_lookup_key32_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_KEY32_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; ) { @@ -865,6 +884,7 @@ rte_table_hash_lookup_key32_lru( } *lookup_hit_mask = pkts_mask_out; + RTE_TABLE_HASH_KEY32_STATS_PKTS_LOOKUP_MISS(f, n_pkts_in - __builtin_popcountll(pkts_mask_out)); return 0; } @@ -955,6 +975,7 @@ rte_table_hash_lookup_key32_lru( mbuf20, mbuf21, bucket20, bucket21, pkts_mask_out, entries, f); *lookup_hit_mask = pkts_mask_out; + RTE_TABLE_HASH_KEY32_STATS_PKTS_LOOKUP_MISS(f, n_pkts_in - __builtin_popcountll(pkts_mask_out)); return 0; } /* rte_table_hash_lookup_key32_lru() */ @@ -975,6 +996,9 @@ rte_table_hash_lookup_key32_ext( struct rte_bucket_4_32 *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_KEY32_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; ) { @@ -1101,15 +1125,31 @@ grind_next_buckets: } *lookup_hit_mask = pkts_mask_out; + RTE_TABLE_HASH_KEY32_STATS_PKTS_LOOKUP_MISS(f, n_pkts_in - __builtin_popcountll(pkts_mask_out)); return 0; } /* rte_table_hash_lookup_key32_ext() */ +static int +rte_table_hash_key32_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_key32_lru_ops = { .f_create = rte_table_hash_create_key32_lru, .f_free = rte_table_hash_free_key32_lru, .f_add = rte_table_hash_entry_add_key32_lru, .f_delete = rte_table_hash_entry_delete_key32_lru, .f_lookup = rte_table_hash_lookup_key32_lru, + .f_stats = rte_table_hash_key32_stats_read, }; struct rte_table_ops rte_table_hash_key32_ext_ops = { @@ -1118,4 +1158,5 @@ struct rte_table_ops rte_table_hash_key32_ext_ops = { .f_add = rte_table_hash_entry_add_key32_ext, .f_delete = rte_table_hash_entry_delete_key32_ext, .f_lookup = rte_table_hash_lookup_key32_ext, + .f_stats =rte_table_hash_key32_stats_read, }; -- 1.7.9.5