doc: separate versioning guide into version and policy

[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 213e574..40cae3e 100644 (file)
--- a/lib/librte_mempool/rte_mempool.c
+++ b/lib/librte_mempool/rte_mempool.c
@@ -329,7 +329,7 @@ rte_mempool_populate_iova(struct rte_mempool *mp, char *vaddr,
        if (mp->flags & MEMPOOL_F_NO_CACHE_ALIGN)
                off = RTE_PTR_ALIGN_CEIL(vaddr, 8) - vaddr;
        else
-               off = RTE_PTR_ALIGN_CEIL(vaddr, RTE_CACHE_LINE_SIZE) - vaddr;
+               off = RTE_PTR_ALIGN_CEIL(vaddr, RTE_MEMPOOL_ALIGN) - vaddr;
 
        if (off > len) {
                ret = -EINVAL;
@@ -414,6 +414,31 @@ rte_mempool_populate_virt(struct rte_mempool *mp, char *addr,
        return ret;
 }
 
+/* Get the minimal page size used in a mempool before populating it. */
+int
+rte_mempool_get_page_size(struct rte_mempool *mp, size_t *pg_sz)
+{
+       bool need_iova_contig_obj;
+       bool alloc_in_ext_mem;
+       int ret;
+
+       /* check if we can retrieve a valid socket ID */
+       ret = rte_malloc_heap_socket_is_external(mp->socket_id);
+       if (ret < 0)
+               return -EINVAL;
+       alloc_in_ext_mem = (ret == 1);
+       need_iova_contig_obj = !(mp->flags & MEMPOOL_F_NO_IOVA_CONTIG);
+
+       if (!need_iova_contig_obj)
+               *pg_sz = 0;
+       else if (rte_eal_has_hugepages() || alloc_in_ext_mem)
+               *pg_sz = get_min_page_size(mp->socket_id);
+       else
+               *pg_sz = getpagesize();
+
+       return 0;
+}
+
 /* Default function to populate the mempool: allocate memory in memzones,
  * and populate them. Return the number of objects added, or a negative
  * value on error.
@@ -425,12 +450,11 @@ rte_mempool_populate_default(struct rte_mempool *mp)
        char mz_name[RTE_MEMZONE_NAMESIZE];
        const struct rte_memzone *mz;
        ssize_t mem_size;
-       size_t align, pg_sz, pg_shift;
+       size_t align, pg_sz, pg_shift = 0;
        rte_iova_t iova;
        unsigned mz_id, n;
        int ret;
        bool need_iova_contig_obj;
-       bool alloc_in_ext_mem;
 
        ret = mempool_ops_alloc_once(mp);
        if (ret != 0)
@@ -455,17 +479,15 @@ rte_mempool_populate_default(struct rte_mempool *mp)
         * then just set page shift and page size to 0, because the user has
         * indicated that there's no need to care about anything.
         *
-        * if we do need contiguous objects, there is also an option to reserve
-        * the entire mempool memory as one contiguous block of memory, in
-        * which case the page shift and alignment wouldn't matter as well.
+        * if we do need contiguous objects (if a mempool driver has its
+        * own calc_size() method returning min_chunk_size = mem_size),
+        * there is also an option to reserve the entire mempool memory
+        * as one contiguous block of memory.
         *
         * if we require contiguous objects, but not necessarily the entire
-        * mempool reserved space to be contiguous, then there are two options.
-        *
-        * if our IO addresses are virtual, not actual physical (IOVA as VA
-        * case), then no page shift needed - our memory allocation will give us
-        * contiguous IO memory as far as the hardware is concerned, so
-        * act as if we're getting contiguous memory.
+        * mempool reserved space to be contiguous, pg_sz will be != 0,
+        * and the default ops->populate() will take care of not placing
+        * objects across pages.
         *
         * if our IO addresses are physical, we may get memory from bigger
         * pages, or we might get memory from smaller pages, and how much of it
@@ -478,33 +500,15 @@ rte_mempool_populate_default(struct rte_mempool *mp)
         *
         * If we fail to get enough contiguous memory, then we'll go and
         * reserve space in smaller chunks.
-        *
-        * We also have to take into account the fact that memory that we're
-        * going to allocate from can belong to an externally allocated memory
-        * area, in which case the assumption of IOVA as VA mode being
-        * synonymous with IOVA contiguousness will not hold.
         */
 
-       /* check if we can retrieve a valid socket ID */
-       ret = rte_malloc_heap_socket_is_external(mp->socket_id);
-       if (ret < 0)
-               return -EINVAL;
-       alloc_in_ext_mem = (ret == 1);
        need_iova_contig_obj = !(mp->flags & MEMPOOL_F_NO_IOVA_CONTIG);
+       ret = rte_mempool_get_page_size(mp, &pg_sz);
+       if (ret < 0)
+               return ret;
 
-       if (!need_iova_contig_obj) {
-               pg_sz = 0;
-               pg_shift = 0;
-       } else if (!alloc_in_ext_mem && rte_eal_iova_mode() == RTE_IOVA_VA) {
-               pg_sz = 0;
-               pg_shift = 0;
-       } else if (rte_eal_has_hugepages() || alloc_in_ext_mem) {
-               pg_sz = get_min_page_size(mp->socket_id);
-               pg_shift = rte_bsf32(pg_sz);
-       } else {
-               pg_sz = getpagesize();
+       if (pg_sz != 0)
                pg_shift = rte_bsf32(pg_sz);
-       }
 
        for (mz_id = 0, n = mp->size; n > 0; mz_id++, n -= ret) {
                size_t min_chunk_size;