0d440d081c
Many exported headers rely on definitions found in rte_config.h without
including it, as shown by the following command:
grep -L '^#include <rte_config.h>' -- \
$(grep -Rl \
$(sed -n '/^#define \([^ ]\+\).*$/{s//\1/;H;};${x;s/\n//;s/\n/\\|/g;p;}' \
build/include/rte_config.h) \
-- build/include/)
We cannot assume external applications will include rte_config.h on their
own, neither directly nor through a -include parameter like DPDK does
internally.
This not only causes obvious compilation failures that can be reproduced
with check-includes.sh such as:
[...]/rte_memory.h:88:43: error: ‘RTE_CACHE_LINE_SIZE’ was not declared in
this scope
#define __rte_cache_aligned __rte_aligned(RTE_CACHE_LINE_SIZE)
^
It also results in less visible issues, for instance rte_hash_crc.h relying
on RTE_ARCH_X86_64's presence to provide dedicated inline functions.
This patch partially reverts the commit below and adds missing include
lines to the remaining files.
Fixes: f1a7a5c5f4 ("remove include of generated config header")
Cc: stable@dpdk.org
Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
Acked-by: Thomas Monjalon <thomas@monjalon.net>
94 lines
1.9 KiB
C
94 lines
1.9 KiB
C
/* SPDX-License-Identifier: BSD-3-Clause
|
|
* Copyright(c) 2010-2014 Intel Corporation
|
|
*/
|
|
|
|
#ifndef __INCLUDE_RTE_LRU_H__
|
|
#define __INCLUDE_RTE_LRU_H__
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#include <rte_config.h>
|
|
#ifdef RTE_ARCH_X86_64
|
|
#include "rte_lru_x86.h"
|
|
#elif defined(RTE_ARCH_ARM64)
|
|
#include "rte_lru_arm64.h"
|
|
#else
|
|
#undef RTE_TABLE_HASH_LRU_STRATEGY
|
|
#define RTE_TABLE_HASH_LRU_STRATEGY 1
|
|
#endif
|
|
|
|
#if RTE_TABLE_HASH_LRU_STRATEGY == 0
|
|
|
|
#define lru_init(bucket) \
|
|
do \
|
|
bucket = bucket; \
|
|
while (0)
|
|
|
|
#define lru_pos(bucket) (bucket->lru_list & 0xFFFFLLU)
|
|
|
|
#define lru_update(bucket, mru_val) \
|
|
do { \
|
|
bucket = bucket; \
|
|
mru_val = mru_val; \
|
|
} while (0)
|
|
|
|
#elif RTE_TABLE_HASH_LRU_STRATEGY == 1
|
|
|
|
#define lru_init(bucket) \
|
|
do \
|
|
bucket->lru_list = 0x0000000100020003LLU; \
|
|
while (0)
|
|
|
|
#define lru_pos(bucket) (bucket->lru_list & 0xFFFFLLU)
|
|
|
|
#define lru_update(bucket, mru_val) \
|
|
do { \
|
|
uint64_t x, pos, x0, x1, x2, mask; \
|
|
\
|
|
x = bucket->lru_list; \
|
|
\
|
|
pos = 4; \
|
|
if ((x >> 48) == ((uint64_t) mru_val)) \
|
|
pos = 3; \
|
|
\
|
|
if (((x >> 32) & 0xFFFFLLU) == ((uint64_t) mru_val)) \
|
|
pos = 2; \
|
|
\
|
|
if (((x >> 16) & 0xFFFFLLU) == ((uint64_t) mru_val)) \
|
|
pos = 1; \
|
|
\
|
|
if ((x & 0xFFFFLLU) == ((uint64_t) mru_val)) \
|
|
pos = 0; \
|
|
\
|
|
\
|
|
pos <<= 4; \
|
|
mask = (~0LLU) << pos; \
|
|
x0 = x & (~mask); \
|
|
x1 = (x >> 16) & mask; \
|
|
x2 = (x << (48 - pos)) & (0xFFFFLLU << 48); \
|
|
x = x0 | x1 | x2; \
|
|
\
|
|
if (pos != 64) \
|
|
bucket->lru_list = x; \
|
|
} while (0)
|
|
|
|
#elif (RTE_TABLE_HASH_LRU_STRATEGY == 2) || (RTE_TABLE_HASH_LRU_STRATEGY == 3)
|
|
|
|
/**
|
|
* These strategies are implemented in architecture specific header files.
|
|
*/
|
|
|
|
#else
|
|
|
|
#error "Incorrect value for RTE_TABLE_HASH_LRU_STRATEGY"
|
|
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif
|