8ea4143883
Add dedicated parameter structure for cuckoo hash. The cuckoo hash from
librte_hash uses slightly different prototype for the hash function (no
key_mask parameter, 32-bit seed and return value) that require either
of the following approaches:
1/ Function pointer conversion: gcc 8.1 warning [1], misleading [2]
2/ Union within the parameter structure: pollutes a very generic API
parameter structure with some implementation dependent detail
(i.e. key mask not available for one of the available
implementations)
3/ Using opaque pointer for hash function: same issue from 2/
4/ Different parameter structure: avoid issue from 2/; hopefully,
it won't be long before librte_hash implements the key mask feature,
so the generic API structure could be used.
[1] http://www.dpdk.org/ml/archives/dev/2018-April/094950.html
[2] http://www.dpdk.org/ml/archives/dev/2018-April/096250.html
Fixes: 5a80bf0ae613 ("table: add cuckoo hash")
Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
131 lines
2.9 KiB
C
131 lines
2.9 KiB
C
/* SPDX-License-Identifier: BSD-3-Clause
|
|
* Copyright(c) 2010-2016 Intel Corporation
|
|
*/
|
|
|
|
#ifndef _MAIN_H_
|
|
#define _MAIN_H_
|
|
|
|
#ifndef APP_MBUF_ARRAY_SIZE
|
|
#define APP_MBUF_ARRAY_SIZE 256
|
|
#endif
|
|
|
|
struct app_mbuf_array {
|
|
struct rte_mbuf *array[APP_MBUF_ARRAY_SIZE];
|
|
uint16_t n_mbufs;
|
|
};
|
|
|
|
#ifndef APP_MAX_PORTS
|
|
#define APP_MAX_PORTS 4
|
|
#endif
|
|
|
|
struct app_params {
|
|
/* CPU cores */
|
|
uint32_t core_rx;
|
|
uint32_t core_worker;
|
|
uint32_t core_tx;
|
|
|
|
/* Ports*/
|
|
uint32_t ports[APP_MAX_PORTS];
|
|
uint32_t n_ports;
|
|
uint32_t port_rx_ring_size;
|
|
uint32_t port_tx_ring_size;
|
|
|
|
/* Rings */
|
|
struct rte_ring *rings_rx[APP_MAX_PORTS];
|
|
struct rte_ring *rings_tx[APP_MAX_PORTS];
|
|
uint32_t ring_rx_size;
|
|
uint32_t ring_tx_size;
|
|
|
|
/* Internal buffers */
|
|
struct app_mbuf_array mbuf_rx;
|
|
struct app_mbuf_array mbuf_tx[APP_MAX_PORTS];
|
|
|
|
/* Buffer pool */
|
|
struct rte_mempool *pool;
|
|
uint32_t pool_buffer_size;
|
|
uint32_t pool_size;
|
|
uint32_t pool_cache_size;
|
|
|
|
/* Burst sizes */
|
|
uint32_t burst_size_rx_read;
|
|
uint32_t burst_size_rx_write;
|
|
uint32_t burst_size_worker_read;
|
|
uint32_t burst_size_worker_write;
|
|
uint32_t burst_size_tx_read;
|
|
uint32_t burst_size_tx_write;
|
|
|
|
/* App behavior */
|
|
uint32_t pipeline_type;
|
|
} __rte_cache_aligned;
|
|
|
|
extern struct app_params app;
|
|
|
|
int app_parse_args(int argc, char **argv);
|
|
void app_print_usage(void);
|
|
void app_init(void);
|
|
int app_lcore_main_loop(void *arg);
|
|
|
|
/* Pipeline */
|
|
enum {
|
|
e_APP_PIPELINE_NONE = 0,
|
|
e_APP_PIPELINE_STUB,
|
|
|
|
e_APP_PIPELINE_HASH_KEY8_EXT,
|
|
e_APP_PIPELINE_HASH_KEY8_LRU,
|
|
e_APP_PIPELINE_HASH_KEY16_EXT,
|
|
e_APP_PIPELINE_HASH_KEY16_LRU,
|
|
e_APP_PIPELINE_HASH_KEY32_EXT,
|
|
e_APP_PIPELINE_HASH_KEY32_LRU,
|
|
|
|
e_APP_PIPELINE_HASH_SPEC_KEY8_EXT,
|
|
e_APP_PIPELINE_HASH_SPEC_KEY8_LRU,
|
|
e_APP_PIPELINE_HASH_SPEC_KEY16_EXT,
|
|
e_APP_PIPELINE_HASH_SPEC_KEY16_LRU,
|
|
e_APP_PIPELINE_HASH_SPEC_KEY32_EXT,
|
|
e_APP_PIPELINE_HASH_SPEC_KEY32_LRU,
|
|
|
|
e_APP_PIPELINE_ACL,
|
|
e_APP_PIPELINE_LPM,
|
|
e_APP_PIPELINE_LPM_IPV6,
|
|
|
|
e_APP_PIPELINE_HASH_CUCKOO_KEY8,
|
|
e_APP_PIPELINE_HASH_CUCKOO_KEY16,
|
|
e_APP_PIPELINE_HASH_CUCKOO_KEY32,
|
|
e_APP_PIPELINE_HASH_CUCKOO_KEY48,
|
|
e_APP_PIPELINE_HASH_CUCKOO_KEY64,
|
|
e_APP_PIPELINE_HASH_CUCKOO_KEY80,
|
|
e_APP_PIPELINE_HASH_CUCKOO_KEY96,
|
|
e_APP_PIPELINE_HASH_CUCKOO_KEY112,
|
|
e_APP_PIPELINE_HASH_CUCKOO_KEY128,
|
|
e_APP_PIPELINES
|
|
};
|
|
|
|
void app_main_loop_rx(void);
|
|
void app_main_loop_rx_metadata(void);
|
|
uint64_t test_hash(void *key,
|
|
void *key_mask,
|
|
uint32_t key_size,
|
|
uint64_t seed);
|
|
|
|
uint32_t test_hash_cuckoo(const void *key,
|
|
uint32_t key_size,
|
|
uint32_t seed);
|
|
|
|
void app_main_loop_worker(void);
|
|
void app_main_loop_worker_pipeline_stub(void);
|
|
void app_main_loop_worker_pipeline_hash(void);
|
|
void app_main_loop_worker_pipeline_acl(void);
|
|
void app_main_loop_worker_pipeline_lpm(void);
|
|
void app_main_loop_worker_pipeline_lpm_ipv6(void);
|
|
|
|
void app_main_loop_tx(void);
|
|
|
|
#define APP_FLUSH 0
|
|
#ifndef APP_FLUSH
|
|
#define APP_FLUSH 0x3FF
|
|
#endif
|
|
|
|
#define APP_METADATA_OFFSET(offset) (sizeof(struct rte_mbuf) + (offset))
|
|
|
|
#endif /* _MAIN_H_ */
|