Add asserts to make sure the containers within are already empty.
Signed-off-by: Jarno Rajahalme <jrajaha...@nicira.com>
---
lib/classifier.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/lib/classifier.c b/lib/classifier.c
index 657a953..36f3d20 100644
--- a/lib/classifier.c
+++ b/lib/classifier.c
@@ -1080,6 +1080,7 @@ insert_subtable(struct classifier *cls, const struct
minimask *mask)
return subtable;
}
+/* RCU readers may still access the subtable before it is actually freed. */
static void
destroy_subtable(struct classifier *cls, struct cls_subtable *subtable)
OVS_REQUIRES(cls->mutex)
@@ -1087,13 +1088,16 @@ destroy_subtable(struct classifier *cls, struct
cls_subtable *subtable)
int i;
pvector_remove(&cls->subtables, subtable);
- trie_destroy(&subtable->ports_trie);
+ cmap_remove(&cls->subtables_map, &subtable->cmap_node,
+ minimask_hash(&subtable->mask, 0));
+
+ ovs_assert(ovsrcu_get_protected(struct trie_node *, &subtable->ports_trie)
+ == NULL);
+ ovs_assert(cmap_is_empty(&subtable->rules));
for (i = 0; i < subtable->n_indices; i++) {
cmap_destroy(&subtable->indices[i]);
}
- cmap_remove(&cls->subtables_map, &subtable->cmap_node,
- minimask_hash(&subtable->mask, 0));
cmap_destroy(&subtable->rules);
ovsrcu_postpone(free, subtable);
}
--
1.7.10.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
