mempool: fix alignment of memzone length when populating

[dpdk.git] / lib / librte_reorder / rte_reorder.c

diff --git a/lib/librte_reorder/rte_reorder.c b/lib/librte_reorder/rte_reorder.c
index 42d2a47..ecf539d 100644 (file)
--- a/lib/librte_reorder/rte_reorder.c
+++ b/lib/librte_reorder/rte_reorder.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <inttypes.h>
@@ -36,16 +7,19 @@
 
 #include <rte_log.h>
 #include <rte_mbuf.h>
-#include <rte_memzone.h>
 #include <rte_eal_memconfig.h>
 #include <rte_errno.h>
-#include <rte_tailq.h>
 #include <rte_malloc.h>
 
 #include "rte_reorder.h"
 
 TAILQ_HEAD(rte_reorder_list, rte_tailq_entry);
 
+static struct rte_tailq_elem rte_reorder_tailq = {
+       .name = "RTE_REORDER",
+};
+EAL_REGISTER_TAILQ(rte_reorder_tailq)
+
 #define NO_FLAGS 0
 #define RTE_REORDER_PREFIX "RO_"
 #define RTE_REORDER_NAMESIZE 32
@@ -69,6 +43,7 @@ struct rte_reorder_buffer {
        unsigned int memsize; /**< memory area size of reorder buffer */
        struct cir_buffer ready_buf; /**< temp buffer for dequeued entries */
        struct cir_buffer order_buf; /**< buffer used to reorder entries */
+       int is_initialized;
 } __rte_cache_aligned;
 
 static void
@@ -127,12 +102,7 @@ rte_reorder_create(const char *name, unsigned socket_id, unsigned int size)
        const unsigned int bufsize = sizeof(struct rte_reorder_buffer) +
                                        (2 * size * sizeof(struct rte_mbuf *));
 
-       /* check that we have an initialised tail queue */
-       reorder_list = RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_REORDER, rte_reorder_list);
-       if (!reorder_list) {
-               rte_errno = E_RTE_NO_TAILQ;
-               return NULL;
-       }
+       reorder_list = RTE_TAILQ_CAST(rte_reorder_tailq.head, rte_reorder_list);
 
        /* Check user arguments. */
        if (!rte_is_power_of_2(size)) {
@@ -220,12 +190,7 @@ rte_reorder_free(struct rte_reorder_buffer *b)
        if (b == NULL)
                return;
 
-       /* check that we have an initialised tail queue */
-       reorder_list = RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_REORDER, rte_reorder_list);
-       if (!reorder_list) {
-               rte_errno = E_RTE_NO_TAILQ;
-               return;
-       }
+       reorder_list = RTE_TAILQ_CAST(rte_reorder_tailq.head, rte_reorder_list);
 
        rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK);
 
@@ -256,12 +221,7 @@ rte_reorder_find_existing(const char *name)
        struct rte_tailq_entry *te;
        struct rte_reorder_list *reorder_list;
 
-       /* check that we have an initialised tail queue */
-       reorder_list = RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_REORDER, rte_reorder_list);
-       if (!reorder_list) {
-               rte_errno = E_RTE_NO_TAILQ;
-               return NULL;
-       }
+       reorder_list = RTE_TAILQ_CAST(rte_reorder_tailq.head, rte_reorder_list);
 
        rte_rwlock_read_lock(RTE_EAL_TAILQ_RWLOCK);
        TAILQ_FOREACH(te, reorder_list, next) {
@@ -336,6 +296,11 @@ rte_reorder_insert(struct rte_reorder_buffer *b, struct rte_mbuf *mbuf)
        uint32_t offset, position;
        struct cir_buffer *order_buf = &b->order_buf;
 
+       if (!b->is_initialized) {
+               b->min_seqn = mbuf->seqn;
+               b->is_initialized = 1;
+       }
+
        /*
         * calculate the offset from the head pointer we need to go.
         * The subtraction takes care of the sequence number wrapping.