return new_values;
}
+static void
+vnet_classify_entry_claim_resource (vnet_classify_entry_t *e)
+{
+ switch (e->action)
+ {
+ case CLASSIFY_ACTION_SET_IP4_FIB_INDEX:
+ fib_table_lock (e->metadata, FIB_PROTOCOL_IP4, FIB_SOURCE_CLASSIFY);
+ break;
+ case CLASSIFY_ACTION_SET_IP6_FIB_INDEX:
+ fib_table_lock (e->metadata, FIB_PROTOCOL_IP6, FIB_SOURCE_CLASSIFY);
+ break;
+ }
+}
+
+static void
+vnet_classify_entry_release_resource (vnet_classify_entry_t *e)
+{
+ switch (e->action)
+ {
+ case CLASSIFY_ACTION_SET_IP4_FIB_INDEX:
+ fib_table_unlock (e->metadata, FIB_PROTOCOL_IP4, FIB_SOURCE_CLASSIFY);
+ break;
+ case CLASSIFY_ACTION_SET_IP6_FIB_INDEX:
+ fib_table_unlock (e->metadata, FIB_PROTOCOL_IP6, FIB_SOURCE_CLASSIFY);
+ break;
+ }
+}
+
int vnet_classify_add_del (vnet_classify_table_t * t,
vnet_classify_entry_t * add_v,
int is_add)
u32 old_log2_pages, new_log2_pages;
u32 thread_index = vlib_get_thread_index();
u8 * key_minus_skip;
- int resplit_once;
+ int resplit_once = 0;
int mark_bucket_linear;
ASSERT ((add_v->flags & VNET_CLASSIFY_ENTRY_FREE) == 0);
clib_memcpy (v, add_v, sizeof (vnet_classify_entry_t) +
t->match_n_vectors * sizeof (u32x4));
v->flags &= ~(VNET_CLASSIFY_ENTRY_FREE);
+ vnet_classify_entry_claim_resource (v);
tmp_b.as_u64 = 0;
tmp_b.offset = vnet_classify_get_offset (t, v);
clib_memcpy (v, add_v, sizeof (vnet_classify_entry_t) +
t->match_n_vectors * sizeof(u32x4));
v->flags &= ~(VNET_CLASSIFY_ENTRY_FREE);
+ vnet_classify_entry_claim_resource (v);
CLIB_MEMORY_BARRIER();
/* Restore the previous (k,v) pairs */
clib_memcpy (v, add_v, sizeof (vnet_classify_entry_t) +
t->match_n_vectors * sizeof(u32x4));
v->flags &= ~(VNET_CLASSIFY_ENTRY_FREE);
+ vnet_classify_entry_claim_resource (v);
+
CLIB_MEMORY_BARRIER();
b->as_u64 = t->saved_bucket.as_u64;
t->active_elements ++;
if (!memcmp (v->key, add_v->key, t->match_n_vectors * sizeof (u32x4)))
{
+ vnet_classify_entry_release_resource (v);
memset (v, 0xff, sizeof (vnet_classify_entry_t) +
t->match_n_vectors * sizeof(u32x4));
v->flags |= VNET_CLASSIFY_ENTRY_FREE;
+
CLIB_MEMORY_BARRIER();
b->as_u64 = t->saved_bucket.as_u64;
t->active_elements --;
clib_memcpy (new_v, add_v, sizeof (vnet_classify_entry_t) +
t->match_n_vectors * sizeof(u32x4));
new_v->flags &= ~(VNET_CLASSIFY_ENTRY_FREE);
+ vnet_classify_entry_claim_resource (new_v);
+
goto expand_ok;
}
}
e->flags = 0;
e->action = action;
if (e->action == CLASSIFY_ACTION_SET_IP4_FIB_INDEX)
- e->metadata = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4, metadata);
+ e->metadata = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4,
+ metadata,
+ FIB_SOURCE_CLASSIFY);
else if (e->action == CLASSIFY_ACTION_SET_IP6_FIB_INDEX)
- e->metadata = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6, metadata);
+ e->metadata = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6,
+ metadata,
+ FIB_SOURCE_CLASSIFY);
else
e->metadata = 0;
e->key[i] &= t->mask[i];
rv = vnet_classify_add_del (t, e, is_add);
+
+ vnet_classify_entry_release_resource(e);
+
if (rv)
return VNET_API_ERROR_NO_SUCH_ENTRY;
return 0;