From e4233e1d0ad21f8491a7c862a6db0f018e6f946e Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Tue, 6 Oct 2020 09:07:50 +0200 Subject: [PATCH] mempool: promote some experimental functions as stable Move symbols introduced in version <= 19.11 in the stable ABI. Signed-off-by: Olivier Matz Acked-by: Bruce Richardson Reviewed-by: David Marchand --- lib/librte_mempool/rte_mempool.h | 32 ---------------------- lib/librte_mempool/rte_mempool_version.map | 12 +++----- 2 files changed, 4 insertions(+), 40 deletions(-) diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h index 9ea7ff934c..c551cf733a 100644 --- a/lib/librte_mempool/rte_mempool.h +++ b/lib/librte_mempool/rte_mempool.h @@ -191,9 +191,6 @@ struct rte_mempool_memhdr { }; /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * Additional information about the mempool * * The structure is cache-line aligned to avoid ABI breakages in @@ -358,9 +355,6 @@ void rte_mempool_check_cookies(const struct rte_mempool *mp, #endif /* RTE_LIBRTE_MEMPOOL_DEBUG */ /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @internal Check contiguous object blocks and update cookies or panic. * * @param mp @@ -421,9 +415,6 @@ typedef int (*rte_mempool_dequeue_t)(struct rte_mempool *mp, void **obj_table, unsigned int n); /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * Dequeue a number of contiguous object blocks from the external pool. */ typedef int (*rte_mempool_dequeue_contig_blocks_t)(struct rte_mempool *mp, @@ -462,9 +453,6 @@ typedef ssize_t (*rte_mempool_calc_mem_size_t)(const struct rte_mempool *mp, size_t *min_chunk_size, size_t *align); /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @internal Helper to calculate memory size required to store given * number of objects. * @@ -499,7 +487,6 @@ typedef ssize_t (*rte_mempool_calc_mem_size_t)(const struct rte_mempool *mp, * @return * Required memory size. */ -__rte_experimental ssize_t rte_mempool_op_calc_mem_size_helper(const struct rte_mempool *mp, uint32_t obj_num, uint32_t pg_shift, size_t chunk_reserve, size_t *min_chunk_size, size_t *align); @@ -569,9 +556,6 @@ typedef int (*rte_mempool_populate_t)(struct rte_mempool *mp, #define RTE_MEMPOOL_POPULATE_F_ALIGN_OBJ 0x0001 /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @internal Helper to populate memory pool object using provided memory * chunk: just slice objects one by one, taking care of not * crossing page boundaries. @@ -603,7 +587,6 @@ typedef int (*rte_mempool_populate_t)(struct rte_mempool *mp, * @return * The number of objects added in mempool. */ -__rte_experimental int rte_mempool_op_populate_helper(struct rte_mempool *mp, unsigned int flags, unsigned int max_objs, void *vaddr, rte_iova_t iova, size_t len, @@ -621,9 +604,6 @@ int rte_mempool_op_populate_default(struct rte_mempool *mp, rte_mempool_populate_obj_cb_t *obj_cb, void *obj_cb_arg); /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * Get some additional information about a mempool. */ typedef int (*rte_mempool_get_info_t)(const struct rte_mempool *mp, @@ -846,9 +826,6 @@ int rte_mempool_ops_populate(struct rte_mempool *mp, unsigned int max_objs, void *obj_cb_arg); /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * Wrapper for mempool_ops get_info callback. * * @param[in] mp @@ -860,7 +837,6 @@ int rte_mempool_ops_populate(struct rte_mempool *mp, unsigned int max_objs, * mempool information * - -ENOTSUP - doesn't support get_info ops (valid case). */ -__rte_experimental int rte_mempool_ops_get_info(const struct rte_mempool *mp, struct rte_mempool_info *info); @@ -1577,9 +1553,6 @@ rte_mempool_get(struct rte_mempool *mp, void **obj_p) } /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * Get a contiguous blocks of objects from the mempool. * * If cache is enabled, consider to flush it first, to reuse objects @@ -1601,7 +1574,6 @@ rte_mempool_get(struct rte_mempool *mp, void **obj_p) * - -EOPNOTSUPP: The mempool driver does not support block dequeue */ static __rte_always_inline int -__rte_experimental rte_mempool_get_contig_blocks(struct rte_mempool *mp, void **first_obj_table, unsigned int n) { @@ -1786,13 +1758,9 @@ void rte_mempool_walk(void (*func)(struct rte_mempool *, void *arg), void *arg); /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @internal Get page size used for mempool object allocation. * This function is internal to mempool library and mempool drivers. */ -__rte_experimental int rte_mempool_get_page_size(struct rte_mempool *mp, size_t *pg_sz); diff --git a/lib/librte_mempool/rte_mempool_version.map b/lib/librte_mempool/rte_mempool_version.map index 83760ecfc9..50b0602952 100644 --- a/lib/librte_mempool/rte_mempool_version.map +++ b/lib/librte_mempool/rte_mempool_version.map @@ -12,13 +12,17 @@ DPDK_21 { rte_mempool_create_empty; rte_mempool_dump; rte_mempool_free; + rte_mempool_get_page_size; rte_mempool_in_use_count; rte_mempool_list_dump; rte_mempool_lookup; rte_mempool_mem_iter; rte_mempool_obj_iter; rte_mempool_op_calc_mem_size_default; + rte_mempool_op_calc_mem_size_helper; rte_mempool_op_populate_default; + rte_mempool_op_populate_helper; + rte_mempool_ops_get_info; rte_mempool_ops_table; rte_mempool_populate_anon; rte_mempool_populate_default; @@ -34,14 +38,6 @@ DPDK_21 { EXPERIMENTAL { global: - # added in 18.05 - rte_mempool_ops_get_info; - - # added in 19.11 - rte_mempool_get_page_size; - rte_mempool_op_calc_mem_size_helper; - rte_mempool_op_populate_helper; - # added in 20.05 __rte_mempool_trace_ops_dequeue_bulk; __rte_mempool_trace_ops_dequeue_contig_blocks; -- 2.20.1