xen: allow determining DOM0 at runtime

[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 f592dc7..f53076a 100644 (file)
--- a/lib/librte_mempool/rte_mempool.c
+++ b/lib/librte_mempool/rte_mempool.c
@@ -113,17 +113,17 @@ static unsigned optimize_object_size(unsigned obj_size)
        /* get number of channels */
        nchan = rte_memory_get_nchannel();
        if (nchan == 0)
-               nchan = 1;
+               nchan = 4;
 
        nrank = rte_memory_get_nrank();
        if (nrank == 0)
                nrank = 1;
 
        /* process new object size */
-       new_obj_size = (obj_size + RTE_CACHE_LINE_MASK) / RTE_CACHE_LINE_SIZE;
+       new_obj_size = (obj_size + RTE_MEMPOOL_ALIGN_MASK) / RTE_MEMPOOL_ALIGN;
        while (get_gcd(new_obj_size, nrank * nchan) != 1)
                new_obj_size++;
-       return new_obj_size * RTE_CACHE_LINE_SIZE;
+       return new_obj_size * RTE_MEMPOOL_ALIGN;
 }
 
 static void
@@ -136,7 +136,7 @@ mempool_add_elem(struct rte_mempool *mp, void *obj, uint32_t obj_idx,
        obj = (char *)obj + mp->header_size;
 
        /* set mempool ptr in header */
-       hdr = (struct rte_mempool_objhdr *)((char *)obj - sizeof(*hdr));
+       hdr = RTE_PTR_SUB(obj, sizeof(*hdr));
        hdr->mp = mp;
 
 #ifdef RTE_LIBRTE_MEMPOOL_DEBUG
@@ -208,7 +208,7 @@ rte_mempool_obj_iter(void *vaddr, uint32_t elt_num, size_t elt_sz, size_t align,
                }
        }
 
-       return (i);
+       return i;
 }
 
 /*
@@ -267,7 +267,7 @@ rte_mempool_calc_obj_size(uint32_t elt_size, uint32_t flags,
 #endif
        if ((flags & MEMPOOL_F_NO_CACHE_ALIGN) == 0)
                sz->header_size = RTE_ALIGN_CEIL(sz->header_size,
-                       RTE_CACHE_LINE_SIZE);
+                       RTE_MEMPOOL_ALIGN);
 
        /* trailer contains the cookie in debug mode */
        sz->trailer_size = 0;
@@ -281,9 +281,9 @@ rte_mempool_calc_obj_size(uint32_t elt_size, uint32_t flags,
        if ((flags & MEMPOOL_F_NO_CACHE_ALIGN) == 0) {
                sz->total_size = sz->header_size + sz->elt_size +
                        sz->trailer_size;
-               sz->trailer_size += ((RTE_CACHE_LINE_SIZE -
-                                 (sz->total_size & RTE_CACHE_LINE_MASK)) &
-                                RTE_CACHE_LINE_MASK);
+               sz->trailer_size += ((RTE_MEMPOOL_ALIGN -
+                                 (sz->total_size & RTE_MEMPOOL_ALIGN_MASK)) &
+                                RTE_MEMPOOL_ALIGN_MASK);
        }
 
        /*
@@ -317,7 +317,7 @@ rte_mempool_calc_obj_size(uint32_t elt_size, uint32_t flags,
        /* this is the size of an object, including header and trailer */
        sz->total_size = sz->header_size + sz->elt_size + sz->trailer_size;
 
-       return (sz->total_size);
+       return sz->total_size;
 }
 
 
@@ -338,7 +338,7 @@ rte_mempool_xmem_size(uint32_t elt_num, size_t elt_sz, uint32_t pg_shift)
                sz = RTE_ALIGN_CEIL(elt_sz, pg_sz) * elt_num;
        }
 
-       return (sz);
+       return sz;
 }
 
 /*
@@ -367,14 +367,34 @@ 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 (-(ssize_t)n);
+               return -(ssize_t)n;
        }
 
        uv = RTE_ALIGN_CEIL(uv, pg_sz);
        usz = uv - va;
-       return (usz);
+       return usz;
 }
 
+#ifndef RTE_LIBRTE_XEN_DOM0
+/* stub if DOM0 support not configured */
+struct rte_mempool *
+rte_dom0_mempool_create(const char *name __rte_unused,
+                       unsigned n __rte_unused,
+                       unsigned elt_size __rte_unused,
+                       unsigned cache_size __rte_unused,
+                       unsigned private_data_size __rte_unused,
+                       rte_mempool_ctor_t *mp_init __rte_unused,
+                       void *mp_init_arg __rte_unused,
+                       rte_mempool_obj_ctor_t *obj_init __rte_unused,
+                       void *obj_init_arg __rte_unused,
+                       int socket_id __rte_unused,
+                       unsigned flags __rte_unused)
+{
+       rte_errno = EINVAL;
+       return NULL;
+}
+#endif
+
 /* create the mempool */
 struct rte_mempool *
 rte_mempool_create(const char *name, unsigned n, unsigned elt_size,
@@ -383,20 +403,20 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size,
                   rte_mempool_obj_ctor_t *obj_init, void *obj_init_arg,
                   int socket_id, unsigned flags)
 {
-#ifdef RTE_LIBRTE_XEN_DOM0
-       return (rte_dom0_mempool_create(name, n, elt_size,
-               cache_size, private_data_size,
-               mp_init, mp_init_arg,
-               obj_init, obj_init_arg,
-               socket_id, flags));
-#else
-       return (rte_mempool_xmem_create(name, n, elt_size,
-               cache_size, private_data_size,
-               mp_init, mp_init_arg,
-               obj_init, obj_init_arg,
-               socket_id, flags,
-               NULL, NULL, MEMPOOL_PG_NUM_DEFAULT, MEMPOOL_PG_SHIFT_MAX));
-#endif
+       if (is_xen_dom0_supported())
+               return rte_dom0_mempool_create(name, n, elt_size,
+                                              cache_size, private_data_size,
+                                              mp_init, mp_init_arg,
+                                              obj_init, obj_init_arg,
+                                              socket_id, flags);
+       else
+               return rte_mempool_xmem_create(name, n, elt_size,
+                                              cache_size, private_data_size,
+                                              mp_init, mp_init_arg,
+                                              obj_init, obj_init_arg,
+                                              socket_id, flags,
+                                              NULL, NULL, MEMPOOL_PG_NUM_DEFAULT,
+                                              MEMPOOL_PG_SHIFT_MAX);
 }
 
 /*
@@ -498,7 +518,7 @@ rte_mempool_xmem_create(const char *name, unsigned n, unsigned elt_size,
         * cache-aligned
         */
        private_data_size = (private_data_size +
-                            RTE_CACHE_LINE_MASK) & (~RTE_CACHE_LINE_MASK);
+                            RTE_MEMPOOL_ALIGN_MASK) & (~RTE_MEMPOOL_ALIGN_MASK);
 
        if (! rte_eal_has_hugepages()) {
                /*
@@ -525,6 +545,7 @@ rte_mempool_xmem_create(const char *name, unsigned n, unsigned elt_size,
         * enough to hold mempool header and metadata plus mempool objects.
         */
        mempool_size = MEMPOOL_HEADER_SIZE(mp, pg_num) + private_data_size;
+       mempool_size = RTE_ALIGN_CEIL(mempool_size, RTE_MEMPOOL_ALIGN);
        if (vaddr == NULL)
                mempool_size += (size_t)objsz.total_size * n;
 
@@ -580,6 +601,7 @@ rte_mempool_xmem_create(const char *name, unsigned n, unsigned elt_size,
        /* calculate address of the first element for continuous mempool. */
        obj = (char *)mp + MEMPOOL_HEADER_SIZE(mp, pg_num) +
                private_data_size;
+       obj = RTE_PTR_ALIGN_CEIL(obj, RTE_MEMPOOL_ALIGN);
 
        /* populate address translation fields. */
        mp->pg_num = pg_num;