mempool: make mempool populate and free api public

[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 8be3c74..df2ae0e 100644 (file)
--- a/lib/librte_mempool/rte_mempool.c
+++ b/lib/librte_mempool/rte_mempool.c
@@ -40,6 +40,7 @@
 #include <inttypes.h>
 #include <errno.h>
 #include <sys/queue.h>
+#include <sys/mman.h>
 
 #include <rte_common.h>
 #include <rte_log.h>
@@ -367,7 +368,7 @@ rte_mempool_free_memchunks(struct rte_mempool *mp)
  * zone. Return the number of objects added, or a negative value
  * on error.
  */
-static int
+int
 rte_mempool_populate_phys(struct rte_mempool *mp, char *vaddr,
        phys_addr_t paddr, size_t len, rte_mempool_memchunk_free_cb_t *free_cb,
        void *opaque)
@@ -426,7 +427,7 @@ rte_mempool_populate_phys(struct rte_mempool *mp, char *vaddr,
 /* Add objects in the pool, using a table of physical pages. Return the
  * number of objects added, or a negative value on error.
  */
-static int
+int
 rte_mempool_populate_phys_tab(struct rte_mempool *mp, char *vaddr,
        const phys_addr_t paddr[], uint32_t pg_num, uint32_t pg_shift,
        rte_mempool_memchunk_free_cb_t *free_cb, void *opaque)
@@ -462,7 +463,7 @@ rte_mempool_populate_phys_tab(struct rte_mempool *mp, char *vaddr,
 /* Populate the mempool with a virtual area. Return the number of
  * objects added, or a negative value on error.
  */
-static int
+int
 rte_mempool_populate_virt(struct rte_mempool *mp, char *addr,
        size_t len, size_t pg_sz, rte_mempool_memchunk_free_cb_t *free_cb,
        void *opaque)
@@ -523,7 +524,7 @@ rte_mempool_populate_virt(struct rte_mempool *mp, char *addr,
  * and populate them. Return the number of objects added, or a negative
  * value on error.
  */
-static int
+int
 rte_mempool_populate_default(struct rte_mempool *mp)
 {
        int mz_flags = RTE_MEMZONE_1GB|RTE_MEMZONE_SIZE_HINT_ONLY;
@@ -591,8 +592,71 @@ rte_mempool_populate_default(struct rte_mempool *mp)
        return ret;
 }
 
-/* free a mempool */
+/* return the memory size required for mempool objects in anonymous mem */
+static size_t
+get_anon_size(const struct rte_mempool *mp)
+{
+       size_t size, total_elt_sz, pg_sz, pg_shift;
+
+       pg_sz = getpagesize();
+       pg_shift = rte_bsf32(pg_sz);
+       total_elt_sz = mp->header_size + mp->elt_size + mp->trailer_size;
+       size = rte_mempool_xmem_size(mp->size, total_elt_sz, pg_shift);
+
+       return size;
+}
+
+/* unmap a memory zone mapped by rte_mempool_populate_anon() */
 static void
+rte_mempool_memchunk_anon_free(struct rte_mempool_memhdr *memhdr,
+       void *opaque)
+{
+       munmap(opaque, get_anon_size(memhdr->mp));
+}
+
+/* populate the mempool with an anonymous mapping */
+int
+rte_mempool_populate_anon(struct rte_mempool *mp)
+{
+       size_t size;
+       int ret;
+       char *addr;
+
+       /* mempool is already populated, error */
+       if (!STAILQ_EMPTY(&mp->mem_list)) {
+               rte_errno = EINVAL;
+               return 0;
+       }
+
+       /* get chunk of virtually continuous memory */
+       size = get_anon_size(mp);
+       addr = mmap(NULL, size, PROT_READ | PROT_WRITE,
+               MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+       if (addr == MAP_FAILED) {
+               rte_errno = errno;
+               return 0;
+       }
+       /* can't use MMAP_LOCKED, it does not exist on BSD */
+       if (mlock(addr, size) < 0) {
+               rte_errno = errno;
+               munmap(addr, size);
+               return 0;
+       }
+
+       ret = rte_mempool_populate_virt(mp, addr, size, getpagesize(),
+               rte_mempool_memchunk_anon_free, addr);
+       if (ret == 0)
+               goto fail;
+
+       return mp->populated_size;
+
+ fail:
+       rte_mempool_free_memchunks(mp);
+       return 0;
+}
+
+/* free a mempool */
+void
 rte_mempool_free(struct rte_mempool *mp)
 {
        struct rte_mempool_list *mempool_list = NULL;
@@ -621,7 +685,7 @@ rte_mempool_free(struct rte_mempool *mp)
 }
 
 /* create an empty mempool */
-static struct rte_mempool *
+struct rte_mempool *
 rte_mempool_create_empty(const char *name, unsigned n, unsigned elt_size,
        unsigned cache_size, unsigned private_data_size,
        int socket_id, unsigned flags)