net/dpaa2: set device driver

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

diff --git a/lib/librte_table/rte_table_hash_lru.c b/lib/librte_table/rte_table_hash_lru.c
index 14e9072..5a4864e 100644 (file)
--- a/lib/librte_table/rte_table_hash_lru.c
+++ b/lib/librte_table/rte_table_hash_lru.c
@@ -149,7 +149,7 @@ static void *
 rte_table_hash_lru_create(void *params, int socket_id, uint32_t entry_size)
 {
        struct rte_table_hash_lru_params *p =
-               (struct rte_table_hash_lru_params *) params;
+               params;
        struct rte_table_hash *t;
        uint32_t total_size, table_meta_sz;
        uint32_t bucket_sz, key_sz, key_stack_sz, data_sz;
@@ -227,7 +227,7 @@ rte_table_hash_lru_create(void *params, int socket_id, uint32_t entry_size)
 static int
 rte_table_hash_lru_free(void *table)
 {
-       struct rte_table_hash *t = (struct rte_table_hash *) table;
+       struct rte_table_hash *t = table;
 
        /* Check input parameters */
        if (t == NULL)
@@ -241,7 +241,7 @@ static int
 rte_table_hash_lru_entry_add(void *table, void *key, void *entry,
        int *key_found, void **entry_ptr)
 {
-       struct rte_table_hash *t = (struct rte_table_hash *) table;
+       struct rte_table_hash *t = table;
        struct bucket *bkt;
        uint64_t sig;
        uint32_t bkt_index, i;
@@ -325,7 +325,7 @@ static int
 rte_table_hash_lru_entry_delete(void *table, void *key, int *key_found,
        void *entry)
 {
-       struct rte_table_hash *t = (struct rte_table_hash *) table;
+       struct rte_table_hash *t = table;
        struct bucket *bkt;
        uint64_t sig;
        uint32_t bkt_index, i;
@@ -576,6 +576,7 @@ static int rte_table_hash_lru_lookup_unoptimized(
 {                                                              \
        uint64_t pkt00_mask, pkt01_mask;                        \
        struct rte_mbuf *mbuf00, *mbuf01;                       \
+       uint32_t key_offset = t->key_offset;            \
                                                                \
        pkt00_index = __builtin_ctzll(pkts_mask);               \
        pkt00_mask = 1LLU << pkt00_index;                       \
@@ -587,8 +588,8 @@ static int rte_table_hash_lru_lookup_unoptimized(
        pkts_mask &= ~pkt01_mask;                               \
        mbuf01 = pkts[pkt01_index];                             \
                                                                \
-       rte_prefetch0(RTE_MBUF_METADATA_UINT8_PTR(mbuf00, 0));  \
-       rte_prefetch0(RTE_MBUF_METADATA_UINT8_PTR(mbuf01, 0));  \
+       rte_prefetch0(RTE_MBUF_METADATA_UINT8_PTR(mbuf00, key_offset));\
+       rte_prefetch0(RTE_MBUF_METADATA_UINT8_PTR(mbuf01, key_offset));\
 }
 
 #define lookup2_stage0_with_odd_support(t, g, pkts, pkts_mask, pkt00_index, \
@@ -596,6 +597,7 @@ static int rte_table_hash_lru_lookup_unoptimized(
 {                                                              \
        uint64_t pkt00_mask, pkt01_mask;                        \
        struct rte_mbuf *mbuf00, *mbuf01;                       \
+       uint32_t key_offset = t->key_offset;            \
                                                                \
        pkt00_index = __builtin_ctzll(pkts_mask);               \
        pkt00_mask = 1LLU << pkt00_index;                       \
@@ -610,8 +612,8 @@ static int rte_table_hash_lru_lookup_unoptimized(
        pkts_mask &= ~pkt01_mask;                               \
        mbuf01 = pkts[pkt01_index];                             \
                                                                \
-       rte_prefetch0(RTE_MBUF_METADATA_UINT8_PTR(mbuf00, 0));  \
-       rte_prefetch0(RTE_MBUF_METADATA_UINT8_PTR(mbuf01, 0));  \
+       rte_prefetch0(RTE_MBUF_METADATA_UINT8_PTR(mbuf00, key_offset));\
+       rte_prefetch0(RTE_MBUF_METADATA_UINT8_PTR(mbuf01, key_offset));\
 }
 
 #define lookup2_stage1(t, g, pkts, pkt10_index, pkt11_index)   \
@@ -1066,7 +1068,7 @@ static int rte_table_hash_lru_lookup_dosig(
 static int
 rte_table_hash_lru_stats_read(void *table, struct rte_table_stats *stats, int clear)
 {
-       struct rte_table_hash *t = (struct rte_table_hash *) table;
+       struct rte_table_hash *t = table;
 
        if (stats != NULL)
                memcpy(stats, &t->stats, sizeof(t->stats));