net/ice: clean input set macro definition

[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 0be8f9f..afb1239 100644 (file)
--- a/lib/librte_mempool/rte_mempool.c
+++ b/lib/librte_mempool/rte_mempool.c
@@ -12,7 +12,6 @@
 #include <inttypes.h>
 #include <errno.h>
 #include <sys/queue.h>
-#include <sys/mman.h>
 
 #include <rte_common.h>
 #include <rte_log.h>
@@ -31,6 +30,7 @@
 #include <rte_string_fns.h>
 #include <rte_spinlock.h>
 #include <rte_tailq.h>
+#include <rte_eal_paging.h>
 
 #include "rte_mempool.h"
 #include "rte_mempool_trace.h"
@@ -147,7 +147,7 @@ get_min_page_size(int socket_id)
 
        rte_memseg_list_walk(find_min_pagesz, &wa);
 
-       return wa.min == SIZE_MAX ? (size_t) getpagesize() : wa.min;
+       return wa.min == SIZE_MAX ? (size_t) rte_mem_page_size() : wa.min;
 }
 
 
@@ -307,8 +307,8 @@ mempool_ops_alloc_once(struct rte_mempool *mp)
  * zone. Return the number of objects added, or a negative value
  * on error.
  */
-static int
-__rte_mempool_populate_iova(struct rte_mempool *mp, char *vaddr,
+int
+rte_mempool_populate_iova(struct rte_mempool *mp, char *vaddr,
        rte_iova_t iova, size_t len, rte_mempool_memchunk_free_cb_t *free_cb,
        void *opaque)
 {
@@ -359,6 +359,8 @@ __rte_mempool_populate_iova(struct rte_mempool *mp, char *vaddr,
 
        STAILQ_INSERT_TAIL(&mp->mem_list, memhdr, next);
        mp->nb_mem_chunks++;
+
+       rte_mempool_trace_populate_iova(mp, vaddr, iova, len, free_cb, opaque);
        return i;
 
 fail:
@@ -366,22 +368,6 @@ fail:
        return ret;
 }
 
-int
-rte_mempool_populate_iova(struct rte_mempool *mp, char *vaddr,
-       rte_iova_t iova, size_t len, rte_mempool_memchunk_free_cb_t *free_cb,
-       void *opaque)
-{
-       int ret;
-
-       ret = __rte_mempool_populate_iova(mp, vaddr, iova, len, free_cb,
-                                       opaque);
-       if (ret == 0)
-               ret = -EINVAL;
-
-       rte_mempool_trace_populate_iova(mp, vaddr, iova, len, free_cb, opaque);
-       return ret;
-}
-
 static rte_iova_t
 get_iova(void *addr)
 {
@@ -432,7 +418,7 @@ rte_mempool_populate_virt(struct rte_mempool *mp, char *addr,
                                break;
                }
 
-               ret = __rte_mempool_populate_iova(mp, addr + off, iova,
+               ret = rte_mempool_populate_iova(mp, addr + off, iova,
                        phys_len, free_cb, opaque);
                if (ret == 0)
                        continue;
@@ -443,9 +429,6 @@ rte_mempool_populate_virt(struct rte_mempool *mp, char *addr,
                cnt += ret;
        }
 
-       if (cnt == 0)
-               return -EINVAL;
-
        rte_mempool_trace_populate_virt(mp, addr, len, pg_sz, free_cb, opaque);
        return cnt;
 
@@ -474,7 +457,7 @@ rte_mempool_get_page_size(struct rte_mempool *mp, size_t *pg_sz)
        else if (rte_eal_has_hugepages() || alloc_in_ext_mem)
                *pg_sz = get_min_page_size(mp->socket_id);
        else
-               *pg_sz = getpagesize();
+               *pg_sz = rte_mem_page_size();
 
        rte_mempool_trace_get_page_size(mp, *pg_sz);
        return 0;
@@ -582,7 +565,7 @@ rte_mempool_populate_default(struct rte_mempool *mp)
                                RTE_MIN((size_t)mem_size, max_alloc_size),
                                mp->socket_id, mz_flags, align);
 
-                       if (mz == NULL && rte_errno != ENOMEM)
+                       if (mz != NULL || rte_errno != ENOMEM)
                                break;
 
                        max_alloc_size = RTE_MIN(max_alloc_size,
@@ -609,6 +592,8 @@ rte_mempool_populate_default(struct rte_mempool *mp)
                                mz->len, pg_sz,
                                rte_mempool_memchunk_mz_free,
                                (void *)(uintptr_t)mz);
+               if (ret == 0) /* should not happen */
+                       ret = -ENOBUFS;
                if (ret < 0) {
                        rte_memzone_free(mz);
                        goto fail;
@@ -632,7 +617,7 @@ get_anon_size(const struct rte_mempool *mp)
        size_t min_chunk_size;
        size_t align;
 
-       pg_sz = getpagesize();
+       pg_sz = rte_mem_page_size();
        pg_shift = rte_bsf32(pg_sz);
        size = rte_mempool_ops_calc_mem_size(mp, mp->size, pg_shift,
                                             &min_chunk_size, &align);
@@ -656,7 +641,7 @@ rte_mempool_memchunk_anon_free(struct rte_mempool_memhdr *memhdr,
        if (size < 0)
                return;
 
-       munmap(opaque, size);
+       rte_mem_unmap(opaque, size);
 }
 
 /* populate the mempool with an anonymous mapping */
@@ -686,21 +671,20 @@ rte_mempool_populate_anon(struct rte_mempool *mp)
        }
 
        /* get chunk of virtually continuous memory */
-       addr = mmap(NULL, size, PROT_READ | PROT_WRITE,
-               MAP_SHARED | MAP_ANONYMOUS, -1, 0);
-       if (addr == MAP_FAILED) {
-               rte_errno = errno;
+       addr = rte_mem_map(NULL, size, RTE_PROT_READ | RTE_PROT_WRITE,
+               RTE_MAP_SHARED | RTE_MAP_ANONYMOUS, -1, 0);
+       if (addr == NULL)
                return 0;
-       }
        /* can't use MMAP_LOCKED, it does not exist on BSD */
-       if (mlock(addr, size) < 0) {
-               rte_errno = errno;
-               munmap(addr, size);
+       if (rte_mem_lock(addr, size) < 0) {
+               rte_mem_unmap(addr, size);
                return 0;
        }
 
-       ret = rte_mempool_populate_virt(mp, addr, size, getpagesize(),
+       ret = rte_mempool_populate_virt(mp, addr, size, rte_mem_page_size(),
                rte_mempool_memchunk_anon_free, addr);
+       if (ret == 0) /* should not happen */
+               ret = -ENOBUFS;
        if (ret < 0) {
                rte_errno = -ret;
                goto fail;
@@ -1183,7 +1167,7 @@ mempool_audit_cache(const struct rte_mempool *mp)
        for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
                const struct rte_mempool_cache *cache;
                cache = &mp->local_cache[lcore_id];
-               if (cache->len > cache->flushthresh) {
+               if (cache->len > RTE_DIM(cache->objs)) {
                        RTE_LOG(CRIT, MEMPOOL, "badness on cache[%u]\n",
                                lcore_id);
                        rte_panic("MEMPOOL: invalid cache len\n");
@@ -1212,6 +1196,7 @@ rte_mempool_dump(FILE *f, struct rte_mempool *mp)
        unsigned lcore_id;
 #endif
        struct rte_mempool_memhdr *memhdr;
+       struct rte_mempool_ops *ops;
        unsigned common_count;
        unsigned cache_count;
        size_t mem_len = 0;
@@ -1221,6 +1206,7 @@ rte_mempool_dump(FILE *f, struct rte_mempool *mp)
 
        fprintf(f, "mempool <%s>@%p\n", mp->name, mp);
        fprintf(f, "  flags=%x\n", mp->flags);
+       fprintf(f, "  socket_id=%d\n", mp->socket_id);
        fprintf(f, "  pool=%p\n", mp->pool_data);
        fprintf(f, "  iova=0x%" PRIx64 "\n", mp->mz->iova);
        fprintf(f, "  nb_mem_chunks=%u\n", mp->nb_mem_chunks);
@@ -1234,6 +1220,10 @@ rte_mempool_dump(FILE *f, struct rte_mempool *mp)
 
        fprintf(f, "  private_data_size=%"PRIu32"\n", mp->private_data_size);
 
+       fprintf(f, "  ops_index=%d\n", mp->ops_index);
+       ops = rte_mempool_get_ops(mp->ops_index);
+       fprintf(f, "  ops_name: <%s>\n", (ops != NULL) ? ops->name : "NA");
+
        STAILQ_FOREACH(memhdr, &mp->mem_list, next)
                mem_len += memhdr->len;
        if (mem_len != 0) {