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 6AE655AA1 for ; Mon, 30 Mar 2015 14:04:50 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 30 Mar 2015 05:04:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,493,1422950400"; d="scan'208";a="672548109" Received: from unknown (HELO Sent) ([10.217.248.233]) by orsmga001.jf.intel.com with SMTP; 30 Mar 2015 05:04:39 -0700 Received: by Sent (sSMTP sendmail emulation); Mon, 30 Mar 2015 14:02:39 +0200 From: Maciej Gajdzica To: dev@dpdk.org Date: Mon, 30 Mar 2015 13:42:16 +0200 Message-Id: <1427715737-29252-10-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 09/10] table: added lpm_ipv6 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:04:50 -0000 --- config/common_bsdapp | 1 + config/common_linuxapp | 1 + lib/librte_table/rte_table_lpm_ipv6.c | 34 +++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/config/common_bsdapp b/config/common_bsdapp index 8206d22..08b2b4a 100644 --- a/config/common_bsdapp +++ b/config/common_bsdapp @@ -406,6 +406,7 @@ 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 +CONFIG_RTE_TABLE_LPM_IPV6_STATS_COLLECT=n # # Compile librte_pipeline diff --git a/config/common_linuxapp b/config/common_linuxapp index c607077..fde934d 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -413,6 +413,7 @@ 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 +CONFIG_RTE_TABLE_LPM_IPV6_STATS_COLLECT=n # # Compile librte_pipeline diff --git a/lib/librte_table/rte_table_lpm_ipv6.c b/lib/librte_table/rte_table_lpm_ipv6.c index ce4ddc0..11534a9 100644 --- a/lib/librte_table/rte_table_lpm_ipv6.c +++ b/lib/librte_table/rte_table_lpm_ipv6.c @@ -46,7 +46,23 @@ #define RTE_TABLE_LPM_MAX_NEXT_HOPS 256 +#ifdef RTE_TABLE_LPM_IPV6_STATS_COLLECT + +#define RTE_TABLE_LPM_IPV6_STATS_PKTS_IN_ADD(table, val) \ + table->stats.n_pkts_in += val +#define RTE_TABLE_LPM_IPV6_STATS_PKTS_LOOKUP_MISS(table, val) \ + table->stats.n_pkts_lookup_miss += val + +#else + +#define RTE_TABLE_LPM_IPV6_STATS_PKTS_IN_ADD(table, val) +#define RTE_TABLE_LPM_IPV6_STATS_PKTS_LOOKUP_MISS(table, val) + +#endif + struct rte_table_lpm_ipv6 { + struct rte_table_stats stats; + /* Input parameters */ uint32_t entry_size; uint32_t entry_unique_size; @@ -327,6 +343,9 @@ rte_table_lpm_ipv6_lookup( uint64_t pkts_out_mask = 0; uint32_t i; + __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask); + RTE_TABLE_LPM_IPV6_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++) { @@ -349,6 +368,20 @@ rte_table_lpm_ipv6_lookup( } *lookup_hit_mask = pkts_out_mask; + RTE_TABLE_LPM_IPV6_STATS_PKTS_LOOKUP_MISS(lpm, n_pkts_in - __builtin_popcountll(pkts_out_mask)); + return 0; +} + +static int +rte_table_lpm_ipv6_stats_read(void *table, struct rte_table_stats *stats, int clear) +{ + struct rte_table_lpm_ipv6 *t = (struct rte_table_lpm_ipv6 *) table; + + if (stats != NULL) + memcpy(stats, &t->stats, sizeof(t->stats)); + + if (clear) + memset(&t->stats, 0, sizeof(t->stats)); return 0; } @@ -359,4 +392,5 @@ struct rte_table_ops rte_table_lpm_ipv6_ops = { .f_add = rte_table_lpm_ipv6_entry_add, .f_delete = rte_table_lpm_ipv6_entry_delete, .f_lookup = rte_table_lpm_ipv6_lookup, + .f_stats = rte_table_lpm_ipv6_stats_read, }; -- 1.7.9.5