Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/102282 _apply patch failure_ Submitter: Andrew Rybchenko Date: Tuesday, October 19 2021 17:40:22 Applied on: CommitID:821f60c7f4337d74a0c8e4add4095be524d77600 Apply patch set 102282-102287 failed: Checking patch lib/mempool/rte_mempool.h... error: while searching for: #endif } __rte_cache_aligned; #define MEMPOOL_F_NO_SPREAD 0x0001 /**< Spreading among memory channels not required. */ #define MEMPOOL_F_NO_CACHE_ALIGN 0x0002 /**< Do not align objs on cache lines.*/ #define MEMPOOL_F_SP_PUT 0x0004 /**< Default put is "single-producer".*/ #define MEMPOOL_F_SC_GET 0x0008 /**< Default get is "single-consumer".*/ #define MEMPOOL_F_POOL_CREATED 0x0010 /**< Internal: pool is created. */ #define MEMPOOL_F_NO_IOVA_CONTIG 0x0020 /**< Don't need IOVA contiguous objs. */ /** Internal: no object from the pool can be used for device IO (DMA). */ #define MEMPOOL_F_NON_IO 0x0040 error: patch failed: lib/mempool/rte_mempool.h:250 Applying patch lib/mempool/rte_mempool.h with 1 reject... Rejected hunk #1. diff a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h (rejected hunks) @@ -250,13 +250,18 @@ struct rte_mempool { #endif } __rte_cache_aligned; +/** Spreading among memory channels not required. */ #define MEMPOOL_F_NO_SPREAD 0x0001 - /**< Spreading among memory channels not required. */ -#define MEMPOOL_F_NO_CACHE_ALIGN 0x0002 /**< Do not align objs on cache lines.*/ -#define MEMPOOL_F_SP_PUT 0x0004 /**< Default put is "single-producer".*/ -#define MEMPOOL_F_SC_GET 0x0008 /**< Default get is "single-consumer".*/ -#define MEMPOOL_F_POOL_CREATED 0x0010 /**< Internal: pool is created. */ -#define MEMPOOL_F_NO_IOVA_CONTIG 0x0020 /**< Don't need IOVA contiguous objs. */ +/** Do not align objects on cache lines. */ +#define MEMPOOL_F_NO_CACHE_ALIGN 0x0002 +/** Default put is "single-producer". */ +#define MEMPOOL_F_SP_PUT 0x0004 +/** Default get is "single-consumer". */ +#define MEMPOOL_F_SC_GET 0x0008 +/** Internal: pool is created. */ +#define MEMPOOL_F_POOL_CREATED 0x0010 +/** Don't need IOVA contiguous objects. */ +#define MEMPOOL_F_NO_IOVA_CONTIG 0x0020 /** Internal: no object from the pool can be used for device IO (DMA). */ #define MEMPOOL_F_NON_IO 0x0040 Checking patch app/proc-info/main.c... error: while searching for: "\t -- Not used for IO (%c)\n", ptr->name, ptr->socket_id, (flags & MEMPOOL_F_NO_SPREAD) ? 'y' : 'n', (flags & MEMPOOL_F_NO_CACHE_ALIGN) ? 'y' : 'n', (flags & MEMPOOL_F_SP_PUT) ? 'y' : 'n', (flags & MEMPOOL_F_SC_GET) ? 'y' : 'n', (flags & MEMPOOL_F_POOL_CREATED) ? 'y' : 'n', (flags & MEMPOOL_F_NO_IOVA_CONTIG) ? 'y' : 'n', (flags & MEMPOOL_F_NON_IO) ? 'y' : 'n'); printf(" - Size %u Cache %u element %u\n" " - header %u trailer %u\n" " - private data size %u\n", error: patch failed: app/proc-info/main.c:1299 Checking patch app/test-pmd/parameters.c... Checking patch app/test/test_mempool.c... Hunk #1 succeeded at 213 (offset -2 lines). Hunk #2 succeeded at 336 (offset -2 lines). error: while searching for: ret = rte_mempool_populate_default(mp); RTE_TEST_ASSERT(ret > 0, "Failed to populate mempool: %s", rte_strerror(-ret)); RTE_TEST_ASSERT(mp->flags & MEMPOOL_F_NON_IO, "NON_IO flag is not set when NO_IOVA_CONTIG is set"); ret = TEST_SUCCESS; exit: error: patch failed: app/test/test_mempool.c:752 error: while searching for: RTE_BAD_IOVA, block_size, NULL, NULL); RTE_TEST_ASSERT(ret > 0, "Failed to populate mempool: %s", rte_strerror(-ret)); RTE_TEST_ASSERT(mp->flags & MEMPOOL_F_NON_IO, "NON_IO flag is not set when mempool is populated with only RTE_BAD_IOVA"); ret = rte_mempool_populate_iova(mp, virt, iova, block_size, NULL, NULL); RTE_TEST_ASSERT(ret > 0, "Failed to populate mempool: %s", rte_strerror(-ret)); RTE_TEST_ASSERT(!(mp->flags & MEMPOOL_F_NON_IO), "NON_IO flag is not unset when mempool is populated with valid IOVA"); ret = rte_mempool_populate_iova(mp, RTE_PTR_ADD(virt, 2 * block_size), RTE_BAD_IOVA, block_size, NULL, NULL); RTE_TEST_ASSERT(ret > 0, "Failed to populate mempool: %s", rte_strerror(-ret)); RTE_TEST_ASSERT(!(mp->flags & MEMPOOL_F_NON_IO), "NON_IO flag is set even when some objects have valid IOVA"); ret = TEST_SUCCESS; error: patch failed: app/test/test_mempool.c:789 error: while searching for: ret = rte_mempool_populate_default(mp); RTE_TEST_ASSERT_EQUAL(ret, (int)mp->size, "Failed to populate mempool: %s", rte_strerror(-ret)); RTE_TEST_ASSERT(!(mp->flags & MEMPOOL_F_NON_IO), "NON_IO flag is set by default"); ret = TEST_SUCCESS; exit: error: patch failed: app/test/test_mempool.c:826 Checking patch doc/guides/nics/mlx5.rst... error: while searching for: - ``mr_mempool_reg_en`` parameter [int] A nonzero value enables implicit registration of DMA memory of all mempools except those having ``MEMPOOL_F_NON_IO``. This flag is set automatically for mempools populated with non-contiguous objects or those without IOVA. The effect is that when a packet from a mempool is transmitted, its memory is already registered for DMA in the PMD and no registration error: patch failed: doc/guides/nics/mlx5.rst:1004 Checking patch doc/guides/rel_notes/release_21_11.rst... error: while searching for: removed. Its usages have been replaced by a new function ``rte_kvargs_get_with_value()``. * mempool: Added ``MEMPOOL_F_NON_IO`` flag to give a hint to DPDK components that objects from this pool will not be used for device IO (e.g. DMA). * net: Renamed ``s_addr`` and ``d_addr`` fields of ``rte_ether_hdr`` structure to ``src_addr`` and ``dst_addr``, respectively. error: patch failed: doc/guides/rel_notes/release_21_11.rst:227 Checking patch drivers/common/mlx5/mlx5_common_mr.c... error: while searching for: mlx5_mr_mempool_register(struct mlx5_mr_share_cache *share_cache, void *pd, struct rte_mempool *mp, struct mlx5_mp_id *mp_id) { if (mp->flags & MEMPOOL_F_NON_IO) return 0; switch (rte_eal_process_type()) { case RTE_PROC_PRIMARY: error: patch failed: drivers/common/mlx5/mlx5_common_mr.c:1564 error: while searching for: mlx5_mr_mempool_unregister(struct mlx5_mr_share_cache *share_cache, struct rte_mempool *mp, struct mlx5_mp_id *mp_id) { if (mp->flags & MEMPOOL_F_NON_IO) return 0; switch (rte_eal_process_type()) { case RTE_PROC_PRIMARY: error: patch failed: drivers/common/mlx5/mlx5_common_mr.c:1635 Checking patch drivers/event/cnxk/cnxk_tim_evdev.c... Checking patch drivers/event/octeontx/timvf_evdev.c... Checking patch drivers/event/octeontx2/otx2_tim_evdev.c... Checking patch drivers/mempool/bucket/rte_mempool_bucket.c... Checking patch drivers/mempool/ring/rte_mempool_ring.c... Checking patch drivers/net/mlx5/mlx5_mr.c... error: while searching for: mr_ctrl, mp, addr); /* * Lookup can only fail on invalid input, e.g. "addr" * is not from "mp" or "mp" has MEMPOOL_F_NON_IO set. */ if (lkey != UINT32_MAX) return lkey; error: patch failed: drivers/net/mlx5/mlx5_mr.c:127 Checking patch drivers/net/octeontx2/otx2_ethdev.c... Checking patch drivers/net/thunderx/nicvf_ethdev.c... Checking patch lib/mempool/rte_mempool.c... Hunk #1 succeeded at 216 (offset -12 lines). Hunk #2 succeeded at 230 (offset -12 lines). Hunk #3 succeeded at 242 (offset -12 lines). Hunk #4 succeeded at 294 (offset -12 lines). Hunk #5 succeeded at 336 (offset -12 lines). error: while searching for: /* At least some objects in the pool can now be used for IO. */ if (iova != RTE_BAD_IOVA) mp->flags &= ~MEMPOOL_F_NON_IO; /* Report the mempool as ready only when fully populated. */ if (mp->populated_size >= mp->size) error: patch failed: lib/mempool/rte_mempool.c:374 Hunk #7 succeeded at 393 (offset -20 lines). Hunk #8 succeeded at 450 (offset -20 lines). Hunk #9 succeeded at 527 (offset -20 lines). Hunk #10 succeeded at 777 (offset -21 lines). error: while searching for: * No objects in the pool can be used for IO until it's populated * with at least some objects with valid IOVA. */ flags |= MEMPOOL_F_NON_IO; /* "no cache align" imply "no spread" */ if (flags & MEMPOOL_F_NO_CACHE_ALIGN) flags |= MEMPOOL_F_NO_SPREAD; /* calculate mempool object sizes. */ if (!rte_mempool_calc_obj_size(elt_size, flags, &objsz)) { error: patch failed: lib/mempool/rte_mempool.c:859 Hunk #12 succeeded at 948 (offset -27 lines). Checking patch lib/mempool/rte_mempool.h... error: while searching for: } __rte_cache_aligned; /** Spreading among memory channels not required. */ #define MEMPOOL_F_NO_SPREAD 0x0001 /** Do not align objects on cache lines. */ #define MEMPOOL_F_NO_CACHE_ALIGN 0x0002 /** Default put is "single-producer". */ #define MEMPOOL_F_SP_PUT 0x0004 /** Default get is "single-consumer". */ #define MEMPOOL_F_SC_GET 0x0008 /** Internal: pool is created. */ #define MEMPOOL_F_POOL_CREATED 0x0010 /** Don't need IOVA contiguous objects. */ #define MEMPOOL_F_NO_IOVA_CONTIG 0x0020 /** Internal: no object from the pool can be used for device IO (DMA). */ #define MEMPOOL_F_NON_IO 0x0040 /** * @internal When debug is enabled, store some statistics. error: patch failed: lib/mempool/rte_mempool.h:251 Hunk #2 succeeded at 419 (offset -32 lines). Hunk #3 succeeded at 969 (offset -32 lines). Hunk #4 succeeded at 1671 (offset -32 lines). Checking patch lib/mempool/rte_mempool_ops.c... Checking patch lib/pdump/rte_pdump.c... Checking patch lib/vhost/iotlb.c... Applying patch app/proc-info/main.c with 1 reject... Rejected hunk #1. Applied patch app/test-pmd/parameters.c cleanly. Applying patch app/test/test_mempool.c with 3 rejects... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Rejected hunk #3. Rejected hunk #4. Rejected hunk #5. Applying patch doc/guides/nics/mlx5.rst with 1 reject... Rejected hunk #1. Applying patch doc/guides/rel_notes/release_21_11.rst with 1 reject... Rejected hunk #1. Applying patch drivers/common/mlx5/mlx5_common_mr.c with 2 rejects... Rejected hunk #1. Rejected hunk #2. Applied patch drivers/event/cnxk/cnxk_tim_evdev.c cleanly. Applied patch drivers/event/octeontx/timvf_evdev.c cleanly. Applied patch drivers/event/octeontx2/otx2_tim_evdev.c cleanly. Applied patch drivers/mempool/bucket/rte_mempool_bucket.c cleanly. Applied patch drivers/mempool/ring/rte_mempool_ring.c cleanly. Applying patch drivers/net/mlx5/mlx5_mr.c with 1 reject... Rejected hunk #1. Applied patch drivers/net/octeontx2/otx2_ethdev.c cleanly. Applied patch drivers/net/thunderx/nicvf_ethdev.c cleanly. Applying patch lib/mempool/rte_mempool.c with 2 rejects... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Hunk #5 applied cleanly. Rejected hunk #6. Hunk #7 applied cleanly. Hunk #8 applied cleanly. Hunk #9 applied cleanly. Hunk #10 applied cleanly. Rejected hunk #11. Hunk #12 applied cleanly. Applying patch lib/mempool/rte_mempool.h with 1 reject... Rejected hunk #1. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Applied patch lib/mempool/rte_mempool_ops.c cleanly. Applied patch lib/pdump/rte_pdump.c cleanly. Applied patch lib/vhost/iotlb.c cleanly. diff a/app/proc-info/main.c b/app/proc-info/main.c (rejected hunks) @@ -1299,13 +1299,16 @@ show_mempool(char *name) "\t -- Not used for IO (%c)\n", ptr->name, ptr->socket_id, - (flags & MEMPOOL_F_NO_SPREAD) ? 'y' : 'n', - (flags & MEMPOOL_F_NO_CACHE_ALIGN) ? 'y' : 'n', - (flags & MEMPOOL_F_SP_PUT) ? 'y' : 'n', - (flags & MEMPOOL_F_SC_GET) ? 'y' : 'n', - (flags & MEMPOOL_F_POOL_CREATED) ? 'y' : 'n', - (flags & MEMPOOL_F_NO_IOVA_CONTIG) ? 'y' : 'n', - (flags & MEMPOOL_F_NON_IO) ? 'y' : 'n'); + (flags & RTE_MEMPOOL_F_NO_SPREAD) ? 'y' : 'n', + (flags & RTE_MEMPOOL_F_NO_CACHE_ALIGN) ? + 'y' : 'n', + (flags & RTE_MEMPOOL_F_SP_PUT) ? 'y' : 'n', + (flags & RTE_MEMPOOL_F_SC_GET) ? 'y' : 'n', + (flags & RTE_MEMPOOL_F_POOL_CREATED) ? + 'y' : 'n', + (flags & RTE_MEMPOOL_F_NO_IOVA_CONTIG) ? + 'y' : 'n', + (flags & RTE_MEMPOOL_F_NON_IO) ? 'y' : 'n'); printf(" - Size %u Cache %u element %u\n" " - header %u trailer %u\n" " - private data size %u\n", diff a/app/test/test_mempool.c b/app/test/test_mempool.c (rejected hunks) @@ -752,7 +752,7 @@ test_mempool_flag_non_io_set_when_no_iova_contig_set(void) ret = rte_mempool_populate_default(mp); RTE_TEST_ASSERT(ret > 0, "Failed to populate mempool: %s", rte_strerror(-ret)); - RTE_TEST_ASSERT(mp->flags & MEMPOOL_F_NON_IO, + RTE_TEST_ASSERT(mp->flags & RTE_MEMPOOL_F_NON_IO, "NON_IO flag is not set when NO_IOVA_CONTIG is set"); ret = TEST_SUCCESS; exit: @@ -789,20 +789,20 @@ test_mempool_flag_non_io_unset_when_populated_with_valid_iova(void) RTE_BAD_IOVA, block_size, NULL, NULL); RTE_TEST_ASSERT(ret > 0, "Failed to populate mempool: %s", rte_strerror(-ret)); - RTE_TEST_ASSERT(mp->flags & MEMPOOL_F_NON_IO, + RTE_TEST_ASSERT(mp->flags & RTE_MEMPOOL_F_NON_IO, "NON_IO flag is not set when mempool is populated with only RTE_BAD_IOVA"); ret = rte_mempool_populate_iova(mp, virt, iova, block_size, NULL, NULL); RTE_TEST_ASSERT(ret > 0, "Failed to populate mempool: %s", rte_strerror(-ret)); - RTE_TEST_ASSERT(!(mp->flags & MEMPOOL_F_NON_IO), + RTE_TEST_ASSERT(!(mp->flags & RTE_MEMPOOL_F_NON_IO), "NON_IO flag is not unset when mempool is populated with valid IOVA"); ret = rte_mempool_populate_iova(mp, RTE_PTR_ADD(virt, 2 * block_size), RTE_BAD_IOVA, block_size, NULL, NULL); RTE_TEST_ASSERT(ret > 0, "Failed to populate mempool: %s", rte_strerror(-ret)); - RTE_TEST_ASSERT(!(mp->flags & MEMPOOL_F_NON_IO), + RTE_TEST_ASSERT(!(mp->flags & RTE_MEMPOOL_F_NON_IO), "NON_IO flag is set even when some objects have valid IOVA"); ret = TEST_SUCCESS; @@ -826,7 +826,7 @@ test_mempool_flag_non_io_unset_by_default(void) ret = rte_mempool_populate_default(mp); RTE_TEST_ASSERT_EQUAL(ret, (int)mp->size, "Failed to populate mempool: %s", rte_strerror(-ret)); - RTE_TEST_ASSERT(!(mp->flags & MEMPOOL_F_NON_IO), + RTE_TEST_ASSERT(!(mp->flags & RTE_MEMPOOL_F_NON_IO), "NON_IO flag is set by default"); ret = TEST_SUCCESS; exit: diff a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst (rejected hunks) @@ -1004,7 +1004,7 @@ Driver options - ``mr_mempool_reg_en`` parameter [int] A nonzero value enables implicit registration of DMA memory of all mempools - except those having ``MEMPOOL_F_NON_IO``. This flag is set automatically + except those having ``RTE_MEMPOOL_F_NON_IO``. This flag is set automatically for mempools populated with non-contiguous objects or those without IOVA. The effect is that when a packet from a mempool is transmitted, its memory is already registered for DMA in the PMD and no registration diff a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst (rejected hunks) @@ -227,9 +227,12 @@ API Changes removed. Its usages have been replaced by a new function ``rte_kvargs_get_with_value()``. -* mempool: Added ``MEMPOOL_F_NON_IO`` flag to give a hint to DPDK components +* mempool: Added ``RTE_MEMPOOL_F_NON_IO`` flag to give a hint to DPDK components that objects from this pool will not be used for device IO (e.g. DMA). +* mempool: The mempool flags ``MEMPOOL_F_*`` will be deprecated in the future. + Newly added flags with ``RTE_MEMPOOL_F_`` prefix should be used instead. + * net: Renamed ``s_addr`` and ``d_addr`` fields of ``rte_ether_hdr`` structure to ``src_addr`` and ``dst_addr``, respectively. diff a/drivers/common/mlx5/mlx5_common_mr.c b/drivers/common/mlx5/mlx5_common_mr.c (rejected hunks) @@ -1564,7 +1564,7 @@ int mlx5_mr_mempool_register(struct mlx5_mr_share_cache *share_cache, void *pd, struct rte_mempool *mp, struct mlx5_mp_id *mp_id) { - if (mp->flags & MEMPOOL_F_NON_IO) + if (mp->flags & RTE_MEMPOOL_F_NON_IO) return 0; switch (rte_eal_process_type()) { case RTE_PROC_PRIMARY: @@ -1635,7 +1635,7 @@ int mlx5_mr_mempool_unregister(struct mlx5_mr_share_cache *share_cache, struct rte_mempool *mp, struct mlx5_mp_id *mp_id) { - if (mp->flags & MEMPOOL_F_NON_IO) + if (mp->flags & RTE_MEMPOOL_F_NON_IO) return 0; switch (rte_eal_process_type()) { case RTE_PROC_PRIMARY: diff a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c (rejected hunks) @@ -127,7 +127,7 @@ mlx5_tx_mb2mr_bh(struct mlx5_txq_data *txq, struct rte_mbuf *mb) mr_ctrl, mp, addr); /* * Lookup can only fail on invalid input, e.g. "addr" - * is not from "mp" or "mp" has MEMPOOL_F_NON_IO set. + * is not from "mp" or "mp" has RTE_MEMPOOL_F_NON_IO set. */ if (lkey != UINT32_MAX) return lkey; diff a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c (rejected hunks) @@ -374,7 +374,7 @@ rte_mempool_populate_iova(struct rte_mempool *mp, char *vaddr, /* At least some objects in the pool can now be used for IO. */ if (iova != RTE_BAD_IOVA) - mp->flags &= ~MEMPOOL_F_NON_IO; + mp->flags &= ~RTE_MEMPOOL_F_NON_IO; /* Report the mempool as ready only when fully populated. */ if (mp->populated_size >= mp->size) @@ -859,11 +859,11 @@ rte_mempool_create_empty(const char *name, unsigned n, unsigned elt_size, * No objects in the pool can be used for IO until it's populated * with at least some objects with valid IOVA. */ - flags |= MEMPOOL_F_NON_IO; + flags |= RTE_MEMPOOL_F_NON_IO; /* "no cache align" imply "no spread" */ - if (flags & MEMPOOL_F_NO_CACHE_ALIGN) - flags |= MEMPOOL_F_NO_SPREAD; + if (flags & RTE_MEMPOOL_F_NO_CACHE_ALIGN) + flags |= RTE_MEMPOOL_F_NO_SPREAD; /* calculate mempool object sizes. */ if (!rte_mempool_calc_obj_size(elt_size, flags, &objsz)) { diff a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h (rejected hunks) @@ -251,19 +251,44 @@ struct rte_mempool { } __rte_cache_aligned; /** Spreading among memory channels not required. */ -#define MEMPOOL_F_NO_SPREAD 0x0001 +#define RTE_MEMPOOL_F_NO_SPREAD 0x0001 +/** + * Backward compatibility synonym for RTE_MEMPOOL_F_NO_SPREAD. + * To be deprecated. + */ +#define MEMPOOL_F_NO_SPREAD RTE_MEMPOOL_F_NO_SPREAD /** Do not align objects on cache lines. */ -#define MEMPOOL_F_NO_CACHE_ALIGN 0x0002 +#define RTE_MEMPOOL_F_NO_CACHE_ALIGN 0x0002 +/** + * Backward compatibility synonym for RTE_MEMPOOL_F_NO_CACHE_ALIGN. + * To be deprecated. + */ +#define MEMPOOL_F_NO_CACHE_ALIGN RTE_MEMPOOL_F_NO_CACHE_ALIGN /** Default put is "single-producer". */ -#define MEMPOOL_F_SP_PUT 0x0004 +#define RTE_MEMPOOL_F_SP_PUT 0x0004 +/** + * Backward compatibility synonym for RTE_MEMPOOL_F_SP_PUT. + * To be deprecated. + */ +#define MEMPOOL_F_SP_PUT RTE_MEMPOOL_F_SP_PUT /** Default get is "single-consumer". */ -#define MEMPOOL_F_SC_GET 0x0008 +#define RTE_MEMPOOL_F_SC_GET 0x0008 +/** + * Backward compatibility synonym for RTE_MEMPOOL_F_SC_GET. + * To be deprecated. + */ +#define MEMPOOL_F_SC_GET RTE_MEMPOOL_F_SC_GET /** Internal: pool is created. */ -#define MEMPOOL_F_POOL_CREATED 0x0010 +#define RTE_MEMPOOL_F_POOL_CREATED 0x0010 /** Don't need IOVA contiguous objects. */ -#define MEMPOOL_F_NO_IOVA_CONTIG 0x0020 +#define RTE_MEMPOOL_F_NO_IOVA_CONTIG 0x0020 +/** + * Backward compatibility synonym for RTE_MEMPOOL_F_NO_IOVA_CONTIG. + * To be deprecated. + */ +#define MEMPOOL_F_NO_IOVA_CONTIG RTE_MEMPOOL_F_NO_IOVA_CONTIG /** Internal: no object from the pool can be used for device IO (DMA). */ -#define MEMPOOL_F_NON_IO 0x0040 +#define RTE_MEMPOOL_F_NON_IO 0x0040 /** * @internal When debug is enabled, store some statistics. Checking patch drivers/event/octeontx/ssovf_worker.h... Checking patch drivers/net/cnxk/cn10k_rx.h... Checking patch drivers/net/cnxk/cn10k_tx.h... Checking patch drivers/net/cnxk/cn9k_rx.h... Checking patch drivers/net/cnxk/cn9k_tx.h... Checking patch drivers/net/octeontx/octeontx_rxtx.h... Checking patch drivers/net/octeontx2/otx2_ethdev_sec_tx.h... Checking patch drivers/net/octeontx2/otx2_rx.c... Checking patch drivers/net/octeontx2/otx2_rx.h... Checking patch drivers/net/octeontx2/otx2_tx.c... Checking patch drivers/net/octeontx2/otx2_tx.h... Checking patch lib/mempool/rte_mempool.c... error: lib/mempool/rte_mempool.c: does not match index Checking patch lib/mempool/rte_mempool.h... error: lib/mempool/rte_mempool.h: does not match index Applied patch drivers/event/octeontx/ssovf_worker.h cleanly. Applied patch drivers/net/cnxk/cn10k_rx.h cleanly. Applied patch drivers/net/cnxk/cn10k_tx.h cleanly. Applied patch drivers/net/cnxk/cn9k_rx.h cleanly. Applied patch drivers/net/cnxk/cn9k_tx.h cleanly. Applied patch drivers/net/octeontx/octeontx_rxtx.h cleanly. Applied patch drivers/net/octeontx2/otx2_ethdev_sec_tx.h cleanly. Applied patch drivers/net/octeontx2/otx2_rx.c cleanly. Applied patch drivers/net/octeontx2/otx2_rx.h cleanly. Applied patch drivers/net/octeontx2/otx2_tx.c cleanly. Applied patch drivers/net/octeontx2/otx2_tx.h cleanly. Checking patch app/test/test_mempool.c... error: app/test/test_mempool.c: does not match index Checking patch doc/guides/rel_notes/deprecation.rst... Checking patch doc/guides/rel_notes/release_21_11.rst... error: while searching for: * mempool: The mempool flags ``MEMPOOL_F_*`` will be deprecated in the future. Newly added flags with ``RTE_MEMPOOL_F_`` prefix should be used instead. * net: Renamed ``s_addr`` and ``d_addr`` fields of ``rte_ether_hdr`` structure to ``src_addr`` and ``dst_addr``, respectively. error: patch failed: doc/guides/rel_notes/release_21_11.rst:233 Checking patch lib/mempool/rte_mempool.c... error: lib/mempool/rte_mempool.c: does not match index Checking patch lib/mempool/rte_mempool.h... error: lib/mempool/rte_mempool.h: does not match index Applied patch doc/guides/rel_notes/deprecation.rst cleanly. Applying patch doc/guides/rel_notes/release_21_11.rst with 1 reject... Rejected hunk #1. diff a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst (rejected hunks) @@ -233,6 +233,9 @@ API Changes * mempool: The mempool flags ``MEMPOOL_F_*`` will be deprecated in the future. Newly added flags with ``RTE_MEMPOOL_F_`` prefix should be used instead. +* mempool: Helper macro ``MEMPOOL_HEADER_SIZE()`` is deprecated. + The replacement macro ``RTE_MEMPOOL_HEADER_SIZE()`` is internal only. + * net: Renamed ``s_addr`` and ``d_addr`` fields of ``rte_ether_hdr`` structure to ``src_addr`` and ``dst_addr``, respectively. Checking patch doc/guides/prog_guide/mempool_lib.rst... Checking patch doc/guides/rel_notes/deprecation.rst... error: doc/guides/rel_notes/deprecation.rst: does not match index Checking patch doc/guides/rel_notes/release_21_11.rst... error: while searching for: * mempool: Helper macro ``MEMPOOL_HEADER_SIZE()`` is deprecated. The replacement macro ``RTE_MEMPOOL_HEADER_SIZE()`` is internal only. * net: Renamed ``s_addr`` and ``d_addr`` fields of ``rte_ether_hdr`` structure to ``src_addr`` and ``dst_addr``, respectively. error: patch failed: doc/guides/rel_notes/release_21_11.rst:236 Checking patch drivers/mempool/bucket/rte_mempool_bucket.c... error: drivers/mempool/bucket/rte_mempool_bucket.c: does not match index Checking patch drivers/mempool/cnxk/cn10k_mempool_ops.c... Checking patch drivers/mempool/cnxk/cn9k_mempool_ops.c... Checking patch drivers/mempool/dpaa/dpaa_mempool.c... Checking patch drivers/mempool/dpaa2/dpaa2_hw_mempool.c... Checking patch drivers/mempool/octeontx/rte_mempool_octeontx.c... Checking patch drivers/mempool/octeontx2/otx2_mempool_ops.c... Checking patch drivers/mempool/ring/rte_mempool_ring.c... error: drivers/mempool/ring/rte_mempool_ring.c: does not match index Checking patch drivers/mempool/stack/rte_mempool_stack.c... Checking patch lib/mempool/rte_mempool.h... error: lib/mempool/rte_mempool.h: does not match index Applied patch doc/guides/prog_guide/mempool_lib.rst cleanly. Applying patch doc/guides/rel_notes/release_21_11.rst with 1 reject... Rejected hunk #1. Applied patch drivers/mempool/cnxk/cn10k_mempool_ops.c cleanly. Applied patch drivers/mempool/cnxk/cn9k_mempool_ops.c cleanly. Applied patch drivers/mempool/dpaa/dpaa_mempool.c cleanly. Applied patch drivers/mempool/dpaa2/dpaa2_hw_mempool.c cleanly. Applied patch drivers/mempool/octeontx/rte_mempool_octeontx.c cleanly. Applied patch drivers/mempool/octeontx2/otx2_mempool_ops.c cleanly. Applied patch drivers/mempool/stack/rte_mempool_stack.c cleanly. diff a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst (rejected hunks) @@ -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. Checking patch doc/guides/contributing/documentation.rst... Checking patch doc/guides/rel_notes/deprecation.rst... error: doc/guides/rel_notes/deprecation.rst: does not match index Checking patch doc/guides/rel_notes/release_21_11.rst... error: while searching for: * 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. error: patch failed: doc/guides/rel_notes/release_21_11.rst:239 Checking patch lib/mempool/rte_mempool.h... error: lib/mempool/rte_mempool.h: does not match index Applied patch doc/guides/contributing/documentation.rst cleanly. Applying patch doc/guides/rel_notes/release_21_11.rst with 1 reject... Rejected hunk #1. diff a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst (rejected hunks) @@ -239,6 +239,9 @@ API Changes * mempool: Macro to register mempool driver ``MEMPOOL_REGISTER_OPS()`` is deprecated. Use replacement ``RTE_MEMPOOL_REGISTER_OPS()``. +* mempool: The mempool API macros ``MEMPOOL_PG_*`` are deprecated and + will be removed in DPDK 22.11. + * net: Renamed ``s_addr`` and ``d_addr`` fields of ``rte_ether_hdr`` structure to ``src_addr`` and ``dst_addr``, respectively. https://lab.dpdk.org/results/dashboard/patchsets/19557/ UNH-IOL DPDK Community Lab