ring: allow non power-of-2 sizes

The rte_rings traditionally have only supported having ring sizes as powers
of 2, with the actual usable space being the size - 1. In some cases, for
example, with an eventdev where we want to precisely control queue depths
for latency, we need to allow ring sizes which are not powers of two so we
add in an additional ring capacity value to allow that. For existing rings,
this value will be size-1, i.e. the same as the mask, but if the new
EXACT_SZ flag is passed on ring creation, the ring will have exactly the
usable space requested, although the underlying memory size may be bigger.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>

diff --git a/lib/librte_ring/rte_ring.c b/lib/librte_ring/rte_ring.c
index 6f58faf..036467f 100644 (file)
--- a/lib/librte_ring/rte_ring.c
+++ b/lib/librte_ring/rte_ring.c
@@ -140,8 +140,22 @@ rte_ring_init(struct rte_ring *r, const char *name, unsigned count,
        r->flags = flags;
        r->prod.single = (flags & RING_F_SP_ENQ) ? __IS_SP : __IS_MP;
        r->cons.single = (flags & RING_F_SC_DEQ) ? __IS_SC : __IS_MC;
-       r->size = count;
-       r->mask = count - 1;
+
+       if (flags & RING_F_EXACT_SZ) {
+               r->size = rte_align32pow2(count + 1);
+               r->mask = r->size - 1;
+               r->capacity = count;
+       } else {
+               if ((!POWEROF2(count)) || (count > RTE_RING_SZ_MASK)) {
+                       RTE_LOG(ERR, RING,
+                               "Requested size is invalid, must be power of 2, and not exceed the size limit %u\n",
+                               RTE_RING_SZ_MASK);
+                       return -EINVAL;
+               }
+               r->size = count;
+               r->mask = count - 1;
+               r->capacity = r->mask;
+       }
        r->prod.head = r->cons.head = 0;
        r->prod.tail = r->cons.tail = 0;
 
@@ -160,10 +174,15 @@ rte_ring_create(const char *name, unsigned count, int socket_id,
        ssize_t ring_size;
        int mz_flags = 0;
        struct rte_ring_list* ring_list = NULL;
+       const unsigned int requested_count = count;
        int ret;
 
        ring_list = RTE_TAILQ_CAST(rte_ring_tailq.head, rte_ring_list);
 
+       /* for an exact size ring, round up from count to a power of two */
+       if (flags & RING_F_EXACT_SZ)
+               count = rte_align32pow2(count + 1);
+
        ring_size = rte_ring_get_memsize(count);
        if (ring_size < 0) {
                rte_errno = ring_size;
@@ -195,7 +214,7 @@ rte_ring_create(const char *name, unsigned count, int socket_id,
                r = mz->addr;
                /* no need to check return value here, we already checked the
                 * arguments above */
-               rte_ring_init(r, name, count, flags);
+               rte_ring_init(r, name, requested_count, flags);
 
                te->data = (void *) r;
                r->memzone = mz;
@@ -263,6 +282,7 @@ rte_ring_dump(FILE *f, const struct rte_ring *r)
        fprintf(f, "ring <%s>@%p\n", r->name, r);
        fprintf(f, "  flags=%x\n", r->flags);
        fprintf(f, "  size=%"PRIu32"\n", r->size);
+       fprintf(f, "  capacity=%"PRIu32"\n", r->capacity);
        fprintf(f, "  ct=%"PRIu32"\n", r->cons.tail);
        fprintf(f, "  ch=%"PRIu32"\n", r->cons.head);
        fprintf(f, "  pt=%"PRIu32"\n", r->prod.tail);

diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h
index f5880df..8f5a493 100644 (file)
--- a/lib/librte_ring/rte_ring.h
+++ b/lib/librte_ring/rte_ring.h
@@ -154,6 +154,7 @@ struct rte_ring {
                        /**< Memzone, if any, containing the rte_ring */
        uint32_t size;           /**< Size of ring. */
        uint32_t mask;           /**< Mask (size-1) of ring. */
+       uint32_t capacity;       /**< Usable size of ring */
 
        /** Ring producer status. */
        struct rte_ring_headtail prod __rte_aligned(PROD_ALIGN);
@@ -164,6 +165,15 @@ struct rte_ring {
 
 #define RING_F_SP_ENQ 0x0001 /**< The default enqueue is "single-producer". */
 #define RING_F_SC_DEQ 0x0002 /**< The default dequeue is "single-consumer". */
+/**
+ * Ring is to hold exactly requested number of entries.
+ * Without this flag set, the ring size requested must be a power of 2, and the
+ * usable space will be that size - 1. With the flag, the requested size will
+ * be rounded up to the next power of two, but the usable space will be exactly
+ * that requested. Worst case, if a power-of-2 size is requested, half the
+ * ring space will be wasted.
+ */
+#define RING_F_EXACT_SZ 0x0004
 #define RTE_RING_SZ_MASK  (unsigned)(0x0fffffff) /**< Ring size mask */
 
 /* @internal defines for passing to the enqueue dequeue worker functions */
@@ -390,7 +400,7 @@ __rte_ring_move_prod_head(struct rte_ring *r, int is_sp,
                uint32_t *old_head, uint32_t *new_head,
                uint32_t *free_entries)
 {
-       const uint32_t mask = r->mask;
+       const uint32_t capacity = r->capacity;
        unsigned int max = n;
        int success;
 
@@ -400,11 +410,13 @@ __rte_ring_move_prod_head(struct rte_ring *r, int is_sp,
 
                *old_head = r->prod.head;
                const uint32_t cons_tail = r->cons.tail;
-               /* The subtraction is done between two unsigned 32bits value
+               /*
+                *  The subtraction is done between two unsigned 32bits value
                 * (the result is always modulo 32 bits even if we have
                 * *old_head > cons_tail). So 'free_entries' is always between 0
-                * and size(ring)-1. */
-               *free_entries = (mask + cons_tail - *old_head);
+                * and capacity (which is < size).
+                */
+               *free_entries = (capacity + cons_tail - *old_head);
 
                /* check that we have enough room in ring */
                if (unlikely(n > *free_entries))
@@ -846,69 +858,64 @@ rte_ring_dequeue(struct rte_ring *r, void **obj_p)
 }
 
 /**
- * Test if a ring is full.
+ * Return the number of entries in a ring.
  *
  * @param r
  *   A pointer to the ring structure.
  * @return
- *   - 1: The ring is full.
- *   - 0: The ring is not full.
+ *   The number of entries in the ring.
  */
-static inline int
-rte_ring_full(const struct rte_ring *r)
+static inline unsigned
+rte_ring_count(const struct rte_ring *r)
 {
        uint32_t prod_tail = r->prod.tail;
        uint32_t cons_tail = r->cons.tail;
-       return ((cons_tail - prod_tail - 1) & r->mask) == 0;
+       uint32_t count = (prod_tail - cons_tail) & r->mask;
+       return (count > r->capacity) ? r->capacity : count;
 }
 
 /**
- * Test if a ring is empty.
+ * Return the number of free entries in a ring.
  *
  * @param r
  *   A pointer to the ring structure.
  * @return
- *   - 1: The ring is empty.
- *   - 0: The ring is not empty.
+ *   The number of free entries in the ring.
  */
-static inline int
-rte_ring_empty(const struct rte_ring *r)
+static inline unsigned
+rte_ring_free_count(const struct rte_ring *r)
 {
-       uint32_t prod_tail = r->prod.tail;
-       uint32_t cons_tail = r->cons.tail;
-       return !!(cons_tail == prod_tail);
+       return r->capacity - rte_ring_count(r);
 }
 
 /**
- * Return the number of entries in a ring.
+ * Test if a ring is full.
  *
  * @param r
  *   A pointer to the ring structure.
  * @return
- *   The number of entries in the ring.
+ *   - 1: The ring is full.
+ *   - 0: The ring is not full.
  */
-static inline unsigned
-rte_ring_count(const struct rte_ring *r)
+static inline int
+rte_ring_full(const struct rte_ring *r)
 {
-       uint32_t prod_tail = r->prod.tail;
-       uint32_t cons_tail = r->cons.tail;
-       return (prod_tail - cons_tail) & r->mask;
+       return rte_ring_free_count(r) == 0;
 }
 
 /**
- * Return the number of free entries in a ring.
+ * Test if a ring is empty.
  *
  * @param r
  *   A pointer to the ring structure.
  * @return
- *   The number of free entries in the ring.
+ *   - 1: The ring is empty.
+ *   - 0: The ring is not empty.
  */
-static inline unsigned
-rte_ring_free_count(const struct rte_ring *r)
+static inline int
+rte_ring_empty(const struct rte_ring *r)
 {
-       uint32_t prod_tail = r->prod.tail;
-       uint32_t cons_tail = r->cons.tail;
-       return (cons_tail - prod_tail - 1) & r->mask;
+       return rte_ring_count(r) == 0;
 }
 
 /**
@@ -917,7 +924,9 @@ rte_ring_free_count(const struct rte_ring *r)
  * @param r
  *   A pointer to the ring structure.
  * @return
- *   The number of elements which can be stored in the ring.
+ *   The size of the data store used by the ring.
+ *   NOTE: this is not the same as the usable space in the ring. To query that
+ *   use ``rte_ring_get_capacity()``.
  */
 static inline unsigned int
 rte_ring_get_size(const struct rte_ring *r)
@@ -925,6 +934,20 @@ rte_ring_get_size(const struct rte_ring *r)
        return r->size;
 }
 
+/**
+ * Return the number of elements which can be stored in the ring.
+ *
+ * @param r
+ *   A pointer to the ring structure.
+ * @return
+ *   The usable size of the ring.
+ */
+static inline unsigned int
+rte_ring_get_capacity(const struct rte_ring *r)
+{
+       return r->capacity;
+}
+
 /**
  * Dump the status of all rings on the console
  *