d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mempool: add namespace to driver register macro

Browse Source 
Add RTE_ prefix to macro used to register mempool driver.
The old one is still available but deprecated.

Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Acked-by: Olivier Matz <olivier.matz@6wind.com>
This commit is contained in:
Andrew Rybchenko 2021-10-19 20:40:21 +03:00 committed by David Marchand
parent d720366184
commit cb77b060eb
13 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/guides/prog_guide/mempool_lib.rst
View File

@ -115,7 +115,7 @@ management systems and software based memory allocators, to be used with DPDK.
There are two aspects to a mempool handler.
* Adding the code for your new mempool operations (ops). This is achieved by
adding a new mempool ops code, and using the ``MEMPOOL_REGISTER_OPS`` macro.
adding a new mempool ops code, and using the ``RTE_MEMPOOL_REGISTER_OPS`` macro.
* Using the new API to call ``rte_mempool_create_empty()`` and
``rte_mempool_set_ops_byname()`` to create a new mempool and specifying which

4
doc/guides/rel_notes/deprecation.rst
View File

@ -43,6 +43,10 @@ Deprecation Notices
be removed in DPDK 22.11. The replacement macro
``RTE_MEMPOOL_HEADER_SIZE()`` is internal only.
* mempool: Macro to register mempool driver ``MEMPOOL_REGISTER_OPS()`` is
deprecated and will be removed in DPDK 22.11. Use replacement macro
``RTE_MEMPOOL_REGISTER_OPS()``.
* mbuf: The mbuf offload flags ``PKT_*`` will be renamed as ``RTE_MBUF_F_*``.
A compatibility layer will be kept until DPDK 22.11, except for the flags
that are already deprecated (``PKT_RX_L4_CKSUM_BAD``, ``PKT_RX_IP_CKSUM_BAD``,

3
doc/guides/rel_notes/release_21_11.rst
View File

@ -236,6 +236,9 @@ API Changes
* mempool: Helper macro ``MEMPOOL_HEADER_SIZE()`` is deprecated.
The replacement macro ``RTE_MEMPOOL_HEADER_SIZE()`` is internal only.
* mempool: Macro to register mempool driver ``MEMPOOL_REGISTER_OPS()`` is
deprecated. Use replacement ``RTE_MEMPOOL_REGISTER_OPS()``.
* net: Renamed ``s_addr`` and ``d_addr`` fields of ``rte_ether_hdr`` structure
to ``src_addr`` and ``dst_addr``, respectively.

2
drivers/mempool/bucket/rte_mempool_bucket.c
View File

@ -663,4 +663,4 @@ static const struct rte_mempool_ops ops_bucket = {
};
MEMPOOL_REGISTER_OPS(ops_bucket);
RTE_MEMPOOL_REGISTER_OPS(ops_bucket);

2
drivers/mempool/cnxk/cn10k_mempool_ops.c
View File

@ -316,4 +316,4 @@ static struct rte_mempool_ops cn10k_mempool_ops = {
.populate = cnxk_mempool_populate,
};
MEMPOOL_REGISTER_OPS(cn10k_mempool_ops);
RTE_MEMPOOL_REGISTER_OPS(cn10k_mempool_ops);

2
drivers/mempool/cnxk/cn9k_mempool_ops.c
View File

@ -86,4 +86,4 @@ static struct rte_mempool_ops cn9k_mempool_ops = {
.populate = cnxk_mempool_populate,
};
MEMPOOL_REGISTER_OPS(cn9k_mempool_ops);
RTE_MEMPOOL_REGISTER_OPS(cn9k_mempool_ops);

2
drivers/mempool/dpaa/dpaa_mempool.c
View File

@ -358,4 +358,4 @@ static const struct rte_mempool_ops dpaa_mpool_ops = {
.populate = dpaa_populate,
};
MEMPOOL_REGISTER_OPS(dpaa_mpool_ops);
RTE_MEMPOOL_REGISTER_OPS(dpaa_mpool_ops);

2
drivers/mempool/dpaa2/dpaa2_hw_mempool.c
View File

@ -455,6 +455,6 @@ static const struct rte_mempool_ops dpaa2_mpool_ops = {
.populate = dpaa2_populate,
};
MEMPOOL_REGISTER_OPS(dpaa2_mpool_ops);
RTE_MEMPOOL_REGISTER_OPS(dpaa2_mpool_ops);
RTE_LOG_REGISTER_DEFAULT(dpaa2_logtype_mempool, NOTICE);

2
drivers/mempool/octeontx/rte_mempool_octeontx.c
View File

@ -202,4 +202,4 @@ static struct rte_mempool_ops octeontx_fpavf_ops = {
.populate = octeontx_fpavf_populate,
};
MEMPOOL_REGISTER_OPS(octeontx_fpavf_ops);
RTE_MEMPOOL_REGISTER_OPS(octeontx_fpavf_ops);

2
drivers/mempool/octeontx2/otx2_mempool_ops.c
View File

@ -898,4 +898,4 @@ static struct rte_mempool_ops otx2_npa_ops = {
#endif
};
MEMPOOL_REGISTER_OPS(otx2_npa_ops);
RTE_MEMPOOL_REGISTER_OPS(otx2_npa_ops);

12
drivers/mempool/ring/rte_mempool_ring.c
View File

@ -198,9 +198,9 @@ static const struct rte_mempool_ops ops_mt_hts = {
.get_count = common_ring_get_count,
};
MEMPOOL_REGISTER_OPS(ops_mp_mc);
MEMPOOL_REGISTER_OPS(ops_sp_sc);
MEMPOOL_REGISTER_OPS(ops_mp_sc);
MEMPOOL_REGISTER_OPS(ops_sp_mc);
MEMPOOL_REGISTER_OPS(ops_mt_rts);
MEMPOOL_REGISTER_OPS(ops_mt_hts);
RTE_MEMPOOL_REGISTER_OPS(ops_mp_mc);
RTE_MEMPOOL_REGISTER_OPS(ops_sp_sc);
RTE_MEMPOOL_REGISTER_OPS(ops_mp_sc);
RTE_MEMPOOL_REGISTER_OPS(ops_sp_mc);
RTE_MEMPOOL_REGISTER_OPS(ops_mt_rts);
RTE_MEMPOOL_REGISTER_OPS(ops_mt_hts);

4
drivers/mempool/stack/rte_mempool_stack.c
View File

@ -93,5 +93,5 @@ static struct rte_mempool_ops ops_lf_stack = {
.get_count = stack_get_count
};
MEMPOOL_REGISTER_OPS(ops_stack);
MEMPOOL_REGISTER_OPS(ops_lf_stack);
RTE_MEMPOOL_REGISTER_OPS(ops_stack);
RTE_MEMPOOL_REGISTER_OPS(ops_lf_stack);

6
lib/mempool/rte_mempool.h
View File

@ -922,12 +922,16 @@ int rte_mempool_register_ops(const struct rte_mempool_ops *ops);
* Note that the rte_mempool_register_ops fails silently here when
* more than RTE_MEMPOOL_MAX_OPS_IDX is registered.
*/
#define MEMPOOL_REGISTER_OPS(ops) \
#define RTE_MEMPOOL_REGISTER_OPS(ops) \
RTE_INIT(mp_hdlr_init_##ops) \
{ \
rte_mempool_register_ops(&ops); \
}
/** Deprecated. Use RTE_MEMPOOL_REGISTER_OPS() instead. */
#define MEMPOOL_REGISTER_OPS(ops) \
RTE_DEPRECATED(MEMPOOL_REGISTER_OPS) RTE_MEMPOOL_REGISTER_OPS(ops)
/**
* An object callback function for mempool.
*