net/dpaa2: support extra stats

[dpdk.git] / lib / librte_table / rte_table_lpm_ipv6.c

diff --git a/lib/librte_table/rte_table_lpm_ipv6.c b/lib/librte_table/rte_table_lpm_ipv6.c
index ce4ddc0..5def2ad 100644 (file)
--- 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_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;
@@ -65,7 +81,7 @@ static void *
 rte_table_lpm_ipv6_create(void *params, int socket_id, uint32_t entry_size)
 {
        struct rte_table_lpm_ipv6_params *p =
-               (struct rte_table_lpm_ipv6_params *) params;
+               params;
        struct rte_table_lpm_ipv6 *lpm;
        struct rte_lpm6_config lpm6_config;
        uint32_t total_size, nht_size;
@@ -93,11 +109,11 @@ rte_table_lpm_ipv6_create(void *params, int socket_id, uint32_t entry_size)
                        __func__);
                return NULL;
        }
-       if ((p->offset & 0x3) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: Invalid offset\n", __func__);
+       if (p->name == NULL) {
+               RTE_LOG(ERR, TABLE, "%s: Table name is NULL\n",
+                       __func__);
                return NULL;
        }
-
        entry_size = RTE_ALIGN(entry_size, sizeof(uint64_t));
 
        /* Memory allocation */
@@ -116,7 +132,7 @@ rte_table_lpm_ipv6_create(void *params, int socket_id, uint32_t entry_size)
        lpm6_config.max_rules = p->n_rules;
        lpm6_config.number_tbl8s = p->number_tbl8s;
        lpm6_config.flags = 0;
-       lpm->lpm = rte_lpm6_create("LPM IPv6", socket_id, &lpm6_config);
+       lpm->lpm = rte_lpm6_create(p->name, socket_id, &lpm6_config);
        if (lpm->lpm == NULL) {
                rte_free(lpm);
                RTE_LOG(ERR, TABLE,
@@ -136,7 +152,7 @@ rte_table_lpm_ipv6_create(void *params, int socket_id, uint32_t entry_size)
 static int
 rte_table_lpm_ipv6_free(void *table)
 {
-       struct rte_table_lpm_ipv6 *lpm = (struct rte_table_lpm_ipv6 *) table;
+       struct rte_table_lpm_ipv6 *lpm = table;
 
        /* Check input parameters */
        if (lpm == NULL) {
@@ -192,12 +208,11 @@ rte_table_lpm_ipv6_entry_add(
        int *key_found,
        void **entry_ptr)
 {
-       struct rte_table_lpm_ipv6 *lpm = (struct rte_table_lpm_ipv6 *) table;
+       struct rte_table_lpm_ipv6 *lpm = table;
        struct rte_table_lpm_ipv6_key *ip_prefix =
-               (struct rte_table_lpm_ipv6_key *) key;
-       uint32_t nht_pos, nht_pos0_valid;
+               key;
+       uint32_t nht_pos, nht_pos0, nht_pos0_valid;
        int status;
-       uint8_t nht_pos0;
 
        /* Check input parameters */
        if (lpm == NULL) {
@@ -240,7 +255,7 @@ rte_table_lpm_ipv6_entry_add(
 
        /* Add rule to low level LPM table */
        if (rte_lpm6_add(lpm->lpm, ip_prefix->ip, ip_prefix->depth,
-               (uint8_t) nht_pos) < 0) {
+               nht_pos) < 0) {
                RTE_LOG(ERR, TABLE, "%s: LPM IPv6 rule add failed\n", __func__);
                return -1;
        }
@@ -261,10 +276,10 @@ rte_table_lpm_ipv6_entry_delete(
        int *key_found,
        void *entry)
 {
-       struct rte_table_lpm_ipv6 *lpm = (struct rte_table_lpm_ipv6 *) table;
+       struct rte_table_lpm_ipv6 *lpm = table;
        struct rte_table_lpm_ipv6_key *ip_prefix =
-               (struct rte_table_lpm_ipv6_key *) key;
-       uint8_t nht_pos;
+               key;
+       uint32_t nht_pos;
        int status;
 
        /* Check input parameters */
@@ -327,6 +342,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++) {
@@ -337,7 +355,7 @@ rte_table_lpm_ipv6_lookup(
                        uint8_t *ip = RTE_MBUF_METADATA_UINT8_PTR(pkt,
                                lpm->offset);
                        int status;
-                       uint8_t nht_pos;
+                       uint32_t nht_pos;
 
                        status = rte_lpm6_lookup(lpm->lpm, ip, &nht_pos);
                        if (status == 0) {
@@ -349,6 +367,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 = table;
+
+       if (stats != NULL)
+               memcpy(stats, &t->stats, sizeof(t->stats));
+
+       if (clear)
+               memset(&t->stats, 0, sizeof(t->stats));
 
        return 0;
 }
@@ -358,5 +390,8 @@ struct rte_table_ops rte_table_lpm_ipv6_ops = {
        .f_free = rte_table_lpm_ipv6_free,
        .f_add = rte_table_lpm_ipv6_entry_add,
        .f_delete = rte_table_lpm_ipv6_entry_delete,
+       .f_add_bulk = NULL,
+       .f_delete_bulk = NULL,
        .f_lookup = rte_table_lpm_ipv6_lookup,
+       .f_stats = rte_table_lpm_ipv6_stats_read,
 };