mempool: add structure for object headers

[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 bb40523..b2d8700 100644 (file)
--- a/lib/librte_mempool/rte_mempool.c
+++ b/lib/librte_mempool/rte_mempool.c
@@ -62,7 +62,14 @@
 
 TAILQ_HEAD(rte_mempool_list, rte_tailq_entry);
 
+static struct rte_tailq_elem rte_mempool_tailq = {
+       .name = "RTE_MEMPOOL",
+};
+EAL_REGISTER_TAILQ(rte_mempool_tailq)
+
 #define CACHE_FLUSHTHRESH_MULTIPLIER 1.5
+#define CALC_CACHE_FLUSHTHRESH(c)      \
+       ((typeof(c))((c) * CACHE_FLUSHTHRESH_MULTIPLIER))
 
 /*
  * return the greatest common divisor between a and b (fast algorithm)
@@ -123,16 +130,16 @@ static void
 mempool_add_elem(struct rte_mempool *mp, void *obj, uint32_t obj_idx,
        rte_mempool_obj_ctor_t *obj_init, void *obj_init_arg)
 {
-       struct rte_mempool **mpp;
+       struct rte_mempool_objhdr *hdr;
 
        obj = (char *)obj + mp->header_size;
 
        /* set mempool ptr in header */
-       mpp = __mempool_from_obj(obj);
-       *mpp = mp;
+       hdr = (struct rte_mempool_objhdr *)((char *)obj - sizeof(*hdr));
+       hdr->mp = mp;
 
 #ifdef RTE_LIBRTE_MEMPOOL_DEBUG
-       __mempool_write_header_cookie(obj, 1);
+       hdr->cookie = RTE_MEMPOOL_HEADER_COOKIE2;
        __mempool_write_trailer_cookie(obj);
 #endif
        /* call the initializer */
@@ -149,7 +156,7 @@ rte_mempool_obj_iter(void *vaddr, uint32_t elt_num, size_t elt_sz, size_t align,
        rte_mempool_obj_iter_t obj_iter, void *obj_iter_arg)
 {
        uint32_t i, j, k;
-       uint32_t pgn;
+       uint32_t pgn, pgf;
        uintptr_t end, start, va;
        uintptr_t pg_sz;
 
@@ -164,10 +171,14 @@ rte_mempool_obj_iter(void *vaddr, uint32_t elt_num, size_t elt_sz, size_t align,
                start = RTE_ALIGN_CEIL(va, align);
                end = start + elt_sz;
 
-               pgn = (end >> pg_shift) - (start >> pg_shift);
+               /* index of the first page for the next element. */
+               pgf = (end >> pg_shift) - (start >> pg_shift);
+
+               /* index of the last page for the current element. */
+               pgn = ((end - 1) >> pg_shift) - (start >> pg_shift);
                pgn += j;
 
-               /* do we have enough space left for the next element. */
+               /* do we have enough space left for the element. */
                if (pgn >= pg_num)
                        break;
 
@@ -187,7 +198,7 @@ rte_mempool_obj_iter(void *vaddr, uint32_t elt_num, size_t elt_sz, size_t align,
                                obj_iter(obj_iter_arg, (void *)start,
                                        (void *)end, i);
                        va = end;
-                       j = pgn;
+                       j += pgf;
                        i++;
                } else {
                        va = RTE_ALIGN_CEIL((va + 1), pg_sz);
@@ -354,7 +365,7 @@ rte_mempool_xmem_usage(void *vaddr, uint32_t elt_num, size_t elt_sz,
        if ((n = rte_mempool_obj_iter(vaddr, elt_num, elt_sz, 1,
                        paddr, pg_num, pg_shift, mempool_lelem_iter,
                        &uv)) != elt_num) {
-               return (-n);
+               return (-(ssize_t)n);
        }
 
        uv = RTE_ALIGN_CEIL(uv, pg_sz);
@@ -403,6 +414,7 @@ rte_mempool_xmem_create(const char *name, unsigned n, unsigned elt_size,
 {
        char mz_name[RTE_MEMZONE_NAMESIZE];
        char rg_name[RTE_RING_NAMESIZE];
+       struct rte_mempool_list *mempool_list;
        struct rte_mempool *mp = NULL;
        struct rte_tailq_entry *te;
        struct rte_ring *r;
@@ -431,15 +443,11 @@ rte_mempool_xmem_create(const char *name, unsigned n, unsigned elt_size,
                          RTE_CACHE_LINE_MASK) != 0);
 #endif
 
-       /* check that we have an initialised tail queue */
-       if (RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_MEMPOOL,
-                       rte_mempool_list) == NULL) {
-               rte_errno = E_RTE_NO_TAILQ;
-               return NULL;
-       }
+       mempool_list = RTE_TAILQ_CAST(rte_mempool_tailq.head, rte_mempool_list);
 
        /* asked cache too big */
-       if (cache_size > RTE_MEMPOOL_CACHE_MAX_SIZE) {
+       if (cache_size > RTE_MEMPOOL_CACHE_MAX_SIZE ||
+           CALC_CACHE_FLUSHTHRESH(cache_size) > n) {
                rte_errno = EINVAL;
                return NULL;
        }
@@ -564,8 +572,7 @@ rte_mempool_xmem_create(const char *name, unsigned n, unsigned elt_size,
        mp->header_size = objsz.header_size;
        mp->trailer_size = objsz.trailer_size;
        mp->cache_size = cache_size;
-       mp->cache_flushthresh = (uint32_t)
-               (cache_size * CACHE_FLUSHTHRESH_MULTIPLIER);
+       mp->cache_flushthresh = CALC_CACHE_FLUSHTHRESH(cache_size);
        mp->private_data_size = private_data_size;
 
        /* calculate address of the first element for continuous mempool. */
@@ -599,7 +606,9 @@ rte_mempool_xmem_create(const char *name, unsigned n, unsigned elt_size,
 
        te->data = (void *) mp;
 
-       RTE_EAL_TAILQ_INSERT_TAIL(RTE_TAILQ_MEMPOOL, rte_mempool_list, te);
+       rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK);
+       TAILQ_INSERT_TAIL(mempool_list, te, next);
+       rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
 
 exit:
        rte_rwlock_write_unlock(RTE_EAL_MEMPOOL_RWLOCK);
@@ -830,11 +839,7 @@ rte_mempool_list_dump(FILE *f)
        struct rte_tailq_entry *te;
        struct rte_mempool_list *mempool_list;
 
-       if ((mempool_list =
-            RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_MEMPOOL, rte_mempool_list)) == NULL) {
-               rte_errno = E_RTE_NO_TAILQ;
-               return;
-       }
+       mempool_list = RTE_TAILQ_CAST(rte_mempool_tailq.head, rte_mempool_list);
 
        rte_rwlock_read_lock(RTE_EAL_MEMPOOL_RWLOCK);
 
@@ -854,11 +859,7 @@ rte_mempool_lookup(const char *name)
        struct rte_tailq_entry *te;
        struct rte_mempool_list *mempool_list;
 
-       if ((mempool_list =
-            RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_MEMPOOL, rte_mempool_list)) == NULL) {
-               rte_errno = E_RTE_NO_TAILQ;
-               return NULL;
-       }
+       mempool_list = RTE_TAILQ_CAST(rte_mempool_tailq.head, rte_mempool_list);
 
        rte_rwlock_read_lock(RTE_EAL_MEMPOOL_RWLOCK);
 
@@ -884,11 +885,7 @@ void rte_mempool_walk(void (*func)(const struct rte_mempool *, void *),
        struct rte_tailq_entry *te = NULL;
        struct rte_mempool_list *mempool_list;
 
-       if ((mempool_list =
-            RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_MEMPOOL, rte_mempool_list)) == NULL) {
-               rte_errno = E_RTE_NO_TAILQ;
-               return;
-       }
+       mempool_list = RTE_TAILQ_CAST(rte_mempool_tailq.head, rte_mempool_list);
 
        rte_rwlock_read_lock(RTE_EAL_MEMPOOL_RWLOCK);