debian/control: dpdk binary package Recommends [arm64] and Suggest dpdk dkms packages

[deb_dpdk.git] / lib / librte_mempool / rte_mempool.c

diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c
index d78d02b..2e28e2e 100644 (file)
--- a/lib/librte_mempool/rte_mempool.c
+++ b/lib/librte_mempool/rte_mempool.c
@@ -199,7 +199,11 @@ rte_mempool_calc_obj_size(uint32_t elt_size, uint32_t flags,
                sz->header_size = RTE_ALIGN_CEIL(sz->header_size,
                        RTE_MEMPOOL_ALIGN);
 
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
        sz->trailer_size = sizeof(struct rte_mempool_objtlr);
+#else
+       sz->trailer_size = 0;
+#endif
 
        /* element size is 8 bytes-aligned at least */
        sz->elt_size = RTE_ALIGN_CEIL(elt_size, sizeof(uint64_t));
@@ -524,7 +528,11 @@ rte_mempool_populate_default(struct rte_mempool *mp)
        if (mp->nb_mem_chunks != 0)
                return -EEXIST;
 
-       if (rte_eal_has_hugepages()) {
+       if (rte_xen_dom0_supported()) {
+               pg_sz = RTE_PGSIZE_2M;
+               pg_shift = rte_bsf32(pg_sz);
+               align = pg_sz;
+       } else if (rte_eal_has_hugepages()) {
                pg_shift = 0; /* not needed, zone is physically contiguous */
                pg_sz = 0;
                align = RTE_CACHE_LINE_SIZE;
@@ -1275,12 +1283,13 @@ void rte_mempool_walk(void (*func)(struct rte_mempool *, void *),
 {
        struct rte_tailq_entry *te = NULL;
        struct rte_mempool_list *mempool_list;
+       void *tmp_te;
 
        mempool_list = RTE_TAILQ_CAST(rte_mempool_tailq.head, rte_mempool_list);
 
        rte_rwlock_read_lock(RTE_EAL_MEMPOOL_RWLOCK);
 
-       TAILQ_FOREACH(te, mempool_list, next) {
+       TAILQ_FOREACH_SAFE(te, mempool_list, next, tmp_te) {
                (*func)((struct rte_mempool *) te->data, arg);
        }