@@ -51,6 +51,7 @@
#include "fat-rwlock.h"
#include "flow.h"
#include "hmapx.h"
+#include "id-fpool.h"
#include "id-pool.h"
#include "ipf.h"
#include "mov-avg.h"
@@ -2349,7 +2350,7 @@ struct megaflow_to_mark_data {
struct flow_mark {
struct cmap megaflow_to_mark;
struct cmap mark_to_flow;
- struct id_pool *pool;
+ struct id_fpool *pool;
};
static struct flow_mark flow_mark = {
@@ -2360,14 +2361,18 @@ static struct flow_mark flow_mark = {
static uint32_t
flow_mark_alloc(void)
{
+ static struct ovsthread_once pool_init = OVSTHREAD_ONCE_INITIALIZER;
+ unsigned int tid = netdev_offload_thread_id();
uint32_t mark;
- if (!flow_mark.pool) {
+ if (ovsthread_once_start(&pool_init)) {
/* Haven't initiated yet, do it here */
- flow_mark.pool = id_pool_create(1, MAX_FLOW_MARK);
+ flow_mark.pool = id_fpool_create(netdev_offload_thread_nb(),
+ 1, MAX_FLOW_MARK);
+ ovsthread_once_done(&pool_init);
}
- if (id_pool_alloc_id(flow_mark.pool, &mark)) {
+ if (id_fpool_new_id(flow_mark.pool, tid, &mark)) {
return mark;
}
@@ -2377,7 +2382,9 @@ flow_mark_alloc(void)
static void
flow_mark_free(uint32_t mark)
{
- id_pool_free_id(flow_mark.pool, mark);
+ unsigned int tid = netdev_offload_thread_id();
+
+ id_fpool_free_id(flow_mark.pool, tid, mark);
}
/* associate megaflow with a mark, which is a 1:1 mapping */