diff mbox

[dpdk-dev,v2,02/10] table: added acl table stats

Message ID 1430396078-968-3-git-send-email-michalx.k.jastrzebski@intel.com (mailing list archive)
State Changes Requested, archived
Headers

Commit Message

Michal Jastrzebski April 30, 2015, 12:14 p.m. UTC 
  From: Maciej Gajdzica <maciejx.t.gajdzica@intel.com>

Added statistics for ACL table.

Signed-off-by: Maciej Gajdzica <maciejx.t.gajdzica@intel.com>
---
 config/common_bsdapp             |    1 +
 config/common_linuxapp           |    1 +
 lib/librte_table/rte_table_acl.c |   35 +++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)

Comments

Stephen Hemminger April 30, 2015, 3:55 p.m. UTC | #1 
On Thu, 30 Apr 2015 14:14:30 +0200
Michal Jastrzebski <michalx.k.jastrzebski@intel.com> wrote:

> From: Maciej Gajdzica <maciejx.t.gajdzica@intel.com>
> 
> Added statistics for ACL table.
> 
> Signed-off-by: Maciej Gajdzica <maciejx.t.gajdzica@intel.com>
> ---
>  config/common_bsdapp             |    1 +
>  config/common_linuxapp           |    1 +
>  lib/librte_table/rte_table_acl.c |   35 +++++++++++++++++++++++++++++++++++
>  3 files changed, 37 insertions(+)
> 
> diff --git a/config/common_bsdapp b/config/common_bsdapp
> index 238d178..096e09c 100644
> --- a/config/common_bsdapp
> +++ b/config/common_bsdapp
> @@ -400,6 +400,7 @@ CONFIG_RTE_PORT_SINK_STATS_COLLECT=n
>  # Compile librte_table
>  #
>  CONFIG_RTE_LIBRTE_TABLE=y
> +CONFIG_RTE_TABLE_ACL_STATS_COLLECT=n

Sigh. More config options does not make DPDK better.
It makes more unsupportable for distros
Thomas Monjalon May 18, 2015, 10:57 a.m. UTC | #2 
2015-04-30 08:55, Stephen Hemminger:
> > From: Maciej Gajdzica <maciejx.t.gajdzica@intel.com>
> > 
> > Added statistics for ACL table.
> > 
> > Signed-off-by: Maciej Gajdzica <maciejx.t.gajdzica@intel.com>
> > ---
> >  config/common_bsdapp             |    1 +
> >  config/common_linuxapp           |    1 +
[...]
> >  # Compile librte_table
> >  #
> >  CONFIG_RTE_LIBRTE_TABLE=y
> > +CONFIG_RTE_TABLE_ACL_STATS_COLLECT=n
> 
> Sigh. More config options does not make DPDK better.
> It makes more unsupportable for distros

+1
It is the same comment as for port statistics.
Please stop trying to add new config options.
diff mbox

Patch

diff --git a/config/common_bsdapp b/config/common_bsdapp
index 238d178..096e09c 100644
--- a/config/common_bsdapp
+++ b/config/common_bsdapp
@@ -400,6 +400,7 @@  CONFIG_RTE_PORT_SINK_STATS_COLLECT=n
 # Compile librte_table
 #
 CONFIG_RTE_LIBRTE_TABLE=y
+CONFIG_RTE_TABLE_ACL_STATS_COLLECT=n
 
 #
 # Compile librte_pipeline
diff --git a/config/common_linuxapp b/config/common_linuxapp
index 36a623d..d930808 100644
--- a/config/common_linuxapp
+++ b/config/common_linuxapp
@@ -407,6 +407,7 @@  CONFIG_RTE_PORT_SINK_STATS_COLLECT=n
 # Compile librte_table
 #
 CONFIG_RTE_LIBRTE_TABLE=y
+CONFIG_RTE_TABLE_ACL_STATS_COLLECT=n
 
 #
 # Compile librte_pipeline
diff --git a/lib/librte_table/rte_table_acl.c b/lib/librte_table/rte_table_acl.c
index 4416311..194316d 100644
--- a/lib/librte_table/rte_table_acl.c
+++ b/lib/librte_table/rte_table_acl.c
@@ -43,7 +43,23 @@ 
 #include "rte_table_acl.h"
 #include <rte_ether.h>
 
+#ifdef RTE_TABLE_ACL_STATS_COLLECT
+
+#define RTE_TABLE_ACL_STATS_PKTS_IN_ADD(table, val) \
+	table->stats.n_pkts_in += val
+#define RTE_TABLE_ACL_STATS_PKTS_LOOKUP_MISS(table, val) \
+	table->stats.n_pkts_lookup_miss += val
+
+#else
+
+#define RTE_TABLE_ACL_STATS_PKTS_IN_ADD(table, val)
+#define RTE_TABLE_ACL_STATS_PKTS_LOOKUP_MISS(table, val)
+
+#endif
+
 struct rte_table_acl {
+	struct rte_table_stats stats;
+
 	/* Low-level ACL table */
 	char name[2][RTE_ACL_NAMESIZE];
 	struct rte_acl_param acl_params; /* for creating low level acl table */
@@ -441,6 +457,9 @@  rte_table_acl_lookup(
 	uint64_t pkts_out_mask;
 	uint32_t n_pkts, i, j;
 
+	__rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask);
+	RTE_TABLE_ACL_STATS_PKTS_IN_ADD(acl, n_pkts_in);
+
 	/* Input conversion */
 	for (i = 0, j = 0; i < (uint32_t)(RTE_PORT_IN_BURST_SIZE_MAX -
 		__builtin_clzll(pkts_mask)); i++) {
@@ -478,6 +497,21 @@  rte_table_acl_lookup(
 	}
 
 	*lookup_hit_mask = pkts_out_mask;
+	RTE_TABLE_ACL_STATS_PKTS_LOOKUP_MISS(acl, n_pkts_in - __builtin_popcountll(pkts_out_mask));
+
+	return 0;
+}
+
+static int
+rte_table_acl_stats_read(void *table, struct rte_table_stats *stats, int clear)
+{
+	struct rte_table_acl *acl = (struct rte_table_acl *) table;
+
+	if (stats != NULL)
+		memcpy(stats, &acl->stats, sizeof(acl->stats));
+
+	if (clear)
+		memset(&acl->stats, 0, sizeof(acl->stats));
 
 	return 0;
 }
@@ -488,4 +522,5 @@  struct rte_table_ops rte_table_acl_ops = {
 	.f_add = rte_table_acl_entry_add,
 	.f_delete = rte_table_acl_entry_delete,
 	.f_lookup = rte_table_acl_lookup,
+	.f_stats = rte_table_acl_stats_read,
 };