vhost: catch overflow causing mmap of size 0

[dpdk.git] / lib / librte_rcu / rte_rcu_qsbr.c

diff --git a/lib/librte_rcu/rte_rcu_qsbr.c b/lib/librte_rcu/rte_rcu_qsbr.c
index ce7f93d..2f3fad7 100644 (file)
--- a/lib/librte_rcu/rte_rcu_qsbr.c
+++ b/lib/librte_rcu/rte_rcu_qsbr.c
@@ -14,7 +14,6 @@
 #include <rte_memory.h>
 #include <rte_malloc.h>
 #include <rte_eal.h>
-#include <rte_eal_memconfig.h>
 #include <rte_atomic.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
@@ -73,6 +72,7 @@ rte_rcu_qsbr_init(struct rte_rcu_qsbr *v, uint32_t max_threads)
                        __RTE_QSBR_THRID_ARRAY_ELM_SIZE) /
                        __RTE_QSBR_THRID_ARRAY_ELM_SIZE;
        v->token = __RTE_QSBR_CNT_INIT;
+       v->acked_token = __RTE_QSBR_CNT_INIT - 1;
 
        return 0;
 }
@@ -158,7 +158,7 @@ rte_rcu_qsbr_thread_unregister(struct rte_rcu_qsbr *v, unsigned int thread_id)
        /* Check if the thread is already unregistered */
        old_bmap = __atomic_load_n(__RTE_QSBR_THRID_ARRAY_ELM(v, i),
                                        __ATOMIC_RELAXED);
-       if (old_bmap & ~(1UL << id))
+       if (!(old_bmap & (1UL << id)))
                return 0;
 
        do {
@@ -175,7 +175,7 @@ rte_rcu_qsbr_thread_unregister(struct rte_rcu_qsbr *v, unsigned int thread_id)
                if (success)
                        __atomic_fetch_sub(&v->num_threads,
                                                1, __ATOMIC_RELAXED);
-               else if (old_bmap & ~(1UL << id))
+               else if (!(old_bmap & (1UL << id)))
                        /* Someone else unregistered this thread.
                         * Counter should not be incremented.
                         */
@@ -245,6 +245,9 @@ rte_rcu_qsbr_dump(FILE *f, struct rte_rcu_qsbr *v)
        fprintf(f, "  Token = %"PRIu64"\n",
                        __atomic_load_n(&v->token, __ATOMIC_ACQUIRE));
 
+       fprintf(f, "  Least Acknowledged Token = %"PRIu64"\n",
+                       __atomic_load_n(&v->acked_token, __ATOMIC_ACQUIRE));
+
        fprintf(f, "Quiescent State Counts for readers:\n");
        for (i = 0; i < v->num_elems; i++) {
                bmap = __atomic_load_n(__RTE_QSBR_THRID_ARRAY_ELM(v, i),