1094dd940e
With symbols going though experimental/stable stages, we accumulated
a lot of discrepancies about inclusion of the rte_compat.h header.
Some headers are including it where unneeded, while others rely on
implicit inclusion.
Fix unneeded inclusions:
$ git grep -l include..rte_compat.h |
xargs grep -LE '__rte_(internal|experimental)' |
xargs sed -i -e '/#include..rte_compat.h/d'
Fix missing inclusion, by inserting rte_compat.h before the first
inclusion of a DPDK header:
$ git grep -lE '__rte_(internal|experimental)' |
xargs grep -L include..rte_compat.h |
xargs sed -i -e \
'0,/#include..\(rte_\|.*pmd.h.$\)/{
s/\(#include..\(rte_\|.*pmd.h.$\)\)/#include <rte_compat.h>\n\1/
}'
Fix missing inclusion, by inserting rte_compat.h after the last
inclusion of a non DPDK header:
$ for file in $(git grep -lE '__rte_(internal|experimental)' |
xargs grep -L include..rte_compat.h); do
tac $file > $file.$$
sed -i -e \
'0,/#include../{
s/\(#include..*$\)/#include <rte_compat.h>\n\n\1/
}' $file.$$
tac $file.$$ > $file
rm $file.$$
done
Fix missing inclusion, by inserting rte_compat.h after the header guard:
$ git grep -lE '__rte_(internal|experimental)' |
xargs grep -L include..rte_compat.h |
xargs sed -i -e \
'0,/#define/{
s/\(#define .*$\)/\1\n\n#include <rte_compat.h>/
}'
And finally, exclude rte_compat.h itself.
$ git checkout lib/eal/include/rte_compat.h
At the end of all this, we have a clean tree:
$ git grep -lE '__rte_(internal|experimental)' |
xargs grep -L include..rte_compat.h
buildtools/check-symbols.sh
devtools/checkpatches.sh
doc/guides/contributing/abi_policy.rst
doc/guides/rel_notes/release_20_11.rst
lib/eal/include/rte_compat.h
Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
109 lines
2.2 KiB
C
109 lines
2.2 KiB
C
/* SPDX-License-Identifier: BSD-3-Clause
|
|
* Copyright 2020 Mellanox Technologies, Ltd
|
|
*/
|
|
|
|
#ifndef MLX5_MALLOC_H_
|
|
#define MLX5_MALLOC_H_
|
|
|
|
#include <rte_compat.h>
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#ifndef MLX5_MALLOC_ALIGNMENT
|
|
#ifndef RTE_ARCH_64
|
|
#define MLX5_MALLOC_ALIGNMENT 8
|
|
#else
|
|
#define MLX5_MALLOC_ALIGNMENT 16
|
|
#endif
|
|
#endif
|
|
|
|
enum mlx5_mem_flags {
|
|
MLX5_MEM_ANY = 0,
|
|
/* Memory will be allocated depends on sys_mem_en. */
|
|
MLX5_MEM_SYS = 1 << 0,
|
|
/* Memory should be allocated from system. */
|
|
MLX5_MEM_RTE = 1 << 1,
|
|
/* Memory should be allocated from rte hugepage. */
|
|
MLX5_MEM_ZERO = 1 << 2,
|
|
/* Memory should be cleared to zero. */
|
|
};
|
|
|
|
/**
|
|
* Select the PMD memory allocate preference.
|
|
*
|
|
* Once sys_mem_en is set, the default memory allocate will from
|
|
* system only if an explicitly flag is set to order the memory
|
|
* from rte hugepage memory.
|
|
*
|
|
* @param sys_mem_en
|
|
* Use system memory or not.
|
|
*/
|
|
void mlx5_malloc_mem_select(uint32_t sys_mem_en);
|
|
|
|
/**
|
|
* Dump the PMD memory usage statistic.
|
|
*/
|
|
__rte_internal
|
|
void mlx5_memory_stat_dump(void);
|
|
|
|
/**
|
|
* Memory allocate function.
|
|
*
|
|
* @param flags
|
|
* The bits as enum mlx5_mem_flags defined.
|
|
* @param size
|
|
* Memory size to be allocated.
|
|
* @param align
|
|
* Memory alignment.
|
|
* @param socket
|
|
* The socket memory should allocated.
|
|
* Valid only when allocate the memory from rte hugepage.
|
|
*
|
|
* @return
|
|
* Pointer of the allocated memory, NULL otherwise.
|
|
*/
|
|
__rte_internal
|
|
void *mlx5_malloc(uint32_t flags, size_t size, unsigned int align, int socket);
|
|
|
|
/**
|
|
* Memory reallocate function.
|
|
*
|
|
*
|
|
*
|
|
* @param addr
|
|
* The memory to be reallocated.
|
|
* @param flags
|
|
* The bits as enum mlx5_mem_flags defined.
|
|
* @param size
|
|
* Memory size to be allocated.
|
|
* @param align
|
|
* Memory alignment.
|
|
* @param socket
|
|
* The socket memory should allocated.
|
|
* Valid only when allocate the memory from rte hugepage.
|
|
*
|
|
* @return
|
|
* Pointer of the allocated memory, NULL otherwise.
|
|
*/
|
|
|
|
__rte_internal
|
|
void *mlx5_realloc(void *addr, uint32_t flags, size_t size, unsigned int align,
|
|
int socket);
|
|
|
|
/**
|
|
* Memory free function.
|
|
*
|
|
* @param addr
|
|
* The memory address to be freed..
|
|
*/
|
|
__rte_internal
|
|
void mlx5_free(void *addr);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif
|