mempool: remove callback to register memory area
The callback is not required any more since there is a new callback to populate objects using provided memory area which provides the same information. Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com> Acked-by: Santosh Shukla <santosh.shukla@caviumnetworks.com> Acked-by: Olivier Matz <olivier.matz@6wind.com>
This commit is contained in:
parent
0c51eac502
commit
05912855bc
@ -51,7 +51,6 @@ Deprecation Notices
|
||||
|
||||
The following changes are planned:
|
||||
|
||||
- substitute ``register_memory_area`` with ``populate`` ops.
|
||||
- addition of new op to allocate contiguous
|
||||
block of objects if underlying driver supports it.
|
||||
|
||||
|
@ -250,6 +250,8 @@ ABI Changes
|
||||
Callback ``get_capabilities`` has been removed from ``rte_mempool_ops``
|
||||
since its features are covered by ``calc_mem_size`` and ``populate``
|
||||
callbacks.
|
||||
Callback ``register_memory_area`` has been removed from ``rte_mempool_ops``
|
||||
since the new callback ``populate`` may be used instead of it.
|
||||
|
||||
* **Additional fields in rte_eth_dev_info.**
|
||||
|
||||
|
@ -378,11 +378,6 @@ rte_mempool_populate_iova(struct rte_mempool *mp, char *vaddr,
|
||||
if (ret != 0)
|
||||
return ret;
|
||||
|
||||
/* Notify memory area to mempool */
|
||||
ret = rte_mempool_ops_register_memory_area(mp, vaddr, iova, len);
|
||||
if (ret != -ENOTSUP && ret < 0)
|
||||
return ret;
|
||||
|
||||
/* mempool is already populated */
|
||||
if (mp->populated_size >= mp->size)
|
||||
return -ENOSPC;
|
||||
|
@ -370,12 +370,6 @@ typedef int (*rte_mempool_dequeue_t)(struct rte_mempool *mp,
|
||||
*/
|
||||
typedef unsigned (*rte_mempool_get_count)(const struct rte_mempool *mp);
|
||||
|
||||
/**
|
||||
* Notify new memory area to mempool.
|
||||
*/
|
||||
typedef int (*rte_mempool_ops_register_memory_area_t)
|
||||
(const struct rte_mempool *mp, char *vaddr, rte_iova_t iova, size_t len);
|
||||
|
||||
/**
|
||||
* Calculate memory size required to store given number of objects.
|
||||
*
|
||||
@ -513,10 +507,6 @@ struct rte_mempool_ops {
|
||||
rte_mempool_enqueue_t enqueue; /**< Enqueue an object. */
|
||||
rte_mempool_dequeue_t dequeue; /**< Dequeue an object. */
|
||||
rte_mempool_get_count get_count; /**< Get qty of available objs. */
|
||||
/**
|
||||
* Notify new memory area to mempool
|
||||
*/
|
||||
rte_mempool_ops_register_memory_area_t register_memory_area;
|
||||
/**
|
||||
* Optional callback to calculate memory size required to
|
||||
* store specified number of objects.
|
||||
@ -638,27 +628,6 @@ rte_mempool_ops_enqueue_bulk(struct rte_mempool *mp, void * const *obj_table,
|
||||
unsigned
|
||||
rte_mempool_ops_get_count(const struct rte_mempool *mp);
|
||||
|
||||
/**
|
||||
* @internal wrapper for mempool_ops register_memory_area callback.
|
||||
* API to notify the mempool handler when a new memory area is added to pool.
|
||||
*
|
||||
* @param mp
|
||||
* Pointer to the memory pool.
|
||||
* @param vaddr
|
||||
* Pointer to the buffer virtual address.
|
||||
* @param iova
|
||||
* Pointer to the buffer IO address.
|
||||
* @param len
|
||||
* Pool size.
|
||||
* @return
|
||||
* - 0: Success;
|
||||
* - -ENOTSUP - doesn't support register_memory_area ops (valid error case).
|
||||
* - Otherwise, rte_mempool_populate_phys fails thus pool create fails.
|
||||
*/
|
||||
int
|
||||
rte_mempool_ops_register_memory_area(const struct rte_mempool *mp,
|
||||
char *vaddr, rte_iova_t iova, size_t len);
|
||||
|
||||
/**
|
||||
* @internal wrapper for mempool_ops calc_mem_size callback.
|
||||
* API to calculate size of memory required to store specified number of
|
||||
|
@ -57,7 +57,6 @@ rte_mempool_register_ops(const struct rte_mempool_ops *h)
|
||||
ops->enqueue = h->enqueue;
|
||||
ops->dequeue = h->dequeue;
|
||||
ops->get_count = h->get_count;
|
||||
ops->register_memory_area = h->register_memory_area;
|
||||
ops->calc_mem_size = h->calc_mem_size;
|
||||
ops->populate = h->populate;
|
||||
|
||||
@ -98,19 +97,6 @@ rte_mempool_ops_get_count(const struct rte_mempool *mp)
|
||||
return ops->get_count(mp);
|
||||
}
|
||||
|
||||
/* wrapper to notify new memory area to external mempool */
|
||||
int
|
||||
rte_mempool_ops_register_memory_area(const struct rte_mempool *mp, char *vaddr,
|
||||
rte_iova_t iova, size_t len)
|
||||
{
|
||||
struct rte_mempool_ops *ops;
|
||||
|
||||
ops = rte_mempool_get_ops(mp->ops_index);
|
||||
|
||||
RTE_FUNC_PTR_OR_ERR_RET(ops->register_memory_area, -ENOTSUP);
|
||||
return ops->register_memory_area(mp, vaddr, iova, len);
|
||||
}
|
||||
|
||||
/* wrapper to notify new memory area to external mempool */
|
||||
ssize_t
|
||||
rte_mempool_ops_calc_mem_size(const struct rte_mempool *mp,
|
||||
|
@ -45,7 +45,6 @@ DPDK_16.07 {
|
||||
DPDK_17.11 {
|
||||
global:
|
||||
|
||||
rte_mempool_ops_register_memory_area;
|
||||
rte_mempool_populate_iova;
|
||||
rte_mempool_populate_iova_tab;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user