vhost: fix crash after mmap failure

[dpdk.git] / lib / librte_mempool / rte_mempool_ops_default.c

diff --git a/lib/librte_mempool/rte_mempool_ops_default.c b/lib/librte_mempool/rte_mempool_ops_default.c
index 57295f7..4e2bfc8 100644 (file)
--- a/lib/librte_mempool/rte_mempool_ops_default.c
+++ b/lib/librte_mempool/rte_mempool_ops_default.c
@@ -11,26 +11,34 @@ rte_mempool_op_calc_mem_size_default(const struct rte_mempool *mp,
                                     uint32_t obj_num, uint32_t pg_shift,
                                     size_t *min_chunk_size, size_t *align)
 {
-       unsigned int mp_flags;
-       int ret;
        size_t total_elt_sz;
+       size_t obj_per_page, pg_num, pg_sz;
        size_t mem_size;
 
-       /* Get mempool capabilities */
-       mp_flags = 0;
-       ret = rte_mempool_ops_get_capabilities(mp, &mp_flags);
-       if ((ret < 0) && (ret != -ENOTSUP))
-               return ret;
-
        total_elt_sz = mp->header_size + mp->elt_size + mp->trailer_size;
+       if (total_elt_sz == 0) {
+               mem_size = 0;
+       } else if (pg_shift == 0) {
+               mem_size = total_elt_sz * obj_num;
+       } else {
+               pg_sz = (size_t)1 << pg_shift;
+               obj_per_page = pg_sz / total_elt_sz;
+               if (obj_per_page == 0) {
+                       /*
+                        * Note that if object size is bigger than page size,
+                        * then it is assumed that pages are grouped in subsets
+                        * of physically continuous pages big enough to store
+                        * at least one object.
+                        */
+                       mem_size =
+                               RTE_ALIGN_CEIL(total_elt_sz, pg_sz) * obj_num;
+               } else {
+                       pg_num = (obj_num + obj_per_page - 1) / obj_per_page;
+                       mem_size = pg_num << pg_shift;
+               }
+       }
 
-       mem_size = rte_mempool_xmem_size(obj_num, total_elt_sz, pg_shift,
-                                        mp->flags | mp_flags);
-
-       if (mp_flags & MEMPOOL_F_CAPA_PHYS_CONTIG)
-               *min_chunk_size = mem_size;
-       else
-               *min_chunk_size = RTE_MAX((size_t)1 << pg_shift, total_elt_sz);
+       *min_chunk_size = RTE_MAX((size_t)1 << pg_shift, total_elt_sz);
 
        *align = RTE_MAX((size_t)RTE_CACHE_LINE_SIZE, (size_t)1 << pg_shift);