table: fix empty bucket removal during entry deletion
authorBalazs Nemeth <balazs.nemeth@intel.com>
Fri, 26 Sep 2014 09:37:37 +0000 (09:37 +0000)
committerThomas Monjalon <thomas.monjalon@6wind.com>
Mon, 24 Nov 2014 12:17:49 +0000 (13:17 +0100)
When an entry is deleted from an extensible rte_table_hash, the bucket
that stored the entry can become empty. If this is the case, the
bucket needs to be removed from the chain of buckets.

During removal of the bucket, the chain should be updated first. If
the bucket that will be removed is cleared first, the chain is broken
and the information to update the chain is lost.

Signed-off-by: Balazs Nemeth <balazs.nemeth@intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
lib/librte_table/rte_table_hash_ext.c

index 6e26d98..17c16cd 100644 (file)
@@ -408,12 +408,12 @@ void *entry)
                                if ((bkt_prev != NULL) &&
                                    (bkt->sig[0] == 0) && (bkt->sig[1] == 0) &&
                                    (bkt->sig[2] == 0) && (bkt->sig[3] == 0)) {
-                                       /* Clear bucket */
-                                       memset(bkt, 0, sizeof(struct bucket));
-
                                        /* Unchain bucket */
                                        BUCKET_NEXT_COPY(bkt_prev, bkt);
 
+                                       /* Clear bucket */
+                                       memset(bkt, 0, sizeof(struct bucket));
+
                                        /* Free bucket back to buckets ext */
                                        bkt_index = bkt - t->buckets_ext;
                                        t->bkt_ext_stack[t->bkt_ext_stack_tos++]