From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 7FC14CBF8 for ; Thu, 30 Apr 2015 14:15:24 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP; 30 Apr 2015 05:15:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,676,1422950400"; d="scan'208";a="687983866" Received: from unknown (HELO Sent) ([10.217.248.194]) by orsmga001.jf.intel.com with SMTP; 30 Apr 2015 05:15:18 -0700 Received: by Sent (sSMTP sendmail emulation); Thu, 30 Apr 2015 14:15:16 +0116 From: Michal Jastrzebski To: dev@dpdk.org Date: Thu, 30 Apr 2015 14:14:38 +0200 Message-Id: <1430396078-968-11-git-send-email-michalx.k.jastrzebski@intel.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1430396078-968-1-git-send-email-michalx.k.jastrzebski@intel.com> References: <1430396078-968-1-git-send-email-michalx.k.jastrzebski@intel.com> Subject: [dpdk-dev] [PATCH v2 10/10] table: added lpm 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: Thu, 30 Apr 2015 12:15:25 -0000 From: Maciej Gajdzica Added lpm table statistics. Signed-off-by: Maciej Gajdzica --- config/common_bsdapp | 1 + config/common_linuxapp | 1 + lib/librte_table/rte_table_lpm.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/config/common_bsdapp b/config/common_bsdapp index acd4866..1d0f5b2 100644 --- a/config/common_bsdapp +++ b/config/common_bsdapp @@ -408,6 +408,7 @@ CONFIG_RTE_TABLE_HASH_KEY32_STATS_COLLECT=n CONFIG_RTE_TABLE_HASH_KEY8_STATS_COLLECT=n CONFIG_RTE_TABLE_HASH_LRU_STATS_COLLECT=n CONFIG_RTE_TABLE_LPM_IPV6_STATS_COLLECT=n +CONFIG_RTE_TABLE_LPM_STATS_COLLECT=n # # Compile librte_pipeline diff --git a/config/common_linuxapp b/config/common_linuxapp index 740d769..8b01ca9 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -415,6 +415,7 @@ CONFIG_RTE_TABLE_HASH_KEY32_STATS_COLLECT=n CONFIG_RTE_TABLE_HASH_KEY8_STATS_COLLECT=n CONFIG_RTE_TABLE_HASH_LRU_STATS_COLLECT=n CONFIG_RTE_TABLE_LPM_IPV6_STATS_COLLECT=n +CONFIG_RTE_TABLE_LPM_STATS_COLLECT=n # # Compile librte_pipeline diff --git a/lib/librte_table/rte_table_lpm.c b/lib/librte_table/rte_table_lpm.c index 64c684d..7d8f670 100644 --- a/lib/librte_table/rte_table_lpm.c +++ b/lib/librte_table/rte_table_lpm.c @@ -46,7 +46,23 @@ #define RTE_TABLE_LPM_MAX_NEXT_HOPS 256 +#ifdef RTE_TABLE_LPM_STATS_COLLECT + +#define RTE_TABLE_LPM_STATS_PKTS_IN_ADD(table, val) \ + table->stats.n_pkts_in += val +#define RTE_TABLE_LPM_STATS_PKTS_LOOKUP_MISS(table, val) \ + table->stats.n_pkts_lookup_miss += val + +#else + +#define RTE_TABLE_LPM_STATS_PKTS_IN_ADD(table, val) +#define RTE_TABLE_LPM_STATS_PKTS_LOOKUP_MISS(table, val) + +#endif + struct rte_table_lpm { + struct rte_table_stats stats; + /* Input parameters */ uint32_t entry_size; uint32_t entry_unique_size; @@ -313,6 +329,9 @@ rte_table_lpm_lookup( uint64_t pkts_out_mask = 0; uint32_t i; + __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask); + RTE_TABLE_LPM_STATS_PKTS_IN_ADD(lpm, n_pkts_in); + pkts_out_mask = 0; for (i = 0; i < (uint32_t)(RTE_PORT_IN_BURST_SIZE_MAX - __builtin_clzll(pkts_mask)); i++) { @@ -335,6 +354,20 @@ rte_table_lpm_lookup( } *lookup_hit_mask = pkts_out_mask; + RTE_TABLE_LPM_STATS_PKTS_LOOKUP_MISS(lpm, n_pkts_in - __builtin_popcountll(pkts_out_mask)); + return 0; +} + +static int +rte_table_lpm_stats_read(void *table, struct rte_table_stats *stats, int clear) +{ + struct rte_table_lpm *t = (struct rte_table_lpm *) table; + + if (stats != NULL) + memcpy(stats, &t->stats, sizeof(t->stats)); + + if (clear) + memset(&t->stats, 0, sizeof(t->stats)); return 0; } @@ -345,4 +378,5 @@ struct rte_table_ops rte_table_lpm_ops = { .f_add = rte_table_lpm_entry_add, .f_delete = rte_table_lpm_entry_delete, .f_lookup = rte_table_lpm_lookup, + .f_stats = rte_table_lpm_stats_read, }; -- 1.7.9.5