net/sfc: fix jumbo frame flag condition for MTU set

[dpdk.git] / lib / librte_ring / rte_ring.c

diff --git a/lib/librte_ring/rte_ring.c b/lib/librte_ring/rte_ring.c
index 222eec0..f17bd96 100644 (file)
--- a/lib/librte_ring/rte_ring.c
+++ b/lib/librte_ring/rte_ring.c
@@ -42,6 +42,11 @@ static struct rte_tailq_elem rte_ring_tailq = {
 };
 EAL_REGISTER_TAILQ(rte_ring_tailq)
 
+/* mask of all valid flag values to ring_create() */
+#define RING_F_MASK (RING_F_SP_ENQ | RING_F_SC_DEQ | RING_F_EXACT_SZ | \
+                    RING_F_MP_RTS_ENQ | RING_F_MC_RTS_DEQ |           \
+                    RING_F_MP_HTS_ENQ | RING_F_MC_HTS_DEQ)
+
 /* true if x is a power of 2 */
 #define POWEROF2(x) ((((x)-1) & (x)) == 0)
 
@@ -89,9 +94,11 @@ static void
 reset_headtail(void *p)
 {
        struct rte_ring_headtail *ht;
+       struct rte_ring_hts_headtail *ht_hts;
        struct rte_ring_rts_headtail *ht_rts;
 
        ht = p;
+       ht_hts = p;
        ht_rts = p;
 
        switch (ht->sync_type) {
@@ -104,6 +111,9 @@ reset_headtail(void *p)
                ht_rts->head.raw = 0;
                ht_rts->tail.raw = 0;
                break;
+       case RTE_RING_SYNC_MT_HTS:
+               ht_hts->ht.raw = 0;
+               break;
        default:
                /* unknown sync mode */
                RTE_ASSERT(0);
@@ -127,9 +137,9 @@ get_sync_type(uint32_t flags, enum rte_ring_sync_type *prod_st,
        enum rte_ring_sync_type *cons_st)
 {
        static const uint32_t prod_st_flags =
-               (RING_F_SP_ENQ | RING_F_MP_RTS_ENQ);
+               (RING_F_SP_ENQ | RING_F_MP_RTS_ENQ | RING_F_MP_HTS_ENQ);
        static const uint32_t cons_st_flags =
-               (RING_F_SC_DEQ | RING_F_MC_RTS_DEQ);
+               (RING_F_SC_DEQ | RING_F_MC_RTS_DEQ | RING_F_MC_HTS_DEQ);
 
        switch (flags & prod_st_flags) {
        case 0:
@@ -141,6 +151,9 @@ get_sync_type(uint32_t flags, enum rte_ring_sync_type *prod_st,
        case RING_F_MP_RTS_ENQ:
                *prod_st = RTE_RING_SYNC_MT_RTS;
                break;
+       case RING_F_MP_HTS_ENQ:
+               *prod_st = RTE_RING_SYNC_MT_HTS;
+               break;
        default:
                return -EINVAL;
        }
@@ -155,6 +168,9 @@ get_sync_type(uint32_t flags, enum rte_ring_sync_type *prod_st,
        case RING_F_MC_RTS_DEQ:
                *cons_st = RTE_RING_SYNC_MT_RTS;
                break;
+       case RING_F_MC_HTS_DEQ:
+               *cons_st = RTE_RING_SYNC_MT_HTS;
+               break;
        default:
                return -EINVAL;
        }
@@ -163,8 +179,8 @@ get_sync_type(uint32_t flags, enum rte_ring_sync_type *prod_st,
 }
 
 int
-rte_ring_init(struct rte_ring *r, const char *name, unsigned count,
-       unsigned flags)
+rte_ring_init(struct rte_ring *r, const char *name, unsigned int count,
+       unsigned int flags)
 {
        int ret;
 
@@ -176,11 +192,23 @@ rte_ring_init(struct rte_ring *r, const char *name, unsigned count,
        RTE_BUILD_BUG_ON((offsetof(struct rte_ring, prod) &
                          RTE_CACHE_LINE_MASK) != 0);
 
+       RTE_BUILD_BUG_ON(offsetof(struct rte_ring_headtail, sync_type) !=
+               offsetof(struct rte_ring_hts_headtail, sync_type));
+       RTE_BUILD_BUG_ON(offsetof(struct rte_ring_headtail, tail) !=
+               offsetof(struct rte_ring_hts_headtail, ht.pos.tail));
+
        RTE_BUILD_BUG_ON(offsetof(struct rte_ring_headtail, sync_type) !=
                offsetof(struct rte_ring_rts_headtail, sync_type));
        RTE_BUILD_BUG_ON(offsetof(struct rte_ring_headtail, tail) !=
                offsetof(struct rte_ring_rts_headtail, tail.val.pos));
 
+       /* future proof flags, only allow supported values */
+       if (flags & ~RING_F_MASK) {
+               RTE_LOG(ERR, RING,
+                       "Unsupported flags requested %#x\n", flags);
+               return -EINVAL;
+       }
+
        /* init the ring structure */
        memset(r, 0, sizeof(*r));
        ret = strlcpy(r->name, name, sizeof(r->name));