[COMMIT] branch master updated. v1.19.0.2_tigermoth-180-g0f6ebf74
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via 0f6ebf74b3f77bf7e02558778e32d317cb983393 (commit)
via 31f9a83aec500e45576202cc42219bf0673a9790 (commit)
via 08620451ad0d82b092ac7516673644ab20ebc9bc (commit)
via 83478c2c04ee939b69e09867f97be88ae5c9e684 (commit)
via c5025dfd7c43740aae55d8e69104a251ef1c32ab (commit)
via bbe8e532130900bbd6896e7ec5e6828f7e19fa4b (commit)
via cd760151e86ac1276906edc83856650b7694162e (commit)
via 99a96552ddc57fa93af1eb041b71c55e0927fa75 (commit)
via 664cbd820806256b9f9d44dd879b5fa85c70d40c (commit)
from 01a3bd80c5e56bdfa1868cfb1f030ca3a834d742 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0f6ebf74b3f77bf7e02558778e32d317cb983393
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Oct 12 10:15:18 2018 +0300
validation: pool: add max num pool tests
Test that pools can be created with maximum number of
events defined in pool capability. Test that all events
can be allocated and freed. Event size is small.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/pool/pool.c b/test/validation/api/pool/pool.c
index 2795e857..71a1a284 100644
--- a/test/validation/api/pool/pool.c
+++ b/test/validation/api/pool/pool.c
@@ -11,6 +11,7 @@
#define PKT_LEN 400
#define PKT_NUM 500
+#define MAX_NUM_DEFAULT (10 * 1024 * 1024)
static const int default_buffer_size = 1500;
static const int default_buffer_num = 1000;
@@ -32,7 +33,7 @@ static void pool_test_create_destroy_buffer(void)
odp_pool_param_init(¶m);
- param.type = ODP_POOL_BUFFER,
+ param.type = ODP_POOL_BUFFER;
param.buf.size = default_buffer_size;
param.buf.align = ODP_CACHE_LINE_SIZE;
param.buf.num = default_buffer_num;
@@ -106,7 +107,7 @@ static void pool_test_alloc_packet(void)
odp_pool_param_init(¶m);
- param.type = ODP_POOL_PACKET,
+ param.type = ODP_POOL_PACKET;
param.pkt.num = PKT_NUM;
param.pkt.len = PKT_LEN;
@@ -145,7 +146,7 @@ static void pool_test_alloc_packet_subparam(void)
odp_pool_param_init(¶m);
- param.type = ODP_POOL_PACKET,
+ param.type = ODP_POOL_PACKET;
param.pkt.num = PKT_NUM;
param.pkt.len = PKT_LEN;
param.pkt.num_subparam = num_sub;
@@ -270,6 +271,159 @@ static void pool_test_info_data_range(void)
CU_ASSERT(odp_pool_destroy(pool) == 0);
}
+static void pool_test_buf_max_num(void)
+{
+ odp_pool_t pool;
+ odp_pool_param_t param;
+ odp_pool_capability_t capa;
+ uint32_t max_num, num, i;
+ odp_shm_t shm;
+ odp_buffer_t *buf;
+
+ CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0);
+
+ max_num = MAX_NUM_DEFAULT;
+ if (capa.buf.max_num)
+ max_num = capa.buf.max_num;
+
+ odp_pool_param_init(¶m);
+
+ param.type = ODP_POOL_BUFFER;
+ param.buf.num = max_num;
+ param.buf.size = 10;
+
+ pool = odp_pool_create("test_buf_max_num", ¶m);
+
+ CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
+
+ shm = odp_shm_reserve("test_max_num_shm",
+ max_num * sizeof(odp_buffer_t),
+ sizeof(odp_buffer_t), 0);
+
+ CU_ASSERT_FATAL(shm != ODP_SHM_INVALID);
+
+ buf = odp_shm_addr(shm);
+
+ num = 0;
+ for (i = 0; i < max_num; i++) {
+ buf[num] = odp_buffer_alloc(pool);
+
+ if (buf[num] != ODP_BUFFER_INVALID)
+ num++;
+ }
+
+ CU_ASSERT(num == max_num);
+
+ for (i = 0; i < num; i++)
+ odp_buffer_free(buf[i]);
+
+ CU_ASSERT(odp_shm_free(shm) == 0);
+ CU_ASSERT(odp_pool_destroy(pool) == 0);
+}
+
+static void pool_test_pkt_max_num(void)
+{
+ odp_pool_t pool;
+ odp_pool_param_t param;
+ odp_pool_capability_t capa;
+ uint32_t max_num, num, i;
+ odp_shm_t shm;
+ odp_packet_t *pkt;
+ uint32_t len = 10;
+
+ CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0);
+
+ max_num = MAX_NUM_DEFAULT;
+ if (capa.pkt.max_num)
+ max_num = capa.pkt.max_num;
+
+ odp_pool_param_init(¶m);
+
+ param.type = ODP_POOL_PACKET;
+ param.pkt.num = max_num;
+ param.pkt.max_num = max_num;
+ param.pkt.len = len;
+ param.pkt.max_len = len;
+ param.pkt.headroom = 0;
+
+ pool = odp_pool_create("test_packet_max_num", ¶m);
+
+ CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
+
+ shm = odp_shm_reserve("test_max_num_shm",
+ max_num * sizeof(odp_packet_t),
+ sizeof(odp_packet_t), 0);
+
+ CU_ASSERT_FATAL(shm != ODP_SHM_INVALID);
+
+ pkt = odp_shm_addr(shm);
+
+ num = 0;
+ for (i = 0; i < max_num; i++) {
+ pkt[num] = odp_packet_alloc(pool, len);
+
+ if (pkt[num] != ODP_PACKET_INVALID)
+ num++;
+ }
+
+ CU_ASSERT(num == max_num);
+
+ for (i = 0; i < num; i++)
+ odp_packet_free(pkt[i]);
+
+ CU_ASSERT(odp_shm_free(shm) == 0);
+ CU_ASSERT(odp_pool_destroy(pool) == 0);
+}
+
+static void pool_test_tmo_max_num(void)
+{
+ odp_pool_t pool;
+ odp_pool_param_t param;
+ odp_pool_capability_t capa;
+ uint32_t max_num, num, i;
+ odp_shm_t shm;
+ odp_timeout_t *tmo;
+
+ CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0);
+
+ max_num = MAX_NUM_DEFAULT;
+ if (capa.tmo.max_num)
+ max_num = capa.tmo.max_num;
+
+ odp_pool_param_init(¶m);
+
+ param.type = ODP_POOL_TIMEOUT;
+ param.tmo.num = max_num;
+
+ pool = odp_pool_create("test_tmo_max_num", ¶m);
+
+ CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
+
+ shm = odp_shm_reserve("test_max_num_shm",
+ max_num * sizeof(odp_packet_t),
+ sizeof(odp_packet_t), 0);
+
+ CU_ASSERT_FATAL(shm != ODP_SHM_INVALID);
+
+ tmo = odp_shm_addr(shm);
+
+ num = 0;
+ for (i = 0; i < max_num; i++) {
+ tmo[num] = odp_timeout_alloc(pool);
+
+ if (tmo[num] != ODP_TIMEOUT_INVALID)
+ num++;
+ }
+
+ CU_ASSERT(num == max_num);
+
+ for (i = 0; i < num; i++)
+ odp_timeout_free(tmo[i]);
+
+ CU_ASSERT(odp_shm_free(shm) == 0);
+ CU_ASSERT(odp_pool_destroy(pool) == 0);
+}
+
odp_testinfo_t pool_suite[] = {
ODP_TEST_INFO(pool_test_create_destroy_buffer),
ODP_TEST_INFO(pool_test_create_destroy_packet),
@@ -279,6 +433,9 @@ odp_testinfo_t pool_suite[] = {
ODP_TEST_INFO(pool_test_info_packet),
ODP_TEST_INFO(pool_test_lookup_info_print),
ODP_TEST_INFO(pool_test_info_data_range),
+ ODP_TEST_INFO(pool_test_buf_max_num),
+ ODP_TEST_INFO(pool_test_pkt_max_num),
+ ODP_TEST_INFO(pool_test_tmo_max_num),
ODP_TEST_INFO_NULL,
};
commit 31f9a83aec500e45576202cc42219bf0673a9790
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Oct 12 14:43:38 2018 +0300
linux-gen: pool: reduce max pool size
Reduce maximum pool size, so that maximum size (packet) pool
requires less than 1GB of SHM memory. The limit of 1GB (for
default configuration) comes from maximum SHM reserve size
in process mode (single VA) and limited memory size CI virtual
machines.
This define can be increased when pool size options are added
into the configuration file.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h
index d87c457b..a94012ac 100644
--- a/platform/linux-generic/include/odp_config_internal.h
+++ b/platform/linux-generic/include/odp_config_internal.h
@@ -157,7 +157,7 @@ extern "C" {
* Maximum number of events in a pool. Power of two minus one results optimal
* memory usage for the ring.
*/
-#define CONFIG_POOL_MAX_NUM ((1 * 1024 * 1024) - 1)
+#define CONFIG_POOL_MAX_NUM ((256 * 1024) - 1)
/*
* Maximum number of events in a thread local pool cache
commit 08620451ad0d82b092ac7516673644ab20ebc9bc
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Oct 11 15:03:01 2018 +0300
linux-gen: ring: add reader tail check
Reader tail index is needed to detect if a reader is so much
behind that a writer is going to overwrite the data it is
reading.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_ring_internal.h b/platform/linux-generic/include/odp_ring_internal.h
index 9a637afb..ad2f37ef 100644
--- a/platform/linux-generic/include/odp_ring_internal.h
+++ b/platform/linux-generic/include/odp_ring_internal.h
@@ -23,8 +23,9 @@ extern "C" {
* Ring stores head and tail counters. Ring indexes are formed from these
* counters with a mask (mask = ring_size - 1), which requires that ring size
* must be a power of two. Also ring size must be larger than the maximum
- * number of data items that will be stored on it (there's no check against
- * overwriting). */
+ * number of data items that will be stored on it as write operations are
+ * assumed to succeed eventually (after readers complete their current
+ * operations). */
typedef struct ODP_ALIGNED_CACHE {
/* Writer head and tail */
odp_atomic_u32_t w_head;
@@ -33,6 +34,7 @@ typedef struct ODP_ALIGNED_CACHE {
/* Reader head and tail */
odp_atomic_u32_t r_head;
+ odp_atomic_u32_t r_tail;
uint32_t data[0];
} ring_t;
@@ -53,6 +55,7 @@ static inline void ring_init(ring_t *ring)
odp_atomic_init_u32(&ring->w_head, 0);
odp_atomic_init_u32(&ring->w_tail, 0);
odp_atomic_init_u32(&ring->r_head, 0);
+ odp_atomic_init_u32(&ring->r_tail, 0);
}
/* Dequeue data from the ring head */
@@ -75,12 +78,19 @@ static inline uint32_t ring_deq(ring_t *ring, uint32_t mask, uint32_t *data)
new_head = head + 1;
} while (odp_unlikely(cas_mo_u32(&ring->r_head, &head, new_head,
- __ATOMIC_ACQ_REL,
+ __ATOMIC_ACQUIRE,
__ATOMIC_ACQUIRE) == 0));
- /* Read data. CAS acquire-release ensures that data read
- * does not move above from here. */
+ /* Read data. */
*data = ring->data[new_head & mask];
+
+ /* Wait until other readers have updated the tail */
+ while (odp_unlikely(odp_atomic_load_u32(&ring->r_tail) != head))
+ odp_cpu_pause();
+
+ /* Update the tail. Writers acquire it. */
+ odp_atomic_store_rel_u32(&ring->r_tail, new_head);
+
return 1;
}
@@ -110,14 +120,20 @@ static inline uint32_t ring_deq_multi(ring_t *ring, uint32_t mask,
new_head = head + num;
} while (odp_unlikely(cas_mo_u32(&ring->r_head, &head, new_head,
- __ATOMIC_ACQ_REL,
+ __ATOMIC_ACQUIRE,
__ATOMIC_ACQUIRE) == 0));
- /* Read data. CAS acquire-release ensures that data read
- * does not move above from here. */
+ /* Read data. */
for (i = 0; i < num; i++)
data[i] = ring->data[(head + 1 + i) & mask];
+ /* Wait until other readers have updated the tail */
+ while (odp_unlikely(odp_atomic_load_u32(&ring->r_tail) != head))
+ odp_cpu_pause();
+
+ /* Update the tail. Writers acquire it. */
+ odp_atomic_store_rel_u32(&ring->r_tail, new_head);
+
return num;
}
@@ -125,16 +141,24 @@ static inline uint32_t ring_deq_multi(ring_t *ring, uint32_t mask,
static inline void ring_enq(ring_t *ring, uint32_t mask, uint32_t data)
{
uint32_t old_head, new_head;
+ uint32_t size = mask + 1;
/* Reserve a slot in the ring for writing */
old_head = odp_atomic_fetch_inc_u32(&ring->w_head);
new_head = old_head + 1;
+ /* Wait for the last reader to finish. This prevents overwrite when
+ * a reader has been left behind (e.g. due to an interrupt) and is
+ * still reading the same slot. */
+ while (odp_unlikely(new_head - odp_atomic_load_acq_u32(&ring->r_tail)
+ >= size))
+ odp_cpu_pause();
+
/* Write data */
ring->data[new_head & mask] = data;
/* Wait until other writers have updated the tail */
- while (odp_unlikely(odp_atomic_load_acq_u32(&ring->w_tail) != old_head))
+ while (odp_unlikely(odp_atomic_load_u32(&ring->w_tail) != old_head))
odp_cpu_pause();
/* Release the new writer tail, readers acquire it. */
@@ -146,17 +170,25 @@ static inline void ring_enq_multi(ring_t *ring, uint32_t mask, uint32_t data[],
uint32_t num)
{
uint32_t old_head, new_head, i;
+ uint32_t size = mask + 1;
/* Reserve a slot in the ring for writing */
old_head = odp_atomic_fetch_add_u32(&ring->w_head, num);
new_head = old_head + 1;
+ /* Wait for the last reader to finish. This prevents overwrite when
+ * a reader has been left behind (e.g. due to an interrupt) and is
+ * still reading these slots. */
+ while (odp_unlikely(new_head - odp_atomic_load_acq_u32(&ring->r_tail)
+ >= size))
+ odp_cpu_pause();
+
/* Write data */
for (i = 0; i < num; i++)
ring->data[(new_head + i) & mask] = data[i];
/* Wait until other writers have updated the tail */
- while (odp_unlikely(odp_atomic_load_acq_u32(&ring->w_tail) != old_head))
+ while (odp_unlikely(odp_atomic_load_u32(&ring->w_tail) != old_head))
odp_cpu_pause();
/* Release the new writer tail, readers acquire it. */
commit 83478c2c04ee939b69e09867f97be88ae5c9e684
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Oct 11 15:01:46 2018 +0300
linux-gen: pool: ring size must be larger than num items
Ensure that ring size is larger than number of events to be
stored in there.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h
index bfe203bf..d87c457b 100644
--- a/platform/linux-generic/include/odp_config_internal.h
+++ b/platform/linux-generic/include/odp_config_internal.h
@@ -154,9 +154,10 @@ extern "C" {
#define CONFIG_BURST_SIZE 32
/*
- * Maximum number of events in a pool
+ * Maximum number of events in a pool. Power of two minus one results optimal
+ * memory usage for the ring.
*/
-#define CONFIG_POOL_MAX_NUM (1 * 1024 * 1024)
+#define CONFIG_POOL_MAX_NUM ((1 * 1024 * 1024) - 1)
/*
* Maximum number of events in a thread local pool cache
diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h
index df02fdaf..2696e8ee 100644
--- a/platform/linux-generic/include/odp_pool_internal.h
+++ b/platform/linux-generic/include/odp_pool_internal.h
@@ -38,7 +38,7 @@ typedef struct ODP_ALIGNED_CACHE {
ring_t hdr;
/* Ring data: buffer handles */
- uint32_t buf[CONFIG_POOL_MAX_NUM];
+ uint32_t buf[CONFIG_POOL_MAX_NUM + 1];
} pool_ring_t;
diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c
index 5bb5bc63..7a4a9eb9 100644
--- a/platform/linux-generic/odp_pool.c
+++ b/platform/linux-generic/odp_pool.c
@@ -471,10 +471,11 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params,
FIRST_HP_SIZE - 1) / FIRST_HP_SIZE);
}
- if (num <= RING_SIZE_MIN)
+ /* Ring size must be larger than the number of items stored */
+ if (num + 1 <= RING_SIZE_MIN)
ring_size = RING_SIZE_MIN;
else
- ring_size = ROUNDUP_POWER2_U32(num);
+ ring_size = ROUNDUP_POWER2_U32(num + 1);
pool->ring_mask = ring_size - 1;
pool->num = num;
commit c5025dfd7c43740aae55d8e69104a251ef1c32ab
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Oct 11 09:33:49 2018 +0300
linux-gen: sched: remove unnecessary queue null index
Ring does not use any more special null index. So, queue index
initialization to null index is not needed any more.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c
index f9f45670..49d9c25c 100644
--- a/platform/linux-generic/odp_schedule_basic.c
+++ b/platform/linux-generic/odp_schedule_basic.c
@@ -69,17 +69,11 @@ ODP_STATIC_ASSERT((ODP_SCHED_PRIO_NORMAL > 0) &&
/* Maximum pktin index. Needs to fit into 8 bits. */
#define MAX_PKTIN_INDEX 255
-/* Not a valid index */
-#define NULL_INDEX ((uint32_t)-1)
-
/* Maximum priority queue ring size. A ring must be large enough to store all
* queues in the worst case (all queues are scheduled, have the same priority
* and no spreading). */
#define MAX_RING_SIZE ODP_CONFIG_QUEUES
-/* Priority queue empty, not a valid queue index. */
-#define PRIO_QUEUE_EMPTY NULL_INDEX
-
/* For best performance, the number of queues should be a power of two. */
ODP_STATIC_ASSERT(CHECK_IS_POWER2(ODP_CONFIG_QUEUES),
"Number_of_queues_is_not_power_of_two");
@@ -329,8 +323,6 @@ static void sched_local_init(void)
sched_local.thr = odp_thread_id();
sched_local.sync_ctx = NO_SYNC_CONTEXT;
sched_local.stash.queue = ODP_QUEUE_INVALID;
- sched_local.stash.qi = PRIO_QUEUE_EMPTY;
- sched_local.ordered.src_queue = NULL_INDEX;
spread = prio_spread_index(sched_local.thr);
@@ -380,15 +372,9 @@ static int schedule_init_global(void)
for (i = 0; i < NUM_PRIO; i++) {
for (j = 0; j < MAX_SPREAD; j++) {
prio_queue_t *prio_q;
- int k;
prio_q = &sched->prio_q[grp][i][j];
ring_init(&prio_q->ring);
-
- for (k = 0; k < MAX_RING_SIZE; k++) {
- prio_q->queue_index[k] =
- PRIO_QUEUE_EMPTY;
- }
}
}
}
@@ -1177,8 +1163,7 @@ static void schedule_order_lock(uint32_t lock_index)
queue_index = sched_local.ordered.src_queue;
- ODP_ASSERT(queue_index != NULL_INDEX &&
- lock_index <= sched->queue[queue_index].order_lock_count &&
+ ODP_ASSERT(lock_index <= sched->queue[queue_index].order_lock_count &&
!sched_local.ordered.lock_called.u8[lock_index]);
ord_lock = &sched->order[queue_index].lock[lock_index];
@@ -1207,8 +1192,7 @@ static void schedule_order_unlock(uint32_t lock_index)
queue_index = sched_local.ordered.src_queue;
- ODP_ASSERT(queue_index != NULL_INDEX &&
- lock_index <= sched->queue[queue_index].order_lock_count);
+ ODP_ASSERT(lock_index <= sched->queue[queue_index].order_lock_count);
ord_lock = &sched->order[queue_index].lock[lock_index];
commit bbe8e532130900bbd6896e7ec5e6828f7e19fa4b
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Oct 12 10:19:23 2018 +0300
test: sched_latency: honor pool capability limits
Check maximum pool size from pool capability.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/performance/odp_sched_latency.c b/test/performance/odp_sched_latency.c
index 64a21983..873738ef 100644
--- a/test/performance/odp_sched_latency.c
+++ b/test/performance/odp_sched_latency.c
@@ -641,11 +641,13 @@ int main(int argc, char *argv[])
odph_odpthread_params_t thr_params;
odp_cpumask_t cpumask;
odp_pool_t pool;
+ odp_pool_capability_t pool_capa;
odp_pool_param_t params;
odp_shm_t shm;
test_globals_t *globals;
test_args_t args;
char cpumaskstr[ODP_CPUMASK_STR_SIZE];
+ uint32_t pool_size;
int i, j;
int ret = 0;
int num_workers = 0;
@@ -706,10 +708,19 @@ int main(int argc, char *argv[])
/*
* Create event pool
*/
+ if (odp_pool_capability(&pool_capa)) {
+ LOG_ERR("pool capa failed\n");
+ return -1;
+ }
+
+ pool_size = EVENT_POOL_SIZE;
+ if (pool_capa.buf.max_num && pool_capa.buf.max_num < EVENT_POOL_SIZE)
+ pool_size = pool_capa.buf.max_num;
+
odp_pool_param_init(¶ms);
params.buf.size = sizeof(test_event_t);
params.buf.align = 0;
- params.buf.num = EVENT_POOL_SIZE;
+ params.buf.num = pool_size;
params.type = ODP_POOL_BUFFER;
pool = odp_pool_create("event_pool", ¶ms);
commit cd760151e86ac1276906edc83856650b7694162e
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Oct 12 16:02:50 2018 +0300
test: scheduling: honor pool capability
Limit pool size to maximum pool capability.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/performance/odp_scheduling.c b/test/performance/odp_scheduling.c
index 3b75f635..5eeb6926 100644
--- a/test/performance/odp_scheduling.c
+++ b/test/performance/odp_scheduling.c
@@ -30,7 +30,7 @@
/* GNU lib C */
#include <getopt.h>
-#define NUM_MSG (512 * 1024) /**< Number of msg in pool */
+#define MAX_BUF (512 * 1024) /**< Maximum pool size */
#define MAX_ALLOCS 32 /**< Alloc burst size */
#define QUEUES_PER_PRIO 64 /**< Queue per priority */
#define NUM_PRIOS 2 /**< Number of tested priorities */
@@ -813,7 +813,8 @@ int main(int argc, char *argv[])
odp_instance_t instance;
odph_odpthread_params_t thr_params;
odp_queue_capability_t capa;
- uint32_t num_queues;
+ odp_pool_capability_t pool_capa;
+ uint32_t num_queues, num_buf;
printf("\nODP example starts\n\n");
@@ -869,11 +870,19 @@ int main(int argc, char *argv[])
/*
* Create message pool
*/
+ if (odp_pool_capability(&pool_capa)) {
+ LOG_ERR("Pool capabilities failed.\n");
+ return -1;
+ }
+
+ num_buf = MAX_BUF;
+ if (pool_capa.buf.max_num && pool_capa.buf.max_num < MAX_BUF)
+ num_buf = pool_capa.buf.max_num;
odp_pool_param_init(¶ms);
params.buf.size = sizeof(test_message_t);
params.buf.align = 0;
- params.buf.num = NUM_MSG;
+ params.buf.num = num_buf;
params.type = ODP_POOL_BUFFER;
pool = odp_pool_create("msg_pool", ¶ms);
commit 99a96552ddc57fa93af1eb041b71c55e0927fa75
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Oct 12 15:56:14 2018 +0300
test: scheduling: fix script to exit with failure status
It seems that some shells did not notice failure status.
Simplified the script to exit on the first failure.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/performance/odp_scheduling_run.sh b/test/performance/odp_scheduling_run.sh
index ae3d1c8f..57792276 100755
--- a/test/performance/odp_scheduling_run.sh
+++ b/test/performance/odp_scheduling_run.sh
@@ -17,7 +17,12 @@ run()
echo odp_scheduling_run starts requesting $1 worker threads
echo ===============================================
- $TEST_DIR/odp_scheduling${EXEEXT} -c $1 || ret=1
+ $TEST_DIR/odp_scheduling${EXEEXT} -c $1
+
+ if [ $? -ne 0 ]; then
+ echo odp_scheduling FAILED
+ exit $?
+ fi
}
run 1
@@ -26,4 +31,4 @@ run 8
run 11
run $ALL
-exit $ret
+exit 0
commit 664cbd820806256b9f9d44dd879b5fa85c70d40c
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Oct 12 11:06:19 2018 +0300
helper: iplookup: check capabilities
Check pool and queue capabilities instead of assuming e.g. that
1M events can be stored into a queue. Reduced table defines
(pool / queue size requirement) as an easy fix to pass tests.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/helper/iplookuptable.c b/helper/iplookuptable.c
index 7102eb54..84b4e2cb 100644
--- a/helper/iplookuptable.c
+++ b/helper/iplookuptable.c
@@ -83,9 +83,9 @@ typedef struct trie_node {
} trie_node_t;
/** Number of L2\L3 entries(subtrees) per cache cube. */
-#define CACHE_NUM_SUBTREE (1 << 13)
+#define CACHE_NUM_SUBTREE (4 * 1024)
/** Number of trie nodes per cache cube. */
-#define CACHE_NUM_TRIE (1 << 20)
+#define CACHE_NUM_TRIE (4 * 1024)
/** @typedef cache_type_t
* Cache node type
@@ -187,12 +187,34 @@ cache_alloc_new_pool(
{
odp_pool_t pool;
odp_pool_param_t param;
+ odp_pool_capability_t pool_capa;
odp_queue_t queue = tbl->free_slots[type];
odp_buffer_t buffer;
char pool_name[ODPH_TABLE_NAME_LEN + 8];
uint32_t size = 0, num = 0;
+ if (odp_pool_capability(&pool_capa)) {
+ ODPH_ERR("pool capa failed\n");
+ return -1;
+ }
+
+ if (pool_capa.buf.max_num) {
+ if (pool_capa.buf.max_num < CACHE_NUM_TRIE ||
+ pool_capa.buf.max_num < CACHE_NUM_SUBTREE) {
+ ODPH_ERR("pool size too small\n");
+ return -1;
+ }
+ }
+
+ if (pool_capa.buf.max_size) {
+ if (pool_capa.buf.max_size < ENTRY_SIZE * ENTRY_NUM_SUBTREE ||
+ pool_capa.buf.max_size < sizeof(trie_node_t)) {
+ ODPH_ERR("buffer size too small\n");
+ return -1;
+ }
+ }
+
/* Create new pool (new free buffers). */
odp_pool_param_init(¶m);
param.type = ODP_POOL_BUFFER;
@@ -223,7 +245,11 @@ cache_alloc_new_pool(
while ((buffer = odp_buffer_alloc(pool))
!= ODP_BUFFER_INVALID) {
cache_init_buffer(buffer, type, size);
- odp_queue_enq(queue, odp_buffer_to_event(buffer));
+ if (odp_queue_enq(queue, odp_buffer_to_event(buffer))) {
+ ODPH_DBG("queue enqueue failed\n");
+ odp_buffer_free(buffer);
+ break;
+ }
}
tbl->cache_count[type]++;
@@ -449,10 +475,28 @@ odph_table_t odph_iplookup_table_create(const char *name,
odp_shm_t shm_tbl;
odp_queue_t queue;
odp_queue_param_t qparam;
+ odp_queue_capability_t queue_capa;
unsigned i;
- uint32_t impl_size, l1_size;
+ uint32_t impl_size, l1_size, queue_size;
char queue_name[ODPH_TABLE_NAME_LEN + 2];
+ if (odp_queue_capability(&queue_capa)) {
+ ODPH_ERR("queue capa failed\n");
+ return NULL;
+ }
+
+ if (queue_capa.plain.max_size) {
+ if (queue_capa.plain.max_size < CACHE_NUM_TRIE ||
+ queue_capa.plain.max_size < CACHE_NUM_SUBTREE) {
+ ODPH_ERR("queue size too small\n");
+ return NULL;
+ }
+ }
+
+ queue_size = CACHE_NUM_TRIE;
+ if (CACHE_NUM_SUBTREE > CACHE_NUM_TRIE)
+ queue_size = CACHE_NUM_SUBTREE;
+
/* Check for valid parameters */
if (strlen(name) == 0) {
ODPH_DBG("invalid parameters\n");
@@ -502,6 +546,7 @@ odph_table_t odph_iplookup_table_create(const char *name,
odp_queue_param_init(&qparam);
qparam.type = ODP_QUEUE_TYPE_PLAIN;
+ qparam.size = queue_size;
sprintf(queue_name, "%s_%d", name, i);
queue = odp_queue_create(queue_name, &qparam);
if (queue == ODP_QUEUE_INVALID) {
-----------------------------------------------------------------------
Summary of changes:
helper/iplookuptable.c | 53 ++++++-
.../linux-generic/include/odp_config_internal.h | 5 +-
platform/linux-generic/include/odp_pool_internal.h | 2 +-
platform/linux-generic/include/odp_ring_internal.h | 52 +++++--
platform/linux-generic/odp_pool.c | 5 +-
platform/linux-generic/odp_schedule_basic.c | 20 +--
test/performance/odp_sched_latency.c | 13 +-
test/performance/odp_scheduling.c | 15 +-
test/performance/odp_scheduling_run.sh | 9 +-
test/validation/api/pool/pool.c | 163 ++++++++++++++++++++-
10 files changed, 291 insertions(+), 46 deletions(-)
hooks/post-receive
--
6 years, 8 months
- 1
- 0
[COMMIT] branch master updated. v1.19.0.2_tigermoth-171-g01a3bd80
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via 01a3bd80c5e56bdfa1868cfb1f030ca3a834d742 (commit)
via 09affd4785c5817f14eb528940420d3831ab81de (commit)
via 35265db49b1f5329deed85734cb94cac2cc44178 (commit)
via ad7a654b1355f346e33834dd220535b07a4eef0e (commit)
from 577a58dddef4824f709f00b602543bde3f440ac7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 01a3bd80c5e56bdfa1868cfb1f030ca3a834d742
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Wed Oct 3 13:38:24 2018 +0300
linux-gen: dpdk: improved zero-copy implementation
Improved zero-copy DPDK pktio implementation which better adheres to DPDK
APIs. The new implementation reduces overhead by moving mbuf
initialization to ODP pool create and by using offsets instead of saved
pointers to do ODP packet / DPDK mbuf conversion.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h
index 0dac296a..1b660bab 100644
--- a/platform/linux-generic/include/odp_packet_dpdk.h
+++ b/platform/linux-generic/include/odp_packet_dpdk.h
@@ -7,11 +7,25 @@
#ifndef ODP_PACKET_DPDK_H
#define ODP_PACKET_DPDK_H
+#include <stdint.h>
+
#include <odp/api/packet_io.h>
+#include <odp_packet_internal.h>
+#include <odp_pool_internal.h>
+
struct rte_mbuf;
-/** Cache for storing packets */
+/**
+ * Calculate size of zero-copy DPDK packet pool object
+ */
+uint32_t _odp_dpdk_pool_obj_size(pool_t *pool, uint32_t block_size);
+
+/**
+ * Create zero-copy DPDK packet pool
+ */
+int _odp_dpdk_pool_create(pool_t *pool);
+
/** Packet parser using DPDK interface */
int _odp_dpdk_packet_parse_common(packet_parser_t *pkt_hdr,
const uint8_t *ptr,
diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h
index 0dccc97d..d17a61a0 100644
--- a/platform/linux-generic/include/odp_packet_internal.h
+++ b/platform/linux-generic/include/odp_packet_internal.h
@@ -95,9 +95,6 @@ typedef struct {
* Members below are not initialized by packet_init()
*/
- /* Type of extra data */
- uint8_t extra_type;
-
/* Flow hash value */
uint32_t flow_hash;
@@ -113,11 +110,6 @@ typedef struct {
/* Context for IPsec */
odp_ipsec_packet_result_t ipsec_ctx;
-#ifdef ODP_PKTIO_DPDK
- /* Extra space for packet descriptors. E.g. DPDK mbuf. Keep as the last
- * member before data. */
- uint8_t ODP_ALIGNED_CACHE extra[PKT_EXTRA_LEN];
-#endif
/* Packet data storage */
uint8_t data[0];
} odp_packet_hdr_t;
diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h
index e8a04614..df02fdaf 100644
--- a/platform/linux-generic/include/odp_pool_internal.h
+++ b/platform/linux-generic/include/odp_pool_internal.h
@@ -67,11 +67,15 @@ typedef struct pool_t {
uint32_t max_len;
uint32_t uarea_size;
uint32_t block_size;
+ uint32_t block_offset;
uint8_t *base_addr;
uint8_t *uarea_base_addr;
/* Used by DPDK zero-copy pktio */
- uint8_t mem_from_huge_pages;
+ uint32_t dpdk_elt_size;
+ uint32_t skipped_blocks;
+ uint8_t pool_in_use;
+ uint8_t mem_from_huge_pages;
pool_destroy_cb_fn ext_destroy;
void *ext_desc;
@@ -110,7 +114,8 @@ static inline odp_buffer_hdr_t *buf_hdr_from_index(pool_t *pool,
uint64_t block_offset;
odp_buffer_hdr_t *buf_hdr;
- block_offset = buffer_idx * (uint64_t)pool->block_size;
+ block_offset = (buffer_idx * (uint64_t)pool->block_size) +
+ pool->block_offset;
/* clang requires cast to uintptr_t */
buf_hdr = (odp_buffer_hdr_t *)(uintptr_t)&pool->base_addr[block_offset];
diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c
index 8ae0e4e3..5bb5bc63 100644
--- a/platform/linux-generic/odp_pool.c
+++ b/platform/linux-generic/odp_pool.c
@@ -16,6 +16,7 @@
#include <odp_pool_internal.h>
#include <odp_init_internal.h>
#include <odp_packet_internal.h>
+#include <odp_packet_dpdk.h>
#include <odp_config_internal.h>
#include <odp_debug_internal.h>
#include <odp_ring_internal.h>
@@ -248,7 +249,10 @@ static void init_buffers(pool_t *pool)
type = pool->params.type;
for (i = 0; i < pool->num + skipped_blocks ; i++) {
- addr = &pool->base_addr[i * pool->block_size];
+ int skip = 0;
+
+ addr = &pool->base_addr[(i * pool->block_size) +
+ pool->block_offset];
buf_hdr = addr;
pkt_hdr = addr;
/* Skip packet buffers which cross huge page boundaries. Some
@@ -265,7 +269,7 @@ static void init_buffers(pool_t *pool)
~(page_size - 1));
if (last_page != first_page) {
skipped_blocks++;
- continue;
+ skip = 1;
}
}
if (pool->uarea_size)
@@ -310,8 +314,10 @@ static void init_buffers(pool_t *pool)
pool->tailroom];
/* Store buffer index into the global pool */
- ring_enq(ring, mask, i);
+ if (!skip)
+ ring_enq(ring, mask, i);
}
+ pool->skipped_blocks = skipped_blocks;
}
static bool shm_is_from_huge_pages(odp_shm_t shm)
@@ -445,6 +451,17 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params,
block_size = ROUNDUP_CACHE_LINE(hdr_size + align + headroom + seg_len +
tailroom);
+ /* Calculate extra space required for storing DPDK objects and mbuf
+ * headers. NOP if zero-copy is disabled. */
+ pool->block_offset = 0;
+ if (params->type == ODP_POOL_PACKET) {
+ block_size = _odp_dpdk_pool_obj_size(pool, block_size);
+ if (!block_size) {
+ ODP_ERR("Calculating DPDK mempool obj size failed\n");
+ return ODP_POOL_INVALID;
+ }
+ }
+
/* Allocate extra memory for skipping packet buffers which cross huge
* page boundaries. */
if (params->type == ODP_POOL_PACKET) {
@@ -506,6 +523,12 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params,
ring_init(&pool->ring->hdr);
init_buffers(pool);
+ /* Create zero-copy DPDK memory pool. NOP if zero-copy is disabled. */
+ if (params->type == ODP_POOL_PACKET && _odp_dpdk_pool_create(pool)) {
+ ODP_ERR("Creating DPDK packet pool failed\n");
+ goto error;
+ }
+
return pool->pool_hdl;
error:
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index 34c23440..23f39445 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -68,8 +68,6 @@
#if ODP_DPDK_ZERO_COPY
ODP_STATIC_ASSERT(CONFIG_PACKET_HEADROOM == RTE_PKTMBUF_HEADROOM,
"ODP and DPDK headroom sizes not matching!");
-ODP_STATIC_ASSERT(PKT_EXTRA_LEN >= sizeof(struct rte_mbuf),
- "DPDK rte_mbuf won't fit in odp_packet_hdr_t.extra!");
#endif
/* DPDK poll mode drivers requiring minimum RX burst size DPDK_MIN_RX_BURST */
@@ -81,6 +79,8 @@ ODP_STATIC_ASSERT(PKT_EXTRA_LEN >= sizeof(struct rte_mbuf),
#define DPDK_MBUF_BUF_SIZE RTE_MBUF_DEFAULT_BUF_SIZE
#define DPDK_MEMPOOL_CACHE_SIZE 64
+#define MBUF_OFFSET (ROUNDUP_CACHE_LINE(sizeof(struct rte_mbuf)))
+
ODP_STATIC_ASSERT((DPDK_NB_MBUF % DPDK_MEMPOOL_CACHE_SIZE == 0) &&
(DPDK_MEMPOOL_CACHE_SIZE <= RTE_MEMPOOL_CACHE_MAX_SIZE) &&
(DPDK_MEMPOOL_CACHE_SIZE <= DPDK_MBUF_BUF_SIZE * 10 / 15)
@@ -165,6 +165,8 @@ void refer_constructors(void)
}
#endif
+static int dpdk_pktio_init(void);
+
static int pool_alloc(struct rte_mempool *mp);
static int lookup_opt(const char *opt_name, const char *drv_name, int *val)
@@ -272,34 +274,39 @@ static inline void mbuf_update(struct rte_mbuf *mbuf, odp_packet_hdr_t *pkt_hdr,
}
/**
- * Initialize mbuf
- *
- * Called once per ODP packet.
+ * Initialize packet mbuf. Modified version of standard rte_pktmbuf_init()
+ * function.
*/
-static void mbuf_init(struct rte_mempool *mp, struct rte_mbuf *mbuf,
- odp_packet_hdr_t *pkt_hdr)
+static void pktmbuf_init(struct rte_mempool *mp, void *opaque_arg ODP_UNUSED,
+ void *_m, unsigned i ODP_UNUSED)
{
- void *buf_addr = pkt_hdr->buf_hdr.base_data - RTE_PKTMBUF_HEADROOM;
-
- memset(mbuf, 0, sizeof(struct rte_mbuf));
-
- mbuf->priv_size = 0;
- mbuf->buf_addr = buf_addr;
- mbuf->buf_physaddr = rte_mem_virt2phy(buf_addr);
- if (odp_unlikely(mbuf->buf_physaddr == RTE_BAD_PHYS_ADDR ||
- mbuf->buf_physaddr == 0))
- ODP_ABORT("Failed to map virt addr to phy");
-
- mbuf->buf_len = (uint16_t)rte_pktmbuf_data_room_size(mp);
- mbuf->data_off = RTE_PKTMBUF_HEADROOM;
- mbuf->pool = mp;
- mbuf->refcnt = 1;
- mbuf->nb_segs = 1;
- mbuf->port = 0xff;
-
- /* Store ODP packet handle inside rte_mbuf */
- mbuf->userdata = packet_handle(pkt_hdr);
- pkt_hdr->extra_type = PKT_EXTRA_TYPE_DPDK;
+ struct rte_mbuf *m = _m;
+ uint32_t mbuf_size, buf_len;
+ odp_packet_hdr_t *pkt_hdr;
+ void *buf_addr;
+
+ pkt_hdr = (odp_packet_hdr_t *)(uintptr_t)((uint8_t *)m + MBUF_OFFSET);
+ buf_addr = pkt_hdr->buf_hdr.base_data - RTE_PKTMBUF_HEADROOM;
+
+ mbuf_size = sizeof(struct rte_mbuf);
+ buf_len = rte_pktmbuf_data_room_size(mp);
+
+ memset(m, 0, mbuf_size);
+ m->priv_size = 0;
+ m->buf_addr = buf_addr;
+ m->buf_iova = rte_mem_virt2iova(buf_addr);
+ m->buf_len = (uint16_t)buf_len;
+ m->data_off = RTE_PKTMBUF_HEADROOM;
+
+ if (odp_unlikely(m->buf_iova == RTE_BAD_IOVA || m->buf_iova == 0))
+ ODP_ABORT("Failed to map virt addr to iova\n");
+
+ /* Init some constant fields */
+ m->pool = mp;
+ m->nb_segs = 1;
+ m->port = MBUF_INVALID_PORT;
+ rte_mbuf_refcnt_set(m, 1);
+ m->next = NULL;
}
/**
@@ -308,60 +315,87 @@ static void mbuf_init(struct rte_mempool *mp, struct rte_mbuf *mbuf,
static struct rte_mempool *mbuf_pool_create(const char *name,
pool_t *pool_entry)
{
- struct rte_mempool *mp;
+ struct rte_mempool *mp = NULL;
struct rte_pktmbuf_pool_private mbp_priv;
- unsigned elt_size;
- unsigned num;
- uint16_t data_room_size;
+ struct rte_mempool_objsz sz;
+ unsigned int elt_size = pool_entry->dpdk_elt_size;
+ unsigned int num = pool_entry->num;
+ uint32_t total_size;
if (!(pool_entry->mem_from_huge_pages)) {
ODP_ERR("DPDK requires memory is allocated from huge pages\n");
- return NULL;
+ goto fail;
}
- num = pool_entry->num;
- data_room_size = pool_entry->seg_len + CONFIG_PACKET_HEADROOM;
- elt_size = sizeof(struct rte_mbuf) + (unsigned)data_room_size;
- mbp_priv.mbuf_data_room_size = data_room_size;
- mbp_priv.mbuf_priv_size = 0;
+ total_size = rte_mempool_calc_obj_size(elt_size, MEMPOOL_F_NO_SPREAD,
+ &sz);
+ if (total_size != pool_entry->block_size) {
+ ODP_ERR("DPDK pool block size not matching to ODP pool: "
+ "%" PRIu32 "/%" PRIu32 "\n", total_size,
+ pool_entry->block_size);
+ goto fail;
+ }
- mp = rte_mempool_create_empty(name, num, elt_size, cache_size(num),
+ /* Skipped buffers have to be taken into account to populate pool
+ * properly. */
+ mp = rte_mempool_create_empty(name, num + pool_entry->skipped_blocks,
+ elt_size, cache_size(num),
sizeof(struct rte_pktmbuf_pool_private),
- rte_socket_id(), 0);
+ rte_socket_id(), MEMPOOL_F_NO_SPREAD);
if (mp == NULL) {
ODP_ERR("Failed to create empty DPDK packet pool\n");
- return NULL;
+ goto fail;
}
if (rte_mempool_set_ops_byname(mp, "odp_pool", pool_entry)) {
ODP_ERR("Failed setting mempool operations\n");
- return NULL;
+ goto fail;
}
+ mbp_priv.mbuf_data_room_size = pool_entry->seg_len;
+ mbp_priv.mbuf_priv_size = 0;
rte_pktmbuf_pool_init(mp, &mbp_priv);
if (pool_alloc(mp)) {
ODP_ERR("Failed allocating mempool\n");
- return NULL;
+ goto fail;
+ }
+
+ num = rte_mempool_populate_iova(mp, (char *)pool_entry->base_addr,
+ RTE_BAD_IOVA, pool_entry->shm_size,
+ NULL, NULL);
+ if (num <= 0) {
+ ODP_ERR("Failed to populate mempool: %d\n", num);
+ goto fail;
}
+ rte_mempool_obj_iter(mp, pktmbuf_init, NULL);
+
return mp;
+
+fail:
+ if (mp)
+ rte_mempool_free(mp);
+ return NULL;
}
/* DPDK external memory pool operations */
-static int pool_enqueue(struct rte_mempool *mp ODP_UNUSED,
+static int pool_enqueue(struct rte_mempool *mp,
void * const *obj_table, unsigned num)
{
odp_packet_t pkt_tbl[num];
+ pool_t *pool_entry = (pool_t *)mp->pool_config;
unsigned i;
- if (odp_unlikely(num == 0))
+ if (odp_unlikely(num == 0 || !pool_entry->pool_in_use))
return 0;
- for (i = 0; i < num; i++)
- pkt_tbl[i] = (odp_packet_t)((struct rte_mbuf *)
- obj_table[i])->userdata;
+ for (i = 0; i < num; i++) {
+ odp_packet_hdr_t *pkt_hdr = (odp_packet_hdr_t *)(uintptr_t)
+ ((uint8_t *)obj_table[i] + MBUF_OFFSET);
+ pkt_tbl[i] = packet_handle(pkt_hdr);
+ }
odp_packet_free_multi(pkt_tbl, num);
@@ -387,13 +421,10 @@ static int pool_dequeue_bulk(struct rte_mempool *mp, void **obj_table,
}
for (i = 0; i < pkts; i++) {
- odp_packet_t pkt = packet_tbl[i];
- odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
- struct rte_mbuf *mbuf = (struct rte_mbuf *)
- (uintptr_t)pkt_hdr->extra;
- if (pkt_hdr->extra_type != PKT_EXTRA_TYPE_DPDK)
- mbuf_init(mp, mbuf, pkt_hdr);
- obj_table[i] = mbuf;
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(packet_tbl[i]);
+
+ obj_table[i] = (struct rte_mbuf *)(uintptr_t)
+ ((uint8_t *)pkt_hdr - MBUF_OFFSET);
}
return 0;
@@ -438,21 +469,23 @@ static void pool_destroy(void *pool)
{
struct rte_mempool *mp = (struct rte_mempool *)pool;
- if (mp != NULL)
+ if (mp != NULL) {
+ pool_t *pool_entry = (pool_t *)mp->pool_config;
+
+ pool_entry->pool_in_use = 0;
rte_mempool_free(mp);
+ }
}
-static struct rte_mempool *pool_create(pool_t *pool)
+int _odp_dpdk_pool_create(pool_t *pool)
{
struct rte_mempool *pkt_pool;
char pool_name[RTE_MEMPOOL_NAMESIZE];
- odp_ticketlock_lock(&pool->lock);
+ if (!ODP_DPDK_ZERO_COPY)
+ return 0;
- if (pool->ext_desc != NULL) {
- odp_ticketlock_unlock(&pool->lock);
- return (struct rte_mempool *)pool->ext_desc;
- }
+ pool->pool_in_use = 0;
snprintf(pool_name, sizeof(pool_name),
"dpdk_pktpool_%" PRIu32 "_%" PRIu32 "", odp_global_ro.main_pid,
@@ -460,17 +493,41 @@ static struct rte_mempool *pool_create(pool_t *pool)
pkt_pool = mbuf_pool_create(pool_name, pool);
if (pkt_pool == NULL) {
- odp_ticketlock_unlock(&pool->lock);
ODP_ERR("Creating external DPDK pool failed\n");
- return NULL;
+ return -1;
}
pool->ext_desc = pkt_pool;
pool->ext_destroy = pool_destroy;
+ pool->pool_in_use = 1;
+
+ return 0;
+}
+
+uint32_t _odp_dpdk_pool_obj_size(pool_t *pool, uint32_t block_size)
+{
+ struct rte_mempool_objsz sz;
+ uint32_t total_size;
+
+ if (!ODP_DPDK_ZERO_COPY)
+ return block_size;
- odp_ticketlock_unlock(&pool->lock);
+ if (odp_global_rw->dpdk_initialized == 0) {
+ if (dpdk_pktio_init()) {
+ ODP_ERR("Initializing DPDK failed\n");
+ return 0;
+ }
+ odp_global_rw->dpdk_initialized = 1;
+ }
+
+ block_size += MBUF_OFFSET;
+ total_size = rte_mempool_calc_obj_size(block_size, MEMPOOL_F_NO_SPREAD,
+ &sz);
- return pkt_pool;
+ pool->dpdk_elt_size = sz.elt_size;
+ pool->block_offset = sz.header_size + MBUF_OFFSET;
+
+ return total_size;
}
static struct rte_mempool_ops ops_stack = {
@@ -748,7 +805,8 @@ fail:
static inline void prefetch_pkt(struct rte_mbuf *mbuf)
{
- odp_packet_hdr_t *pkt_hdr = mbuf->userdata;
+ odp_packet_hdr_t *pkt_hdr = (odp_packet_hdr_t *)(uintptr_t)
+ ((uint8_t *)mbuf + MBUF_OFFSET);
void *data = rte_pktmbuf_mtod(mbuf, char *);
odp_prefetch(pkt_hdr);
@@ -761,7 +819,6 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry,
struct rte_mbuf *mbuf_table[],
uint16_t mbuf_num, odp_time_t *ts)
{
- odp_packet_t pkt;
odp_packet_hdr_t *pkt_hdr;
uint16_t pkt_len;
struct rte_mbuf *mbuf;
@@ -799,8 +856,8 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry,
data = rte_pktmbuf_mtod(mbuf, char *);
pkt_len = rte_pktmbuf_pkt_len(mbuf);
- pkt = (odp_packet_t)mbuf->userdata;
- pkt_hdr = packet_hdr(pkt);
+ pkt_hdr = (odp_packet_hdr_t *)(uintptr_t)((uint8_t *)mbuf +
+ MBUF_OFFSET);
if (pktio_cls_enabled(pktio_entry)) {
packet_parse_reset(&parsed_hdr);
@@ -845,7 +902,7 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry,
packet_set_ts(pkt_hdr, ts);
- pkt_table[nb_pkts++] = pkt;
+ pkt_table[nb_pkts++] = packet_handle(pkt_hdr);
}
return nb_pkts;
@@ -866,45 +923,25 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry,
for (i = 0; i < num; i++) {
odp_packet_t pkt = pkt_table[i];
odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
- struct rte_mbuf *mbuf = (struct rte_mbuf *)
- (uintptr_t)pkt_hdr->extra;
+ struct rte_mbuf *mbuf = (struct rte_mbuf *)(uintptr_t)
+ ((uint8_t *)pkt_hdr - MBUF_OFFSET);
uint16_t pkt_len = odp_packet_len(pkt);
if (odp_unlikely(pkt_len > pkt_dpdk->mtu))
goto fail;
- if (odp_likely(pkt_hdr->buf_hdr.segcount == 1 &&
- pkt_hdr->extra_type == PKT_EXTRA_TYPE_DPDK)) {
+ if (odp_likely(pkt_hdr->buf_hdr.segcount == 1)) {
mbuf_update(mbuf, pkt_hdr, pkt_len);
if (odp_unlikely(pktio_entry->s.chksum_insert_ena))
pkt_set_ol_tx(pktout_cfg, pktout_capa, pkt_hdr,
mbuf, odp_packet_data(pkt));
} else {
- pool_t *pool_entry = pkt_hdr->buf_hdr.pool_ptr;
-
- if (odp_unlikely(pool_entry->ext_desc == NULL)) {
- if (pool_create(pool_entry) == NULL)
- ODP_ABORT("Creating DPDK pool failed");
- }
-
- if (pkt_hdr->buf_hdr.segcount != 1 ||
- !pool_entry->mem_from_huge_pages) {
- /* Fall back to packet copy */
- if (odp_unlikely(pkt_to_mbuf(pktio_entry, &mbuf,
- &pkt, 1) != 1))
- goto fail;
- (*copy_count)++;
-
- } else {
- mbuf_init((struct rte_mempool *)
- pool_entry->ext_desc, mbuf, pkt_hdr);
- mbuf_update(mbuf, pkt_hdr, pkt_len);
- if (pktio_entry->s.chksum_insert_ena)
- pkt_set_ol_tx(pktout_cfg, pktout_capa,
- pkt_hdr, mbuf,
- odp_packet_data(pkt));
- }
+ /* Fall back to packet copy */
+ if (odp_unlikely(pkt_to_mbuf(pktio_entry, &mbuf,
+ &pkt, 1) != 1))
+ goto fail;
+ (*copy_count)++;
}
mbuf_table[i] = mbuf;
}
@@ -1486,10 +1523,7 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED,
pkt_dpdk->min_rx_burst = 0;
if (ODP_DPDK_ZERO_COPY) {
- if (pool_entry->ext_desc != NULL)
- pkt_pool = (struct rte_mempool *)pool_entry->ext_desc;
- else
- pkt_pool = pool_create(pool_entry);
+ pkt_pool = (struct rte_mempool *)pool_entry->ext_desc;
} else {
snprintf(pool_name, sizeof(pool_name), "pktpool_%s", netdev);
/* Check if the pool exists already */
@@ -1879,4 +1913,27 @@ const pktio_if_ops_t dpdk_pktio_ops = {
.output_queues_config = dpdk_output_queues_config
};
+#else
+
+#include <stdint.h>
+
+#include <odp/api/hints.h>
+
+#include <odp_packet_dpdk.h>
+#include <odp_pool_internal.h>
+
+/*
+ * Dummy functions for pool_create()
+ */
+
+uint32_t _odp_dpdk_pool_obj_size(pool_t *pool ODP_UNUSED, uint32_t block_size)
+{
+ return block_size;
+}
+
+int _odp_dpdk_pool_create(pool_t *pool ODP_UNUSED)
+{
+ return 0;
+}
+
#endif /* ODP_PKTIO_DPDK */
commit 09affd4785c5817f14eb528940420d3831ab81de
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Oct 9 14:26:47 2018 +0300
linux-gen: dpdk: prefix visible internal parse functions with _odp_
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h
index d457cfa3..0dac296a 100644
--- a/platform/linux-generic/include/odp_packet_dpdk.h
+++ b/platform/linux-generic/include/odp_packet_dpdk.h
@@ -13,23 +13,24 @@ struct rte_mbuf;
/** Cache for storing packets */
/** Packet parser using DPDK interface */
-int dpdk_packet_parse_common(packet_parser_t *pkt_hdr,
- const uint8_t *ptr,
- uint32_t pkt_len,
- uint32_t seg_len,
- struct rte_mbuf *mbuf,
- int layer,
- odp_pktin_config_opt_t pktin_cfg);
+int _odp_dpdk_packet_parse_common(packet_parser_t *pkt_hdr,
+ const uint8_t *ptr,
+ uint32_t pkt_len,
+ uint32_t seg_len,
+ struct rte_mbuf *mbuf,
+ int layer,
+ odp_pktin_config_opt_t pktin_cfg);
-static inline int dpdk_packet_parse_layer(odp_packet_hdr_t *pkt_hdr,
- struct rte_mbuf *mbuf,
- odp_pktio_parser_layer_t layer,
- odp_pktin_config_opt_t pktin_cfg)
+static inline int _odp_dpdk_packet_parse_layer(odp_packet_hdr_t *pkt_hdr,
+ struct rte_mbuf *mbuf,
+ odp_pktio_parser_layer_t layer,
+ odp_pktin_config_opt_t pktin_cfg)
{
uint32_t seg_len = pkt_hdr->buf_hdr.seg[0].len;
void *base = pkt_hdr->buf_hdr.seg[0].data;
- return dpdk_packet_parse_common(&pkt_hdr->p, base, pkt_hdr->frame_len,
- seg_len, mbuf, layer, pktin_cfg);
+ return _odp_dpdk_packet_parse_common(&pkt_hdr->p, base,
+ pkt_hdr->frame_len, seg_len, mbuf,
+ layer, pktin_cfg);
}
#endif
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index 3e34b247..34c23440 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -530,10 +530,11 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry,
if (pktio_cls_enabled(pktio_entry)) {
packet_parse_reset(&parsed_hdr);
packet_set_len(&parsed_hdr, pkt_len);
- if (dpdk_packet_parse_common(&parsed_hdr.p, data,
- pkt_len, pkt_len, mbuf,
- ODP_PROTO_LAYER_ALL,
- pktin_cfg)) {
+ if (_odp_dpdk_packet_parse_common(&parsed_hdr.p, data,
+ pkt_len, pkt_len,
+ mbuf,
+ ODP_PROTO_LAYER_ALL,
+ pktin_cfg)) {
odp_packet_free(pkt_table[i]);
rte_pktmbuf_free(mbuf);
continue;
@@ -557,8 +558,9 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry,
if (pktio_cls_enabled(pktio_entry))
copy_packet_cls_metadata(&parsed_hdr, pkt_hdr);
else if (parse_layer != ODP_PROTO_LAYER_NONE)
- if (dpdk_packet_parse_layer(pkt_hdr, mbuf, parse_layer,
- pktin_cfg)) {
+ if (_odp_dpdk_packet_parse_layer(pkt_hdr, mbuf,
+ parse_layer,
+ pktin_cfg)) {
odp_packet_free(pkt);
rte_pktmbuf_free(mbuf);
continue;
@@ -803,10 +805,11 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry,
if (pktio_cls_enabled(pktio_entry)) {
packet_parse_reset(&parsed_hdr);
packet_set_len(&parsed_hdr, pkt_len);
- if (dpdk_packet_parse_common(&parsed_hdr.p, data,
- pkt_len, pkt_len, mbuf,
- ODP_PROTO_LAYER_ALL,
- pktin_cfg)) {
+ if (_odp_dpdk_packet_parse_common(&parsed_hdr.p, data,
+ pkt_len, pkt_len,
+ mbuf,
+ ODP_PROTO_LAYER_ALL,
+ pktin_cfg)) {
rte_pktmbuf_free(mbuf);
continue;
}
@@ -830,8 +833,9 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry,
if (pktio_cls_enabled(pktio_entry))
copy_packet_cls_metadata(&parsed_hdr, pkt_hdr);
else if (parse_layer != ODP_PROTO_LAYER_NONE)
- if (dpdk_packet_parse_layer(pkt_hdr, mbuf, parse_layer,
- pktin_cfg)) {
+ if (_odp_dpdk_packet_parse_layer(pkt_hdr, mbuf,
+ parse_layer,
+ pktin_cfg)) {
rte_pktmbuf_free(mbuf);
continue;
}
diff --git a/platform/linux-generic/pktio/dpdk_parse.c b/platform/linux-generic/pktio/dpdk_parse.c
index e9de0756..5f2b31d0 100644
--- a/platform/linux-generic/pktio/dpdk_parse.c
+++ b/platform/linux-generic/pktio/dpdk_parse.c
@@ -457,10 +457,10 @@ int dpdk_packet_parse_common_l3_l4(packet_parser_t *prs,
/**
* DPDK packet parser
*/
-int dpdk_packet_parse_common(packet_parser_t *prs, const uint8_t *ptr,
- uint32_t frame_len, uint32_t seg_len,
- struct rte_mbuf *mbuf, int layer,
- odp_pktin_config_opt_t pktin_cfg)
+int _odp_dpdk_packet_parse_common(packet_parser_t *prs, const uint8_t *ptr,
+ uint32_t frame_len, uint32_t seg_len,
+ struct rte_mbuf *mbuf, int layer,
+ odp_pktin_config_opt_t pktin_cfg)
{
uint32_t offset;
uint16_t ethtype;
commit 35265db49b1f5329deed85734cb94cac2cc44178
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Mon Oct 8 16:56:15 2018 +0300
linux-gen: dpdk: fix running multiple odp instances simulaneusly
Prefix DPDK packet pool names and huge page mappings with
PID to avoid name conflicts. Also, let DPDK detect process
type automatically.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index 578a94b0..3e34b247 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -455,7 +455,8 @@ static struct rte_mempool *pool_create(pool_t *pool)
}
snprintf(pool_name, sizeof(pool_name),
- "dpdk_pktpool_%" PRIu32 "", pool->pool_idx);
+ "dpdk_pktpool_%" PRIu32 "_%" PRIu32 "", odp_global_ro.main_pid,
+ pool->pool_idx);
pkt_pool = mbuf_pool_create(pool_name, pool);
if (pkt_pool == NULL) {
@@ -1174,15 +1175,17 @@ static int dpdk_pktio_init(void)
cmdline = "";
/* masklen includes the terminating null as well */
- cmd_len = strlen("odpdpdk -c --socket-mem ") + masklen +
- strlen(mem_str) + strlen(cmdline) + strlen(" ");
+ cmd_len = snprintf(NULL, 0, "odpdpdk --file-prefix %" PRIu32 "_ "
+ "--proc-type auto -c %s --socket-mem %s %s ",
+ odp_global_ro.main_pid, mask_str, mem_str, cmdline);
char full_cmd[cmd_len];
/* first argument is facility log, simply bind it to odpdpdk for now.*/
cmd_len = snprintf(full_cmd, cmd_len,
- "odpdpdk -c %s --socket-mem %s %s", mask_str,
- mem_str, cmdline);
+ "odpdpdk --file-prefix %" PRIu32 "_ "
+ "--proc-type auto -c %s --socket-mem %s %s ",
+ odp_global_ro.main_pid, mask_str, mem_str, cmdline);
for (i = 0, dpdk_argc = 1; i < cmd_len; ++i) {
if (isspace(full_cmd[i]))
commit ad7a654b1355f346e33834dd220535b07a4eef0e
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Wed Oct 10 11:28:04 2018 +0300
validation: packet: add packet reset test
Added test for odp_packet_reset().
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c
index a564c002..a6e44f45 100644
--- a/test/validation/api/packet/packet.c
+++ b/test/validation/api/packet/packet.c
@@ -31,7 +31,7 @@ static uint32_t packet_len;
static uint32_t segmented_packet_len;
static odp_bool_t segmentation_supported = true;
-odp_packet_t test_packet, segmented_test_packet;
+odp_packet_t test_packet, segmented_test_packet, test_reset_packet;
static struct udata_struct {
uint64_t u64;
@@ -213,11 +213,23 @@ static int packet_suite_init(void)
test_packet = odp_packet_alloc(packet_pool, packet_len);
+ if (test_packet == ODP_PACKET_INVALID) {
+ printf("test_packet alloc failed\n");
+ return -1;
+ }
+
for (i = 0; i < packet_len; i++) {
odp_packet_copy_from_mem(test_packet, i, 1, &data);
data++;
}
+ test_reset_packet = odp_packet_alloc(packet_pool, packet_len);
+
+ if (test_reset_packet == ODP_PACKET_INVALID) {
+ printf("test_reset_packet alloc failed\n");
+ return -1;
+ }
+
/* Try to allocate PACKET_POOL_NUM_SEG largest possible packets to see
* if segmentation is supported */
do {
@@ -278,6 +290,7 @@ static int packet_suite_init(void)
static int packet_suite_term(void)
{
odp_packet_free(test_packet);
+ odp_packet_free(test_reset_packet);
odp_packet_free(segmented_test_packet);
if (odp_pool_destroy(packet_pool_double_uarea) != 0 ||
@@ -658,6 +671,70 @@ static void packet_test_length(void)
CU_ASSERT(buf_len >= packet_len + headroom + tailroom);
}
+static void packet_test_reset(void)
+{
+ uint32_t len, headroom;
+ uintptr_t ptr_len;
+ void *data, *new_data, *tail, *new_tail;
+ odp_packet_t pkt = test_reset_packet;
+
+ len = odp_packet_len(pkt);
+ headroom = odp_packet_headroom(pkt);
+ CU_ASSERT(len > 1);
+
+ if (headroom) {
+ data = odp_packet_data(pkt);
+ new_data = odp_packet_push_head(pkt, 1);
+ CU_ASSERT(odp_packet_len(pkt) == len + 1);
+ CU_ASSERT((uintptr_t)new_data == ((uintptr_t)data - 1));
+ CU_ASSERT(odp_packet_headroom(pkt) == headroom - 1);
+ ptr_len = (uintptr_t)odp_packet_data(pkt) -
+ (uintptr_t)odp_packet_head(pkt);
+ CU_ASSERT(ptr_len == (headroom - 1));
+ CU_ASSERT(odp_packet_reset(pkt, len) == 0);
+ CU_ASSERT(odp_packet_len(pkt) == len);
+ CU_ASSERT(odp_packet_headroom(pkt) == headroom);
+ ptr_len = (uintptr_t)odp_packet_data(pkt) -
+ (uintptr_t)odp_packet_head(pkt);
+ CU_ASSERT(ptr_len == headroom);
+ }
+
+ data = odp_packet_data(pkt);
+ new_data = odp_packet_pull_head(pkt, 1);
+ CU_ASSERT(odp_packet_len(pkt) == len - 1);
+ CU_ASSERT((uintptr_t)new_data == ((uintptr_t)data + 1));
+ CU_ASSERT(odp_packet_headroom(pkt) == headroom + 1);
+ ptr_len = (uintptr_t)odp_packet_data(pkt) -
+ (uintptr_t)odp_packet_head(pkt);
+ CU_ASSERT(ptr_len == (headroom + 1));
+ CU_ASSERT(odp_packet_reset(pkt, len) == 0);
+ CU_ASSERT(odp_packet_len(pkt) == len);
+ CU_ASSERT(odp_packet_headroom(pkt) == headroom);
+ ptr_len = (uintptr_t)odp_packet_data(pkt) -
+ (uintptr_t)odp_packet_head(pkt);
+ CU_ASSERT(ptr_len == headroom);
+
+ tail = odp_packet_tail(pkt);
+ new_tail = odp_packet_pull_tail(pkt, 1);
+ CU_ASSERT(odp_packet_len(pkt) == len - 1);
+ CU_ASSERT((uintptr_t)new_tail == ((uintptr_t)tail - 1));
+ CU_ASSERT(odp_packet_reset(pkt, len) == 0);
+ CU_ASSERT(odp_packet_len(pkt) == len);
+
+ CU_ASSERT(odp_packet_has_udp(pkt) == 0);
+ odp_packet_has_udp_set(pkt, 1);
+ CU_ASSERT(odp_packet_has_udp(pkt) != 0);
+ CU_ASSERT(odp_packet_reset(pkt, len) == 0);
+ CU_ASSERT(odp_packet_has_udp(pkt) == 0);
+
+ CU_ASSERT(odp_packet_reset(pkt, len - 1) == 0);
+ CU_ASSERT(odp_packet_len(pkt) == (len - 1));
+
+ len = len - len / 2;
+ CU_ASSERT(odp_packet_reset(pkt, len) == 0);
+ CU_ASSERT(odp_packet_len(pkt) == len);
+}
+
static void packet_test_prefetch(void)
{
odp_packet_prefetch(test_packet, 0, odp_packet_len(test_packet));
@@ -3313,6 +3390,7 @@ odp_testinfo_t packet_suite[] = {
ODP_TEST_INFO(packet_test_debug),
ODP_TEST_INFO(packet_test_segments),
ODP_TEST_INFO(packet_test_length),
+ ODP_TEST_INFO(packet_test_reset),
ODP_TEST_INFO(packet_test_prefetch),
ODP_TEST_INFO(packet_test_headroom),
ODP_TEST_INFO(packet_test_tailroom),
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/include/odp_packet_dpdk.h | 45 ++-
.../linux-generic/include/odp_packet_internal.h | 8 -
platform/linux-generic/include/odp_pool_internal.h | 9 +-
platform/linux-generic/odp_pool.c | 29 +-
platform/linux-generic/pktio/dpdk.c | 304 +++++++++++++--------
platform/linux-generic/pktio/dpdk_parse.c | 8 +-
test/validation/api/packet/packet.c | 80 +++++-
7 files changed, 330 insertions(+), 153 deletions(-)
hooks/post-receive
--
6 years, 8 months
- 1
- 0
[COMMIT] branch master updated. v1.19.0.2_tigermoth-167-g577a58dd
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via 577a58dddef4824f709f00b602543bde3f440ac7 (commit)
via 0c6352e2d0f755c310692f5cf627801abf8ccb63 (commit)
via 71b674a18a4655ab17bb9ab851492f8c51a9b950 (commit)
via 3b11463dc8f9ce6bdb95490eeda933e6b6be3534 (commit)
via 23e4a06ea025492e33a9a0f759386133e9eef6ad (commit)
via 917a2bf7e8a41538f811889099738eb3979efc3a (commit)
via f60d82e96b995e10217ab40b6ad9f9cba3a6cadb (commit)
from 65f2959da164c4fed23b713c99842213c7ab04e1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 577a58dddef4824f709f00b602543bde3f440ac7
Author: Janne Peltonen <janne.peltonen(a)nokia.com>
Date: Tue Sep 25 13:00:51 2018 +0300
linux-gen: ipsec: make IPv4 ID allocator scale better to multiple threads
Allocate IPv4 ID to threads in blocks to avoid updating shared IPv4
ID variable for every packet. Keep free ID blocks in a ring to
maximize the time before reusing a block.
Signed-off-by: Janne Peltonen <janne.peltonen(a)nokia.com>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index 08e43993..fa0d7096 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -15,6 +15,7 @@
#include <odp_debug_internal.h>
#include <odp_ipsec_internal.h>
#include <odp_shm_internal.h>
+#include <odp_ring_mpmc_internal.h>
#include <odp/api/plat/atomic_inlines.h>
#include <odp/api/plat/cpu_inlines.h>
@@ -25,10 +26,33 @@
#define IPSEC_SA_STATE_FREE 0xc0000000
#define IPSEC_SA_STATE_RESERVED 0x80000000
+/*
+ * We do not have global IPv4 ID counter that is accessed for every outbound
+ * packet. Instead, we split IPv4 ID space to fixed size blocks that we
+ * allocate to threads on demand. When a thread has used its block of IDs,
+ * it frees it and allocates a new block. Free blocks are kept in a ring so
+ * that the block last freed is the one to be allocated last to maximize
+ * the time before IPv4 ID reuse.
+ */
+#define IPV4_ID_BLOCK_SIZE 64 /* must be power of 2 */
+#define IPV4_ID_RING_SIZE (UINT16_MAX / IPV4_ID_BLOCK_SIZE)
+#define IPV4_ID_RING_MASK (IPV4_ID_RING_SIZE - 1)
+
+#if IPV4_ID_RING_SIZE <= ODP_THREAD_COUNT_MAX
+#warning IPV4_ID_RING_SIZE is too small for the maximum number of threads.
+#endif
+
+typedef struct ODP_ALIGNED_CACHE ipsec_thread_local_s {
+ uint16_t first_ipv4_id; /* first ID of current block of IDs */
+ uint16_t next_ipv4_id; /* next ID to be used */
+} ipsec_thread_local_t;
+
typedef struct ipsec_sa_table_t {
ipsec_sa_t ipsec_sa[ODP_CONFIG_IPSEC_SAS];
+ ipsec_thread_local_t per_thread[ODP_THREAD_COUNT_MAX];
struct ODP_ALIGNED_CACHE {
- odp_atomic_u32_t ipv4_id;
+ ring_mpmc_t ipv4_id_ring;
+ uint32_t ODP_ALIGNED_CACHE ipv4_id_data[IPV4_ID_RING_SIZE];
} hot;
odp_shm_t shm;
} ipsec_sa_table_t;
@@ -71,7 +95,31 @@ int _odp_ipsec_sad_init_global(void)
ipsec_sa_tbl = odp_shm_addr(shm);
memset(ipsec_sa_tbl, 0, sizeof(ipsec_sa_table_t));
ipsec_sa_tbl->shm = shm;
- odp_atomic_init_u32(&ipsec_sa_tbl->hot.ipv4_id, 0);
+
+ ring_mpmc_init(&ipsec_sa_tbl->hot.ipv4_id_ring);
+ for (i = 0; i < ODP_THREAD_COUNT_MAX; i++) {
+ /*
+ * Make the current ID block fully used, forcing allocation
+ * of a fresh block at first use.
+ */
+ ipsec_sa_tbl->per_thread[i].first_ipv4_id = 0;
+ ipsec_sa_tbl->per_thread[i].next_ipv4_id = IPV4_ID_BLOCK_SIZE;
+ }
+ /*
+ * Initialize IPv4 ID ring with ID blocks.
+ *
+ * The last ID block is left unused since the ring can hold
+ * only IPV4_ID_RING_SIZE - 1 entries.
+ */
+ for (i = 0; i < IPV4_ID_RING_SIZE - 1; i++) {
+ uint32_t data = i * IPV4_ID_BLOCK_SIZE;
+
+ ring_mpmc_enq_multi(&ipsec_sa_tbl->hot.ipv4_id_ring,
+ ipsec_sa_tbl->hot.ipv4_id_data,
+ IPV4_ID_RING_MASK,
+ &data,
+ 1);
+ }
for (i = 0; i < ODP_CONFIG_IPSEC_SAS; i++) {
ipsec_sa_t *ipsec_sa = ipsec_sa_entry(i);
@@ -737,8 +785,28 @@ int _odp_ipsec_sa_replay_update(ipsec_sa_t *ipsec_sa, uint32_t seq,
uint16_t _odp_ipsec_sa_alloc_ipv4_id(ipsec_sa_t *ipsec_sa)
{
(void) ipsec_sa;
+ ipsec_thread_local_t *tl = &ipsec_sa_tbl->per_thread[odp_thread_id()];
+ uint32_t data;
+
+ if (odp_unlikely(tl->next_ipv4_id ==
+ tl->first_ipv4_id + IPV4_ID_BLOCK_SIZE)) {
+ /* Return used ID block to the ring */
+ data = tl->first_ipv4_id;
+ ring_mpmc_enq_multi(&ipsec_sa_tbl->hot.ipv4_id_ring,
+ ipsec_sa_tbl->hot.ipv4_id_data,
+ IPV4_ID_RING_MASK,
+ &data,
+ 1);
+ /* Get new ID block */
+ ring_mpmc_deq_multi(&ipsec_sa_tbl->hot.ipv4_id_ring,
+ ipsec_sa_tbl->hot.ipv4_id_data,
+ IPV4_ID_RING_MASK,
+ &data,
+ 1);
+ tl->first_ipv4_id = data;
+ tl->next_ipv4_id = data;
+ }
/* No need to convert to BE: ID just should not be duplicated */
- return odp_atomic_fetch_add_u32(&ipsec_sa_tbl->hot.ipv4_id, 1)
- & 0xffff;
+ return tl->next_ipv4_id++;
}
commit 0c6352e2d0f755c310692f5cf627801abf8ccb63
Author: Janne Peltonen <janne.peltonen(a)nokia.com>
Date: Mon Sep 24 11:29:19 2018 +0300
linux-gen: ipsec: use global IPv4 ID allocator for all tunnel SAs
Change the per-SA IPv4 ID allocator to a global one for IPsec to
reduce the risk of duplicate IPv4 IDs when there are multiple
SAs between the same endpoints.
Use zero IPv4 ID in atomic datagrams (RFC 6864).
Fixes: https://bugs.linaro.org/show_bug.cgi?id=4013
Signed-off-by: Janne Peltonen <janne.peltonen(a)nokia.com>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_ipsec_internal.h b/platform/linux-generic/include/odp_ipsec_internal.h
index d1185110..3d7d40a3 100644
--- a/platform/linux-generic/include/odp_ipsec_internal.h
+++ b/platform/linux-generic/include/odp_ipsec_internal.h
@@ -181,9 +181,6 @@ struct ipsec_sa_s {
odp_ipsec_ipv4_param_t param;
odp_u32be_t src_ip;
odp_u32be_t dst_ip;
-
- /* 32-bit from which low 16 are used */
- odp_atomic_u32_t hdr_id;
} tun_ipv4;
struct {
odp_ipsec_ipv6_param_t param;
@@ -273,6 +270,12 @@ int _odp_ipsec_sa_replay_precheck(ipsec_sa_t *ipsec_sa, uint32_t seq,
*/
int _odp_ipsec_sa_replay_update(ipsec_sa_t *ipsec_sa, uint32_t seq,
odp_ipsec_op_status_t *status);
+
+/**
+ * Allocate an IPv4 ID for an outgoing packet.
+ */
+uint16_t _odp_ipsec_sa_alloc_ipv4_id(ipsec_sa_t *ipsec_sa);
+
/**
* Try inline IPsec processing of provided packet.
*
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index b7368c5a..8430d707 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -872,14 +872,18 @@ static int ipsec_out_tunnel_ipv4(odp_packet_t *pkt,
state->ip_tot_len += _ODP_IPV4HDR_LEN;
out_ip.tot_len = odp_cpu_to_be_16(state->ip_tot_len);
- /* No need to convert to BE: ID just should not be duplicated */
- out_ip.id = odp_atomic_fetch_add_u32(&ipsec_sa->out.tun_ipv4.hdr_id,
- 1);
if (ipsec_sa->copy_df)
flags = state->out_tunnel.ip_df;
else
flags = ((uint16_t)ipv4_param->df) << 14;
out_ip.frag_offset = odp_cpu_to_be_16(flags);
+
+ /* Allocate unique IP ID only for non-atomic datagrams */
+ if (out_ip.frag_offset == 0)
+ out_ip.id = _odp_ipsec_sa_alloc_ipv4_id(ipsec_sa);
+ else
+ out_ip.id = 0;
+
out_ip.ttl = ipv4_param->ttl;
/* Will be filled later by packet checksum update */
out_ip.chksum = 0;
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index c33c1cc1..08e43993 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -27,6 +27,9 @@
typedef struct ipsec_sa_table_t {
ipsec_sa_t ipsec_sa[ODP_CONFIG_IPSEC_SAS];
+ struct ODP_ALIGNED_CACHE {
+ odp_atomic_u32_t ipv4_id;
+ } hot;
odp_shm_t shm;
} ipsec_sa_table_t;
@@ -68,6 +71,7 @@ int _odp_ipsec_sad_init_global(void)
ipsec_sa_tbl = odp_shm_addr(shm);
memset(ipsec_sa_tbl, 0, sizeof(ipsec_sa_table_t));
ipsec_sa_tbl->shm = shm;
+ odp_atomic_init_u32(&ipsec_sa_tbl->hot.ipv4_id, 0);
for (i = 0; i < ODP_CONFIG_IPSEC_SAS; i++) {
ipsec_sa_t *ipsec_sa = ipsec_sa_entry(i);
@@ -348,7 +352,6 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
memcpy(&ipsec_sa->out.tun_ipv4.dst_ip,
param->outbound.tunnel.ipv4.dst_addr,
sizeof(ipsec_sa->out.tun_ipv4.dst_ip));
- odp_atomic_init_u32(&ipsec_sa->out.tun_ipv4.hdr_id, 0);
ipsec_sa->out.tun_ipv4.param.src_addr =
&ipsec_sa->out.tun_ipv4.src_ip;
ipsec_sa->out.tun_ipv4.param.dst_addr =
@@ -730,3 +733,12 @@ int _odp_ipsec_sa_replay_update(ipsec_sa_t *ipsec_sa, uint32_t seq,
return 0;
}
+
+uint16_t _odp_ipsec_sa_alloc_ipv4_id(ipsec_sa_t *ipsec_sa)
+{
+ (void) ipsec_sa;
+
+ /* No need to convert to BE: ID just should not be duplicated */
+ return odp_atomic_fetch_add_u32(&ipsec_sa_tbl->hot.ipv4_id, 1)
+ & 0xffff;
+}
commit 71b674a18a4655ab17bb9ab851492f8c51a9b950
Author: Janne Peltonen <janne.peltonen(a)nokia.com>
Date: Mon Oct 8 10:50:22 2018 +0300
validation: ipsec: make output checking accept any IP ID value
ODP implementation is free to choose the IP ID value in the outbound
IP header. Make outbound validation check accept any IP ID value, not
just the one in the test vector. Relax packet check for AH packets
since IP ID is included in the ICV and the expected ICV cannot be
easily calculated in the current api validation code.
Fixes: https://bugs.linaro.org/show_bug.cgi?id=4017
Signed-off-by: Janne Peltonen <janne.peltonen(a)nokia.com>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index 31a6f9b5..b50a5ef9 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -9,6 +9,7 @@
#include <odp_api.h>
#include <odp_cunit_common.h>
#include <unistd.h>
+#include <odp/helper/odph_api.h>
#include "ipsec.h"
@@ -438,11 +439,14 @@ odp_packet_t ipsec_packet(const ipsec_test_packet *itp)
/*
* Compare packages ignoring everything before L3 header
*/
-static void ipsec_check_packet(const ipsec_test_packet *itp, odp_packet_t pkt)
+static void ipsec_check_packet(const ipsec_test_packet *itp, odp_packet_t pkt,
+ odp_bool_t is_outbound)
{
uint32_t len = (ODP_PACKET_INVALID == pkt) ? 1 : odp_packet_len(pkt);
uint32_t l3, l4;
uint8_t data[len];
+ const odph_ipv4hdr_t *itp_ip;
+ odph_ipv4hdr_t *ip;
if (NULL == itp)
return;
@@ -472,6 +476,38 @@ static void ipsec_check_packet(const ipsec_test_packet *itp, odp_packet_t pkt)
if (l4 - l3 != itp->l4_offset - itp->l3_offset)
return;
+ ip = (odph_ipv4hdr_t *) &data[l3];
+ itp_ip = (const odph_ipv4hdr_t *) &itp->data[itp->l3_offset];
+ if (ODPH_IPV4HDR_VER(ip->ver_ihl) == ODPH_IPV4 &&
+ is_outbound &&
+ ip->id != itp_ip->id) {
+ /*
+ * IP ID value chosen by the implementation differs
+ * from the IP value in our test vector. This requires
+ * special handling in outbound checks.
+ */
+ /*
+ * Let's change IP ID and header checksum to same values
+ * as in the test vector to facilitate packet comparison.
+ */
+ CU_ASSERT(odph_ipv4_csum_valid(pkt));
+ ip->id = itp_ip->id;
+ ip->chksum = itp_ip->chksum;
+
+ if (ip->proto == ODPH_IPPROTO_AH) {
+ /*
+ * ID field is included in the authentication so
+ * we cannot check ICV against our test vector.
+ * Check packet data before the first possible
+ * location of the AH ICV field.
+ */
+ CU_ASSERT_EQUAL(0, memcmp(data + l3,
+ itp->data + itp->l3_offset,
+ ODPH_IPV4HDR_LEN + 12));
+ return;
+ }
+ }
+
CU_ASSERT_EQUAL(0, memcmp(data + l3,
itp->data + itp->l3_offset,
len - l3));
@@ -701,7 +737,8 @@ void ipsec_check_in_one(const ipsec_test_part *part, odp_ipsec_sa_t sa)
odp_ipsec_sa_context(sa));
}
ipsec_check_packet(part->out[i].pkt_out,
- pkto[i]);
+ pkto[i],
+ false);
if (part->out[i].pkt_out != NULL &&
part->out[i].l3_type != _ODP_PROTO_L3_TYPE_UNDEF)
CU_ASSERT_EQUAL(part->out[i].l3_type,
@@ -746,7 +783,8 @@ void ipsec_check_out_one(const ipsec_test_part *part, odp_ipsec_sa_t sa)
odp_ipsec_sa_context(sa));
}
ipsec_check_packet(part->out[i].pkt_out,
- pkto[i]);
+ pkto[i],
+ true);
odp_packet_free(pkto[i]);
}
}
commit 3b11463dc8f9ce6bdb95490eeda933e6b6be3534
Author: Janne Peltonen <janne.peltonen(a)nokia.com>
Date: Wed Sep 19 14:52:33 2018 +0300
linux-gen: ipsec: use sequence number counter for counter based IV
Reduce frequently updated SA state by reusing 64-bit sequence number
as a counter based IV instead of having a separate counter for it.
Signed-off-by: Janne Peltonen <janne.peltonen(a)nokia.com>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_ipsec_internal.h b/platform/linux-generic/include/odp_ipsec_internal.h
index d9884f88..d1185110 100644
--- a/platform/linux-generic/include/odp_ipsec_internal.h
+++ b/platform/linux-generic/include/odp_ipsec_internal.h
@@ -109,8 +109,11 @@ struct ipsec_sa_s {
} in;
struct {
- odp_atomic_u64_t counter; /* for CTR/GCM */
- odp_atomic_u32_t seq;
+ /*
+ * 64-bit sequence number that is also used as
+ * CTR/GCM IV
+ */
+ odp_atomic_u64_t seq;
} out;
};
} hot;
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index 6a44277d..b7368c5a 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -811,9 +811,9 @@ err:
/* Generate sequence number */
static inline
-uint32_t ipsec_seq_no(ipsec_sa_t *ipsec_sa)
+uint64_t ipsec_seq_no(ipsec_sa_t *ipsec_sa)
{
- return odp_atomic_fetch_add_u32(&ipsec_sa->hot.out.seq, 1);
+ return odp_atomic_fetch_add_u64(&ipsec_sa->hot.out.seq, 1);
}
/* Helper for calculating encode length using data length and block size */
@@ -1002,22 +1002,19 @@ static int ipsec_random_data(uint8_t *data, uint32_t len)
}
static int ipsec_out_iv(ipsec_state_t *state,
- ipsec_sa_t *ipsec_sa)
+ ipsec_sa_t *ipsec_sa,
+ uint64_t seq_no)
{
if (ipsec_sa->use_counter_iv) {
- uint64_t ctr;
-
/* Both GCM and CTR use 8-bit counters */
- ODP_ASSERT(sizeof(ctr) == ipsec_sa->esp_iv_len);
+ ODP_ASSERT(sizeof(seq_no) == ipsec_sa->esp_iv_len);
- ctr = odp_atomic_fetch_add_u64(&ipsec_sa->hot.out.counter,
- 1);
/* Check for overrun */
- if (ctr == 0)
+ if (seq_no == 0)
return -1;
memcpy(state->iv, ipsec_sa->salt, ipsec_sa->salt_length);
- memcpy(state->iv + ipsec_sa->salt_length, &ctr,
+ memcpy(state->iv + ipsec_sa->salt_length, &seq_no,
ipsec_sa->esp_iv_len);
if (ipsec_sa->aes_ctr_iv) {
@@ -1056,6 +1053,7 @@ static int ipsec_out_esp(odp_packet_t *pkt,
unsigned trl_len;
unsigned pkt_len, new_len;
uint8_t proto = _ODP_IPPROTO_ESP;
+ uint64_t seq_no;
if (odp_unlikely(opt->flag.tfc_dummy)) {
ip_data_len = 0;
@@ -1089,7 +1087,9 @@ static int ipsec_out_esp(odp_packet_t *pkt,
return -1;
}
- if (ipsec_out_iv(state, ipsec_sa) < 0) {
+ seq_no = ipsec_seq_no(ipsec_sa);
+
+ if (ipsec_out_iv(state, ipsec_sa, seq_no) < 0) {
status->error.alg = 1;
return -1;
}
@@ -1099,7 +1099,7 @@ static int ipsec_out_esp(odp_packet_t *pkt,
memset(&esp, 0, sizeof(esp));
esp.spi = odp_cpu_to_be_32(ipsec_sa->spi);
- esp.seq_no = odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa));
+ esp.seq_no = odp_cpu_to_be_32(seq_no & 0xffffffff);
state->esp.aad.spi = esp.spi;
state->esp.aad.seq_no = esp.seq_no;
@@ -1221,15 +1221,18 @@ static int ipsec_out_ah(odp_packet_t *pkt,
ipsec_sa->icv_len;
uint16_t ipsec_offset = state->ip_offset + state->ip_hdr_len;
uint8_t proto = _ODP_IPPROTO_AH;
+ uint64_t seq_no;
if (state->ip_tot_len + hdr_len > mtu) {
status->error.mtu = 1;
return -1;
}
+ seq_no = ipsec_seq_no(ipsec_sa);
+
memset(&ah, 0, sizeof(ah));
ah.spi = odp_cpu_to_be_32(ipsec_sa->spi);
- ah.seq_no = odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa));
+ ah.seq_no = odp_cpu_to_be_32(seq_no & 0xffffffff);
ah.next_header = state->ip_next_hdr;
odp_packet_copy_from_mem(*pkt, state->ip_next_hdr_offset, 1, &proto);
@@ -1265,7 +1268,7 @@ static int ipsec_out_ah(odp_packet_t *pkt,
ah.ah_len = hdr_len / 4 - 2;
/* For GMAC */
- if (ipsec_out_iv(state, ipsec_sa) < 0) {
+ if (ipsec_out_iv(state, ipsec_sa, seq_no) < 0) {
status->error.alg = 1;
return -1;
}
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index 31a7ac92..c33c1cc1 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -321,7 +321,7 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
odp_atomic_init_u64(&ipsec_sa->hot.in.antireplay, 0);
} else {
ipsec_sa->lookup_mode = ODP_IPSEC_LOOKUP_DISABLED;
- odp_atomic_store_u32(&ipsec_sa->hot.out.seq, 1);
+ odp_atomic_store_u64(&ipsec_sa->hot.out.seq, 1);
ipsec_sa->out.frag_mode = param->outbound.frag_mode;
ipsec_sa->out.mtu = param->outbound.mtu;
}
@@ -470,10 +470,6 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
break;
}
- if (1 == ipsec_sa->use_counter_iv &&
- ODP_IPSEC_DIR_OUTBOUND == param->dir)
- odp_atomic_init_u64(&ipsec_sa->hot.out.counter, 1);
-
ipsec_sa->icv_len = crypto_param.auth_digest_len;
if (param->crypto.cipher_key_extra.length) {
commit 23e4a06ea025492e33a9a0f759386133e9eef6ad
Author: Janne Peltonen <janne.peltonen(a)nokia.com>
Date: Tue Sep 11 11:37:49 2018 +0300
linux-gen: ipsec: separate hot r/w data from r/o data in an SA
Group very frequently updated SA state together, separately from
read-only data to reduce false sharing of cache lines and resulting
cache missed (not done for tun_ipv4.hdr_id which should be removed).
Signed-off-by: Janne Peltonen <janne.peltonen(a)nokia.com>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_ipsec_internal.h b/platform/linux-generic/include/odp_ipsec_internal.h
index 4941fbba..d9884f88 100644
--- a/platform/linux-generic/include/odp_ipsec_internal.h
+++ b/platform/linux-generic/include/odp_ipsec_internal.h
@@ -94,6 +94,27 @@ int _odp_ipsec_status_send(odp_queue_t queue,
struct ipsec_sa_s {
odp_atomic_u32_t ODP_ALIGNED_CACHE state;
+ /*
+ * State that gets updated very frequently. Grouped separately
+ * to avoid false cache line sharing with other data.
+ */
+ struct ODP_ALIGNED_CACHE {
+ /* Statistics for soft/hard expiration */
+ odp_atomic_u64_t bytes;
+ odp_atomic_u64_t packets;
+
+ union {
+ struct {
+ odp_atomic_u64_t antireplay;
+ } in;
+
+ struct {
+ odp_atomic_u64_t counter; /* for CTR/GCM */
+ odp_atomic_u32_t seq;
+ } out;
+ };
+ } hot;
+
uint32_t ipsec_sa_idx;
odp_ipsec_sa_t ipsec_sa_hdl;
@@ -108,10 +129,6 @@ struct ipsec_sa_s {
uint64_t hard_limit_bytes;
uint64_t hard_limit_packets;
- /* Statistics for soft/hard expiration */
- odp_atomic_u64_t bytes;
- odp_atomic_u64_t packets;
-
odp_crypto_session_t session;
void *context;
odp_queue_t queue;
@@ -150,12 +167,9 @@ struct ipsec_sa_s {
odp_u32be_t lookup_dst_ipv4;
uint8_t lookup_dst_ipv6[_ODP_IPV6ADDR_LEN];
};
- odp_atomic_u64_t antireplay;
} in;
struct {
- odp_atomic_u64_t counter; /* for CTR/GCM */
- odp_atomic_u32_t seq;
odp_ipsec_frag_mode_t frag_mode;
uint32_t mtu;
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index a71efffe..6a44277d 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -813,7 +813,7 @@ err:
static inline
uint32_t ipsec_seq_no(ipsec_sa_t *ipsec_sa)
{
- return odp_atomic_fetch_add_u32(&ipsec_sa->out.seq, 1);
+ return odp_atomic_fetch_add_u32(&ipsec_sa->hot.out.seq, 1);
}
/* Helper for calculating encode length using data length and block size */
@@ -1010,7 +1010,7 @@ static int ipsec_out_iv(ipsec_state_t *state,
/* Both GCM and CTR use 8-bit counters */
ODP_ASSERT(sizeof(ctr) == ipsec_sa->esp_iv_len);
- ctr = odp_atomic_fetch_add_u64(&ipsec_sa->out.counter,
+ ctr = odp_atomic_fetch_add_u64(&ipsec_sa->hot.out.counter,
1);
/* Check for overrun */
if (ctr == 0)
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index aa1c337d..31a7ac92 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -75,8 +75,8 @@ int _odp_ipsec_sad_init_global(void)
ipsec_sa->ipsec_sa_hdl = ipsec_sa_index_to_handle(i);
ipsec_sa->ipsec_sa_idx = i;
odp_atomic_init_u32(&ipsec_sa->state, IPSEC_SA_STATE_FREE);
- odp_atomic_init_u64(&ipsec_sa->bytes, 0);
- odp_atomic_init_u64(&ipsec_sa->packets, 0);
+ odp_atomic_init_u64(&ipsec_sa->hot.bytes, 0);
+ odp_atomic_init_u64(&ipsec_sa->hot.packets, 0);
}
return 0;
@@ -318,10 +318,10 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
if (param->inbound.antireplay_ws > IPSEC_ANTIREPLAY_WS)
goto error;
ipsec_sa->antireplay = (param->inbound.antireplay_ws != 0);
- odp_atomic_init_u64(&ipsec_sa->in.antireplay, 0);
+ odp_atomic_init_u64(&ipsec_sa->hot.in.antireplay, 0);
} else {
ipsec_sa->lookup_mode = ODP_IPSEC_LOOKUP_DISABLED;
- odp_atomic_store_u32(&ipsec_sa->out.seq, 1);
+ odp_atomic_store_u32(&ipsec_sa->hot.out.seq, 1);
ipsec_sa->out.frag_mode = param->outbound.frag_mode;
ipsec_sa->out.mtu = param->outbound.mtu;
}
@@ -331,8 +331,8 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
ipsec_sa->copy_flabel = param->opt.copy_flabel;
ipsec_sa->udp_encap = param->opt.udp_encap;
- odp_atomic_store_u64(&ipsec_sa->bytes, 0);
- odp_atomic_store_u64(&ipsec_sa->packets, 0);
+ odp_atomic_store_u64(&ipsec_sa->hot.bytes, 0);
+ odp_atomic_store_u64(&ipsec_sa->hot.packets, 0);
ipsec_sa->soft_limit_bytes = param->lifetime.soft_limit.bytes;
ipsec_sa->soft_limit_packets = param->lifetime.soft_limit.packets;
ipsec_sa->hard_limit_bytes = param->lifetime.hard_limit.bytes;
@@ -472,7 +472,7 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
if (1 == ipsec_sa->use_counter_iv &&
ODP_IPSEC_DIR_OUTBOUND == param->dir)
- odp_atomic_init_u64(&ipsec_sa->out.counter, 1);
+ odp_atomic_init_u64(&ipsec_sa->hot.out.counter, 1);
ipsec_sa->icv_len = crypto_param.auth_digest_len;
@@ -636,13 +636,13 @@ int _odp_ipsec_sa_stats_precheck(ipsec_sa_t *ipsec_sa,
int rc = 0;
if (ipsec_sa->hard_limit_bytes > 0 &&
- odp_atomic_load_u64(&ipsec_sa->bytes) >
+ odp_atomic_load_u64(&ipsec_sa->hot.bytes) >
ipsec_sa->hard_limit_bytes) {
status->error.hard_exp_bytes = 1;
rc = -1;
}
if (ipsec_sa->hard_limit_packets > 0 &&
- odp_atomic_load_u64(&ipsec_sa->packets) >
+ odp_atomic_load_u64(&ipsec_sa->hot.packets) >
ipsec_sa->hard_limit_packets) {
status->error.hard_exp_packets = 1;
rc = -1;
@@ -654,8 +654,8 @@ int _odp_ipsec_sa_stats_precheck(ipsec_sa_t *ipsec_sa,
int _odp_ipsec_sa_stats_update(ipsec_sa_t *ipsec_sa, uint32_t len,
odp_ipsec_op_status_t *status)
{
- uint64_t bytes = odp_atomic_fetch_add_u64(&ipsec_sa->bytes, len) + len;
- uint64_t packets = odp_atomic_fetch_add_u64(&ipsec_sa->packets, 1) + 1;
+ uint64_t bytes = odp_atomic_fetch_add_u64(&ipsec_sa->hot.bytes, len) + len;
+ uint64_t packets = odp_atomic_fetch_add_u64(&ipsec_sa->hot.packets, 1) + 1;
int rc = 0;
if (ipsec_sa->soft_limit_bytes > 0 &&
@@ -686,7 +686,7 @@ int _odp_ipsec_sa_replay_precheck(ipsec_sa_t *ipsec_sa, uint32_t seq,
/* Try to be as quick as possible, we will discard packets later */
if (ipsec_sa->antireplay &&
seq + IPSEC_ANTIREPLAY_WS <=
- (odp_atomic_load_u64(&ipsec_sa->in.antireplay) & 0xffffffff)) {
+ (odp_atomic_load_u64(&ipsec_sa->hot.in.antireplay) & 0xffffffff)) {
status->error.antireplay = 1;
return -1;
}
@@ -703,7 +703,7 @@ int _odp_ipsec_sa_replay_update(ipsec_sa_t *ipsec_sa, uint32_t seq,
if (!ipsec_sa->antireplay)
return 0;
- state = odp_atomic_load_u64(&ipsec_sa->in.antireplay);
+ state = odp_atomic_load_u64(&ipsec_sa->hot.in.antireplay);
while (0 == cas) {
uint32_t max_seq = state & 0xffffffff;
@@ -728,7 +728,7 @@ int _odp_ipsec_sa_replay_update(ipsec_sa_t *ipsec_sa, uint32_t seq,
new_state = (((uint64_t)mask) << 32) | max_seq;
- cas = odp_atomic_cas_acq_rel_u64(&ipsec_sa->in.antireplay,
+ cas = odp_atomic_cas_acq_rel_u64(&ipsec_sa->hot.in.antireplay,
&state, new_state);
}
commit 917a2bf7e8a41538f811889099738eb3979efc3a
Author: Janne Peltonen <janne.peltonen(a)nokia.com>
Date: Mon Sep 17 14:55:53 2018 +0300
linux-gen: ipsec: remove SA reference counting from outbound processing
SA reference counting in IPsec output has severe performance penalty
when the same SA is used in multiple threads. Remove SA reference
counting from odp_ipsec_out() and odp_ipsec_out_enq() as it is
actually unnecessary with applications adhering to the ODP API.
The reference counting would prevent odp_ipsec_sa_disable() from
completing if IPsec outbound processing for the same SA were still
in progress in some other thread. With a correctly behaving ODP
application such situation never occurs because the ODP API requires
that odp_ipsec_sa_disable() must not be called at the same time as
odp_ipsec_out() or odp_ipsec_out_enq() for the same SA. The disable
call must thus happen after (in the C11 thread model sense, including
memory ordering) any conflicting IPsec output call, which means that
the ODP application must use appropriate synchronization mechanisms to
ensure that all odp_ipsec_out()/odp_ipsec_out_enc() calls (for the SA)
have completed before odp_ipsec_sa_disable() is called.
Similarly, when an SA is created, the handle must not be used in
other threads for output before the creation is complete and visible.
This means that an ODP application must use proper synchronization
mechanism when passing the handle of a newly created SA to another
thread and before using it there. This in turns make the SA state
check in ipsec_sa_lock() unnecessary when indirectly called through
the IPsec output routines.
Signed-off-by: Janne Peltonen <janne.peltonen(a)nokia.com>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_ipsec_internal.h b/platform/linux-generic/include/odp_ipsec_internal.h
index dfde4d57..4941fbba 100644
--- a/platform/linux-generic/include/odp_ipsec_internal.h
+++ b/platform/linux-generic/include/odp_ipsec_internal.h
@@ -207,6 +207,11 @@ uint32_t _odp_ipsec_cipher_iv_len(odp_cipher_alg_t cipher);
/* Return digest length required for the cipher for IPsec use */
uint32_t _odp_ipsec_auth_digest_len(odp_auth_alg_t auth);
+/*
+ * Get SA entry from handle without obtaining a reference
+ */
+ipsec_sa_t *_odp_ipsec_sa_entry_from_hdl(odp_ipsec_sa_t sa);
+
/**
* Obtain SA reference
*/
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index a62266ec..a71efffe 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -1380,7 +1380,14 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
odp_ipsec_frag_mode_t frag_mode;
uint32_t mtu;
- ipsec_sa = _odp_ipsec_sa_use(sa);
+ /*
+ * No need to do _odp_ipsec_sa_use() here since an ODP application
+ * is not allowed to do call IPsec output before SA creation has
+ * completed nor call odp_ipsec_sa_disable() before IPsec output
+ * has completed. IOW, the needed sychronization between threads
+ * is done by the application.
+ */
+ ipsec_sa = _odp_ipsec_sa_entry_from_hdl(sa);
ODP_ASSERT(NULL != ipsec_sa);
if (opt->flag.tfc_dummy) {
@@ -1482,6 +1489,18 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
param.session = ipsec_sa->session;
+ /*
+ * NOTE: Do not change to an asynchronous design without thinking
+ * concurrency and what changes are required to guarantee that
+ * used SAs are not destroyed when asynchronous operations are in
+ * progress.
+ *
+ * The containing code does not hold a reference to the SA but
+ * completes outbound processing synchronously and makes use of
+ * the fact that the application may not disable (and then destroy)
+ * the SA before this output routine returns (and all its side
+ * effects are visible to the disabling thread).
+ */
rc = odp_crypto_op(&pkt, &pkt, ¶m, 1);
if (rc < 0) {
ODP_DBG("Crypto failed\n");
@@ -1632,9 +1651,6 @@ int odp_ipsec_out(const odp_packet_t pkt_in[], int num_in,
out_pkt++;
sa_idx += sa_inc;
opt_idx += opt_inc;
-
- /* Last thing */
- _odp_ipsec_sa_unuse(ipsec_sa);
}
*num_out = out_pkt;
@@ -1742,9 +1758,6 @@ int odp_ipsec_out_enq(const odp_packet_t pkt_in[], int num_in,
in_pkt++;
sa_idx += sa_inc;
opt_idx += opt_inc;
-
- /* Last thing */
- _odp_ipsec_sa_unuse(ipsec_sa);
}
return in_pkt;
@@ -1884,9 +1897,6 @@ err:
in_pkt++;
sa_idx += sa_inc;
opt_idx += opt_inc;
-
- /* Last thing */
- _odp_ipsec_sa_unuse(ipsec_sa);
}
return in_pkt;
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index 6dd7ec71..aa1c337d 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -47,6 +47,12 @@ static inline odp_ipsec_sa_t ipsec_sa_index_to_handle(uint32_t ipsec_sa_idx)
return _odp_cast_scalar(odp_ipsec_sa_t, ipsec_sa_idx + 1);
}
+ipsec_sa_t *_odp_ipsec_sa_entry_from_hdl(odp_ipsec_sa_t sa)
+{
+ ODP_ASSERT(ODP_IPSEC_SA_INVALID != sa);
+ return ipsec_sa_entry_from_hdl(sa);
+}
+
int _odp_ipsec_sad_init_global(void)
{
odp_shm_t shm;
commit f60d82e96b995e10217ab40b6ad9f9cba3a6cadb
Author: Janne Peltonen <janne.peltonen(a)nokia.com>
Date: Fri Sep 7 13:14:03 2018 +0300
linux-gen: ipsec: speed up random IV generation by thread-local buffering
Outbound IPsec processing for SAs that require random IV is slow
since the the OpenSSL based odp_random_data() is slow and not
multi-thread scalable.
Improve performance by not calling odp_random_data() for every packet
but by getting random data for IVs from a thread local buffer that is
filled by less frequent but larger odp_random_data requests.
Signed-off-by: Janne Peltonen <janne.peltonen(a)nokia.com>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index 63121744..a62266ec 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -976,6 +976,31 @@ static int ipsec_out_tunnel_ipv6(odp_packet_t *pkt,
return 0;
}
+#define IPSEC_RANDOM_BUF_SIZE 256
+
+static int ipsec_random_data(uint8_t *data, uint32_t len)
+{
+ static __thread uint8_t buffer[IPSEC_RANDOM_BUF_SIZE];
+ static __thread uint32_t buffer_used = IPSEC_RANDOM_BUF_SIZE;
+
+ if (odp_likely(buffer_used + len <= IPSEC_RANDOM_BUF_SIZE)) {
+ memcpy(data, &buffer[buffer_used], len);
+ buffer_used += len;
+ } else if (odp_likely(len <= IPSEC_RANDOM_BUF_SIZE)) {
+ uint32_t rnd_len;
+
+ rnd_len = odp_random_data(buffer, IPSEC_RANDOM_BUF_SIZE,
+ odp_global_ro.ipsec_rand_kind);
+ if (odp_unlikely(rnd_len != IPSEC_RANDOM_BUF_SIZE))
+ return -1;
+ memcpy(data, &buffer[0], len);
+ buffer_used = len;
+ } else {
+ return -1;
+ }
+ return 0;
+}
+
static int ipsec_out_iv(ipsec_state_t *state,
ipsec_sa_t *ipsec_sa)
{
@@ -1002,12 +1027,7 @@ static int ipsec_out_iv(ipsec_state_t *state,
state->iv[15] = 1;
}
} else if (ipsec_sa->esp_iv_len) {
- uint32_t len;
-
- len = odp_random_data(state->iv, ipsec_sa->esp_iv_len,
- odp_global_ro.ipsec_rand_kind);
-
- if (len != ipsec_sa->esp_iv_len)
+ if (ipsec_random_data(state->iv, ipsec_sa->esp_iv_len))
return -1;
}
-----------------------------------------------------------------------
Summary of changes:
.../linux-generic/include/odp_ipsec_internal.h | 45 ++++++--
platform/linux-generic/odp_ipsec.c | 103 ++++++++++++------
platform/linux-generic/odp_ipsec_sad.c | 118 +++++++++++++++++----
test/validation/api/ipsec/ipsec.c | 44 +++++++-
4 files changed, 246 insertions(+), 64 deletions(-)
hooks/post-receive
--
6 years, 8 months
- 1
- 0
[COMMIT] branch master updated. v1.19.0.2_tigermoth-160-g65f2959d
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via 65f2959da164c4fed23b713c99842213c7ab04e1 (commit)
via 1d5c2ffab0051390641628a458f657c49ea54d41 (commit)
via 406054d9c9ce31990d59640aa5d3dfd49e2d1e9d (commit)
via b7da3cd005ab576b55e066ffa854697f41bb6f82 (commit)
via a7f23e35b596dada847205235821336e9e8d7166 (commit)
via 0db006b5ea8fb6c760a4e48a5dd953b65d1895fc (commit)
via d966e0e452517e1e0a29ca59b892f6685d560c78 (commit)
via 2dd51f19e1d9c84fd09962ad2d134c376b46c45f (commit)
via d46c341e321cb5085d5577dd5fb8ca0b3f7ba554 (commit)
via 21f383e9fa9f0f0c127dbb251e08ae91da56d817 (commit)
from f6b06ba4ef87d2c62fe47fe8ffe4e240b37c8fc1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 65f2959da164c4fed23b713c99842213c7ab04e1
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Thu Sep 13 22:15:53 2018 +0300
linux-gen: do not use huge pages for internal allocations
Some linux-generic internal shared memory allocations have
to be in normal pages due to small required data. Relaying
on odp_sys_huge_page_size() is not really correct, because
call returns default huge page size. But default huge page
size is definned in kernel boot parameter as:
default_hugepagesz=1G hugepagesz=1G hugepages=2
So in that case for small allocation linux-gen will create 1GB
huge page. This patch introduces internal flag to shm funtion
to allocate hp.
This patch remains allowing changes on top of it:
For now pools are in huge page. And for apps with small pool it's
big overhead of unused memory. We should take into account
odp_sys_huge_page_size_all() call and found best sized huge pages.
https://bugs.linaro.org/show_bug.cgi?id=3954
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_shm_internal.h b/platform/linux-generic/include/odp_shm_internal.h
index a835b8f3..9827af75 100644
--- a/platform/linux-generic/include/odp_shm_internal.h
+++ b/platform/linux-generic/include/odp_shm_internal.h
@@ -16,8 +16,9 @@ extern "C" {
#define SHM_DEVNAME_MAXLEN (ODP_SHM_NAME_LEN + 16)
#define SHM_DEVNAME_FORMAT "/odp-%d-%s" /* /dev/shm/odp-<pid>-<name> */
-#define _ODP_SHM_PROC_NOCREAT 0x40 /**< Do not create shm if not exist */
-#define _ODP_SHM_O_EXCL 0x80 /**< Do not create shm if exist */
+#define _ODP_SHM_PROC_NOCREAT (1 << 6) /**< Do not create shm if not exist */
+#define _ODP_SHM_O_EXCL (1 << 7) /**< Do not create shm if exist */
+#define _ODP_SHM_NO_HP (1 << 8) /**< Do not use huge pages */
#ifdef __cplusplus
}
diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c
index d02fb507..901b5044 100644
--- a/platform/linux-generic/odp_classification.c
+++ b/platform/linux-generic/odp_classification.c
@@ -11,6 +11,7 @@
#include <odp/api/queue.h>
#include <odp/api/debug.h>
#include <odp_init_internal.h>
+#include <odp_shm_internal.h>
#include <odp_debug_internal.h>
#include <odp_packet_internal.h>
#include <odp/api/packet_io.h>
@@ -84,9 +85,10 @@ int odp_classification_init_global(void)
odp_shm_t queue_grp_shm;
int i;
- cos_shm = odp_shm_reserve("shm_odp_cos_tbl",
+ cos_shm = odp_shm_reserve("_odp_shm_odp_cos_tbl",
sizeof(cos_tbl_t),
- sizeof(cos_t), 0);
+ sizeof(cos_t),
+ _ODP_SHM_NO_HP);
if (cos_shm == ODP_SHM_INVALID) {
ODP_ERR("shm allocation failed for shm_odp_cos_tbl");
@@ -104,9 +106,10 @@ int odp_classification_init_global(void)
LOCK_INIT(&cos->s.lock);
}
- pmr_shm = odp_shm_reserve("shm_odp_pmr_tbl",
+ pmr_shm = odp_shm_reserve("_odp_shm_odp_pmr_tbl",
sizeof(pmr_tbl_t),
- sizeof(pmr_t), 0);
+ sizeof(pmr_t),
+ _ODP_SHM_NO_HP);
if (pmr_shm == ODP_SHM_INVALID) {
ODP_ERR("shm allocation failed for shm_odp_pmr_tbl");
@@ -124,9 +127,10 @@ int odp_classification_init_global(void)
LOCK_INIT(&pmr->s.lock);
}
- queue_grp_shm = odp_shm_reserve("shm_odp_cls_queue_grp_tbl",
+ queue_grp_shm = odp_shm_reserve("_odp_shm_cls_queue_grp_tbl",
sizeof(_cls_queue_grp_tbl_t),
- sizeof(queue_entry_t *), 0);
+ sizeof(queue_entry_t *),
+ _ODP_SHM_NO_HP);
if (queue_grp_shm == ODP_SHM_INVALID) {
ODP_ERR("shm allocation failed for queue_grp_tbl");
@@ -153,19 +157,19 @@ int odp_classification_term_global(void)
int ret = 0;
int rc = 0;
- ret = odp_shm_free(odp_shm_lookup("shm_odp_cos_tbl"));
+ ret = odp_shm_free(odp_shm_lookup("_odp_shm_odp_cos_tbl"));
if (ret < 0) {
ODP_ERR("shm free failed for shm_odp_cos_tbl");
rc = -1;
}
- ret = odp_shm_free(odp_shm_lookup("shm_odp_pmr_tbl"));
+ ret = odp_shm_free(odp_shm_lookup("_odp_shm_odp_pmr_tbl"));
if (ret < 0) {
ODP_ERR("shm free failed for shm_odp_pmr_tbl");
rc = -1;
}
- ret = odp_shm_free(odp_shm_lookup("shm_odp_cls_queue_grp_tbl"));
+ ret = odp_shm_free(odp_shm_lookup("_odp_shm_cls_queue_grp_tbl"));
if (ret < 0) {
ODP_ERR("shm free failed for shm_odp_cls_queue_grp_tbl");
rc = -1;
diff --git a/platform/linux-generic/odp_crypto_null.c b/platform/linux-generic/odp_crypto_null.c
index 13aae9bc..939b2fbb 100644
--- a/platform/linux-generic/odp_crypto_null.c
+++ b/platform/linux-generic/odp_crypto_null.c
@@ -21,6 +21,7 @@
#include <odp/api/plat/thread_inlines.h>
#include <odp_packet_internal.h>
#include <odp/api/plat/queue_inlines.h>
+#include <odp_shm_internal.h>
/* Inlined API functions */
#include <odp/api/plat/event_inlines.h>
@@ -316,8 +317,9 @@ odp_crypto_init_global(void)
mem_size = sizeof(odp_crypto_global_t);
/* Allocate our globally shared memory */
- shm = odp_shm_reserve("crypto_pool", mem_size,
- ODP_CACHE_LINE_SIZE, 0);
+ shm = odp_shm_reserve("_odp_crypto_pool_null", mem_size,
+ ODP_CACHE_LINE_SIZE,
+ _ODP_SHM_NO_HP);
if (ODP_SHM_INVALID == shm) {
ODP_ERR("unable to allocate crypto pool\n");
return -1;
@@ -352,9 +354,9 @@ int odp_crypto_term_global(void)
rc = -1;
}
- ret = odp_shm_free(odp_shm_lookup("crypto_pool"));
+ ret = odp_shm_free(odp_shm_lookup("_odp_crypto_pool_null"));
if (ret < 0) {
- ODP_ERR("shm free failed for crypto_pool\n");
+ ODP_ERR("shm free failed for _odp_crypto_pool_null\n");
rc = -1;
}
diff --git a/platform/linux-generic/odp_crypto_openssl.c b/platform/linux-generic/odp_crypto_openssl.c
index d98c87b0..ec3e85bf 100644
--- a/platform/linux-generic/odp_crypto_openssl.c
+++ b/platform/linux-generic/odp_crypto_openssl.c
@@ -21,6 +21,7 @@
#include <odp/api/plat/thread_inlines.h>
#include <odp_packet_internal.h>
#include <odp/api/plat/queue_inlines.h>
+#include <odp_shm_internal.h>
/* Inlined API functions */
#include <odp/api/plat/event_inlines.h>
@@ -1856,8 +1857,9 @@ odp_crypto_init_global(void)
mem_size += nlocks * sizeof(odp_ticketlock_t);
/* Allocate our globally shared memory */
- shm = odp_shm_reserve("crypto_pool", mem_size,
- ODP_CACHE_LINE_SIZE, 0);
+ shm = odp_shm_reserve("_odp_crypto_pool_ssl", mem_size,
+ ODP_CACHE_LINE_SIZE,
+ _ODP_SHM_NO_HP);
if (ODP_SHM_INVALID == shm) {
ODP_ERR("unable to allocate crypto pool\n");
return -1;
@@ -1903,7 +1905,7 @@ int odp_crypto_term_global(void)
CRYPTO_set_locking_callback(NULL);
CRYPTO_set_id_callback(NULL);
- ret = odp_shm_free(odp_shm_lookup("crypto_pool"));
+ ret = odp_shm_free(odp_shm_lookup("_odp_crypto_pool_ssl"));
if (ret < 0) {
ODP_ERR("shm free failed for crypto_pool\n");
rc = -1;
diff --git a/platform/linux-generic/odp_ipsec_events.c b/platform/linux-generic/odp_ipsec_events.c
index ea9ce961..c1d153c0 100644
--- a/platform/linux-generic/odp_ipsec_events.c
+++ b/platform/linux-generic/odp_ipsec_events.c
@@ -41,7 +41,7 @@ int _odp_ipsec_events_init_global(void)
param.buf.num = IPSEC_EVENTS_POOL_BUF_COUNT;
param.type = ODP_POOL_BUFFER;
- ipsec_status_pool = odp_pool_create("ipsec_status_pool", ¶m);
+ ipsec_status_pool = odp_pool_create("_odp_ipsec_status_pool", ¶m);
if (ODP_POOL_INVALID == ipsec_status_pool) {
ODP_ERR("Error: status pool create failed.\n");
goto err_status;
@@ -55,16 +55,15 @@ err_status:
int _odp_ipsec_events_term_global(void)
{
- int ret = 0;
- int rc = 0;
+ int ret;
ret = odp_pool_destroy(ipsec_status_pool);
if (ret < 0) {
ODP_ERR("status pool destroy failed");
- rc = -1;
+ return -1;
}
- return rc;
+ return 0;
}
ipsec_status_t _odp_ipsec_status_from_event(odp_event_t ev)
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index 5557e314..6dd7ec71 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -14,6 +14,7 @@
#include <odp_init_internal.h>
#include <odp_debug_internal.h>
#include <odp_ipsec_internal.h>
+#include <odp_shm_internal.h>
#include <odp/api/plat/atomic_inlines.h>
#include <odp/api/plat/cpu_inlines.h>
@@ -51,14 +52,14 @@ int _odp_ipsec_sad_init_global(void)
odp_shm_t shm;
unsigned i;
- shm = odp_shm_reserve("ipsec_sa_table",
+ shm = odp_shm_reserve("_odp_ipsec_sa_table",
sizeof(ipsec_sa_table_t),
- ODP_CACHE_LINE_SIZE, 0);
-
- ipsec_sa_tbl = odp_shm_addr(shm);
- if (ipsec_sa_tbl == NULL)
+ ODP_CACHE_LINE_SIZE,
+ _ODP_SHM_NO_HP);
+ if (shm == ODP_SHM_INVALID)
return -1;
+ ipsec_sa_tbl = odp_shm_addr(shm);
memset(ipsec_sa_tbl, 0, sizeof(ipsec_sa_table_t));
ipsec_sa_tbl->shm = shm;
diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c
index 1a4ca947..cf37bd9b 100644
--- a/platform/linux-generic/odp_ishm.c
+++ b/platform/linux-generic/odp_ishm.c
@@ -1036,7 +1036,8 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd,
/* Get system page sizes: page_hp_size is 0 if no huge page available*/
page_sz = odp_sys_page_size();
- page_hp_size = odp_sys_huge_page_size();
+ page_hp_size = user_flags & _ODP_SHM_NO_HP ?
+ 0 : odp_sys_huge_page_size();
/* grab a new entry: */
for (new_index = 0; new_index < ISHM_MAX_NB_BLOCKS; new_index++) {
diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c
index 91efba1a..26be844c 100644
--- a/platform/linux-generic/odp_packet_io.c
+++ b/platform/linux-generic/odp_packet_io.c
@@ -29,6 +29,7 @@
#include <odp/api/plat/time_inlines.h>
#include <odp_pcapng.h>
#include <odp/api/plat/queue_inlines.h>
+#include <odp_shm_internal.h>
#include <string.h>
#include <inttypes.h>
@@ -65,9 +66,10 @@ int odp_pktio_init_global(void)
odp_shm_t shm;
int pktio_if;
- shm = odp_shm_reserve("odp_pktio_entries",
+ shm = odp_shm_reserve("_odp_pktio_entries",
sizeof(pktio_table_t),
- sizeof(pktio_entry_t), 0);
+ sizeof(pktio_entry_t),
+ _ODP_SHM_NO_HP);
if (shm == ODP_SHM_INVALID)
return -1;
@@ -1326,9 +1328,9 @@ int odp_pktio_term_global(void)
pktio_if);
}
- ret = odp_shm_free(odp_shm_lookup("odp_pktio_entries"));
+ ret = odp_shm_free(odp_shm_lookup("_odp_pktio_entries"));
if (ret != 0)
- ODP_ERR("shm free failed for odp_pktio_entries");
+ ODP_ERR("shm free failed for _odp_pktio_entries");
return ret;
}
diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c
index bb6aa98b..8ae0e4e3 100644
--- a/platform/linux-generic/odp_pool.c
+++ b/platform/linux-generic/odp_pool.c
@@ -19,6 +19,7 @@
#include <odp_config_internal.h>
#include <odp_debug_internal.h>
#include <odp_ring_internal.h>
+#include <odp_shm_internal.h>
#include <odp_global_data.h>
#include <string.h>
@@ -88,7 +89,8 @@ int odp_pool_init_global(void)
shm = odp_shm_reserve("_odp_pool_table",
sizeof(pool_table_t),
- ODP_CACHE_LINE_SIZE, 0);
+ ODP_CACHE_LINE_SIZE,
+ _ODP_SHM_NO_HP);
pool_tbl = odp_shm_addr(shm);
@@ -200,7 +202,7 @@ static pool_t *reserve_pool(uint32_t shmflags)
if (pool->reserved == 0) {
pool->reserved = 1;
UNLOCK(&pool->lock);
- sprintf(ring_name, "pool_ring_%d", i);
+ sprintf(ring_name, "_odp_pool_ring_%d", i);
pool->ring_shm =
odp_shm_reserve(ring_name,
sizeof(pool_ring_t),
diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c
index dffe6ee9..96409b75 100644
--- a/platform/linux-generic/odp_queue_basic.c
+++ b/platform/linux-generic/odp_queue_basic.c
@@ -15,6 +15,7 @@
#include <odp_buffer_internal.h>
#include <odp_pool_internal.h>
#include <odp_init_internal.h>
+#include <odp_shm_internal.h>
#include <odp/api/shared_memory.h>
#include <odp/api/schedule.h>
#include <odp_schedule_if.h>
@@ -134,13 +135,13 @@ static int queue_init_global(void)
shm = odp_shm_reserve("_odp_queue_gbl",
sizeof(queue_global_t),
- sizeof(queue_entry_t), 0);
+ sizeof(queue_entry_t),
+ _ODP_SHM_NO_HP);
+ if (shm == ODP_SHM_INVALID)
+ return -1;
queue_glb = odp_shm_addr(shm);
- if (queue_glb == NULL)
- return -1;
-
memset(queue_glb, 0, sizeof(queue_global_t));
for (i = 0; i < ODP_CONFIG_QUEUES; i++) {
@@ -161,7 +162,8 @@ static int queue_init_global(void)
(uint64_t)queue_glb->config.max_queue_size;
shm = odp_shm_reserve("_odp_queue_rings", mem_size,
- ODP_CACHE_LINE_SIZE, 0);
+ ODP_CACHE_LINE_SIZE,
+ _ODP_SHM_NO_HP);
if (shm == ODP_SHM_INVALID) {
odp_shm_free(queue_glb->queue_gbl_shm);
diff --git a/platform/linux-generic/odp_queue_lf.c b/platform/linux-generic/odp_queue_lf.c
index a28da2c7..ac8b4226 100644
--- a/platform/linux-generic/odp_queue_lf.c
+++ b/platform/linux-generic/odp_queue_lf.c
@@ -9,6 +9,7 @@
#include <odp/api/plat/atomic_inlines.h>
#include <odp/api/shared_memory.h>
#include <odp_queue_basic_internal.h>
+#include <odp_shm_internal.h>
#include <string.h>
#include <stdio.h>
@@ -318,8 +319,11 @@ uint32_t queue_lf_init_global(uint32_t *queue_lf_size,
if (!lockfree)
return 0;
- shm = odp_shm_reserve("odp_queues_lf", sizeof(queue_lf_global_t),
- ODP_CACHE_LINE_SIZE, 0);
+ shm = odp_shm_reserve("_odp_queues_lf", sizeof(queue_lf_global_t),
+ ODP_CACHE_LINE_SIZE,
+ _ODP_SHM_NO_HP);
+ if (shm == ODP_SHM_INVALID)
+ return 0;
queue_lf_glb = odp_shm_addr(shm);
memset(queue_lf_glb, 0, sizeof(queue_lf_global_t));
diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c
index e9cd5366..f9f45670 100644
--- a/platform/linux-generic/odp_schedule_basic.c
+++ b/platform/linux-generic/odp_schedule_basic.c
@@ -29,6 +29,7 @@
#include <odp_queue_basic_internal.h>
#include <odp_libconfig_internal.h>
#include <odp/api/plat/queue_inlines.h>
+#include <odp_shm_internal.h>
/* No synchronization context */
#define NO_SYNC_CONTEXT ODP_SCHED_SYNC_PARALLEL
@@ -353,17 +354,16 @@ static int schedule_init_global(void)
ODP_DBG("Schedule init ... ");
- shm = odp_shm_reserve("odp_scheduler",
+ shm = odp_shm_reserve("_odp_scheduler",
sizeof(sched_global_t),
- ODP_CACHE_LINE_SIZE, 0);
-
- sched = odp_shm_addr(shm);
-
- if (sched == NULL) {
+ ODP_CACHE_LINE_SIZE,
+ _ODP_SHM_NO_HP);
+ if (shm == ODP_SHM_INVALID) {
ODP_ERR("Schedule init: Shm reserve failed.\n");
return -1;
}
+ sched = odp_shm_addr(shm);
memset(sched, 0, sizeof(sched_global_t));
if (read_config_file(sched)) {
diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c
index 5345cee8..9c9139bb 100644
--- a/platform/linux-generic/odp_shared_memory.c
+++ b/platform/linux-generic/odp_shared_memory.c
@@ -59,7 +59,7 @@ odp_shm_t odp_shm_reserve(const char *name, uint64_t size, uint64_t align,
uint32_t flags)
{
int block_index;
- int flgs = 0; /* internal ishm flags */
+ uint32_t flgs = 0; /* internal ishm flags */
flgs = get_ishm_flags(flags);
diff --git a/platform/linux-generic/odp_thread.c b/platform/linux-generic/odp_thread.c
index a5f62ec7..4fc6acc9 100644
--- a/platform/linux-generic/odp_thread.c
+++ b/platform/linux-generic/odp_thread.c
@@ -54,7 +54,7 @@ int odp_thread_init_global(void)
{
odp_shm_t shm;
- shm = odp_shm_reserve("odp_thread_globals",
+ shm = odp_shm_reserve("_odp_thread_globals",
sizeof(thread_globals_t),
ODP_CACHE_LINE_SIZE, 0);
@@ -73,9 +73,9 @@ int odp_thread_term_global(void)
{
int ret;
- ret = odp_shm_free(odp_shm_lookup("odp_thread_globals"));
+ ret = odp_shm_free(odp_shm_lookup("_odp_thread_globals"));
if (ret < 0)
- ODP_ERR("shm free failed for odp_thread_globals");
+ ODP_ERR("shm free failed for _odp_thread_globals");
return ret;
}
commit 1d5c2ffab0051390641628a458f657c49ea54d41
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Thu Sep 13 22:36:56 2018 +0300
linux-gen: shm: do not print map error
map error just spams output screen and it's impossible
to see anything in the log. No need this extra debug
print. It's ok if memory can not be allocated in HP and
reservation fails to normal pages.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/platform/linux-generic/odp_ishmphy.c b/platform/linux-generic/odp_ishmphy.c
index e770b7bc..94a20f8f 100644
--- a/platform/linux-generic/odp_ishmphy.c
+++ b/platform/linux-generic/odp_ishmphy.c
@@ -147,10 +147,8 @@ void *_odp_ishmphy_map(int fd, void *start, uint64_t size,
}
}
- if (mapped_addr == MAP_FAILED) {
- ODP_ERR("mmap failed:%s\n", strerror(errno));
+ if (mapped_addr == MAP_FAILED)
return NULL;
- }
/* if locking is requested, lock it...*/
if (flags & _ODP_ISHM_LOCK) {
commit 406054d9c9ce31990d59640aa5d3dfd49e2d1e9d
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Sep 27 15:00:49 2018 +0300
test: build: configure option to disable test build
Test applications are not always needed. Added a configuration
option to disable test application build and install. This
makes build faster and install footprint smaller.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/Makefile.am b/Makefile.am
index 9038203a..e4dab7e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,15 +12,18 @@ SUBDIRS = \
include \
$(PLATFORM_DIR) \
helper \
- test \
- $(PLATFORM_TEST_DIR) \
- helper/test \
doc
if WITH_EXAMPLES
SUBDIRS += example
endif
+if WITH_TESTS
+SUBDIRS += test
+SUBDIRS += helper/test
+SUBDIRS += $(PLATFORM_TEST_DIR)
+endif
+
@DX_RULES@
EXTRA_DIST = bootstrap CHANGELOG config/README config/odp-$(with_platform).conf
diff --git a/configure.ac b/configure.ac
index 99f5ef43..3b71ef51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -399,6 +399,7 @@ AC_MSG_RESULT([
cunit: ${cunit_support}
static tests linkage: ${enable_static_applications}
with_examples: ${with_examples}
+ with_tests: ${with_tests}
test_vald: ${test_vald}
test_perf: ${test_perf}
test_perf_proc: ${test_perf_proc}
diff --git a/test/m4/configure.m4 b/test/m4/configure.m4
index dd07839f..309c18ae 100644
--- a/test/m4/configure.m4
+++ b/test/m4/configure.m4
@@ -1,3 +1,13 @@
+##########################################################################
+# Build and install test applications
+##########################################################################
+AC_ARG_WITH([tests],
+ [AS_HELP_STRING([--without-tests],
+ [don't build and install test applications])],
+ [],
+ [with_tests=yes])
+AM_CONDITIONAL([WITH_TESTS], [test x$with_tests != xno])
+
m4_include([test/m4/miscellaneous.m4])
m4_include([test/m4/performance.m4])
m4_include([test/m4/validation.m4])
commit b7da3cd005ab576b55e066ffa854697f41bb6f82
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Sep 27 14:40:32 2018 +0300
example: build: configure option to disable example build
Example applications are not always needed. Added a configuration
option to disable example application build and install. This
makes build faster and install footprint smaller.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/Makefile.am b/Makefile.am
index 4f3e0020..9038203a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,8 +15,11 @@ SUBDIRS = \
test \
$(PLATFORM_TEST_DIR) \
helper/test \
- doc \
- example
+ doc
+
+if WITH_EXAMPLES
+SUBDIRS += example
+endif
@DX_RULES@
diff --git a/configure.ac b/configure.ac
index a187fba7..99f5ef43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -398,6 +398,7 @@ AC_MSG_RESULT([
debug: ${enable_debug}
cunit: ${cunit_support}
static tests linkage: ${enable_static_applications}
+ with_examples: ${with_examples}
test_vald: ${test_vald}
test_perf: ${test_perf}
test_perf_proc: ${test_perf_proc}
diff --git a/example/m4/configure.m4 b/example/m4/configure.m4
index cbac0914..ee4f44ba 100644
--- a/example/m4/configure.m4
+++ b/example/m4/configure.m4
@@ -1,5 +1,15 @@
##########################################################################
-# Enable/disable test-example
+# Build and install example applications
+##########################################################################
+AC_ARG_WITH([examples],
+ [AS_HELP_STRING([--without-examples],
+ [don't build and install example applications])],
+ [],
+ [with_examples=yes])
+AM_CONDITIONAL([WITH_EXAMPLES], [test x$with_examples != xno])
+
+##########################################################################
+# Test examples during 'make check'
##########################################################################
AC_ARG_ENABLE([test-example],
[AS_HELP_STRING([--enable-test-example], [run basic test against examples])],
commit a7f23e35b596dada847205235821336e9e8d7166
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Oct 4 16:13:30 2018 +0300
test: sched_pktio: add pipeline queue size option
Added option to set pipeline queue size. Default is 256 to
avoid large buffering in pipeline queues.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c
index d0682527..91771e87 100644
--- a/test/performance/odp_sched_pktio.c
+++ b/test/performance/odp_sched_pktio.c
@@ -22,7 +22,7 @@
#define MAX_PIPE_STAGES 64
#define MAX_PIPE_QUEUES 1024
#define MAX_PKT_LEN 1514
-#define MAX_PKT_NUM (16 * 1024)
+#define MAX_PKT_NUM (128 * 1024)
#define MIN_PKT_SEG_LEN 64
#define BURST_SIZE 32
#define CHECK_PERIOD 10000
@@ -40,6 +40,7 @@ typedef struct test_options_t {
int num_pktio_queue;
int pipe_stages;
int pipe_queues;
+ uint32_t pipe_queue_size;
uint8_t collect_stat;
char pktio_name[MAX_PKTIOS][MAX_PKTIO_NAME + 1];
@@ -536,6 +537,7 @@ static void print_usage(const char *progname)
" -t, --timeout <number> Flow inactivity timeout (in usec) per packet. Default: 0 (don't use timers)\n"
" --pipe-stages <number> Number of pipeline stages per interface\n"
" --pipe-queues <number> Number of queues per pipeline stage\n"
+ " --pipe-queue-size <num> Number of events a pipeline queue must be able to store. Default 256.\n"
" -m, --sched_mode <mode> Scheduler synchronization mode for all queues. 1: parallel, 2: atomic, 3: ordered. Default: 2\n"
" -s, --stat Collect statistics.\n"
" -h, --help Display help and exit.\n\n",
@@ -555,6 +557,7 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options)
{"sched_mode", required_argument, NULL, 'm'},
{"pipe-stages", required_argument, NULL, 0},
{"pipe-queues", required_argument, NULL, 1},
+ {"pipe-queue-size", required_argument, NULL, 2},
{"stat", no_argument, NULL, 's'},
{"help", no_argument, NULL, 'h'},
{NULL, 0, NULL, 0}
@@ -567,6 +570,7 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options)
test_options->sched_mode = SCHED_MODE_ATOMIC;
test_options->num_worker = 1;
test_options->num_pktio_queue = 0;
+ test_options->pipe_queue_size = 256;
/* let helper collect its own arguments (e.g. --odph_proc) */
argc = odph_parse_options(argc, argv);
@@ -584,6 +588,9 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options)
case 1:
test_options->pipe_queues = atoi(optarg);
break;
+ case 2:
+ test_options->pipe_queue_size = atoi(optarg);
+ break;
case 'i':
i = 0;
str = optarg;
@@ -721,8 +728,10 @@ static int config_setup(test_global_t *test_global)
if (pool_capa.pkt.max_len && pkt_len > pool_capa.pkt.max_len)
pkt_len = pool_capa.pkt.max_len;
- if (pool_capa.pkt.max_num && pkt_num > pool_capa.pkt.max_num)
+ if (pool_capa.pkt.max_num && pkt_num > pool_capa.pkt.max_num) {
pkt_num = pool_capa.pkt.max_num;
+ printf("Warning: Pool size rounded down to %u\n", pkt_num);
+ }
test_global->pkt_len = pkt_len;
test_global->pkt_num = pkt_num;
@@ -1093,9 +1102,15 @@ static int create_pipeline_queues(test_global_t *test_global)
int i, j, k, num_pktio, stages, queues, ctx_size;
pipe_queue_context_t *ctx;
odp_queue_param_t queue_param;
+ odp_queue_capability_t queue_capa;
odp_schedule_sync_t sched_sync;
int ret = 0;
+ if (odp_queue_capability(&queue_capa)) {
+ printf("Error: Queue capability failed\n");
+ return -1;
+ }
+
num_pktio = test_global->opt.num_pktio;
stages = test_global->opt.pipe_stages;
queues = test_global->opt.pipe_queues;
@@ -1107,6 +1122,14 @@ static int create_pipeline_queues(test_global_t *test_global)
queue_param.sched.sync = sched_sync;
queue_param.sched.group = ODP_SCHED_GROUP_ALL;
+ queue_param.size = test_global->opt.pipe_queue_size;
+ if (queue_capa.sched.max_size &&
+ queue_param.size > queue_capa.sched.max_size) {
+ printf("Error: Pipeline queue max size is %u\n",
+ queue_capa.sched.max_size);
+ return -1;
+ }
+
ctx_size = sizeof(pipe_queue_context_t);
for (i = 0; i < stages; i++) {
commit 0db006b5ea8fb6c760a4e48a5dd953b65d1895fc
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Oct 4 11:34:09 2018 +0300
test: sched_pktio: add scheduler sync mode option
Added option to select scheduler synchronization mode
(parallel, atomic, ordered) for all queues.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c
index 1ae73f92..d0682527 100644
--- a/test/performance/odp_sched_pktio.c
+++ b/test/performance/odp_sched_pktio.c
@@ -28,9 +28,13 @@
#define CHECK_PERIOD 10000
#define TEST_PASSED_LIMIT 5000
#define TIMEOUT_OFFSET_NS 1000000
+#define SCHED_MODE_PARAL 1
+#define SCHED_MODE_ATOMIC 2
+#define SCHED_MODE_ORDER 3
typedef struct test_options_t {
long int timeout_us;
+ int sched_mode;
int num_worker;
int num_pktio;
int num_pktio_queue;
@@ -532,6 +536,7 @@ static void print_usage(const char *progname)
" -t, --timeout <number> Flow inactivity timeout (in usec) per packet. Default: 0 (don't use timers)\n"
" --pipe-stages <number> Number of pipeline stages per interface\n"
" --pipe-queues <number> Number of queues per pipeline stage\n"
+ " -m, --sched_mode <mode> Scheduler synchronization mode for all queues. 1: parallel, 2: atomic, 3: ordered. Default: 2\n"
" -s, --stat Collect statistics.\n"
" -h, --help Display help and exit.\n\n",
NO_PATH(progname));
@@ -541,23 +546,25 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options)
{
int i, opt, long_index;
char *name, *str;
- int len, str_len;
+ int len, str_len, sched_mode;
const struct option longopts[] = {
{"interface", required_argument, NULL, 'i'},
{"num_cpu", required_argument, NULL, 'c'},
{"num_queue", required_argument, NULL, 'q'},
{"timeout", required_argument, NULL, 't'},
+ {"sched_mode", required_argument, NULL, 'm'},
{"pipe-stages", required_argument, NULL, 0},
{"pipe-queues", required_argument, NULL, 1},
{"stat", no_argument, NULL, 's'},
{"help", no_argument, NULL, 'h'},
{NULL, 0, NULL, 0}
};
- const char *shortopts = "+i:c:q:t:sh";
+ const char *shortopts = "+i:c:q:t:m:sh";
int ret = 0;
memset(test_options, 0, sizeof(test_options_t));
+ test_options->sched_mode = SCHED_MODE_ATOMIC;
test_options->num_worker = 1;
test_options->num_pktio_queue = 0;
@@ -617,6 +624,9 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options)
case 't':
test_options->timeout_us = atol(optarg);
break;
+ case 'm':
+ test_options->sched_mode = atoi(optarg);
+ break;
case 's':
test_options->collect_stat = 1;
break;
@@ -650,12 +660,34 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options)
ret = -1;
}
+ sched_mode = test_options->sched_mode;
+ if (sched_mode != SCHED_MODE_PARAL &&
+ sched_mode != SCHED_MODE_ATOMIC &&
+ sched_mode != SCHED_MODE_ORDER) {
+ printf("Error: Bad scheduler mode: %i\n", sched_mode);
+ ret = -1;
+ }
+
if (test_options->num_pktio_queue == 0)
test_options->num_pktio_queue = test_options->num_worker;
return ret;
}
+static odp_schedule_sync_t sched_sync_mode(test_global_t *test_global)
+{
+ switch (test_global->opt.sched_mode) {
+ case SCHED_MODE_PARAL:
+ return ODP_SCHED_SYNC_PARALLEL;
+ case SCHED_MODE_ATOMIC:
+ return ODP_SCHED_SYNC_ATOMIC;
+ case SCHED_MODE_ORDER:
+ return ODP_SCHED_SYNC_ORDERED;
+ default:
+ return -1;
+ }
+}
+
static int config_setup(test_global_t *test_global)
{
int i, cpu;
@@ -820,7 +852,7 @@ static int open_pktios(test_global_t *test_global)
pktio_param.in_mode = ODP_PKTIN_MODE_SCHED;
pktio_param.out_mode = ODP_PKTOUT_MODE_DIRECT;
- sched_sync = ODP_SCHED_SYNC_ATOMIC;
+ sched_sync = sched_sync_mode(test_global);
for (i = 0; i < num_pktio; i++)
test_global->pktio[i].pktio = ODP_PKTIO_INVALID;
@@ -1067,7 +1099,7 @@ static int create_pipeline_queues(test_global_t *test_global)
num_pktio = test_global->opt.num_pktio;
stages = test_global->opt.pipe_stages;
queues = test_global->opt.pipe_queues;
- sched_sync = ODP_SCHED_SYNC_ATOMIC;
+ sched_sync = sched_sync_mode(test_global);
odp_queue_param_init(&queue_param);
queue_param.type = ODP_QUEUE_TYPE_SCHED;
commit d966e0e452517e1e0a29ca59b892f6685d560c78
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Wed Oct 3 14:41:29 2018 +0300
test: sched_pktio: add queue pipeline options
Added options to test performance when received packets are
pushed through a set of queues (pipeline stages) before
packet output.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c
index d81994cd..1ae73f92 100644
--- a/test/performance/odp_sched_pktio.c
+++ b/test/performance/odp_sched_pktio.c
@@ -19,6 +19,8 @@
#define MAX_PKTIOS 32
#define MAX_PKTIO_NAME 31
#define MAX_PKTIO_QUEUES MAX_WORKERS
+#define MAX_PIPE_STAGES 64
+#define MAX_PIPE_QUEUES 1024
#define MAX_PKT_LEN 1514
#define MAX_PKT_NUM (16 * 1024)
#define MIN_PKT_SEG_LEN 64
@@ -32,6 +34,8 @@ typedef struct test_options_t {
int num_worker;
int num_pktio;
int num_pktio_queue;
+ int pipe_stages;
+ int pipe_queues;
uint8_t collect_stat;
char pktio_name[MAX_PKTIOS][MAX_PKTIO_NAME + 1];
@@ -45,16 +49,29 @@ typedef struct {
typedef struct ODP_ALIGNED_CACHE {
uint64_t rx_pkt;
uint64_t tx_pkt;
+ uint64_t pipe_pkt;
+ uint64_t tx_drop;
+ uint64_t pipe_drop;
uint64_t tmo;
} worker_stat_t;
-typedef struct queue_context_t {
+typedef struct pktin_queue_context_t {
+ /* Queue context must start with stage and idx */
+ uint16_t stage;
+ uint16_t queue_idx;
+
+ uint8_t dst_pktio;
+ uint8_t dst_queue;
+ uint8_t src_pktio;
+ uint8_t src_queue;
odp_pktout_queue_t dst_pktout;
- uint8_t dst_pktio;
- uint8_t dst_queue;
- uint8_t src_pktio;
- uint8_t src_queue;
-} queue_context_t;
+} pktin_queue_context_t;
+
+typedef struct pipe_queue_context_t {
+ /* Queue context must start with stage and idx. */
+ uint16_t stage;
+ uint16_t queue_idx;
+} pipe_queue_context_t;
typedef struct {
volatile int stop_workers;
@@ -79,7 +96,7 @@ typedef struct {
odph_ethaddr_t my_addr;
odp_queue_t input_queue[MAX_PKTIO_QUEUES];
odp_pktout_queue_t pktout[MAX_PKTIO_QUEUES];
- queue_context_t queue_context[MAX_PKTIO_QUEUES];
+ pktin_queue_context_t queue_context[MAX_PKTIO_QUEUES];
} pktio[MAX_PKTIOS];
@@ -91,6 +108,14 @@ typedef struct {
} timer;
+ struct {
+ odp_queue_t queue[MAX_PIPE_QUEUES];
+ } pipe_queue[MAX_PKTIOS][MAX_PIPE_STAGES];
+
+ struct {
+ pipe_queue_context_t ctx;
+ } pipe_queue_ctx[MAX_PIPE_STAGES][MAX_PIPE_QUEUES];
+
worker_arg_t worker_arg[MAX_WORKERS];
worker_stat_t worker_stat[MAX_WORKERS];
@@ -125,13 +150,38 @@ static inline void fill_eth_addr(odp_packet_t pkt[], int num,
}
}
-static int worker_thread(void *arg)
+static inline void send_packets(test_global_t *test_global,
+ odp_packet_t pkt[], int num_pkt,
+ int output, odp_pktout_queue_t pktout,
+ int worker_id)
+{
+ int sent, drop;
+
+ fill_eth_addr(pkt, num_pkt, test_global, output);
+
+ sent = odp_pktout_send(pktout, pkt, num_pkt);
+
+ if (odp_unlikely(sent < 0))
+ sent = 0;
+
+ drop = num_pkt - sent;
+
+ if (odp_unlikely(drop))
+ odp_packet_free_multi(&pkt[sent], drop);
+
+ if (odp_unlikely(test_global->opt.collect_stat)) {
+ test_global->worker_stat[worker_id].tx_pkt += sent;
+ test_global->worker_stat[worker_id].tx_drop += drop;
+ }
+}
+
+static int worker_thread_direct(void *arg)
{
odp_event_t ev[BURST_SIZE];
- int num_pkt, sent, drop, out;
+ int num_pkt, out;
odp_pktout_queue_t pktout;
odp_queue_t queue;
- queue_context_t *queue_context;
+ pktin_queue_context_t *queue_context;
worker_arg_t *worker_arg = arg;
test_global_t *test_global = worker_arg->test_global_ptr;
int worker_id = worker_arg->worker_id;
@@ -174,22 +224,167 @@ static int worker_thread(void *arg)
pktout = queue_context->dst_pktout;
out = queue_context->dst_pktio;
- fill_eth_addr(pkt, num_pkt, test_global, out);
+ send_packets(test_global, pkt, num_pkt, out, pktout, worker_id);
+
+ if (odp_unlikely(test_global->opt.collect_stat))
+ test_global->worker_stat[worker_id].rx_pkt += num_pkt;
+ }
+
+ printf("Worker %i stopped\n", worker_id);
+
+ return 0;
+}
+
+static inline void enqueue_events(odp_queue_t dst_queue, odp_event_t ev[],
+ int num, int worker_id)
+{
+ int sent, drop;
- sent = odp_pktout_send(pktout, pkt, num_pkt);
+ sent = odp_queue_enq_multi(dst_queue, ev, num);
- if (odp_unlikely(sent < 0))
- sent = 0;
+ if (odp_unlikely(sent < 0))
+ sent = 0;
- drop = num_pkt - sent;
+ drop = num - sent;
- if (odp_unlikely(drop))
- odp_packet_free_multi(&pkt[sent], drop);
+ if (odp_unlikely(drop))
+ odp_event_free_multi(&ev[sent], drop);
- if (odp_unlikely(test_global->opt.collect_stat)) {
- test_global->worker_stat[worker_id].rx_pkt += num_pkt;
- test_global->worker_stat[worker_id].tx_pkt += sent;
+ if (odp_unlikely(test_global->opt.collect_stat))
+ test_global->worker_stat[worker_id].pipe_drop += drop;
+}
+
+static inline odp_queue_t next_queue(test_global_t *test_global, int input,
+ uint16_t stage, uint16_t queue_idx)
+{
+ return test_global->pipe_queue[input][stage].queue[queue_idx];
+}
+
+static int worker_thread_pipeline(void *arg)
+{
+ odp_event_t ev[BURST_SIZE];
+ int i, num_pkt, input, output, output_queue;
+ odp_queue_t queue, dst_queue;
+ odp_pktout_queue_t pktout;
+ pipe_queue_context_t *pipe_context;
+ uint16_t stage, queue_idx;
+ worker_arg_t *worker_arg = arg;
+ test_global_t *test_global = worker_arg->test_global_ptr;
+ int worker_id = worker_arg->worker_id;
+ int pipe_stages = test_global->opt.pipe_stages;
+ int pipe_queues = test_global->opt.pipe_queues;
+ int num_pktio = test_global->opt.num_pktio;
+ int num_pktio_queue = test_global->opt.num_pktio_queue;
+ uint32_t polls = 0;
+
+ printf("Worker %i started\n", worker_id);
+
+ /* Wait for other workers to start */
+ odp_barrier_wait(&test_global->worker_start);
+
+ while (1) {
+ odp_packet_t pkt[BURST_SIZE];
+
+ num_pkt = odp_schedule_multi(&queue, ODP_SCHED_NO_WAIT,
+ ev, BURST_SIZE);
+
+ polls++;
+
+ if (polls == CHECK_PERIOD) {
+ polls = 0;
+ if (test_global->stop_workers)
+ break;
}
+
+ if (num_pkt <= 0)
+ continue;
+
+ pipe_context = odp_queue_context(queue);
+ stage = pipe_context->stage;
+ queue_idx = pipe_context->queue_idx;
+
+ /* A queue is connected to a single input interface. All
+ * packets from a queue are from the same interface. */
+ input = odp_packet_input_index(odp_packet_from_event(ev[0]));
+
+ if (DEBUG_PRINT)
+ printf("worker %i: stage %u, idx %u, %i packets\n",
+ worker_id, stage, queue_idx, num_pkt);
+
+ if (stage == 0) {
+ if (odp_unlikely(test_global->opt.collect_stat))
+ test_global->worker_stat[worker_id].rx_pkt +=
+ num_pkt;
+
+ /* The first stage (packet input). Forward packet flows
+ * into first pipeline queues. */
+ if (pipe_queues > num_pktio_queue) {
+ /* More pipeline queues than input queues.
+ * Use flow hash to spread flows into pipeline
+ * queues. */
+ odp_packet_t p;
+ worker_stat_t *stat;
+ uint32_t hash;
+ uint16_t idx;
+ int drop = 0;
+
+ stat = &test_global->worker_stat[worker_id];
+
+ for (i = 0; i < num_pkt; i++) {
+ p = odp_packet_from_event(ev[i]);
+ hash = odp_packet_flow_hash(p);
+ idx = queue_idx;
+
+ if (odp_packet_has_flow_hash(p))
+ idx = hash % pipe_queues;
+
+ dst_queue = next_queue(test_global,
+ input, stage,
+ idx);
+
+ if (odp_queue_enq(dst_queue, ev[i])) {
+ odp_event_free(ev[i]);
+ drop++;
+ }
+ }
+
+ if (odp_unlikely(test_global->opt.collect_stat))
+ stat->pipe_drop += drop;
+ } else {
+ queue_idx = queue_idx % pipe_queues;
+ dst_queue = next_queue(test_global, input,
+ stage, queue_idx);
+
+ enqueue_events(dst_queue, ev, num_pkt,
+ worker_id);
+ }
+ continue;
+ }
+
+ if (stage < pipe_stages) {
+ /* Middle stages */
+ dst_queue = next_queue(test_global, input, stage,
+ queue_idx);
+ enqueue_events(dst_queue, ev, num_pkt, worker_id);
+
+ if (odp_unlikely(test_global->opt.collect_stat))
+ test_global->worker_stat[worker_id].pipe_pkt +=
+ num_pkt;
+
+ continue;
+ }
+
+ /* The last stage, send packets out */
+ odp_packet_from_event_multi(pkt, ev, num_pkt);
+
+ /* If single interface loopback, otherwise forward to the next
+ * interface. */
+ output = (input + 1) % num_pktio;
+ output_queue = queue_idx % num_pktio_queue;
+ pktout = test_global->pktio[output].pktout[output_queue];
+
+ send_packets(test_global, pkt, num_pkt, output, pktout,
+ worker_id);
}
printf("Worker %i stopped\n", worker_id);
@@ -200,10 +395,10 @@ static int worker_thread(void *arg)
static int worker_thread_timers(void *arg)
{
odp_event_t ev[BURST_SIZE];
- int num, num_pkt, sent, drop, out, tmos, i, src_pktio, src_queue;
+ int num, num_pkt, out, tmos, i, src_pktio, src_queue;
odp_pktout_queue_t pktout;
odp_queue_t queue;
- queue_context_t *queue_context;
+ pktin_queue_context_t *queue_context;
odp_timer_t timer;
odp_timer_set_t ret;
worker_arg_t *worker_arg = arg;
@@ -299,22 +494,10 @@ static int worker_thread_timers(void *arg)
pktout = queue_context->dst_pktout;
out = queue_context->dst_pktio;
- fill_eth_addr(pkt, num_pkt, test_global, out);
-
- sent = odp_pktout_send(pktout, pkt, num_pkt);
-
- if (odp_unlikely(sent < 0))
- sent = 0;
-
- drop = num_pkt - sent;
-
- if (odp_unlikely(drop))
- odp_packet_free_multi(&pkt[sent], drop);
+ send_packets(test_global, pkt, num_pkt, out, pktout, worker_id);
- if (odp_unlikely(test_global->opt.collect_stat)) {
+ if (odp_unlikely(test_global->opt.collect_stat))
test_global->worker_stat[worker_id].rx_pkt += num_pkt;
- test_global->worker_stat[worker_id].tx_pkt += sent;
- }
}
printf("Worker %i stopped\n", worker_id);
@@ -343,12 +526,14 @@ static void print_usage(const char *progname)
"Usage: %s [options]\n"
"\n"
"OPTIONS:\n"
- " -i, --interface <name> Packet IO interfaces (comma-separated, no spaces)\n"
- " -c, --num_cpu <number> Worker thread count. Default: 1\n"
- " -q, --num_queue <number> Number of pktio queues. Default: Worker thread count\n"
- " -t, --timeout <number> Flow inactivity timeout (in usec) per packet. Default: 0 (don't use timers)\n"
- " -s, --stat Collect statistics.\n"
- " -h, --help Display help and exit.\n\n",
+ " -i, --interface <name> Packet IO interfaces (comma-separated, no spaces)\n"
+ " -c, --num_cpu <number> Worker thread count. Default: 1\n"
+ " -q, --num_queue <number> Number of pktio queues. Default: Worker thread count\n"
+ " -t, --timeout <number> Flow inactivity timeout (in usec) per packet. Default: 0 (don't use timers)\n"
+ " --pipe-stages <number> Number of pipeline stages per interface\n"
+ " --pipe-queues <number> Number of queues per pipeline stage\n"
+ " -s, --stat Collect statistics.\n"
+ " -h, --help Display help and exit.\n\n",
NO_PATH(progname));
}
@@ -358,12 +543,14 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options)
char *name, *str;
int len, str_len;
const struct option longopts[] = {
- {"interface", required_argument, NULL, 'i'},
- {"num_cpu", required_argument, NULL, 'c'},
- {"num_queue", required_argument, NULL, 'q'},
- {"timeout", required_argument, NULL, 't'},
- {"stat", no_argument, NULL, 's'},
- {"help", no_argument, NULL, 'h'},
+ {"interface", required_argument, NULL, 'i'},
+ {"num_cpu", required_argument, NULL, 'c'},
+ {"num_queue", required_argument, NULL, 'q'},
+ {"timeout", required_argument, NULL, 't'},
+ {"pipe-stages", required_argument, NULL, 0},
+ {"pipe-queues", required_argument, NULL, 1},
+ {"stat", no_argument, NULL, 's'},
+ {"help", no_argument, NULL, 'h'},
{NULL, 0, NULL, 0}
};
const char *shortopts = "+i:c:q:t:sh";
@@ -384,6 +571,12 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options)
break; /* No more options */
switch (opt) {
+ case 0:
+ test_options->pipe_stages = atoi(optarg);
+ break;
+ case 1:
+ test_options->pipe_queues = atoi(optarg);
+ break;
case 'i':
i = 0;
str = optarg;
@@ -437,6 +630,26 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options)
}
}
+ if (test_options->timeout_us && test_options->pipe_stages) {
+ printf("Error: Cannot run timeout and pipeline tests simultaneously\n");
+ ret = -1;
+ }
+
+ if (test_options->pipe_stages > MAX_PIPE_STAGES) {
+ printf("Error: Too many pipeline stages\n");
+ ret = -1;
+ }
+
+ if (test_options->pipe_queues > MAX_PIPE_QUEUES) {
+ printf("Error: Too many queues per pipeline stage\n");
+ ret = -1;
+ }
+
+ if (test_options->num_pktio == 0) {
+ printf("Error: At least one pktio interface needed.\n");
+ ret = -1;
+ }
+
if (test_options->num_pktio_queue == 0)
test_options->num_pktio_queue = test_options->num_worker;
@@ -465,11 +678,6 @@ static int config_setup(test_global_t *test_global)
cpu = odp_cpumask_next(cpumask, cpu);
}
- if (test_global->opt.num_pktio == 0) {
- printf("Error: At least one pktio interface needed.\n");
- return -1;
- }
-
if (odp_pool_capability(&pool_capa)) {
printf("Error: Pool capability failed.\n");
return -1;
@@ -531,34 +739,40 @@ static void print_config(test_global_t *test_global)
static void print_stat(test_global_t *test_global, uint64_t nsec)
{
int i;
- uint64_t rx, tx, drop, tmo;
+ uint64_t rx, tx, pipe, drop, tmo;
uint64_t rx_sum = 0;
uint64_t tx_sum = 0;
+ uint64_t pipe_sum = 0;
uint64_t tmo_sum = 0;
double sec = 0.0;
printf("\nTest statistics\n");
- printf(" worker rx_pkt tx_pkt dropped tmo\n");
+ printf(" worker rx_pkt tx_pkt pipe dropped tmo\n");
for (i = 0; i < test_global->opt.num_worker; i++) {
rx = test_global->worker_stat[i].rx_pkt;
tx = test_global->worker_stat[i].tx_pkt;
+ pipe = test_global->worker_stat[i].pipe_pkt;
tmo = test_global->worker_stat[i].tmo;
rx_sum += rx;
tx_sum += tx;
+ pipe_sum += pipe;
tmo_sum += tmo;
+ drop = test_global->worker_stat[i].tx_drop +
+ test_global->worker_stat[i].pipe_drop;
printf(" %6i %16" PRIu64 " %16" PRIu64 " %16" PRIu64 " %16"
- PRIu64 "\n", i, rx, tx, rx - tx, tmo);
+ PRIu64 " %16" PRIu64 "\n", i, rx, tx, pipe, drop, tmo);
}
test_global->rx_pkt_sum = rx_sum;
test_global->tx_pkt_sum = tx_sum;
drop = rx_sum - tx_sum;
- printf(" -------------------------------------------------------------------\n");
+ printf(" ------------------------------------------------------------------------------------\n");
printf(" total %16" PRIu64 " %16" PRIu64 " %16" PRIu64 " %16"
- PRIu64 "\n\n", rx_sum, tx_sum, drop, tmo_sum);
+ PRIu64 " %16" PRIu64 "\n\n", rx_sum, tx_sum, pipe_sum, drop,
+ tmo_sum);
sec = nsec / 1000000000.0;
printf(" Total test time: %.2f sec\n", sec);
@@ -684,7 +898,7 @@ static int open_pktios(test_global_t *test_global)
for (j = 0; j < num_queue; j++) {
odp_queue_t queue;
void *ctx;
- uint32_t len = sizeof(queue_context_t);
+ uint32_t len = sizeof(pktin_queue_context_t);
queue = test_global->pktio[i].input_queue[j];
ctx = &test_global->pktio[i].queue_context[j];
@@ -700,6 +914,9 @@ static int open_pktios(test_global_t *test_global)
pktout_param.num_queues = num_queue;
pktout_param.op_mode = ODP_PKTIO_OP_MT_UNSAFE;
+ if (test_global->opt.pipe_stages)
+ pktout_param.op_mode = ODP_PKTIO_OP_MT;
+
if (odp_pktout_queue_config(pktio, &pktout_param)) {
printf("Error (%s): Pktout config failed.\n", name);
return -1;
@@ -722,7 +939,7 @@ static void link_pktios(test_global_t *test_global)
int i, num_pktio, input, output;
int num_queue;
odp_pktout_queue_t pktout;
- queue_context_t *ctx;
+ pktin_queue_context_t *ctx;
num_pktio = test_global->opt.num_pktio;
num_queue = test_global->opt.num_pktio_queue;
@@ -738,6 +955,8 @@ static void link_pktios(test_global_t *test_global)
for (i = 0; i < num_queue; i++) {
ctx = &test_global->pktio[input].queue_context[i];
pktout = test_global->pktio[output].pktout[i];
+ ctx->stage = 0;
+ ctx->queue_idx = i;
ctx->dst_pktout = pktout;
ctx->dst_pktio = output;
ctx->dst_queue = i;
@@ -837,6 +1056,97 @@ static int close_pktios(test_global_t *test_global)
return ret;
}
+static int create_pipeline_queues(test_global_t *test_global)
+{
+ int i, j, k, num_pktio, stages, queues, ctx_size;
+ pipe_queue_context_t *ctx;
+ odp_queue_param_t queue_param;
+ odp_schedule_sync_t sched_sync;
+ int ret = 0;
+
+ num_pktio = test_global->opt.num_pktio;
+ stages = test_global->opt.pipe_stages;
+ queues = test_global->opt.pipe_queues;
+ sched_sync = ODP_SCHED_SYNC_ATOMIC;
+
+ odp_queue_param_init(&queue_param);
+ queue_param.type = ODP_QUEUE_TYPE_SCHED;
+ queue_param.sched.prio = ODP_SCHED_PRIO_DEFAULT;
+ queue_param.sched.sync = sched_sync;
+ queue_param.sched.group = ODP_SCHED_GROUP_ALL;
+
+ ctx_size = sizeof(pipe_queue_context_t);
+
+ for (i = 0; i < stages; i++) {
+ for (j = 0; j < queues; j++) {
+ ctx = &test_global->pipe_queue_ctx[i][j].ctx;
+
+ /* packet input is stage 0 */
+ ctx->stage = i + 1;
+ ctx->queue_idx = j;
+ }
+ }
+
+ for (k = 0; k < num_pktio; k++) {
+ for (i = 0; i < stages; i++) {
+ for (j = 0; j < queues; j++) {
+ odp_queue_t q;
+
+ q = odp_queue_create(NULL, &queue_param);
+ test_global->pipe_queue[k][i].queue[j] = q;
+
+ if (q == ODP_QUEUE_INVALID) {
+ printf("Error: Queue create failed [%i] %i/%i\n",
+ k, i, j);
+ ret = -1;
+ break;
+ }
+
+ ctx = &test_global->pipe_queue_ctx[i][j].ctx;
+
+ if (odp_queue_context_set(q, ctx, ctx_size)) {
+ printf("Error: Queue ctx set failed [%i] %i/%i\n",
+ k, i, j);
+ ret = -1;
+ break;
+ }
+ }
+ }
+ }
+
+ return ret;
+}
+
+static void destroy_pipeline_queues(test_global_t *test_global)
+{
+ int i, j, k, num_pktio, stages, queues;
+ odp_queue_t queue;
+
+ num_pktio = test_global->opt.num_pktio;
+ stages = test_global->opt.pipe_stages;
+ queues = test_global->opt.pipe_queues;
+
+ for (k = 0; k < num_pktio; k++) {
+ for (i = 0; i < stages; i++) {
+ for (j = 0; j < queues; j++) {
+ queue = test_global->pipe_queue[k][i].queue[j];
+
+ if (queue == ODP_QUEUE_INVALID) {
+ printf("Error: Bad queue handle [%i] %i/%i\n",
+ k, i, j);
+ return;
+ }
+
+ if (odp_queue_destroy(queue)) {
+ printf("Error: Queue destroy failed [%i] %i/%i\n",
+ k, i, j);
+ return;
+ }
+ }
+ }
+ }
+}
+
static int create_timers(test_global_t *test_global)
{
int num_timer, num_pktio, num_queue, i, j;
@@ -1021,8 +1331,10 @@ static void start_workers(odph_odpthread_t thread[],
if (test_global->opt.timeout_us)
param.start = worker_thread_timers;
+ else if (test_global->opt.pipe_stages)
+ param.start = worker_thread_pipeline;
else
- param.start = worker_thread;
+ param.start = worker_thread_direct;
param.thr_type = ODP_THREAD_WORKER;
param.instance = test_global->instance;
@@ -1115,6 +1427,9 @@ int main(int argc, char *argv[])
link_pktios(test_global);
+ if (create_pipeline_queues(test_global))
+ goto quit;
+
if (create_timers(test_global))
goto quit;
@@ -1145,6 +1460,7 @@ quit:
stop_pktios(test_global);
empty_queues();
close_pktios(test_global);
+ destroy_pipeline_queues(test_global);
destroy_timers(test_global);
if (test_global->opt.collect_stat) {
commit 2dd51f19e1d9c84fd09962ad2d134c376b46c45f
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Oct 4 14:23:35 2018 +0300
linux-gen: queue: use queue size parameter
Don't round up small queue sizes to default, but to minimum
queue size. Application may need to set small size on some
queues.
Large queue size mean large buffering capacity. E.g. when
large queues are served with a low priority, service level
of higher priority queues may suffer as many/most events of
a shared pool may be stored in low priority queues (while
the pool is empty).
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c
index 9eb3c79e..dffe6ee9 100644
--- a/platform/linux-generic/odp_queue_basic.c
+++ b/platform/linux-generic/odp_queue_basic.c
@@ -38,7 +38,7 @@
#include <string.h>
#include <inttypes.h>
-#define MIN_QUEUE_SIZE 8
+#define MIN_QUEUE_SIZE 32
#define MAX_QUEUE_SIZE (1 * 1024 * 1024)
static int queue_init(queue_entry_t *queue, const char *name,
@@ -816,11 +816,12 @@ static int queue_init(queue_entry_t *queue, const char *name,
queue->s.pktin = PKTIN_INVALID;
queue->s.pktout = PKTOUT_INVALID;
- /* Use default size for all small queues to quarantee performance
- * level. */
- queue_size = queue_glb->config.default_queue_size;
- if (param->size > queue_glb->config.default_queue_size)
- queue_size = param->size;
+ queue_size = param->size;
+ if (queue_size == 0)
+ queue_size = queue_glb->config.default_queue_size;
+
+ if (queue_size < MIN_QUEUE_SIZE)
+ queue_size = MIN_QUEUE_SIZE;
/* Round up if not already a power of two */
queue_size = ROUNDUP_POWER2_U32(queue_size);
commit d46c341e321cb5085d5577dd5fb8ca0b3f7ba554
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Oct 5 11:07:41 2018 +0300
validation: sched: add queue size test
Added test case which uses small queue size for scheduled
queues.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c
index 0e7e6c57..a4e8e218 100644
--- a/test/validation/api/scheduler/scheduler.c
+++ b/test/validation/api/scheduler/scheduler.c
@@ -21,6 +21,8 @@
#define NUM_BUFS_BEFORE_PAUSE 10
#define NUM_GROUPS 2
+#define TEST_QUEUE_SIZE_NUM_EV 50
+
#define GLOBALS_SHM_NAME "test_globals"
#define MSG_POOL_NAME "msg_pool"
#define QUEUE_CTX_POOL_NAME "queue_ctx_pool"
@@ -277,6 +279,91 @@ static void scheduler_test_queue_destroy(void)
CU_ASSERT_FATAL(odp_pool_destroy(p) == 0);
}
+static void scheduler_test_queue_size(void)
+{
+ odp_queue_capability_t queue_capa;
+ odp_pool_t pool;
+ odp_pool_param_t pool_param;
+ odp_queue_param_t queue_param;
+ odp_queue_t queue, from;
+ odp_event_t ev;
+ odp_buffer_t buf;
+ uint32_t i, j, queue_size, num;
+ int ret;
+ odp_schedule_sync_t sync[] = {ODP_SCHED_SYNC_PARALLEL,
+ ODP_SCHED_SYNC_ATOMIC,
+ ODP_SCHED_SYNC_ORDERED};
+
+ CU_ASSERT_FATAL(odp_queue_capability(&queue_capa) == 0);
+ queue_size = TEST_QUEUE_SIZE_NUM_EV;
+ if (queue_capa.sched.max_size &&
+ queue_size > queue_capa.sched.max_size)
+ queue_size = queue_capa.sched.max_size;
+
+ odp_pool_param_init(&pool_param);
+ pool_param.buf.size = 100;
+ pool_param.buf.align = 0;
+ pool_param.buf.num = TEST_QUEUE_SIZE_NUM_EV;
+ pool_param.type = ODP_POOL_BUFFER;
+
+ pool = odp_pool_create("test_queue_size", &pool_param);
+
+ CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
+
+ for (i = 0; i < 3; i++) {
+ /* Ensure that scheduler is empty */
+ for (j = 0; j < 10;) {
+ ev = odp_schedule(NULL, ODP_SCHED_NO_WAIT);
+ CU_ASSERT(ev == ODP_EVENT_INVALID);
+
+ if (ev != ODP_EVENT_INVALID)
+ odp_event_free(ev);
+ else
+ j++;
+ }
+
+ odp_queue_param_init(&queue_param);
+ queue_param.type = ODP_QUEUE_TYPE_SCHED;
+ queue_param.sched.prio = ODP_SCHED_PRIO_DEFAULT;
+ queue_param.sched.sync = sync[i];
+ queue_param.sched.group = ODP_SCHED_GROUP_ALL;
+ queue_param.size = queue_size;
+
+ queue = odp_queue_create("test_queue_size", &queue_param);
+
+ CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID);
+
+ for (j = 0; j < queue_size; j++) {
+ buf = odp_buffer_alloc(pool);
+ CU_ASSERT_FATAL(buf != ODP_BUFFER_INVALID);
+
+ ev = odp_buffer_to_event(buf);
+ ret = odp_queue_enq(queue, ev);
+ CU_ASSERT(ret == 0);
+
+ if (ret)
+ odp_event_free(ev);
+ }
+
+ num = 0;
+ for (j = 0; j < 100 * TEST_QUEUE_SIZE_NUM_EV; j++) {
+ ev = odp_schedule(&from, ODP_SCHED_NO_WAIT);
+
+ if (ev == ODP_EVENT_INVALID)
+ continue;
+
+ CU_ASSERT(from == queue);
+ odp_event_free(ev);
+ num++;
+ }
+
+ CU_ASSERT(num == queue_size);
+ CU_ASSERT_FATAL(odp_queue_destroy(queue) == 0);
+ }
+
+ CU_ASSERT_FATAL(odp_pool_destroy(pool) == 0);
+}
+
static void scheduler_test_groups(void)
{
odp_pool_t p;
@@ -1745,6 +1832,7 @@ odp_testinfo_t scheduler_suite[] = {
ODP_TEST_INFO(scheduler_test_wait_time),
ODP_TEST_INFO(scheduler_test_num_prio),
ODP_TEST_INFO(scheduler_test_queue_destroy),
+ ODP_TEST_INFO(scheduler_test_queue_size),
ODP_TEST_INFO(scheduler_test_groups),
ODP_TEST_INFO(scheduler_test_pause_resume),
ODP_TEST_INFO(scheduler_test_ordered_lock),
commit 21f383e9fa9f0f0c127dbb251e08ae91da56d817
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Oct 8 11:26:10 2018 +0300
linux-gen: pool: decrease minimum segment size to 2k
Decrease minimum segment size from about 8k to about 2k bytes.
Normal Ethernet frames still fit into first segment, but
SHM reservation size is reduced into about 1/3 what it was.
There is 1GB limit in process mode SHM allocations, so 1/3
reduction makes a big difference there.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h
index 99c31af7..bfe203bf 100644
--- a/platform/linux-generic/include/odp_config_internal.h
+++ b/platform/linux-generic/include/odp_config_internal.h
@@ -125,7 +125,9 @@ extern "C" {
* defined segment length (seg_len in odp_pool_param_t) will be rounded up into
* this value.
*/
-#define CONFIG_PACKET_SEG_LEN_MIN CONFIG_PACKET_MAX_SEG_LEN
+#define CONFIG_PACKET_SEG_LEN_MIN ((2 * 1024) - \
+ CONFIG_PACKET_HEADROOM - \
+ CONFIG_PACKET_TAILROOM)
/* Maximum number of shared memory blocks.
*
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 16 +-
configure.ac | 2 +
example/m4/configure.m4 | 12 +-
.../linux-generic/include/odp_config_internal.h | 4 +-
platform/linux-generic/include/odp_shm_internal.h | 5 +-
platform/linux-generic/odp_classification.c | 22 +-
platform/linux-generic/odp_crypto_null.c | 10 +-
platform/linux-generic/odp_crypto_openssl.c | 8 +-
platform/linux-generic/odp_ipsec_events.c | 9 +-
platform/linux-generic/odp_ipsec_sad.c | 11 +-
platform/linux-generic/odp_ishm.c | 3 +-
platform/linux-generic/odp_ishmphy.c | 4 +-
platform/linux-generic/odp_packet_io.c | 10 +-
platform/linux-generic/odp_pool.c | 6 +-
platform/linux-generic/odp_queue_basic.c | 25 +-
platform/linux-generic/odp_queue_lf.c | 8 +-
platform/linux-generic/odp_schedule_basic.c | 12 +-
platform/linux-generic/odp_shared_memory.c | 2 +-
platform/linux-generic/odp_thread.c | 6 +-
test/m4/configure.m4 | 10 +
test/performance/odp_sched_pktio.c | 503 ++++++++++++++++++---
test/validation/api/scheduler/scheduler.c | 88 ++++
22 files changed, 642 insertions(+), 134 deletions(-)
hooks/post-receive
--
6 years, 8 months
- 1
- 0
[COMMIT] branch master updated. v1.19.0.2_tigermoth-150-gf6b06ba4
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via f6b06ba4ef87d2c62fe47fe8ffe4e240b37c8fc1 (commit)
from 66d4b2811d1742dde1a8b84afdf6ab5914bfd1c6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f6b06ba4ef87d2c62fe47fe8ffe4e240b37c8fc1
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Thu Oct 4 16:58:25 2018 +0300
travis: export CI for first distcheck
scripts runs 2 distchecks but only for second one CI
was exported.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/scripts/ci/distcheck.sh b/scripts/ci/distcheck.sh
index c6e0f4ea..c78349e2 100755
--- a/scripts/ci/distcheck.sh
+++ b/scripts/ci/distcheck.sh
@@ -10,12 +10,12 @@ cd "$(dirname "$0")"/../..
./configure \
--enable-user-guides
-make distcheck
-
-make clean
-
# Ignore possible failures there because these tests depends on measurements
# and systems might differ in performance.
export CI="true"
+make distcheck
+
+make clean
+
make distcheck DISTCHECK__CONFIGURE_FLAGS=--disable-abi-compat
-----------------------------------------------------------------------
Summary of changes:
scripts/ci/distcheck.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
6 years, 8 months
- 1
- 0
[COMMIT] branch master updated. v1.19.0.2_tigermoth-149-g66d4b281
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via 66d4b2811d1742dde1a8b84afdf6ab5914bfd1c6 (commit)
via 5a9f779843e0140dce38f0d24640f995a6fcc25a (commit)
via 6e3954910345b19f596fa35a3427c432ffaa0ecf (commit)
via e86f2adb4c33cf047f6521149d67a340288dc8ca (commit)
via 32eba5cfc30b0708ffe6819b87fcff50d8c8102b (commit)
via 8343da812a20c3e1431e75656d97ff74c82bff41 (commit)
via 9cbb27956fffac255bde543e6d52ebb3cc6d589d (commit)
via 6b4331e9e3251d54db409a45cac7e5848d30029c (commit)
via da173cd050d227730307850830b1d02a76db6d2a (commit)
via d2ae9854243a72b7f7bc8c86a7226035c53c37be (commit)
via 84507e04c0d1e1cedaa0b83737c0baa8cdf8d265 (commit)
via c12678f1712dd291c7ce951243b52287f3028883 (commit)
via 07fb2ebf0a16f9ef54b2bdd15c99e2c46eda3afc (commit)
via 8002e2b5ce58a532615f9c630e14c793037f8ef7 (commit)
via 984ffe3caae07b8d5cd9dab14b7b93ca7d87a87d (commit)
via 194f82dac1ff10500ea10d2f25f9c010d67c6e5a (commit)
via bfc46064595db98814a70a048ad9d4de70d12e56 (commit)
via bb3a47d7eb62cfe50b111b357435f8bd554f374f (commit)
via 22dcddaa3dcc82f88b4e9b97a6aa6deb632269f6 (commit)
via 9a4f8305e9c90f0ca0e7e4c240eb88d81b864ae0 (commit)
from a08beb4afc6b7da7786cd7c827643689c1ee86d0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 66d4b2811d1742dde1a8b84afdf6ab5914bfd1c6
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Wed Sep 26 13:31:21 2018 +0300
travis: add process mode test
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/.travis.yml b/.travis.yml
index f2b97e4f..16e3a310 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -98,6 +98,21 @@ script:
fi
jobs:
include:
+ - stage: test
+ env: TEST=process_mode
+ install:
+ - true
+ compiler: gcc
+ script:
+ - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
+ - docker run --privileged -i -t
+ -v `pwd`:/odp --shm-size 8g
+ -e CODECOV_TOKEN="${CODECOV_TOKEN}"
+ -e CC="${CC}"
+ -e CONF="${CONF}"
+ -e ODP_CONFIG_FILE=/odp/platform/linux-generic/test/process-mode.conf
+ -e ODPH_PROC_MODE=1
+ ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_${UBUNTU_VERS} /odp/scripts/ci/check.sh ;
- stage: test
env: TEST=coverage
compiler: gcc
commit 5a9f779843e0140dce38f0d24640f995a6fcc25a
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Wed Sep 26 11:01:51 2018 +0300
linux-gen: test: configuration file for running process mode tests
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/test/process-mode.conf b/platform/linux-generic/test/process-mode.conf
new file mode 100644
index 00000000..8618f2fd
--- /dev/null
+++ b/platform/linux-generic/test/process-mode.conf
@@ -0,0 +1,10 @@
+# Mandatory fields
+odp_implementation = "linux-generic"
+config_file_version = "0.1.0"
+
+# Shared memory options
+shm: {
+ # Override default option and allocate internal shms using single
+ # virtual address space.
+ single_va = 1
+}
commit 6e3954910345b19f596fa35a3427c432ffaa0ecf
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Wed Sep 26 13:25:06 2018 +0300
helper: threads: add ODPH_PROC_MODE environment variable
ODPH_PROC_MODE environment variable can be used to enable process mode.
Setting environment variable is simpler in CI compared to using command
line arguments.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/helper/threads.c b/helper/threads.c
index 86d6bf7b..f1f63875 100644
--- a/helper/threads.c
+++ b/helper/threads.c
@@ -10,6 +10,7 @@
#define _GNU_SOURCE
#endif
#include <sched.h>
+#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/wait.h>
@@ -332,10 +333,18 @@ int odph_odpthread_getaffinity(void)
int odph_parse_options(int argc, char *argv[])
{
+ char *env;
int i, j;
helper_options.proc = 0;
+ /* Enable process mode using environment variable. Setting environment
+ * variable is easier for CI testing compared to command line
+ * argument. */
+ env = getenv("ODPH_PROC_MODE");
+ if (env && atoi(env))
+ helper_options.proc = 1;
+
/* Find and remove option */
for (i = 0; i < argc;) {
if (strcmp(argv[i], "--odph_proc") == 0) {
commit e86f2adb4c33cf047f6521149d67a340288dc8ca
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Sep 28 13:32:11 2018 +0300
test: mmap_vlan_ins: allocate global data from shm
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c
index cf3d6d93..5066eede 100644
--- a/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c
+++ b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c
@@ -19,14 +19,15 @@
#define MAX_PKT_BURST 32
#define MAX_WORKERS 1
-static int g_ret;
-
-struct {
+typedef struct {
odp_pktio_t if0, if1;
odp_pktin_queue_t if0in, if1in;
odp_pktout_queue_t if0out, if1out;
odph_ethaddr_t src, dst;
-} global;
+ int g_ret;
+} global_data_t;
+
+static global_data_t *global;
static odp_pktio_t create_pktio(const char *name, odp_pool_t pool,
odp_pktin_queue_t *pktin,
@@ -80,12 +81,12 @@ static int run_worker(void *arg ODP_UNUSED)
int total_pkts = 0;
uint64_t wait_time = odp_pktin_wait_time(2 * ODP_TIME_SEC_IN_NS);
- if (odp_pktio_start(global.if0)) {
+ if (odp_pktio_start(global->if0)) {
printf("unable to start input interface\n");
exit(1);
}
printf("started input interface\n");
- if (odp_pktio_start(global.if1)) {
+ if (odp_pktio_start(global->if1)) {
printf("unable to start output interface\n");
exit(1);
}
@@ -93,7 +94,7 @@ static int run_worker(void *arg ODP_UNUSED)
printf("started all\n");
while (1) {
- pkts = odp_pktin_recv_tmo(global.if0in, pkt_tbl, MAX_PKT_BURST,
+ pkts = odp_pktin_recv_tmo(global->if0in, pkt_tbl, MAX_PKT_BURST,
wait_time);
if (odp_unlikely(pkts <= 0)) {
printf("recv tmo!\n");
@@ -109,10 +110,10 @@ static int run_worker(void *arg ODP_UNUSED)
return 0;
}
eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL);
- eth->src = global.src;
- eth->dst = global.dst;
+ eth->src = global->src;
+ eth->dst = global->dst;
}
- sent = odp_pktout_send(global.if1out, pkt_tbl, pkts);
+ sent = odp_pktout_send(global->if1out, pkt_tbl, pkts);
if (sent < 0)
sent = 0;
total_pkts += sent;
@@ -124,7 +125,7 @@ static int run_worker(void *arg ODP_UNUSED)
printf("Total send packets: %d\n", total_pkts);
if (total_pkts < 10)
- g_ret = -1;
+ global->g_ret = -1;
return 0;
}
@@ -137,6 +138,8 @@ int main(int argc, char **argv)
odph_odpthread_t thd[MAX_WORKERS];
odp_instance_t instance;
odph_odpthread_params_t thr_params;
+ odp_shm_t shm;
+ int ret;
/* let helper collect its own arguments (e.g. --odph_proc) */
argc = odph_parse_options(argc, argv);
@@ -157,6 +160,17 @@ int main(int argc, char **argv)
exit(1);
}
+ /* Reserve memory for args from shared mem */
+ shm = odp_shm_reserve("_appl_global_data", sizeof(global_data_t),
+ ODP_CACHE_LINE_SIZE, 0);
+ global = odp_shm_addr(shm);
+ if (global == NULL) {
+ printf("Error: shared mem alloc failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ memset(global, 0, sizeof(global_data_t));
+
/* Create packet pool */
odp_pool_param_init(¶ms);
params.pkt.seg_len = POOL_SEG_LEN;
@@ -171,8 +185,10 @@ int main(int argc, char **argv)
exit(1);
}
- global.if0 = create_pktio(argv[1], pool, &global.if0in, &global.if0out);
- global.if1 = create_pktio(argv[2], pool, &global.if1in, &global.if1out);
+ global->if0 = create_pktio(argv[1], pool, &global->if0in,
+ &global->if0out);
+ global->if1 = create_pktio(argv[2], pool, &global->if1in,
+ &global->if1out);
odp_cpumask_default_worker(&cpumask, MAX_WORKERS);
@@ -185,11 +201,18 @@ int main(int argc, char **argv)
odph_odpthreads_create(thd, &cpumask, &thr_params);
odph_odpthreads_join(thd);
+ ret = global->g_ret;
+
if (odp_pool_destroy(pool)) {
printf("Error: pool destroy\n");
exit(EXIT_FAILURE);
}
+ if (odp_shm_free(shm)) {
+ printf("Error: shm free global data\n");
+ exit(EXIT_FAILURE);
+ }
+
if (odp_term_local()) {
printf("Error: term local\n");
exit(EXIT_FAILURE);
@@ -200,5 +223,5 @@ int main(int argc, char **argv)
exit(EXIT_FAILURE);
}
- return g_ret;
+ return ret;
}
commit 32eba5cfc30b0708ffe6819b87fcff50d8c8102b
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Thu Sep 27 16:52:06 2018 +0300
test: ring: allocate global data from shm
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/test/ring/ring_stress.c b/platform/linux-generic/test/ring/ring_stress.c
index c9bd5308..ddabffad 100644
--- a/platform/linux-generic/test/ring/ring_stress.c
+++ b/platform/linux-generic/test/ring/ring_stress.c
@@ -33,12 +33,6 @@
* this many successful enq or deq operations */
#define NUM_BULK_OP ((RING_SIZE / PIECE_BULK) * 100)
-/*
- * Since cunit framework cannot work with multi-threading, ask workers
- * to save their results for delayed assertion after thread collection.
- */
-static int worker_results[MAX_WORKERS];
-
/*
* Note : make sure that both enqueue and dequeue
* operation starts at same time so to avoid data corruption
@@ -54,18 +48,42 @@ typedef enum {
STRESS_N_M_PRODUCER_CONSUMER
} stress_case_t;
+#define GLOBAL_SHM_NAME "RingGlobalShm"
+
/* worker function declarations */
static int stress_worker(void *_data);
/* global name for later look up in workers' context */
static const char *ring_name = "stress_ring";
-/* barrier to run threads at the same time */
-static odp_barrier_t barrier;
+typedef struct {
+ odp_shm_t shm;
+ /* Barrier to run threads at the same time */
+ odp_barrier_t barrier;
+ /*
+ * Since cunit framework cannot work with multi-threading, ask workers
+ * to save their results for delayed assertion after thread collection.
+ */
+ int worker_results[MAX_WORKERS];
+} global_shared_mem_t;
+
+static global_shared_mem_t *global_mem;
int ring_test_stress_start(void)
{
_ring_t *r_stress = NULL;
+ odp_shm_t shm;
+
+ shm = odp_shm_reserve(GLOBAL_SHM_NAME, sizeof(global_shared_mem_t), 64,
+ ODP_SHM_SW_ONLY);
+ if (shm == ODP_SHM_INVALID) {
+ fprintf(stderr, "Unable reserve memory for global_shm\n");
+ return -1;
+ }
+
+ global_mem = odp_shm_addr(shm);
+ memset(global_mem, 0, sizeof(global_shared_mem_t));
+ global_mem->shm = shm;
/* multiple thread usage scenario, thread or process sharable */
r_stress = _ring_create(ring_name, RING_SIZE, _RING_SHM_PROC);
@@ -79,7 +97,11 @@ int ring_test_stress_start(void)
int ring_test_stress_end(void)
{
- _ring_destroy(ring_name);
+ if (odp_shm_free(global_mem->shm)) {
+ fprintf(stderr, "error: odp_shm_free() failed.\n");
+ return -1;
+ }
+
return 0;
}
@@ -90,7 +112,8 @@ void ring_test_stress_1_1_producer_consumer(void)
pthrd_arg worker_param;
/* reset results for delayed assertion */
- memset(worker_results, 0, sizeof(worker_results));
+ memset(global_mem->worker_results, 0,
+ sizeof(global_mem->worker_results));
/* request 2 threads to run 1:1 stress */
worker_param.numthrds = odp_cpumask_default_worker(&cpus, 2);
@@ -103,7 +126,7 @@ void ring_test_stress_1_1_producer_consumer(void)
return;
}
- odp_barrier_init(&barrier, 2);
+ odp_barrier_init(&global_mem->barrier, 2);
/* kick the workers */
odp_cunit_thread_create(stress_worker, &worker_param);
@@ -113,7 +136,7 @@ void ring_test_stress_1_1_producer_consumer(void)
/* delayed assertion due to cunit limitation */
for (i = 0; i < worker_param.numthrds; i++)
- CU_ASSERT(0 == worker_results[i]);
+ CU_ASSERT(0 == global_mem->worker_results[i]);
}
void ring_test_stress_N_M_producer_consumer(void)
@@ -123,7 +146,8 @@ void ring_test_stress_N_M_producer_consumer(void)
pthrd_arg worker_param;
/* reset results for delayed assertion */
- memset(worker_results, 0, sizeof(worker_results));
+ memset(global_mem->worker_results, 0,
+ sizeof(global_mem->worker_results));
/* request MAX_WORKERS threads to run N:M stress */
worker_param.numthrds =
@@ -141,7 +165,7 @@ void ring_test_stress_N_M_producer_consumer(void)
if (worker_param.numthrds & 0x1)
worker_param.numthrds -= 1;
- odp_barrier_init(&barrier, worker_param.numthrds);
+ odp_barrier_init(&global_mem->barrier, worker_param.numthrds);
/* kick the workers */
odp_cunit_thread_create(stress_worker, &worker_param);
@@ -151,7 +175,7 @@ void ring_test_stress_N_M_producer_consumer(void)
/* delayed assertion due to cunit limitation */
for (i = 0; i < worker_param.numthrds; i++)
- CU_ASSERT(0 == worker_results[i]);
+ CU_ASSERT(0 == global_mem->worker_results[i]);
}
void ring_test_stress_1_N_producer_consumer(void)
@@ -214,7 +238,8 @@ static int stress_worker(void *_data)
int worker_id = odp_thread_id();
/* save the worker result for delayed assertion */
- result = &worker_results[(worker_id % worker_param->numthrds)];
+ result = &global_mem->worker_results[(worker_id %
+ worker_param->numthrds)];
/* verify ring lookup in worker context */
r_stress = _ring_lookup(ring_name);
@@ -223,7 +248,7 @@ static int stress_worker(void *_data)
return (*result = -1);
}
- odp_barrier_wait(&barrier);
+ odp_barrier_wait(&global_mem->barrier);
switch (worker_param->testcase) {
case STRESS_1_1_PRODUCER_CONSUMER:
@@ -242,7 +267,7 @@ static int stress_worker(void *_data)
break;
}
- odp_barrier_wait(&barrier);
+ odp_barrier_wait(&global_mem->barrier);
return 0;
}
commit 8343da812a20c3e1431e75656d97ff74c82bff41
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Thu Sep 27 10:28:45 2018 +0300
test: example: allocate global data from shm
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c
index 3403647b..26ad67ee 100644
--- a/example/classifier/odp_classifier.c
+++ b/example/classifier/odp_classifier.c
@@ -73,6 +73,7 @@ typedef struct {
unsigned int cpu_count; /**< Number of CPUs to use */
uint32_t time; /**< Number of seconds to run */
char *if_name; /**< pointer to interface names */
+ int shutdown; /**< Shutdown threads if !0 */
} appl_args_t;
enum packet_mode {
@@ -80,8 +81,6 @@ enum packet_mode {
APPL_MODE_REPLY /**< Packet is sent back */
};
-static int shutdown; /**< Shutdown threads if !0 */
-
/* helper funcs */
static int drop_err_pkts(odp_packet_t pkt_tbl[], unsigned len);
static void swap_pkt_addrs(odp_packet_t pkt_tbl[], unsigned len);
@@ -272,7 +271,7 @@ static int pktio_receive_thread(void *arg)
for (;;) {
odp_pktio_t pktio_tmp;
- if (shutdown)
+ if (appl->shutdown)
break;
/* Use schedule to get buf from any input queue */
@@ -574,7 +573,7 @@ int main(int argc, char *argv[])
print_cls_statistics(args);
odp_pktio_stop(pktio);
- shutdown = 1;
+ args->shutdown = 1;
odph_odpthreads_join(thread_tbl);
for (i = 0; i < args->policy_count; i++) {
diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c
index 0785e3ec..4e06115c 100644
--- a/example/generator/odp_generator.c
+++ b/example/generator/odp_generator.c
@@ -151,14 +151,13 @@ typedef struct {
int thread_cnt;
int tx_burst_size;
int rx_burst_size;
+ /** Barrier to sync threads execution */
+ odp_barrier_t barrier;
} args_t;
/** Global pointer to args */
static args_t *args;
-/** Barrier to sync threads execution */
-static odp_barrier_t barrier;
-
/** Packet processing function types */
typedef odp_packet_t (*setup_pkt_ref_fn_t)(odp_pool_t,
odp_pktout_config_opt_t *);
@@ -758,7 +757,7 @@ static int gen_send_thread(void *arg)
printf(" [%02i] created mode: SEND\n", thr);
- odp_barrier_wait(&barrier);
+ odp_barrier_wait(&args->barrier);
for (;;) {
if (thr_args->stop)
@@ -929,7 +928,7 @@ static int gen_recv_thread(void *arg)
burst_size = args->rx_burst_size;
printf(" [%02i] created mode: RECEIVE SCHEDULER\n", thr);
- odp_barrier_wait(&barrier);
+ odp_barrier_wait(&args->barrier);
for (;;) {
if (thr_args->stop)
@@ -980,7 +979,7 @@ static int gen_recv_direct_thread(void *arg)
burst_size = args->rx_burst_size;
printf(" [%02i] created mode: RECEIVE\n", thr);
- odp_barrier_wait(&barrier);
+ odp_barrier_wait(&args->barrier);
for (;;) {
if (thr_args->stop)
@@ -1046,7 +1045,7 @@ static void print_global_stats(int num_workers)
int verbose_interval = 20, i;
odp_thrmask_t thrd_mask;
- odp_barrier_wait(&barrier);
+ odp_barrier_wait(&args->barrier);
wait = odp_time_local_from_ns(verbose_interval * ODP_TIME_SEC_IN_NS);
next = odp_time_sum(odp_time_local(), wait);
@@ -1293,7 +1292,7 @@ int main(int argc, char *argv[])
thr_params.instance = instance;
/* num workers + print thread */
- odp_barrier_init(&barrier, num_workers + 1);
+ odp_barrier_init(&args->barrier, num_workers + 1);
if (args->appl.mode == APPL_MODE_PING) {
odp_cpumask_t cpu_mask;
diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c
index 2624af5d..ee63451c 100644
--- a/example/ipsec/odp_ipsec.c
+++ b/example/ipsec/odp_ipsec.c
@@ -66,6 +66,8 @@ static int create_stream_db_entry(char *input ODP_UNUSED)
/* maximum number of worker threads */
#define MAX_WORKERS (ODP_THREAD_COUNT_MAX - 1)
+#define MAX_POLL_QUEUES 256
+
/**
* Parsed command line application arguments
*/
@@ -79,21 +81,30 @@ typedef struct {
} appl_args_t;
/**
- * Grouping of both parsed CL args and thread specific args - alloc together
+ * Grouping of both parsed CL args and global application data
*/
typedef struct {
/** Application (parsed) arguments */
appl_args_t appl;
-} args_t;
+ odp_shm_t shm;
+ odp_pool_t ctx_pool;
+ odp_pool_t out_pool;
+ odp_pool_t pkt_pool;
+ /** ATOMIC queue for IPsec sequence number assignment */
+ odp_queue_t seqnumq;
+ /** ORDERED queue for per packet crypto API completion events */
+ odp_queue_t completionq;
+ /** Synchronize threads before packet processing begins */
+ odp_barrier_t sync_barrier;
+ odp_queue_t poll_queues[MAX_POLL_QUEUES];
+ int num_polled_queues;
+} global_data_t;
/* helper funcs */
static void parse_args(int argc, char *argv[], appl_args_t *appl_args);
static void print_info(char *progname, appl_args_t *appl_args);
static void usage(char *progname);
-/** Global pointer to args */
-static args_t *args;
-
/**
* Buffer pool for packet IO
*/
@@ -101,8 +112,6 @@ static args_t *args;
#define SHM_PKT_POOL_BUF_SIZE 4096
#define SHM_PKT_POOL_SIZE (SHM_PKT_POOL_BUF_COUNT * SHM_PKT_POOL_BUF_SIZE)
-static odp_pool_t pkt_pool = ODP_POOL_INVALID;
-
/**
* Buffer pool for crypto session output packets
*/
@@ -110,17 +119,6 @@ static odp_pool_t pkt_pool = ODP_POOL_INVALID;
#define SHM_OUT_POOL_BUF_SIZE 4096
#define SHM_OUT_POOL_SIZE (SHM_OUT_POOL_BUF_COUNT * SHM_OUT_POOL_BUF_SIZE)
-static odp_pool_t out_pool = ODP_POOL_INVALID;
-
-/** ATOMIC queue for IPsec sequence number assignment */
-static odp_queue_t seqnumq;
-
-/** ORDERED queue (eventually) for per packet crypto API completion events */
-static odp_queue_t completionq;
-
-/** Synchronize threads before packet processing begins */
-static odp_barrier_t sync_barrier;
-
/**
* Packet processing states/steps
*/
@@ -184,7 +182,7 @@ typedef struct {
#define SHM_CTX_POOL_BUF_COUNT (SHM_PKT_POOL_BUF_COUNT + SHM_OUT_POOL_BUF_COUNT)
#define SHM_CTX_POOL_SIZE (SHM_CTX_POOL_BUF_COUNT * SHM_CTX_POOL_BUF_SIZE)
-static odp_pool_t ctx_pool = ODP_POOL_INVALID;
+static global_data_t *global;
/**
* Get per packet processing context from packet buffer
@@ -210,7 +208,7 @@ pkt_ctx_t *get_pkt_ctx_from_pkt(odp_packet_t pkt)
static
pkt_ctx_t *alloc_pkt_ctx(odp_packet_t pkt)
{
- odp_buffer_t ctx_buf = odp_buffer_alloc(ctx_pool);
+ odp_buffer_t ctx_buf = odp_buffer_alloc(global->ctx_pool);
pkt_ctx_t *ctx;
if (odp_unlikely(ODP_BUFFER_INVALID == ctx_buf))
@@ -245,11 +243,6 @@ typedef odp_event_t (*schedule_func_t) (odp_queue_t *);
static queue_create_func_t queue_create;
static schedule_func_t schedule;
-#define MAX_POLL_QUEUES 256
-
-static odp_queue_t poll_queues[MAX_POLL_QUEUES];
-static int num_polled_queues;
-
/**
* odp_queue_create wrapper to enable polling versus scheduling
*/
@@ -275,7 +268,7 @@ odp_queue_t polled_odp_queue_create(const char *name,
my_queue = odp_queue_create(name, &qp);
if (ODP_QUEUE_TYPE_SCHED == type) {
- poll_queues[num_polled_queues++] = my_queue;
+ global->poll_queues[global->num_polled_queues++] = my_queue;
printf("%s: adding %"PRIu64"\n", __func__,
odp_queue_to_u64(my_queue));
}
@@ -298,10 +291,10 @@ odp_event_t polled_odp_schedule_cb(odp_queue_t *from)
int idx = 0;
while (1) {
- if (idx >= num_polled_queues)
+ if (idx >= global->num_polled_queues)
idx = 0;
- odp_queue_t queue = poll_queues[idx++];
+ odp_queue_t queue = global->poll_queues[idx++];
odp_event_t buf;
buf = odp_queue_deq(queue);
@@ -337,8 +330,8 @@ void ipsec_init_pre(void)
qparam.sched.sync = ODP_SCHED_SYNC_ATOMIC;
qparam.sched.group = ODP_SCHED_GROUP_ALL;
- completionq = queue_create("completion", &qparam);
- if (ODP_QUEUE_INVALID == completionq) {
+ global->completionq = queue_create("completion", &qparam);
+ if (ODP_QUEUE_INVALID == global->completionq) {
EXAMPLE_ERR("Error: completion queue creation failed\n");
exit(EXIT_FAILURE);
}
@@ -348,8 +341,8 @@ void ipsec_init_pre(void)
qparam.sched.sync = ODP_SCHED_SYNC_ATOMIC;
qparam.sched.group = ODP_SCHED_GROUP_ALL;
- seqnumq = queue_create("seqnum", &qparam);
- if (ODP_QUEUE_INVALID == seqnumq) {
+ global->seqnumq = queue_create("seqnum", &qparam);
+ if (ODP_QUEUE_INVALID == global->seqnumq) {
EXAMPLE_ERR("Error: sequence number queue creation failed\n");
exit(EXIT_FAILURE);
}
@@ -361,9 +354,9 @@ void ipsec_init_pre(void)
params.pkt.num = SHM_PKT_POOL_BUF_COUNT;
params.type = ODP_POOL_PACKET;
- out_pool = odp_pool_create("out_pool", ¶ms);
+ global->out_pool = odp_pool_create("out_pool", ¶ms);
- if (ODP_POOL_INVALID == out_pool) {
+ if (ODP_POOL_INVALID == global->out_pool) {
EXAMPLE_ERR("Error: message pool create failed.\n");
exit(EXIT_FAILURE);
}
@@ -414,8 +407,8 @@ void ipsec_init_post(crypto_api_mode_e api_mode)
tun,
api_mode,
entry->input,
- completionq,
- out_pool)) {
+ global->completionq,
+ global->out_pool)) {
EXAMPLE_ERR("Error: IPSec cache entry failed.\n"
);
exit(EXIT_FAILURE);
@@ -480,7 +473,7 @@ void initialize_intf(char *intf)
/*
* Open a packet IO instance for thread and get default output queue
*/
- pktio = odp_pktio_open(intf, pkt_pool, &pktio_param);
+ pktio = odp_pktio_open(intf, global->pkt_pool, &pktio_param);
if (ODP_PKTIO_INVALID == pktio) {
EXAMPLE_ERR("Error: pktio create failed for %s\n", intf);
exit(EXIT_FAILURE);
@@ -1052,7 +1045,7 @@ int pktio_thread(void *arg EXAMPLE_UNUSED)
printf("Pktio thread [%02i] starts\n", thr);
- odp_barrier_wait(&sync_barrier);
+ odp_barrier_wait(&global->sync_barrier);
/* Loop packets */
for (;;) {
@@ -1067,7 +1060,8 @@ int pktio_thread(void *arg EXAMPLE_UNUSED)
/* Determine new work versus completion or sequence number */
if (ODP_EVENT_PACKET == odp_event_types(ev, &subtype)) {
pkt = odp_packet_from_event(ev);
- if (seqnumq == dispatchq || completionq == dispatchq) {
+ if (global->seqnumq == dispatchq ||
+ global->completionq == dispatchq) {
ctx = get_pkt_ctx_from_pkt(pkt);
} else {
ctx = alloc_pkt_ctx(pkt);
@@ -1132,7 +1126,7 @@ int pktio_thread(void *arg EXAMPLE_UNUSED)
ctx->state = PKT_STATE_TRANSMIT;
} else {
ctx->state = PKT_STATE_IPSEC_OUT_SEQ;
- if (odp_queue_enq(seqnumq, ev))
+ if (odp_queue_enq(global->seqnumq, ev))
rc = PKT_DROP;
}
break;
@@ -1226,16 +1220,17 @@ main(int argc, char *argv[])
}
/* Reserve memory for args from shared mem */
- shm = odp_shm_reserve("shm_args", sizeof(args_t), ODP_CACHE_LINE_SIZE,
- 0);
+ shm = odp_shm_reserve("shm_args", sizeof(global_data_t),
+ ODP_CACHE_LINE_SIZE, 0);
- args = odp_shm_addr(shm);
+ global = odp_shm_addr(shm);
- if (NULL == args) {
+ if (NULL == global) {
EXAMPLE_ERR("Error: shared mem alloc failed.\n");
exit(EXIT_FAILURE);
}
- memset(args, 0, sizeof(*args));
+ memset(global, 0, sizeof(global_data_t));
+ global->shm = shm;
/* Must init our databases before parsing args */
ipsec_init_pre();
@@ -1243,14 +1238,14 @@ main(int argc, char *argv[])
init_stream_db();
/* Parse and store the application arguments */
- parse_args(argc, argv, &args->appl);
+ parse_args(argc, argv, &global->appl);
/* Print both system and application information */
- print_info(NO_PATH(argv[0]), &args->appl);
+ print_info(NO_PATH(argv[0]), &global->appl);
num_workers = MAX_WORKERS;
- if (args->appl.cpu_count && args->appl.cpu_count < MAX_WORKERS)
- num_workers = args->appl.cpu_count;
+ if (global->appl.cpu_count && global->appl.cpu_count < MAX_WORKERS)
+ num_workers = global->appl.cpu_count;
/* Get default worker cpumask */
num_workers = odp_cpumask_default_worker(&cpumask, num_workers);
@@ -1261,7 +1256,7 @@ main(int argc, char *argv[])
printf("cpu mask: %s\n", cpumaskstr);
/* Create a barrier to synchronize thread startup */
- odp_barrier_init(&sync_barrier, num_workers);
+ odp_barrier_init(&global->sync_barrier, num_workers);
/* Create packet buffer pool */
odp_pool_param_init(¶ms);
@@ -1270,9 +1265,9 @@ main(int argc, char *argv[])
params.pkt.num = SHM_PKT_POOL_BUF_COUNT;
params.type = ODP_POOL_PACKET;
- pkt_pool = odp_pool_create("packet_pool", ¶ms);
+ global->pkt_pool = odp_pool_create("packet_pool", ¶ms);
- if (ODP_POOL_INVALID == pkt_pool) {
+ if (ODP_POOL_INVALID == global->pkt_pool) {
EXAMPLE_ERR("Error: packet pool create failed.\n");
exit(EXIT_FAILURE);
}
@@ -1283,24 +1278,23 @@ main(int argc, char *argv[])
params.buf.num = SHM_CTX_POOL_BUF_COUNT;
params.type = ODP_POOL_BUFFER;
- ctx_pool = odp_pool_create("ctx_pool", ¶ms);
+ global->ctx_pool = odp_pool_create("ctx_pool", ¶ms);
- if (ODP_POOL_INVALID == ctx_pool) {
+ if (ODP_POOL_INVALID == global->ctx_pool) {
EXAMPLE_ERR("Error: context pool create failed.\n");
exit(EXIT_FAILURE);
}
/* Populate our IPsec cache */
printf("Using %s mode for crypto API\n\n",
- (CRYPTO_API_SYNC == args->appl.mode) ? "SYNC" :
- (CRYPTO_API_ASYNC_IN_PLACE == args->appl.mode) ?
+ (CRYPTO_API_SYNC == global->appl.mode) ? "SYNC" :
+ (CRYPTO_API_ASYNC_IN_PLACE == global->appl.mode) ?
"ASYNC_IN_PLACE" : "ASYNC_NEW_BUFFER");
- ipsec_init_post(args->appl.mode);
+ ipsec_init_post(global->appl.mode);
/* Initialize interfaces (which resolves FWD DB entries */
- for (i = 0; i < args->appl.if_count; i++) {
- initialize_intf(args->appl.if_names[i]);
- }
+ for (i = 0; i < global->appl.if_count; i++)
+ initialize_intf(global->appl.if_names[i]);
/* If we have test streams build them before starting workers */
resolve_stream_db();
@@ -1331,12 +1325,9 @@ main(int argc, char *argv[])
odph_odpthreads_join(thread_tbl);
}
- free(args->appl.if_names);
- free(args->appl.if_str);
+ free(global->appl.if_names);
+ free(global->appl.if_str);
- shm = odp_shm_lookup("shm_args");
- if (odp_shm_free(shm) != 0)
- EXAMPLE_ERR("Error: shm free shm_args failed\n");
shm = odp_shm_lookup("shm_ipsec_cache");
if (odp_shm_free(shm) != 0)
EXAMPLE_ERR("Error: shm free shm_ipsec_cache failed\n");
@@ -1355,6 +1346,10 @@ main(int argc, char *argv[])
shm = odp_shm_lookup("stream_db");
if (odp_shm_free(shm) != 0)
EXAMPLE_ERR("Error: shm free stream_db failed\n");
+ if (odp_shm_free(global->shm)) {
+ EXAMPLE_ERR("Error: shm free global data failed\n");
+ exit(EXIT_FAILURE);
+ }
printf("Exit\n\n");
diff --git a/example/ipsec_api/odp_ipsec.c b/example/ipsec_api/odp_ipsec.c
index f827eeeb..b402002c 100644
--- a/example/ipsec_api/odp_ipsec.c
+++ b/example/ipsec_api/odp_ipsec.c
@@ -66,6 +66,8 @@ static int create_stream_db_entry(char *input ODP_UNUSED)
/* maximum number of worker threads */
#define MAX_WORKERS (ODP_THREAD_COUNT_MAX - 1)
+#define MAX_POLL_QUEUES 256
+
/**
* Parsed command line application arguments
*/
@@ -80,21 +82,27 @@ typedef struct {
} appl_args_t;
/**
- * Grouping of both parsed CL args and thread specific args - alloc together
+ * Grouping of both parsed CL args and global application data
*/
typedef struct {
/** Application (parsed) arguments */
appl_args_t appl;
-} args_t;
+ odp_shm_t shm;
+ odp_pool_t ctx_pool;
+ odp_pool_t pkt_pool;
+ /** ORDERED queue for per packet crypto API completion events */
+ odp_queue_t completionq;
+ /** Synchronize threads before packet processing begins */
+ odp_barrier_t sync_barrier;
+ odp_queue_t poll_queues[MAX_POLL_QUEUES];
+ int num_polled_queues;
+} global_data_t;
/* helper funcs */
static void parse_args(int argc, char *argv[], appl_args_t *appl_args);
static void print_info(char *progname, appl_args_t *appl_args);
static void usage(char *progname);
-/** Global pointer to args */
-static args_t *args;
-
/**
* Buffer pool for packet IO
*/
@@ -102,14 +110,6 @@ static args_t *args;
#define SHM_PKT_POOL_BUF_SIZE 4096
#define SHM_PKT_POOL_SIZE (SHM_PKT_POOL_BUF_COUNT * SHM_PKT_POOL_BUF_SIZE)
-static odp_pool_t pkt_pool = ODP_POOL_INVALID;
-
-/** ORDERED queue (eventually) for per packet crypto API completion events */
-static odp_queue_t completionq = ODP_QUEUE_INVALID;
-
-/** Synchronize threads before packet processing begins */
-static odp_barrier_t sync_barrier;
-
/**
* Packet processing states/steps
*/
@@ -146,7 +146,7 @@ typedef struct {
#define SHM_CTX_POOL_BUF_COUNT (SHM_PKT_POOL_BUF_COUNT)
#define SHM_CTX_POOL_SIZE (SHM_CTX_POOL_BUF_COUNT * SHM_CTX_POOL_BUF_SIZE)
-static odp_pool_t ctx_pool = ODP_POOL_INVALID;
+static global_data_t *global;
/**
* Allocate per packet processing context and associate it with
@@ -159,7 +159,7 @@ static odp_pool_t ctx_pool = ODP_POOL_INVALID;
static
pkt_ctx_t *alloc_pkt_ctx(odp_packet_t pkt)
{
- odp_buffer_t ctx_buf = odp_buffer_alloc(ctx_pool);
+ odp_buffer_t ctx_buf = odp_buffer_alloc(global->ctx_pool);
pkt_ctx_t *ctx;
if (odp_unlikely(ODP_BUFFER_INVALID == ctx_buf))
@@ -194,11 +194,6 @@ typedef odp_event_t (*schedule_func_t) (odp_queue_t *);
static queue_create_func_t queue_create;
static schedule_func_t schedule;
-#define MAX_POLL_QUEUES 256
-
-static odp_queue_t poll_queues[MAX_POLL_QUEUES];
-static int num_polled_queues;
-
/**
* odp_queue_create wrapper to enable polling versus scheduling
*/
@@ -224,7 +219,7 @@ odp_queue_t polled_odp_queue_create(const char *name,
my_queue = odp_queue_create(name, &qp);
if (ODP_QUEUE_TYPE_SCHED == type) {
- poll_queues[num_polled_queues++] = my_queue;
+ global->poll_queues[global->num_polled_queues++] = my_queue;
printf("%s: adding %" PRIu64 "\n", __func__,
odp_queue_to_u64(my_queue));
}
@@ -247,10 +242,10 @@ odp_event_t polled_odp_schedule_cb(odp_queue_t *from)
int idx = 0;
while (1) {
- if (idx >= num_polled_queues)
+ if (idx >= global->num_polled_queues)
idx = 0;
- odp_queue_t queue = poll_queues[idx++];
+ odp_queue_t queue = global->poll_queues[idx++];
odp_event_t buf;
buf = odp_queue_deq(queue);
@@ -285,8 +280,8 @@ void ipsec_init_pre(void)
qparam.sched.sync = ODP_SCHED_SYNC_ATOMIC;
qparam.sched.group = ODP_SCHED_GROUP_ALL;
- completionq = queue_create("completion", &qparam);
- if (ODP_QUEUE_INVALID == completionq) {
+ global->completionq = queue_create("completion", &qparam);
+ if (ODP_QUEUE_INVALID == global->completionq) {
EXAMPLE_ERR("Error: completion queue creation failed\n");
exit(EXIT_FAILURE);
}
@@ -326,7 +321,7 @@ void ipsec_init_post(odp_ipsec_op_mode_t api_mode)
ipsec_config.inbound.parse_level = ODP_PROTO_LAYER_ALL;
ipsec_config.inbound_mode = api_mode;
ipsec_config.outbound_mode = api_mode;
- ipsec_config.inbound.default_queue = completionq;
+ ipsec_config.inbound.default_queue = global->completionq;
if (odp_ipsec_config(&ipsec_config) != ODP_IPSEC_OK) {
EXAMPLE_ERR("Error: failure setting IPSec config\n");
exit(EXIT_FAILURE);
@@ -358,7 +353,7 @@ void ipsec_init_post(odp_ipsec_op_mode_t api_mode)
auth_sa,
tun,
entry->input,
- completionq)) {
+ global->completionq)) {
EXAMPLE_ERR("Error: IPSec cache entry failed.\n"
);
exit(EXIT_FAILURE);
@@ -445,7 +440,7 @@ void initialize_intf(char *intf)
/*
* Open a packet IO instance for thread and get default output queue
*/
- pktio = odp_pktio_open(intf, pkt_pool, &pktio_param);
+ pktio = odp_pktio_open(intf, global->pkt_pool, &pktio_param);
if (ODP_PKTIO_INVALID == pktio) {
EXAMPLE_ERR("Error: pktio create failed for %s\n", intf);
exit(EXIT_FAILURE);
@@ -481,10 +476,10 @@ void initialize_intf(char *intf)
odp_pktio_config_init(&config);
if (check_stream_db_in(intf) &&
- args->appl.mode == ODP_IPSEC_OP_MODE_INLINE)
+ global->appl.mode == ODP_IPSEC_OP_MODE_INLINE)
config.inbound_ipsec = capa.config.inbound_ipsec;
if (check_stream_db_out(intf) &&
- args->appl.mode == ODP_IPSEC_OP_MODE_INLINE)
+ global->appl.mode == ODP_IPSEC_OP_MODE_INLINE)
config.outbound_ipsec = capa.config.outbound_ipsec;
if (odp_pktio_config(pktio, &config) != 0) {
@@ -571,7 +566,7 @@ pkt_disposition_e do_route_fwd_db(odp_packet_t pkt, pkt_ctx_t *ctx)
memcpy(&ctx->eth.src, entry->src_mac, ODPH_ETHADDR_LEN);
ctx->eth.type = odp_cpu_to_be_16(ODPH_ETHTYPE_IPV4);
- if (args->appl.mode != ODP_IPSEC_OP_MODE_INLINE) {
+ if (global->appl.mode != ODP_IPSEC_OP_MODE_INLINE) {
odp_packet_l2_offset_set(pkt, 0);
odp_packet_copy_from_mem(pkt, 0, ODPH_ETHHDR_LEN,
&ctx->eth);
@@ -620,7 +615,7 @@ pkt_disposition_e do_ipsec_in_classify(odp_packet_t *ppkt)
return PKT_CONTINUE;
memset(&in_param, 0, sizeof(in_param));
- if (args->appl.lookup) {
+ if (global->appl.lookup) {
in_param.num_sa = 0;
in_param.sa = NULL;
} else {
@@ -629,7 +624,7 @@ pkt_disposition_e do_ipsec_in_classify(odp_packet_t *ppkt)
}
/* Issue crypto request */
- if (args->appl.mode != ODP_IPSEC_OP_MODE_SYNC) {
+ if (global->appl.mode != ODP_IPSEC_OP_MODE_SYNC) {
rc = odp_ipsec_in_enq(ppkt, 1, &in_param);
if (rc <= 0)
return PKT_DROP;
@@ -682,7 +677,7 @@ pkt_disposition_e do_ipsec_out_classify(odp_packet_t *ppkt, pkt_ctx_t *ctx)
out_param.opt = NULL;
/* Issue crypto request */
- if (args->appl.mode == ODP_IPSEC_OP_MODE_INLINE) {
+ if (global->appl.mode == ODP_IPSEC_OP_MODE_INLINE) {
odp_ipsec_out_inline_param_t inline_param;
inline_param.pktio = ctx->pktio;
@@ -693,7 +688,7 @@ pkt_disposition_e do_ipsec_out_classify(odp_packet_t *ppkt, pkt_ctx_t *ctx)
return PKT_DROP;
return PKT_DONE;
- } else if (args->appl.mode != ODP_IPSEC_OP_MODE_SYNC) {
+ } else if (global->appl.mode != ODP_IPSEC_OP_MODE_SYNC) {
rc = odp_ipsec_out_enq(ppkt, 1, &out_param);
if (rc <= 0)
return PKT_DROP;
@@ -737,7 +732,7 @@ int pktio_thread(void *arg EXAMPLE_UNUSED)
printf("Pktio thread [%02i] starts\n", thr);
- odp_barrier_wait(&sync_barrier);
+ odp_barrier_wait(&global->sync_barrier);
/* Loop packets */
for (;;) {
@@ -924,16 +919,17 @@ main(int argc, char *argv[])
}
/* Reserve memory for args from shared mem */
- shm = odp_shm_reserve("shm_args", sizeof(args_t), ODP_CACHE_LINE_SIZE,
- 0);
+ shm = odp_shm_reserve("shm_args", sizeof(global_data_t),
+ ODP_CACHE_LINE_SIZE, 0);
- args = odp_shm_addr(shm);
+ global = odp_shm_addr(shm);
- if (NULL == args) {
+ if (NULL == global) {
EXAMPLE_ERR("Error: shared mem alloc failed.\n");
exit(EXIT_FAILURE);
}
- memset(args, 0, sizeof(*args));
+ memset(global, 0, sizeof(global_data_t));
+ global->shm = shm;
/* Must init our databases before parsing args */
ipsec_init_pre();
@@ -941,14 +937,14 @@ main(int argc, char *argv[])
init_stream_db();
/* Parse and store the application arguments */
- parse_args(argc, argv, &args->appl);
+ parse_args(argc, argv, &global->appl);
/* Print both system and application information */
- print_info(NO_PATH(argv[0]), &args->appl);
+ print_info(NO_PATH(argv[0]), &global->appl);
num_workers = MAX_WORKERS;
- if (args->appl.cpu_count && args->appl.cpu_count < MAX_WORKERS)
- num_workers = args->appl.cpu_count;
+ if (global->appl.cpu_count && global->appl.cpu_count < MAX_WORKERS)
+ num_workers = global->appl.cpu_count;
/* Get default worker cpumask */
num_workers = odp_cpumask_default_worker(&cpumask, num_workers);
@@ -959,7 +955,7 @@ main(int argc, char *argv[])
printf("cpu mask: %s\n", cpumaskstr);
/* Create a barrier to synchronize thread startup */
- odp_barrier_init(&sync_barrier, num_workers);
+ odp_barrier_init(&global->sync_barrier, num_workers);
/* Create packet buffer pool */
odp_pool_param_init(¶ms);
@@ -968,9 +964,9 @@ main(int argc, char *argv[])
params.pkt.num = SHM_PKT_POOL_BUF_COUNT;
params.type = ODP_POOL_PACKET;
- pkt_pool = odp_pool_create("packet_pool", ¶ms);
+ global->pkt_pool = odp_pool_create("packet_pool", ¶ms);
- if (ODP_POOL_INVALID == pkt_pool) {
+ if (ODP_POOL_INVALID == global->pkt_pool) {
EXAMPLE_ERR("Error: packet pool create failed.\n");
exit(EXIT_FAILURE);
}
@@ -981,23 +977,23 @@ main(int argc, char *argv[])
params.buf.num = SHM_CTX_POOL_BUF_COUNT;
params.type = ODP_POOL_BUFFER;
- ctx_pool = odp_pool_create("ctx_pool", ¶ms);
+ global->ctx_pool = odp_pool_create("ctx_pool", ¶ms);
- if (ODP_POOL_INVALID == ctx_pool) {
+ if (ODP_POOL_INVALID == global->ctx_pool) {
EXAMPLE_ERR("Error: context pool create failed.\n");
exit(EXIT_FAILURE);
}
/* Populate our IPsec cache */
printf("Using %s mode for IPsec API\n\n",
- (ODP_IPSEC_OP_MODE_SYNC == args->appl.mode) ? "SYNC" :
- (ODP_IPSEC_OP_MODE_ASYNC == args->appl.mode) ? "ASYNC" :
+ (ODP_IPSEC_OP_MODE_SYNC == global->appl.mode) ? "SYNC" :
+ (ODP_IPSEC_OP_MODE_ASYNC == global->appl.mode) ? "ASYNC" :
"INLINE");
- ipsec_init_post(args->appl.mode);
+ ipsec_init_post(global->appl.mode);
/* Initialize interfaces (which resolves FWD DB entries */
- for (i = 0; i < args->appl.if_count; i++)
- initialize_intf(args->appl.if_names[i]);
+ for (i = 0; i < global->appl.if_count; i++)
+ initialize_intf(global->appl.if_names[i]);
/* If we have test streams build them before starting workers */
resolve_stream_db();
@@ -1029,12 +1025,9 @@ main(int argc, char *argv[])
odph_odpthreads_join(thread_tbl);
}
- free(args->appl.if_names);
- free(args->appl.if_str);
+ free(global->appl.if_names);
+ free(global->appl.if_str);
- shm = odp_shm_lookup("shm_args");
- if (odp_shm_free(shm) != 0)
- EXAMPLE_ERR("Error: shm free shm_args failed\n");
shm = odp_shm_lookup("shm_ipsec_cache");
if (odp_shm_free(shm) != 0)
EXAMPLE_ERR("Error: shm free shm_ipsec_cache failed\n");
@@ -1053,6 +1046,10 @@ main(int argc, char *argv[])
shm = odp_shm_lookup("stream_db");
if (odp_shm_free(shm) != 0)
EXAMPLE_ERR("Error: shm free stream_db failed\n");
+ if (odp_shm_free(global->shm)) {
+ EXAMPLE_ERR("Error: shm free global data failed\n");
+ exit(EXIT_FAILURE);
+ }
printf("Exit\n\n");
diff --git a/example/ipsec_offload/odp_ipsec_offload.c b/example/ipsec_offload/odp_ipsec_offload.c
index 63c8f126..89b9dddf 100644
--- a/example/ipsec_offload/odp_ipsec_offload.c
+++ b/example/ipsec_offload/odp_ipsec_offload.c
@@ -48,6 +48,8 @@
/* maximum number of worker threads */
#define MAX_WORKERS (ODP_THREAD_COUNT_MAX - 1)
+#define MAX_COMPL_QUEUES 32
+
/**
* Parsed command line application arguments
*/
@@ -61,12 +63,19 @@ typedef struct {
} appl_args_t;
/**
- * Grouping of both parsed CL args and thread specific args - alloc together
+ * Grouping of both parsed CL args and global application data
*/
typedef struct {
/** Application (parsed) arguments */
appl_args_t appl;
-} args_t;
+ odp_pool_t pkt_pool;
+ /** Atomic queue IPSEC completion events */
+ odp_queue_t completionq[MAX_COMPL_QUEUES];
+ /** Synchronize threads before packet processing begins */
+ odp_barrier_t sync_barrier;
+ int num_compl_queues;
+ int num_workers;
+} global_data_t;
/* helper funcs */
static void parse_args(int argc, char *argv[], appl_args_t *appl_args);
@@ -74,7 +83,7 @@ static void print_info(char *progname, appl_args_t *appl_args);
static void usage(char *progname);
/** Global pointer to args */
-static args_t *args;
+static global_data_t *global;
/**
* Buffer pool for packet IO
@@ -83,11 +92,6 @@ static args_t *args;
#define SHM_PKT_POOL_BUF_SIZE 4096
#define SHM_PKT_POOL_SIZE (SHM_PKT_POOL_BUF_COUNT * SHM_PKT_POOL_BUF_SIZE)
-static odp_pool_t pkt_pool = ODP_POOL_INVALID;
-
-/** Synchronize threads before packet processing begins */
-static odp_barrier_t sync_barrier;
-
/**
* Packet processing result codes
*/
@@ -98,15 +102,8 @@ typedef enum {
PKT_DONE /**< Finished with packet, stop processing */
} pkt_disposition_e;
-#define MAX_COMPL_QUEUES 32
#define GET_THR_QUEUE_ID(x) ((odp_thread_id() - 1) % (x))
-/** Atomic queue IPSEC completion events */
-static odp_queue_t completionq[MAX_COMPL_QUEUES];
-
-static int num_compl_queues;
-static int num_workers;
-
/**
* Calculate hash value on given 2-tuple i.e. sip, dip
*
@@ -154,9 +151,9 @@ void ipsec_init_post(void)
sa_db_entry_t *auth_sa = NULL;
tun_db_entry_t *tun = NULL;
- queue_id %= num_workers;
- if (num_compl_queues < num_workers)
- num_compl_queues++;
+ queue_id %= global->num_workers;
+ if (global->num_compl_queues < global->num_workers)
+ global->num_compl_queues++;
queue_id++;
if (entry->esp) {
cipher_sa = find_sa_db_entry(&entry->src_subnet,
@@ -172,11 +169,13 @@ void ipsec_init_post(void)
}
if (cipher_sa && auth_sa) {
+ odp_queue_t queue = global->completionq[queue_id - 1];
+
if (create_ipsec_cache_entry(cipher_sa,
auth_sa,
tun,
entry->input,
- completionq[queue_id - 1])
+ queue)
) {
EXAMPLE_ABORT("Error: IPSec cache entry failed.\n");
}
@@ -213,7 +212,7 @@ static void initialize_intf(char *intf, int queue_type)
/*
* Open a packet IO instance for thread and get default output queue
*/
- pktio = odp_pktio_open(intf, pkt_pool, &pktio_param);
+ pktio = odp_pktio_open(intf, global->pkt_pool, &pktio_param);
if (ODP_PKTIO_INVALID == pktio)
EXAMPLE_ABORT("Error: pktio create failed for %s\n", intf);
@@ -431,7 +430,7 @@ int pktio_thread(void *arg EXAMPLE_UNUSED)
odp_event_t ev = ODP_EVENT_INVALID;
printf("Pktio thread [%02i] starts\n", thr);
- odp_barrier_wait(&sync_barrier);
+ odp_barrier_wait(&global->sync_barrier);
/* Loop packets */
for (;;) {
@@ -523,26 +522,26 @@ main(int argc, char *argv[])
if (odp_init_local(instance, ODP_THREAD_CONTROL))
EXAMPLE_ABORT("Error: ODP local init failed.\n");
/* Reserve memory for arguments from shared memory */
- shm = odp_shm_reserve("shm_args", sizeof(args_t),
+ shm = odp_shm_reserve("shm_args", sizeof(global_data_t),
ODP_CACHE_LINE_SIZE, 0);
- args = odp_shm_addr(shm);
+ global = odp_shm_addr(shm);
- if (NULL == args)
+ if (NULL == global)
EXAMPLE_ABORT("Error: shared mem alloc failed.\n");
- memset(args, 0, sizeof(*args));
+ memset(global, 0, sizeof(global_data_t));
/* Must init our databases before parsing args */
ipsec_init_pre();
init_fwd_db();
/* Parse and store the application arguments */
- parse_args(argc, argv, &args->appl);
+ parse_args(argc, argv, &global->appl);
/*Initialize route table for user given parameter*/
init_routing_table();
/* Print both system and application information */
- print_info(NO_PATH(argv[0]), &args->appl);
+ print_info(NO_PATH(argv[0]), &global->appl);
if (odp_ipsec_capability(&capa))
EXAMPLE_ABORT("Error: Capability not configured.\n");
@@ -559,15 +558,16 @@ main(int argc, char *argv[])
if (odp_ipsec_config(&config))
EXAMPLE_ABORT("Error: IPSec not configured.\n");
- num_workers = MAX_WORKERS;
- if (args->appl.cpu_count && args->appl.cpu_count < MAX_WORKERS)
- num_workers = args->appl.cpu_count;
+ global->num_workers = MAX_WORKERS;
+ if (global->appl.cpu_count && global->appl.cpu_count < MAX_WORKERS)
+ global->num_workers = global->appl.cpu_count;
/*
* By default CPU #0 runs Linux kernel background tasks.
* Start mapping thread from CPU #1
*/
- num_workers = odp_cpumask_default_worker(&cpumask, num_workers);
+ global->num_workers = odp_cpumask_default_worker(&cpumask,
+ global->num_workers);
(void)odp_cpumask_to_str(&cpumask, cpumaskstr, sizeof(cpumaskstr));
/*
@@ -576,20 +576,21 @@ main(int argc, char *argv[])
odp_queue_param_init(&qparam);
qparam.type = ODP_QUEUE_TYPE_SCHED;
qparam.sched.prio = ODP_SCHED_PRIO_HIGHEST;
- qparam.sched.sync = args->appl.queue_type;
+ qparam.sched.sync = global->appl.queue_type;
qparam.sched.group = ODP_SCHED_GROUP_ALL;
- for (i = 0; i < num_workers; i++) {
- completionq[i] = odp_queue_create("completion", &qparam);
- if (ODP_QUEUE_INVALID == completionq[i])
+ for (i = 0; i < global->num_workers; i++) {
+ global->completionq[i] = odp_queue_create("completion",
+ &qparam);
+ if (ODP_QUEUE_INVALID == global->completionq[i])
EXAMPLE_ABORT("Error: completion queue creation failed\n");
}
- printf("num worker threads: %i\n", num_workers);
+ printf("num worker threads: %i\n", global->num_workers);
printf("first CPU: %i\n", odp_cpumask_first(&cpumask));
printf("cpu mask: %s\n", cpumaskstr);
/* Create a barrier to synchronize thread startup */
- odp_barrier_init(&sync_barrier, num_workers);
+ odp_barrier_init(&global->sync_barrier, global->num_workers);
/* Create packet buffer pool */
odp_pool_param_init(¶ms);
@@ -598,21 +599,22 @@ main(int argc, char *argv[])
params.pkt.num = SHM_PKT_POOL_BUF_COUNT;
params.type = ODP_POOL_PACKET;
- pkt_pool = odp_pool_create("packet_pool", ¶ms);
+ global->pkt_pool = odp_pool_create("packet_pool", ¶ms);
- if (ODP_POOL_INVALID == pkt_pool)
+ if (ODP_POOL_INVALID == global->pkt_pool)
EXAMPLE_ABORT("Error: packet pool create failed.\n");
ipsec_init_post();
/* Initialize interfaces (which resolves FWD DB entries */
- for (i = 0; i < args->appl.if_count; i++)
- initialize_intf(args->appl.if_names[i], args->appl.queue_type);
+ for (i = 0; i < global->appl.if_count; i++)
+ initialize_intf(global->appl.if_names[i],
+ global->appl.queue_type);
printf(" Configured queues SYNC type: [%s]\n",
- (args->appl.queue_type == 0) ?
+ (global->appl.queue_type == 0) ?
"PARALLEL" :
- (args->appl.queue_type == 1) ?
+ (global->appl.queue_type == 1) ?
"ATOMIC" : "ORDERED");
memset(&thr_params, 0, sizeof(thr_params));
thr_params.start = pktio_thread;
@@ -625,8 +627,14 @@ main(int argc, char *argv[])
&thr_params);
odph_odpthreads_join(thread_tbl);
- free(args->appl.if_names);
- free(args->appl.if_str);
+ free(global->appl.if_names);
+ free(global->appl.if_str);
+
+ if (odp_shm_free(shm)) {
+ EXAMPLE_ERR("Error: shm free global data\n");
+ exit(EXIT_FAILURE);
+ }
+
printf("Exit\n\n");
return 0;
}
diff --git a/example/l2fwd_simple/odp_l2fwd_simple.c b/example/l2fwd_simple/odp_l2fwd_simple.c
index fcdd8183..6835e5bb 100644
--- a/example/l2fwd_simple/odp_l2fwd_simple.c
+++ b/example/l2fwd_simple/odp_l2fwd_simple.c
@@ -17,20 +17,22 @@
#define MAX_PKT_BURST 32
#define MAX_WORKERS 1
-static int exit_thr;
-static int wait_sec;
-
-struct {
+typedef struct {
odp_pktio_t if0, if1;
odp_pktin_queue_t if0in, if1in;
odp_pktout_queue_t if0out, if1out;
odph_ethaddr_t src, dst;
-} global;
+ odp_shm_t shm;
+ int exit_thr;
+ int wait_sec;
+} global_data_t;
+
+static global_data_t *global;
static void sig_handler(int signo ODP_UNUSED)
{
printf("sig_handler!\n");
- exit_thr = 1;
+ global->exit_thr = 1;
}
static odp_pktio_t create_pktio(const char *name, odp_pool_t pool,
@@ -89,25 +91,25 @@ static int run_worker(void *arg ODP_UNUSED)
int pkts, sent, tx_drops, i;
uint64_t wait_time = odp_pktin_wait_time(ODP_TIME_SEC_IN_NS);
- if (odp_pktio_start(global.if0)) {
+ if (odp_pktio_start(global->if0)) {
printf("unable to start input interface\n");
exit(1);
}
printf("started input interface\n");
- if (odp_pktio_start(global.if1)) {
+ if (odp_pktio_start(global->if1)) {
printf("unable to start output interface\n");
exit(1);
}
printf("started output interface\n");
printf("started all\n");
- while (!exit_thr) {
- pkts = odp_pktin_recv_tmo(global.if0in, pkt_tbl, MAX_PKT_BURST,
+ while (!global->exit_thr) {
+ pkts = odp_pktin_recv_tmo(global->if0in, pkt_tbl, MAX_PKT_BURST,
wait_time);
if (odp_unlikely(pkts <= 0)) {
- if (wait_sec > 0)
- if (!(--wait_sec))
+ if (global->wait_sec > 0)
+ if (!(--global->wait_sec))
break;
continue;
}
@@ -121,10 +123,10 @@ static int run_worker(void *arg ODP_UNUSED)
return 0;
}
eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL);
- eth->src = global.src;
- eth->dst = global.dst;
+ eth->src = global->src;
+ eth->dst = global->dst;
}
- sent = odp_pktout_send(global.if1out, pkt_tbl, pkts);
+ sent = odp_pktout_send(global->if1out, pkt_tbl, pkts);
if (sent < 0)
sent = 0;
tx_drops = pkts - sent;
@@ -145,13 +147,36 @@ int main(int argc, char **argv)
odph_odpthread_params_t thr_params;
odph_ethaddr_t correct_src;
uint32_t mtu1, mtu2;
+ odp_shm_t shm;
+
+ if (odp_init_global(&instance, NULL, NULL)) {
+ printf("Error: ODP global init failed.\n");
+ exit(1);
+ }
+
+ if (odp_init_local(instance, ODP_THREAD_CONTROL)) {
+ printf("Error: ODP local init failed.\n");
+ exit(1);
+ }
+
+ /* Reserve memory for args from shared mem */
+ shm = odp_shm_reserve("_appl_global_data", sizeof(global_data_t),
+ ODP_CACHE_LINE_SIZE, 0);
+ global = odp_shm_addr(shm);
+ if (global == NULL) {
+ printf("Error: shared mem alloc failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ memset(global, 0, sizeof(global_data_t));
+ global->shm = shm;
/* let helper collect its own arguments (e.g. --odph_proc) */
argc = odph_parse_options(argc, argv);
if (argc > 7 ||
- odph_eth_addr_parse(&global.dst, argv[3]) != 0 ||
- odph_eth_addr_parse(&global.src, argv[4]) != 0) {
+ odph_eth_addr_parse(&global->dst, argv[3]) != 0 ||
+ odph_eth_addr_parse(&global->src, argv[4]) != 0) {
printf("Usage: odp_l2fwd_simple eth0 eth1 01:02:03:04:05:06"
" 07:08:09:0a:0b:0c [-t sec]\n");
printf("Where eth0 and eth1 are the used interfaces"
@@ -161,20 +186,10 @@ int main(int argc, char **argv)
exit(1);
}
if (argc == 7 && !strncmp(argv[5], "-t", 2))
- wait_sec = atoi(argv[6]);
-
- if (wait_sec)
- printf("running test for %d sec\n", wait_sec);
-
- if (odp_init_global(&instance, NULL, NULL)) {
- printf("Error: ODP global init failed.\n");
- exit(1);
- }
+ global->wait_sec = atoi(argv[6]);
- if (odp_init_local(instance, ODP_THREAD_CONTROL)) {
- printf("Error: ODP local init failed.\n");
- exit(1);
- }
+ if (global->wait_sec)
+ printf("running test for %d sec\n", global->wait_sec);
/* Create packet pool */
odp_pool_param_init(¶ms);
@@ -190,23 +205,25 @@ int main(int argc, char **argv)
exit(1);
}
- global.if0 = create_pktio(argv[1], pool, &global.if0in, &global.if0out);
- global.if1 = create_pktio(argv[2], pool, &global.if1in, &global.if1out);
+ global->if0 = create_pktio(argv[1], pool, &global->if0in,
+ &global->if0out);
+ global->if1 = create_pktio(argv[2], pool, &global->if1in,
+ &global->if1out);
/* Do some operations to increase code coverage in tests */
- if (odp_pktio_mac_addr(global.if0, &correct_src, sizeof(correct_src))
+ if (odp_pktio_mac_addr(global->if0, &correct_src, sizeof(correct_src))
!= sizeof(correct_src))
printf("Warning: can't get MAC address\n");
- else if (memcmp(&correct_src, &global.src, sizeof(correct_src)) != 0)
+ else if (memcmp(&correct_src, &global->src, sizeof(correct_src)) != 0)
printf("Warning: src MAC invalid\n");
- odp_pktio_promisc_mode_set(global.if0, true);
- odp_pktio_promisc_mode_set(global.if1, true);
- (void)odp_pktio_promisc_mode(global.if0);
- (void)odp_pktio_promisc_mode(global.if1);
+ odp_pktio_promisc_mode_set(global->if0, true);
+ odp_pktio_promisc_mode_set(global->if1, true);
+ (void)odp_pktio_promisc_mode(global->if0);
+ (void)odp_pktio_promisc_mode(global->if1);
- mtu1 = odp_pktin_maxlen(global.if0);
- mtu2 = odp_pktout_maxlen(global.if1);
+ mtu1 = odp_pktin_maxlen(global->if0);
+ mtu2 = odp_pktout_maxlen(global->if1);
if (mtu1 && mtu2 && mtu1 > mtu2)
printf("Warning: input MTU bigger than output MTU\n");
@@ -228,6 +245,11 @@ int main(int argc, char **argv)
exit(EXIT_FAILURE);
}
+ if (odp_shm_free(global->shm)) {
+ printf("Error: shm free global data\n");
+ exit(EXIT_FAILURE);
+ }
+
if (odp_term_local()) {
printf("Error: term local\n");
exit(EXIT_FAILURE);
diff --git a/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c
index 34e2bfce..f72cf373 100644
--- a/example/l3fwd/odp_l3fwd.c
+++ b/example/l3fwd/odp_l3fwd.c
@@ -80,20 +80,24 @@ typedef struct {
int error_check; /* Check packets for errors */
} app_args_t;
-struct {
+typedef struct {
app_args_t cmd_args;
struct l3fwd_pktio_s l3fwd_pktios[MAX_NB_PKTIO];
odph_odpthread_t l3fwd_workers[MAX_NB_WORKER];
struct thread_arg_s worker_args[MAX_NB_WORKER];
odph_ethaddr_t eth_dest_mac[MAX_NB_PKTIO];
+ /** Global barrier to synchronize main and workers */
+ odp_barrier_t barrier;
+ /** Shm for storing global data */
+ odp_shm_t shm;
+ /** Break workers loop if set to 1 */
+ int exit_threads;
/* forward func, hash or lpm */
int (*fwd_func)(odp_packet_t pkt, int sif);
-} global;
+} global_data_t;
-/** Global barrier to synchronize main and workers */
-static odp_barrier_t barrier;
-static int exit_threads; /**< Break workers loop if set to 1 */
+static global_data_t *global;
static int create_pktio(const char *name, odp_pool_t pool,
struct l3fwd_pktio_s *fwd_pktio)
@@ -122,7 +126,7 @@ static int create_pktio(const char *name, odp_pool_t pool,
}
odp_pktio_config_init(&config);
- config.parser.layer = global.cmd_args.error_check ?
+ config.parser.layer = global->cmd_args.error_check ?
ODP_PROTO_LAYER_ALL :
ODP_PROTO_LAYER_L4;
odp_pktio_config(pktio, &config);
@@ -145,7 +149,7 @@ static void setup_fwd_db(void)
int if_idx;
app_args_t *args;
- args = &global.cmd_args;
+ args = &global->cmd_args;
if (args->hash_mode)
init_fwd_hash_cache();
else
@@ -157,9 +161,9 @@ static void setup_fwd_db(void)
fib_tbl_insert(entry->subnet.addr, if_idx,
entry->subnet.depth);
if (args->dest_mac_changed[if_idx])
- global.eth_dest_mac[if_idx] = entry->dst_mac;
+ global->eth_dest_mac[if_idx] = entry->dst_mac;
else
- entry->dst_mac = global.eth_dest_mac[if_idx];
+ entry->dst_mac = global->eth_dest_mac[if_idx];
}
}
@@ -237,8 +241,8 @@ static inline int l3fwd_pkt_lpm(odp_packet_t pkt, int sif)
if (ret)
dif = sif;
- eth->dst = global.eth_dest_mac[dif];
- eth->src = global.l3fwd_pktios[dif].mac_addr;
+ eth->dst = global->eth_dest_mac[dif];
+ eth->src = global->l3fwd_pktios[dif].mac_addr;
return dif;
}
@@ -265,7 +269,7 @@ static inline int drop_err_pkts(odp_packet_t pkt_tbl[], unsigned num)
pkt = pkt_tbl[i];
err = 0;
- if (global.cmd_args.error_check)
+ if (global->cmd_args.error_check)
err = odp_packet_has_error(pkt);
if (odp_unlikely(err || !odp_packet_has_ipv4(pkt))) {
@@ -286,7 +290,7 @@ static int run_worker(void *arg)
odp_pktin_queue_t inq;
int input_ifs[thr_arg->nb_pktio];
odp_pktin_queue_t input_queues[thr_arg->nb_pktio];
- odp_pktout_queue_t output_queues[global.cmd_args.if_count];
+ odp_pktout_queue_t output_queues[global->cmd_args.if_count];
odp_packet_t pkt_tbl[MAX_PKT_BURST];
odp_packet_t *tbl;
int pkts, drop, sent;
@@ -296,16 +300,16 @@ static int run_worker(void *arg)
int num_pktio = 0;
/* Copy all required handles to local memory */
- for (i = 0; i < global.cmd_args.if_count; i++) {
+ for (i = 0; i < global->cmd_args.if_count; i++) {
int txq_idx = thr_arg->pktio[i].txq_idx;
- output_queues[i] = global.l3fwd_pktios[i].ifout[txq_idx];
+ output_queues[i] = global->l3fwd_pktios[i].ifout[txq_idx];
if_idx = thr_arg->pktio[i].if_idx;
for (j = 0; j < thr_arg->pktio[i].nb_rxq; j++) {
int rxq_idx = thr_arg->pktio[i].rxq[j];
- inq = global.l3fwd_pktios[if_idx].ifin[rxq_idx];
+ inq = global->l3fwd_pktios[if_idx].ifin[rxq_idx];
input_ifs[num_pktio] = if_idx;
input_queues[num_pktio] = inq;
num_pktio++;
@@ -318,9 +322,9 @@ static int run_worker(void *arg)
if_idx = input_ifs[pktio];
inq = input_queues[pktio];
- odp_barrier_wait(&barrier);
+ odp_barrier_wait(&global->barrier);
- while (!exit_threads) {
+ while (!global->exit_threads) {
if (num_pktio > 1) {
if_idx = input_ifs[pktio];
inq = input_queues[pktio];
@@ -340,12 +344,12 @@ static int run_worker(void *arg)
if (odp_unlikely(pkts < 1))
continue;
- dif = global.fwd_func(pkt_tbl[0], if_idx);
+ dif = global->fwd_func(pkt_tbl[0], if_idx);
tbl = &pkt_tbl[0];
while (pkts) {
dst_port = dif;
for (i = 1; i < pkts; i++) {
- dif = global.fwd_func(tbl[i], if_idx);
+ dif = global->fwd_func(tbl[i], if_idx);
if (dif != dst_port)
break;
}
@@ -695,10 +699,10 @@ static void setup_worker_qconf(app_args_t *args)
if (!args->qconf_count) {
if (nb_worker > if_count) {
for (i = 0; i < nb_worker; i++) {
- arg = &global.worker_args[i];
+ arg = &global->worker_args[i];
arg->thr_idx = i;
j = i % if_count;
- port = &global.l3fwd_pktios[j];
+ port = &global->l3fwd_pktios[j];
arg->pktio[0].rxq[0] =
port->rxq_idx % port->nb_rxq;
arg->pktio[0].nb_rxq = 1;
@@ -709,9 +713,9 @@ static void setup_worker_qconf(app_args_t *args)
} else {
for (i = 0; i < if_count; i++) {
j = i % nb_worker;
- arg = &global.worker_args[j];
+ arg = &global->worker_args[j];
arg->thr_idx = j;
- port = &global.l3fwd_pktios[i];
+ port = &global->l3fwd_pktios[i];
rxq_idx = arg->pktio[i].nb_rxq;
pktio = arg->nb_pktio;
arg->pktio[pktio].rxq[rxq_idx] =
@@ -744,7 +748,7 @@ static void setup_worker_qconf(app_args_t *args)
q->if_idx, q->rxq_idx, q->core_idx);
queue_mask[q->if_idx][q->rxq_idx] = 1;
- port = &global.l3fwd_pktios[q->if_idx];
+ port = &global->l3fwd_pktios[q->if_idx];
if (port->rxq_idx < q->rxq_idx)
EXAMPLE_ABORT("Error queue (%d, %d, %d), queue should"
" be in sequence and start from 0, queue"
@@ -760,7 +764,7 @@ static void setup_worker_qconf(app_args_t *args)
port->rxq_idx = q->rxq_idx + 1;
/* put the queue into worker_args */
- arg = &global.worker_args[q->core_idx];
+ arg = &global->worker_args[q->core_idx];
/* Check if interface already has queues configured */
for (j = 0; j < args->if_count; j++) {
@@ -778,9 +782,9 @@ static void setup_worker_qconf(app_args_t *args)
}
/* distribute tx queues among threads */
for (i = 0; i < args->worker_count; i++) {
- arg = &global.worker_args[i];
+ arg = &global->worker_args[i];
for (j = 0; j < args->if_count; j++) {
- port = &global.l3fwd_pktios[j];
+ port = &global->l3fwd_pktios[j];
arg->pktio[j].txq_idx =
port->txq_idx % port->nb_txq;
port->txq_idx++;
@@ -796,7 +800,7 @@ static void setup_worker_qconf(app_args_t *args)
const char *name;
int nb_rxq, nb_txq;
- port = &global.l3fwd_pktios[i];
+ port = &global->l3fwd_pktios[i];
name = args->if_names[i];
odp_pktin_queue_param_init(&in_queue_param);
odp_pktout_queue_param_init(&out_queue_param);
@@ -855,7 +859,7 @@ static void print_qconf_table(app_args_t *args)
"port/id", "rxq", "thread");
for (i = 0; i < args->worker_count; i++) {
- thr_arg = &global.worker_args[i];
+ thr_arg = &global->worker_args[i];
for (j = 0; j < args->if_count; j++) {
if (!thr_arg->pktio[j].nb_rxq)
continue;
@@ -900,7 +904,7 @@ static int print_speed_stats(int num_workers, int duration, int timeout)
timeout = 1;
}
/* Wait for all threads to be ready*/
- odp_barrier_wait(&barrier);
+ odp_barrier_wait(&global->barrier);
do {
pkts = 0;
@@ -909,9 +913,9 @@ static int print_speed_stats(int num_workers, int duration, int timeout)
sleep(timeout);
for (i = 0; i < num_workers; i++) {
- pkts += global.worker_args[i].packets;
- rx_drops += global.worker_args[i].rx_drops;
- tx_drops += global.worker_args[i].tx_drops;
+ pkts += global->worker_args[i].packets;
+ rx_drops += global->worker_args[i].rx_drops;
+ tx_drops += global->worker_args[i].tx_drops;
}
if (stats_enabled) {
pps = (pkts - pkts_prev) / timeout;
@@ -961,17 +965,28 @@ int main(int argc, char **argv)
exit(1);
}
- /* Clear global argument and initialize the dest mac as 2:0:0:0:0:x */
- memset(&global, 0, sizeof(global));
+ /* Reserve memory for args from shared mem */
+ shm = odp_shm_reserve("_appl_global_data", sizeof(global_data_t),
+ ODP_CACHE_LINE_SIZE, 0);
+ global = odp_shm_addr(shm);
+ if (global == NULL) {
+ printf("Error: shared mem alloc failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ memset(global, 0, sizeof(global_data_t));
+ global->shm = shm;
+
+ /* Initialize the dest mac as 2:0:0:0:0:x */
mac[0] = 2;
for (i = 0; i < MAX_NB_PKTIO; i++) {
mac[ODPH_ETHADDR_LEN - 1] = (uint8_t)i;
- memcpy(global.eth_dest_mac[i].addr, mac, ODPH_ETHADDR_LEN);
+ memcpy(global->eth_dest_mac[i].addr, mac, ODPH_ETHADDR_LEN);
}
/* Initialize the thread arguments */
for (i = 0; i < MAX_NB_WORKER; i++) {
- thr_arg = &global.worker_args[i];
+ thr_arg = &global->worker_args[i];
for (j = 0; j < MAX_NB_PKTIO; j++) {
thr_arg->thr_idx = INVALID_ID;
thr_arg->pktio[j].txq_idx = INVALID_ID;
@@ -982,7 +997,7 @@ int main(int argc, char **argv)
}
/* Parse cmdline arguments */
- args = &global.cmd_args;
+ args = &global->cmd_args;
parse_cmdline_args(argc, argv, args);
/* Init l3fwd table */
@@ -1030,7 +1045,7 @@ int main(int argc, char **argv)
char *if_name;
if_name = args->if_names[i];
- port = &global.l3fwd_pktios[i];
+ port = &global->l3fwd_pktios[i];
if (create_pktio(if_name, pool, port)) {
printf("Error: create pktio %s\n", if_name);
exit(1);
@@ -1054,9 +1069,9 @@ int main(int argc, char **argv)
/* Decide ip lookup method */
if (args->hash_mode)
- global.fwd_func = l3fwd_pkt_hash;
+ global->fwd_func = l3fwd_pkt_hash;
else
- global.fwd_func = l3fwd_pkt_lpm;
+ global->fwd_func = l3fwd_pkt_lpm;
/* Start all the available ports */
for (i = 0; i < args->if_count; i++) {
@@ -1065,7 +1080,7 @@ int main(int argc, char **argv)
char buf[32];
if_name = args->if_names[i];
- port = &global.l3fwd_pktios[i];
+ port = &global->l3fwd_pktios[i];
/* start pktio */
if (odp_pktio_start(port->pktio)) {
printf("unable to start pktio: %s\n", if_name);
@@ -1082,7 +1097,7 @@ int main(int argc, char **argv)
printf("start pktio: %s, mac %s\n", if_name, buf);
}
- odp_barrier_init(&barrier, nb_worker + 1);
+ odp_barrier_init(&global->barrier, nb_worker + 1);
memset(&thr_params, 0, sizeof(thr_params));
thr_params.start = run_worker;
@@ -1095,7 +1110,7 @@ int main(int argc, char **argv)
struct thread_arg_s *arg;
odp_cpumask_t thr_mask;
- arg = &global.worker_args[i];
+ arg = &global->worker_args[i];
odp_cpumask_zero(&thr_mask);
odp_cpumask_set(&thr_mask, cpu);
thr_params.arg = arg;
@@ -1105,7 +1120,7 @@ int main(int argc, char **argv)
}
print_speed_stats(nb_worker, args->duration, PRINT_INTERVAL);
- exit_threads = 1;
+ global->exit_threads = 1;
/* wait for other threads to join */
for (i = 0; i < nb_worker; i++)
@@ -1138,6 +1153,11 @@ int main(int argc, char **argv)
exit(EXIT_FAILURE);
}
+ if (odp_shm_free(global->shm)) {
+ printf("Error: shm free global data\n");
+ exit(EXIT_FAILURE);
+ }
+
if (odp_term_local()) {
printf("Error: term local\n");
exit(EXIT_FAILURE);
diff --git a/example/packet/odp_pktio.c b/example/packet/odp_pktio.c
index 7755efcb..9d96dd2c 100644
--- a/example/packet/odp_pktio.c
+++ b/example/packet/odp_pktio.c
@@ -85,6 +85,8 @@ typedef struct {
typedef struct {
/** Application (parsed) arguments */
appl_args_t appl;
+ /** Shm for global data */
+ odp_shm_t shm;
/** Thread specific arguments */
thread_args_t thread[MAX_WORKERS];
/** Flag to exit worker threads */
@@ -351,15 +353,7 @@ int main(int argc, char *argv[])
odp_pool_param_t params;
odp_instance_t instance;
odph_odpthread_params_t thr_params;
-
- args = calloc(1, sizeof(args_t));
- if (args == NULL) {
- EXAMPLE_ERR("Error: args mem alloc failed.\n");
- exit(EXIT_FAILURE);
- }
-
- /* Parse and store the application arguments */
- parse_args(argc, argv, &args->appl);
+ odp_shm_t shm;
/* Init ODP before calling anything else */
if (odp_init_global(&instance, NULL, NULL)) {
@@ -373,6 +367,21 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
+ /* Reserve memory for args from shared mem */
+ shm = odp_shm_reserve("_appl_global_data", sizeof(args_t),
+ ODP_CACHE_LINE_SIZE, 0);
+ args = odp_shm_addr(shm);
+ if (args == NULL) {
+ EXAMPLE_ERR("Error: shared mem alloc failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ memset(args, 0, sizeof(args_t));
+ args->shm = shm;
+
+ /* Parse and store the application arguments */
+ parse_args(argc, argv, &args->appl);
+
/* Print both system and application information */
print_info(NO_PATH(argv[0]), &args->appl);
@@ -467,9 +476,14 @@ int main(int argc, char *argv[])
free(args->appl.if_names);
free(args->appl.if_str);
- free(args);
odp_pool_destroy(pool);
+
+ if (odp_shm_free(args->shm)) {
+ EXAMPLE_ERR("Error: shm free global data\n");
+ exit(EXIT_FAILURE);
+ }
+
odp_term_local();
return odp_term_global(instance);
}
diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c
index 18771ea4..dab60e83 100644
--- a/example/switch/odp_switch.c
+++ b/example/switch/odp_switch.c
@@ -61,8 +61,6 @@ typedef struct {
char *if_str; /**< Storage for interface names */
} appl_args_t;
-static int exit_threads; /**< Break workers loop if set to 1 */
-
/**
* Statistics
*/
@@ -118,6 +116,10 @@ typedef struct {
appl_args_t appl; /**< Parsed application arguments */
thread_args_t thread[MAX_WORKERS]; /**< Thread specific arguments */
odp_pool_t pool; /**< Packet pool */
+ /** Global barrier to synchronize main and workers */
+ odp_barrier_t barrier;
+ /** Break workers loop if set to 1 */
+ int exit_threads;
/** Table of pktio handles */
struct {
odp_pktio_t pktio;
@@ -136,9 +138,6 @@ typedef struct {
/** Global pointer to args */
static args_t *gbl_args;
-/** Global barrier to synchronize main and workers */
-static odp_barrier_t barrier;
-
/**
* Calculate MAC table index using Ethernet address hash
*
@@ -333,7 +332,7 @@ static int print_speed_stats(int num_workers, stats_t (*thr_stats)[MAX_PKTIOS],
timeout = 1;
}
/* Wait for all threads to be ready*/
- odp_barrier_wait(&barrier);
+ odp_barrier_wait(&gbl_args->barrier);
do {
uint64_t rx_pkts[MAX_PKTIOS] = {0};
@@ -595,9 +594,9 @@ static int run_worker(void *arg)
pktin = thr_args->rx_pktio[pktio].pktin;
port_in = thr_args->rx_pktio[pktio].port_idx;
- odp_barrier_wait(&barrier);
+ odp_barrier_wait(&gbl_args->barrier);
- while (!exit_threads) {
+ while (!gbl_args->exit_threads) {
int sent;
unsigned drops;
@@ -974,7 +973,7 @@ int main(int argc, char **argv)
memset(thread_tbl, 0, sizeof(thread_tbl));
- odp_barrier_init(&barrier, num_workers + 1);
+ odp_barrier_init(&gbl_args->barrier, num_workers + 1);
stats = gbl_args->stats;
@@ -1014,7 +1013,7 @@ int main(int argc, char **argv)
ret = print_speed_stats(num_workers, gbl_args->stats,
gbl_args->appl.time, gbl_args->appl.accuracy);
- exit_threads = 1;
+ gbl_args->exit_threads = 1;
/* Master thread waits for other threads to exit */
for (i = 0; i < num_workers; ++i)
commit 9cbb27956fffac255bde543e6d52ebb3cc6d589d
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Wed Sep 26 16:41:59 2018 +0300
test: performance: enable testing in process mode
Allocate global data from shm. Minor fix to
odp_pktio_ordered_run test script.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/performance/odp_bench_packet.c b/test/performance/odp_bench_packet.c
index b4f1905a..a4493139 100644
--- a/test/performance/odp_bench_packet.c
+++ b/test/performance/odp_bench_packet.c
@@ -130,6 +130,8 @@ typedef struct {
bench_info_t *bench;
/** Number of benchmark functions */
int num_bench;
+ /** Break worker loop if set to 1 */
+ int exit_thread;
struct {
/** Test packet length */
uint32_t len;
@@ -166,14 +168,10 @@ typedef struct {
/** Global pointer to args */
static args_t *gbl_args;
-/** Global barrier to synchronize main and worker */
-static odp_barrier_t barrier;
-/** Break worker loop if set to 1 */
-static int exit_thread;
static void sig_handler(int signo ODP_UNUSED)
{
- exit_thread = 1;
+ gbl_args->exit_thread = 1;
}
/**
@@ -188,7 +186,7 @@ static void run_indef(args_t *args, int idx)
printf("Running %s() indefinitely\n", desc);
- while (!exit_thread) {
+ while (!gbl_args->exit_thread) {
int ret;
if (args->bench[idx].init != NULL)
@@ -1623,8 +1621,6 @@ int main(int argc, char *argv[])
memset(&worker_thread, 0, sizeof(odph_odpthread_t));
- odp_barrier_init(&barrier, 1 + 1);
-
signal(SIGINT, sig_handler);
/* Create worker threads */
diff --git a/test/performance/odp_cpu_bench.c b/test/performance/odp_cpu_bench.c
index 949825e9..196af346 100644
--- a/test/performance/odp_cpu_bench.c
+++ b/test/performance/odp_cpu_bench.c
@@ -95,13 +95,13 @@ typedef struct {
odp_queue_t queue[MAX_GROUPS][QUEUES_PER_GROUP];
/* Test lookup table */
lookup_entry_t *lookup_tbl;
+ /* Break workers loop if set to 1 */
+ int exit_threads;
} args_t;
/* Global pointer to args */
static args_t *gbl_args;
-static volatile int exit_threads; /* Break workers loop if set to 1 */
-
static const uint8_t test_udp_packet[] = {
0x00, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x00, 0x01,
0x02, 0x03, 0x04, 0x05, 0x08, 0x00, 0x45, 0x00,
@@ -177,7 +177,7 @@ static const uint8_t test_udp_packet[] = {
static void sig_handler(int signo ODP_UNUSED)
{
- exit_threads = 1;
+ gbl_args->exit_threads = 1;
}
static inline void init_packet(odp_packet_t pkt, uint32_t seq, uint16_t group)
@@ -280,7 +280,7 @@ static int run_thread(void *arg)
c1 = odp_cpu_cycles();
t1 = odp_time_local();
- while (!exit_threads) {
+ while (!gbl_args->exit_threads) {
odp_event_t event_tbl[MAX_EVENT_BURST];
odp_queue_t dst_queue;
int num_events;
@@ -474,9 +474,10 @@ static int print_stats(int num_workers, stats_t **thr_stats, int duration,
pkts_prev = pkts;
elapsed += accuracy;
- } while (!exit_threads && (loop_forever || (elapsed < duration)));
+ } while (!gbl_args->exit_threads &&
+ (loop_forever || (elapsed < duration)));
- exit_threads = 1;
+ gbl_args->exit_threads = 1;
odp_barrier_wait(&gbl_args->term_barrier);
pkts = 0;
diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c
index 16336392..e1eddb13 100644
--- a/test/performance/odp_l2fwd.c
+++ b/test/performance/odp_l2fwd.c
@@ -95,13 +95,6 @@ typedef struct {
int verbose; /* Verbose output */
} appl_args_t;
-static int exit_threads; /* Break workers loop if set to 1 */
-
-static void sig_handler(int signo ODP_UNUSED)
-{
- exit_threads = 1;
-}
-
/* Statistics */
typedef union ODP_ALIGNED_CACHE {
struct {
@@ -175,12 +168,19 @@ typedef struct {
* Table index is pktio_index of the API. This is used by the sched
* mode. */
uint8_t dst_port_from_idx[MAX_PKTIO_INDEXES];
+ /* Break workers loop if set to 1 */
+ int exit_threads;
} args_t;
/* Global pointer to args */
static args_t *gbl_args;
+static void sig_handler(int signo ODP_UNUSED)
+{
+ gbl_args->exit_threads = 1;
+}
+
/*
* Drop packets which input parsing marked as containing errors.
*
@@ -336,7 +336,7 @@ static int run_worker_sched_mode(void *arg)
odp_barrier_wait(&gbl_args->init_barrier);
/* Loop packets */
- while (!exit_threads) {
+ while (!gbl_args->exit_threads) {
odp_event_t ev_tbl[MAX_PKT_BURST];
odp_packet_t pkt_tbl[MAX_PKT_BURST];
int sent;
@@ -453,7 +453,7 @@ static int run_worker_plain_queue_mode(void *arg)
odp_barrier_wait(&gbl_args->init_barrier);
/* Loop packets */
- while (!exit_threads) {
+ while (!gbl_args->exit_threads) {
int sent;
unsigned tx_drops;
odp_event_t event[MAX_PKT_BURST];
@@ -579,7 +579,7 @@ static int run_worker_direct_mode(void *arg)
odp_barrier_wait(&gbl_args->init_barrier);
/* Loop packets */
- while (!exit_threads) {
+ while (!gbl_args->exit_threads) {
int sent;
unsigned tx_drops;
@@ -867,7 +867,8 @@ static int print_speed_stats(int num_workers, stats_t **thr_stats,
pkts_prev = pkts;
}
elapsed += timeout;
- } while (!exit_threads && (loop_forever || (elapsed < duration)));
+ } while (!gbl_args->exit_threads && (loop_forever ||
+ (elapsed < duration)));
if (stats_enabled)
printf("TEST RESULT: %" PRIu64 " maximum packets per second.\n",
@@ -1682,7 +1683,7 @@ int main(int argc, char *argv[])
}
}
- exit_threads = 1;
+ gbl_args->exit_threads = 1;
if (gbl_args->appl.in_mode != DIRECT_RECV)
odp_barrier_wait(&gbl_args->term_barrier);
diff --git a/test/performance/odp_pktio_ordered.c b/test/performance/odp_pktio_ordered.c
index e884d38a..faf41b02 100644
--- a/test/performance/odp_pktio_ordered.c
+++ b/test/performance/odp_pktio_ordered.c
@@ -148,8 +148,6 @@ typedef struct {
char *if_str; /**< Storage for interface names */
} appl_args_t;
-static int exit_threads; /**< Break workers loop if set to 1 */
-
/**
* Queue context
*/
@@ -250,14 +248,15 @@ typedef struct {
int num_rx_queue;
int num_tx_queue;
} pktios[MAX_PKTIOS];
+ /** Global barrier to synchronize main and workers */
+ odp_barrier_t barrier;
+ /** Break workers loop if set to 1 */
+ int exit_threads;
} args_t;
/** Global pointer to args */
static args_t *gbl_args;
-/** Global barrier to synchronize main and workers */
-static odp_barrier_t barrier;
-
/**
* Lookup the destination port for a given packet
*
@@ -537,10 +536,10 @@ static int run_worker(void *arg)
gbl_args->pktios[i].num_tx_queue];
}
}
- odp_barrier_wait(&barrier);
+ odp_barrier_wait(&gbl_args->barrier);
/* Loop packets */
- while (!exit_threads) {
+ while (!gbl_args->exit_threads) {
pkts = odp_schedule_multi(&queue, ODP_SCHED_NO_WAIT, ev_tbl,
MAX_PKT_BURST);
if (pkts <= 0)
@@ -732,7 +731,7 @@ static int print_speed_stats(int num_workers, stats_t *thr_stats,
timeout = 1;
}
/* Wait for all threads to be ready*/
- odp_barrier_wait(&barrier);
+ odp_barrier_wait(&gbl_args->barrier);
do {
pkts = 0;
@@ -1272,7 +1271,7 @@ int main(int argc, char *argv[])
stats = gbl_args->stats;
- odp_barrier_init(&barrier, num_workers + 1);
+ odp_barrier_init(&gbl_args->barrier, num_workers + 1);
/* Create worker threads */
cpu = odp_cpumask_first(&cpumask);
@@ -1315,7 +1314,7 @@ int main(int argc, char *argv[])
for (i = 0; i < if_count; i++)
odp_pktio_stop(gbl_args->pktios[i].pktio);
- exit_threads = 1;
+ gbl_args->exit_threads = 1;
/* Master thread waits for other threads to exit */
for (i = 0; i < num_workers; ++i)
diff --git a/test/performance/odp_pktio_ordered_run.sh b/test/performance/odp_pktio_ordered_run.sh
index d7f23812..295b8803 100755
--- a/test/performance/odp_pktio_ordered_run.sh
+++ b/test/performance/odp_pktio_ordered_run.sh
@@ -31,8 +31,7 @@ fi
$STDBUF ${TEST_DIR}/odp_pktio_ordered${EXEEXT} \
-i pcap:in=${PCAP_IN}:loops=$LOOPS,pcap:out=${PCAP_OUT} \
-t $DURATION | tee $LOG
-
-ret=${PIPESTATUS[0]}
+ret=$?
if [ $ret -ne 0 ]; then
echo "FAIL: no odp_pktio_ordered${EXEEXT}"
diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c
index 7ddf8250..7e8a03ee 100644
--- a/test/performance/odp_pktio_perf.c
+++ b/test/performance/odp_pktio_perf.c
@@ -125,12 +125,18 @@ typedef struct {
odp_barrier_t tx_barrier;
odp_pktio_t pktio_tx;
odp_pktio_t pktio_rx;
+ /* Pool from which transmitted packets are allocated */
+ odp_pool_t transmit_pkt_pool;
pkt_rx_stats_t *rx_stats;
pkt_tx_stats_t *tx_stats;
uint8_t src_mac[ODPH_ETHADDR_LEN];
uint8_t dst_mac[ODPH_ETHADDR_LEN];
uint32_t rx_stats_size;
uint32_t tx_stats_size;
+ /* Indicate to the receivers to shutdown */
+ odp_atomic_u32_t shutdown;
+ /* Sequence number of IP packets */
+ odp_atomic_u32_t ODP_ALIGNED_CACHE ip_seq;
} test_globals_t;
/* Status of max rate search */
@@ -152,15 +158,6 @@ typedef struct {
odp_u32be_t magic; /* Packet header magic number */
} pkt_head_t;
-/* Pool from which transmitted packets are allocated */
-static odp_pool_t transmit_pkt_pool = ODP_POOL_INVALID;
-
-/* Sequence number of IP packets */
-static odp_atomic_u32_t ip_seq;
-
-/* Indicate to the receivers to shutdown */
-static odp_atomic_u32_t shutdown;
-
/* Application global data */
static test_globals_t *gbl_args;
@@ -180,7 +177,7 @@ static odp_packet_t pktio_create_packet(uint32_t seq)
payload_len = sizeof(pkt_hdr) + gbl_args->args.pkt_len;
- pkt = odp_packet_alloc(transmit_pkt_pool,
+ pkt = odp_packet_alloc(gbl_args->transmit_pkt_pool,
payload_len + ODPH_UDPHDR_LEN +
ODPH_IPV4HDR_LEN + ODPH_ETHHDR_LEN);
@@ -261,7 +258,7 @@ static int alloc_packets(odp_packet_t *pkt_tbl, int num_pkts)
int n;
uint16_t seq;
- seq = odp_atomic_fetch_add_u32(&ip_seq, num_pkts);
+ seq = odp_atomic_fetch_add_u32(&gbl_args->ip_seq, num_pkts);
for (n = 0; n < num_pkts; ++n) {
pkt_tbl[n] = pktio_create_packet(seq + n);
if (pkt_tbl[n] == ODP_PACKET_INVALID)
@@ -453,7 +450,7 @@ static int run_thread_rx(void *arg)
}
odp_event_free(ev[i]);
}
- if (n_ev == 0 && odp_atomic_load_u32(&shutdown))
+ if (n_ev == 0 && odp_atomic_load_u32(&gbl_args->shutdown))
break;
}
@@ -618,7 +615,7 @@ static int run_test_single(odp_cpumask_t *thd_mask_tx,
thr_params.thr_type = ODP_THREAD_WORKER;
thr_params.instance = gbl_args->instance;
- odp_atomic_store_u32(&shutdown, 0);
+ odp_atomic_store_u32(&gbl_args->shutdown, 0);
memset(thd_tbl, 0, sizeof(thd_tbl));
memset(gbl_args->rx_stats, 0, gbl_args->rx_stats_size);
@@ -652,7 +649,7 @@ static int run_test_single(odp_cpumask_t *thd_mask_tx,
odp_time_wait_ns(SHUTDOWN_DELAY_NS);
/* indicate to the receivers to exit */
- odp_atomic_store_u32(&shutdown, 1);
+ odp_atomic_store_u32(&gbl_args->shutdown, 1);
/* wait for receivers */
odph_odpthreads_join(&thd_tbl[0]);
@@ -751,12 +748,13 @@ static int test_init(void)
params.pkt.num = PKT_BUF_NUM;
params.type = ODP_POOL_PACKET;
- transmit_pkt_pool = odp_pool_create("pkt_pool_transmit", ¶ms);
- if (transmit_pkt_pool == ODP_POOL_INVALID)
+ gbl_args->transmit_pkt_pool = odp_pool_create("pkt_pool_transmit",
+ ¶ms);
+ if (gbl_args->transmit_pkt_pool == ODP_POOL_INVALID)
LOG_ABORT("Failed to create transmit pool\n");
- odp_atomic_init_u32(&ip_seq, 0);
- odp_atomic_init_u32(&shutdown, 0);
+ odp_atomic_init_u32(&gbl_args->ip_seq, 0);
+ odp_atomic_init_u32(&gbl_args->shutdown, 0);
iface = gbl_args->args.ifaces[0];
schedule = gbl_args->args.schedule;
@@ -892,7 +890,7 @@ static int test_term(void)
}
}
- if (odp_pool_destroy(transmit_pkt_pool) != 0) {
+ if (odp_pool_destroy(gbl_args->transmit_pkt_pool) != 0) {
LOG_ERR("Failed to destroy transmit pool\n");
ret = -1;
}
commit 6b4331e9e3251d54db409a45cac7e5848d30029c
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Wed Sep 26 15:40:11 2018 +0300
validation: timer: allocate global data from shm
Enables testing in process mode.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c
index b1b760dc..281e02c5 100644
--- a/test/validation/api/timer/timer.c
+++ b/test/validation/api/timer/timer.c
@@ -17,6 +17,8 @@
#include "odp_cunit_common.h"
#include "test_debug.h"
+#define GLOBAL_SHM_NAME "GlobalTimerTest"
+
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
/* Timeout range in milliseconds (ms) */
@@ -32,25 +34,6 @@
#define USER_PTR ((void *)0xdead)
#define TICK_INVALID (~(uint64_t)0)
-/* Barrier for thread synchronisation */
-static odp_barrier_t test_barrier;
-
-/* Timeout pool handle used by all threads */
-static odp_pool_t tbp;
-
-/* Timer pool handle used by all threads */
-static odp_timer_pool_t tp;
-
-/* Count of timeouts delivered too late */
-static odp_atomic_u32_t ndelivtoolate;
-
-/* Sum of all allocated timers from all threads. Thread-local
- * caches may make this number lower than the capacity of the pool */
-static odp_atomic_u32_t timers_allocated;
-
-/* Timer resolution in nsec */
-static uint64_t resolution_ns;
-
/* Timer helper structure */
struct test_timer {
odp_timer_t tim; /* Timer handle */
@@ -59,6 +42,72 @@ struct test_timer {
uint64_t tick; /* Expiration tick or TICK_INVALID */
};
+typedef struct {
+ /* Timeout pool handle used by all threads */
+ odp_pool_t tbp;
+ /* Timer pool handle used by all threads */
+ odp_timer_pool_t tp;
+ /* Barrier for thread synchronization */
+ odp_barrier_t test_barrier;
+ /* Count of timeouts delivered too late */
+ odp_atomic_u32_t ndelivtoolate;
+ /* Sum of all allocated timers from all threads. Thread-local
+ * caches may make this number lower than the capacity of the pool */
+ odp_atomic_u32_t timers_allocated;
+} global_shared_mem_t;
+
+static global_shared_mem_t *global_mem;
+
+static int timer_global_init(odp_instance_t *inst)
+{
+ odp_shm_t global_shm;
+
+ if (0 != odp_init_global(inst, NULL, NULL)) {
+ fprintf(stderr, "error: odp_init_global() failed.\n");
+ return -1;
+ }
+ if (0 != odp_init_local(*inst, ODP_THREAD_CONTROL)) {
+ fprintf(stderr, "error: odp_init_local() failed.\n");
+ return -1;
+ }
+
+ global_shm = odp_shm_reserve(GLOBAL_SHM_NAME,
+ sizeof(global_shared_mem_t),
+ ODP_CACHE_LINE_SIZE, ODP_SHM_SW_ONLY);
+ if (global_shm == ODP_SHM_INVALID) {
+ fprintf(stderr, "Unable reserve memory for global_shm\n");
+ return -1;
+ }
+
+ global_mem = odp_shm_addr(global_shm);
+ memset(global_mem, 0, sizeof(global_shared_mem_t));
+
+ return 0;
+}
+
+static int timer_global_term(odp_instance_t inst)
+{
+ odp_shm_t shm;
+
+ shm = odp_shm_lookup(GLOBAL_SHM_NAME);
+ if (0 != odp_shm_free(shm)) {
+ fprintf(stderr, "error: odp_shm_free() failed.\n");
+ return -1;
+ }
+
+ if (0 != odp_term_local()) {
+ fprintf(stderr, "error: odp_term_local() failed.\n");
+ return -1;
+ }
+
+ if (0 != odp_term_global(inst)) {
+ fprintf(stderr, "error: odp_term_global() failed.\n");
+ return -1;
+ }
+
+ return 0;
+}
+
static void timer_test_timeout_pool_alloc(void)
{
odp_pool_t pool;
@@ -540,7 +589,7 @@ static void handle_tmo(odp_event_t ev, bool stale, uint64_t prev_tick)
CU_FAIL("odp_timeout_tick() too small tick");
}
- if (tick > odp_timer_current_tick(tp))
+ if (tick > odp_timer_current_tick(global_mem->tp))
CU_FAIL("Timeout delivered early");
if (tick < prev_tick) {
@@ -548,7 +597,7 @@ static void handle_tmo(odp_event_t ev, bool stale, uint64_t prev_tick)
" prev_tick %" PRIu64"\n",
tick, prev_tick);
/* We don't report late timeouts using CU_FAIL */
- odp_atomic_inc_u32(&ndelivtoolate);
+ odp_atomic_inc_u32(&global_mem->ndelivtoolate);
}
}
@@ -579,6 +628,8 @@ static int worker_entrypoint(void *arg TEST_UNUSED)
struct timespec ts;
uint32_t nstale;
odp_timer_set_t timer_rc;
+ odp_timer_pool_t tp = global_mem->tp;
+ odp_pool_t tbp = global_mem->tbp;
queue = odp_queue_create("timer_queue", NULL);
if (queue == ODP_QUEUE_INVALID)
@@ -609,9 +660,9 @@ static int worker_entrypoint(void *arg TEST_UNUSED)
allocated = i;
if (allocated == 0)
CU_FAIL_FATAL("unable to alloc a timer");
- odp_atomic_fetch_add_u32(&timers_allocated, allocated);
+ odp_atomic_fetch_add_u32(&global_mem->timers_allocated, allocated);
- odp_barrier_wait(&test_barrier);
+ odp_barrier_wait(&global_mem->test_barrier);
/* Initial set all timers with a random expiration time */
nset = 0;
@@ -771,8 +822,12 @@ static void timer_test_odp_timer_all(void)
odp_cpumask_t unused;
odp_timer_pool_info_t tpinfo;
uint64_t ns, tick, ns2;
+ uint64_t resolution_ns;
+ uint32_t timers_allocated;
pthrd_arg thrdarg;
odp_timer_capability_t timer_capa;
+ odp_pool_t tbp;
+ odp_timer_pool_t tp;
/* Reserve at least one core for running other processes so the timer
* test hopefully can run undisturbed and thus get better timing
@@ -792,9 +847,10 @@ static void timer_test_odp_timer_all(void)
params.type = ODP_POOL_TIMEOUT;
params.tmo.num = (NTIMERS + 1) * num_workers;
- tbp = odp_pool_create("tmo_pool", ¶ms);
- if (tbp == ODP_POOL_INVALID)
+ global_mem->tbp = odp_pool_create("tmo_pool", ¶ms);
+ if (global_mem->tbp == ODP_POOL_INVALID)
CU_FAIL_FATAL("Timeout pool create failed");
+ tbp = global_mem->tbp;
/* Create a timer pool */
if (odp_timer_capability(ODP_CLOCK_CPU, &timer_capa))
@@ -807,9 +863,10 @@ static void timer_test_odp_timer_all(void)
tparam.num_timers = num_workers * NTIMERS;
tparam.priv = 0;
tparam.clk_src = ODP_CLOCK_CPU;
- tp = odp_timer_pool_create(NAME, &tparam);
- if (tp == ODP_TIMER_POOL_INVALID)
+ global_mem->tp = odp_timer_pool_create(NAME, &tparam);
+ if (global_mem->tp == ODP_TIMER_POOL_INVALID)
CU_FAIL_FATAL("Timer pool create failed");
+ tp = global_mem->tp;
/* Start all created timer pools */
odp_timer_pool_start();
@@ -854,13 +911,13 @@ static void timer_test_odp_timer_all(void)
}
/* Initialize barrier used by worker threads for synchronization */
- odp_barrier_init(&test_barrier, num_workers);
+ odp_barrier_init(&global_mem->test_barrier, num_workers);
/* Initialize the shared timeout counter */
- odp_atomic_init_u32(&ndelivtoolate, 0);
+ odp_atomic_init_u32(&global_mem->ndelivtoolate, 0);
/* Initialize the number of finally allocated elements */
- odp_atomic_init_u32(&timers_allocated, 0);
+ odp_atomic_init_u32(&global_mem->timers_allocated, 0);
/* Create and start worker threads */
thrdarg.testcase = 0;
@@ -870,14 +927,15 @@ static void timer_test_odp_timer_all(void)
/* Wait for worker threads to exit */
odp_cunit_thread_exit(&thrdarg);
LOG_DBG("Number of timeouts delivered/received too late: %" PRIu32 "\n",
- odp_atomic_load_u32(&ndelivtoolate));
+ odp_atomic_load_u32(&global_mem->ndelivtoolate));
/* Check some statistics after the test */
if (odp_timer_pool_info(tp, &tpinfo) != 0)
CU_FAIL("odp_timer_pool_info");
CU_ASSERT(tpinfo.param.num_timers == (unsigned)num_workers * NTIMERS);
CU_ASSERT(tpinfo.cur_timers == 0);
- CU_ASSERT(tpinfo.hwm_timers == odp_atomic_load_u32(&timers_allocated));
+ timers_allocated = odp_atomic_load_u32(&global_mem->timers_allocated);
+ CU_ASSERT(tpinfo.hwm_timers == timers_allocated);
/* Destroy timer pool, all timers must have been freed */
odp_timer_pool_destroy(tp);
@@ -911,6 +969,9 @@ int main(int argc, char *argv[])
if (odp_cunit_parse_options(argc, argv))
return -1;
+ odp_cunit_register_global_init(timer_global_init);
+ odp_cunit_register_global_term(timer_global_term);
+
int ret = odp_cunit_register(timer_suites);
if (ret == 0)
commit da173cd050d227730307850830b1d02a76db6d2a
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Wed Sep 26 14:46:32 2018 +0300
validation: thread: allocate barriers from shm
Enables testing in process mode.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/thread/thread.c b/test/validation/api/thread/thread.c
index 2fab1a7d..d977f977 100644
--- a/test/validation/api/thread/thread.c
+++ b/test/validation/api/thread/thread.c
@@ -11,9 +11,65 @@
#include <mask_common.h>
#include <test_debug.h>
-/* Test thread entry and exit synchronization barriers */
-odp_barrier_t bar_entry;
-odp_barrier_t bar_exit;
+#define GLOBAL_SHM_NAME "GlobalThreadTest"
+
+typedef struct {
+ /* Test thread entry and exit synchronization barriers */
+ odp_barrier_t bar_entry;
+ odp_barrier_t bar_exit;
+} global_shared_mem_t;
+
+static global_shared_mem_t *global_mem;
+
+static int thread_global_init(odp_instance_t *inst)
+{
+ odp_shm_t global_shm;
+
+ if (0 != odp_init_global(inst, NULL, NULL)) {
+ fprintf(stderr, "error: odp_init_global() failed.\n");
+ return -1;
+ }
+ if (0 != odp_init_local(*inst, ODP_THREAD_CONTROL)) {
+ fprintf(stderr, "error: odp_init_local() failed.\n");
+ return -1;
+ }
+
+ global_shm = odp_shm_reserve(GLOBAL_SHM_NAME,
+ sizeof(global_shared_mem_t),
+ ODP_CACHE_LINE_SIZE, ODP_SHM_SW_ONLY);
+ if (global_shm == ODP_SHM_INVALID) {
+ fprintf(stderr, "Unable reserve memory for global_shm\n");
+ return -1;
+ }
+
+ global_mem = odp_shm_addr(global_shm);
+ memset(global_mem, 0, sizeof(global_shared_mem_t));
+
+ return 0;
+}
+
+static int thread_global_term(odp_instance_t inst)
+{
+ odp_shm_t shm;
+
+ shm = odp_shm_lookup(GLOBAL_SHM_NAME);
+ if (0 != odp_shm_free(shm)) {
+ fprintf(stderr, "error: odp_shm_free() failed.\n");
+ return -1;
+ }
+
+ if (0 != odp_term_local()) {
+ fprintf(stderr, "error: odp_term_local() failed.\n");
+ return -1;
+ }
+
+ if (0 != odp_term_global(inst)) {
+ fprintf(stderr, "error: odp_term_global() failed.\n");
+ return -1;
+ }
+
+ return 0;
+}
static void thread_test_odp_cpu_id(void)
{
@@ -36,12 +92,12 @@ static void thread_test_odp_thread_count(void)
static int thread_func(void *arg TEST_UNUSED)
{
/* indicate that thread has started */
- odp_barrier_wait(&bar_entry);
+ odp_barrier_wait(&global_mem->bar_entry);
CU_ASSERT(odp_thread_type() == ODP_THREAD_WORKER);
/* wait for indication that we can exit */
- odp_barrier_wait(&bar_exit);
+ odp_barrier_wait(&global_mem->bar_exit);
return CU_get_number_of_failures();
}
@@ -54,8 +110,8 @@ static void thread_test_odp_thrmask_worker(void)
CU_ASSERT_FATAL(odp_thread_type() == ODP_THREAD_CONTROL);
- odp_barrier_init(&bar_entry, args.numthrds + 1);
- odp_barrier_init(&bar_exit, args.numthrds + 1);
+ odp_barrier_init(&global_mem->bar_entry, args.numthrds + 1);
+ odp_barrier_init(&global_mem->bar_exit, args.numthrds + 1);
/* should start out with 0 worker threads */
ret = odp_thrmask_worker(&mask);
@@ -70,7 +126,7 @@ static void thread_test_odp_thrmask_worker(void)
return;
/* wait for thread(s) to start */
- odp_barrier_wait(&bar_entry);
+ odp_barrier_wait(&global_mem->bar_entry);
ret = odp_thrmask_worker(&mask);
CU_ASSERT(ret == odp_thrmask_count(&mask));
@@ -78,7 +134,7 @@ static void thread_test_odp_thrmask_worker(void)
CU_ASSERT(ret <= odp_thread_count_max());
/* allow thread(s) to exit */
- odp_barrier_wait(&bar_exit);
+ odp_barrier_wait(&global_mem->bar_exit);
odp_cunit_thread_exit(&args);
}
@@ -132,6 +188,9 @@ int main(int argc, char *argv[])
if (odp_cunit_parse_options(argc, argv))
return -1;
+ odp_cunit_register_global_init(thread_global_init);
+ odp_cunit_register_global_term(thread_global_term);
+
ret = odp_cunit_register(thread_suites);
if (ret == 0)
commit d2ae9854243a72b7f7bc8c86a7226035c53c37be
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Wed Sep 26 14:23:28 2018 +0300
validation: atomic: allocate test variables from shm
Enables testing in process mode.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/atomic/atomic.c b/test/validation/api/atomic/atomic.c
index 71af2d12..a755aef9 100644
--- a/test/validation/api/atomic/atomic.c
+++ b/test/validation/api/atomic/atomic.c
@@ -30,26 +30,22 @@
#define CHECK_MAX_MIN (1 << 0)
#define CHECK_XCHG (1 << 2)
-static odp_atomic_u32_t a32u;
-static odp_atomic_u64_t a64u;
-static odp_atomic_u32_t a32u_min;
-static odp_atomic_u32_t a32u_max;
-static odp_atomic_u64_t a64u_min;
-static odp_atomic_u64_t a64u_max;
-static odp_atomic_u32_t a32u_xchg;
-static odp_atomic_u64_t a64u_xchg;
-
typedef __volatile uint32_t volatile_u32_t;
typedef __volatile uint64_t volatile_u64_t;
typedef struct {
- /* Global variables */
+ odp_atomic_u64_t a64u;
+ odp_atomic_u64_t a64u_min;
+ odp_atomic_u64_t a64u_max;
+ odp_atomic_u64_t a64u_xchg;
+ odp_atomic_u32_t a32u;
+ odp_atomic_u32_t a32u_min;
+ odp_atomic_u32_t a32u_max;
+ odp_atomic_u32_t a32u_xchg;
+
uint32_t g_num_threads;
uint32_t g_iterations;
uint32_t g_verbose;
- uint32_t g_max_num_cores;
-
- volatile_u32_t global_lock_owner;
} global_shared_mem_t;
/* Per-thread memory */
@@ -101,7 +97,7 @@ static void test_atomic_inc_32(void)
int i;
for (i = 0; i < CNT; i++)
- odp_atomic_inc_u32(&a32u);
+ odp_atomic_inc_u32(&global_mem->a32u);
}
static void test_atomic_inc_64(void)
@@ -109,7 +105,7 @@ static void test_atomic_inc_64(void)
int i;
for (i = 0; i < CNT; i++)
- odp_atomic_inc_u64(&a64u);
+ odp_atomic_inc_u64(&global_mem->a64u);
}
static void test_atomic_dec_32(void)
@@ -117,7 +113,7 @@ static void test_atomic_dec_32(void)
int i;
for (i = 0; i < CNT; i++)
- odp_atomic_dec_u32(&a32u);
+ odp_atomic_dec_u32(&global_mem->a32u);
}
static void test_atomic_dec_64(void)
@@ -125,7 +121,7 @@ static void test_atomic_dec_64(void)
int i;
for (i = 0; i < CNT; i++)
- odp_atomic_dec_u64(&a64u);
+ odp_atomic_dec_u64(&global_mem->a64u);
}
static void test_atomic_fetch_inc_32(void)
@@ -133,7 +129,7 @@ static void test_atomic_fetch_inc_32(void)
int i;
for (i = 0; i < CNT; i++)
- odp_atomic_fetch_inc_u32(&a32u);
+ odp_atomic_fetch_inc_u32(&global_mem->a32u);
}
static void test_atomic_fetch_inc_64(void)
@@ -141,7 +137,7 @@ static void test_atomic_fetch_inc_64(void)
int i;
for (i = 0; i < CNT; i++)
- odp_atomic_fetch_inc_u64(&a64u);
+ odp_atomic_fetch_inc_u64(&global_mem->a64u);
}
static void test_atomic_fetch_dec_32(void)
@@ -149,7 +145,7 @@ static void test_atomic_fetch_dec_32(void)
int i;
for (i = 0; i < CNT; i++)
- odp_atomic_fetch_dec_u32(&a32u);
+ odp_atomic_fetch_dec_u32(&global_mem->a32u);
}
static void test_atomic_fetch_dec_64(void)
@@ -157,7 +153,7 @@ static void test_atomic_fetch_dec_64(void)
int i;
for (i = 0; i < CNT; i++)
- odp_atomic_fetch_dec_u64(&a64u);
+ odp_atomic_fetch_dec_u64(&global_mem->a64u);
}
static void test_atomic_add_32(void)
@@ -165,7 +161,7 @@ static void test_atomic_add_32(void)
int i;
for (i = 0; i < CNT; i++)
- odp_atomic_add_u32(&a32u, ADD_SUB_CNT);
+ odp_atomic_add_u32(&global_mem->a32u, ADD_SUB_CNT);
}
static void test_atomic_add_64(void)
@@ -173,7 +169,7 @@ static void test_atomic_add_64(void)
int i;
for (i = 0; i < CNT; i++)
- odp_atomic_add_u64(&a64u, ADD_SUB_CNT);
+ odp_atomic_add_u64(&global_mem->a64u, ADD_SUB_CNT);
}
static void test_atomic_sub_32(void)
@@ -181,7 +177,7 @@ static void test_atomic_sub_32(void)
int i;
for (i = 0; i < CNT; i++)
- odp_atomic_sub_u32(&a32u, ADD_SUB_CNT);
+ odp_atomic_sub_u32(&global_mem->a32u, ADD_SUB_CNT);
}
static void test_atomic_sub_64(void)
@@ -189,7 +185,7 @@ static void test_atomic_sub_64(void)
int i;
for (i = 0; i < CNT; i++)
- odp_atomic_sub_u64(&a64u, ADD_SUB_CNT);
+ odp_atomic_sub_u64(&global_mem->a64u, ADD_SUB_CNT);
}
static void test_atomic_fetch_add_32(void)
@@ -197,7 +193,7 @@ static void test_atomic_fetch_add_32(void)
int i;
for (i = 0; i < CNT; i++)
- odp_atomic_fetch_add_u32(&a32u, ADD_SUB_CNT);
+ odp_atomic_fetch_add_u32(&global_mem->a32u, ADD_SUB_CNT);
}
static void test_atomic_fetch_add_64(void)
@@ -205,7 +201,7 @@ static void test_atomic_fetch_add_64(void)
int i;
for (i = 0; i < CNT; i++)
- odp_atomic_fetch_add_u64(&a64u, ADD_SUB_CNT);
+ odp_atomic_fetch_add_u64(&global_mem->a64u, ADD_SUB_CNT);
}
static void test_atomic_fetch_sub_32(void)
@@ -213,7 +209,7 @@ static void test_atomic_fetch_sub_32(void)
int i;
for (i = 0; i < CNT; i++)
- odp_atomic_fetch_sub_u32(&a32u, ADD_SUB_CNT);
+ odp_atomic_fetch_sub_u32(&global_mem->a32u, ADD_SUB_CNT);
}
static void test_atomic_fetch_sub_64(void)
@@ -221,7 +217,7 @@ static void test_atomic_fetch_sub_64(void)
int i;
for (i = 0; i < CNT; i++)
- odp_atomic_fetch_sub_u64(&a64u, ADD_SUB_CNT);
+ odp_atomic_fetch_sub_u64(&global_mem->a64u, ADD_SUB_CNT);
}
static void test_atomic_min_32(void)
@@ -230,8 +226,8 @@ static void test_atomic_min_32(void)
uint32_t tmp;
for (i = 0; i < CNT; i++) {
- tmp = odp_atomic_fetch_dec_u32(&a32u);
- odp_atomic_min_u32(&a32u_min, tmp);
+ tmp = odp_atomic_fetch_dec_u32(&global_mem->a32u);
+ odp_atomic_min_u32(&global_mem->a32u_min, tmp);
}
}
@@ -241,8 +237,8 @@ static void test_atomic_min_64(void)
uint64_t tmp;
for (i = 0; i < CNT; i++) {
- tmp = odp_atomic_fetch_dec_u64(&a64u);
- odp_atomic_min_u64(&a64u_min, tmp);
+ tmp = odp_atomic_fetch_dec_u64(&global_mem->a64u);
+ odp_atomic_min_u64(&global_mem->a64u_min, tmp);
}
}
@@ -252,8 +248,8 @@ static void test_atomic_max_32(void)
uint32_t tmp;
for (i = 0; i < CNT; i++) {
- tmp = odp_atomic_fetch_inc_u32(&a32u);
- odp_atomic_max_u32(&a32u_max, tmp);
+ tmp = odp_atomic_fetch_inc_u32(&global_mem->a32u);
+ odp_atomic_max_u32(&global_mem->a32u_max, tmp);
}
}
@@ -263,8 +259,8 @@ static void test_atomic_max_64(void)
uint64_t tmp;
for (i = 0; i < CNT; i++) {
- tmp = odp_atomic_fetch_inc_u64(&a64u);
- odp_atomic_max_u64(&a64u_max, tmp);
+ tmp = odp_atomic_fetch_inc_u64(&global_mem->a64u);
+ odp_atomic_max_u64(&global_mem->a64u_max, tmp);
}
}
@@ -272,11 +268,12 @@ static void test_atomic_cas_inc_32(void)
{
int i;
uint32_t old;
+ odp_atomic_u32_t *a32u = &global_mem->a32u;
for (i = 0; i < CNT; i++) {
- old = odp_atomic_load_u32(&a32u);
+ old = odp_atomic_load_u32(a32u);
- while (odp_atomic_cas_u32(&a32u, &old, old + 1) == 0)
+ while (odp_atomic_cas_u32(a32u, &old, old + 1) == 0)
;
}
}
@@ -285,11 +282,12 @@ static void test_atomic_cas_dec_32(void)
{
int i;
uint32_t old;
+ odp_atomic_u32_t *a32u = &global_mem->a32u;
for (i = 0; i < CNT; i++) {
- old = odp_atomic_load_u32(&a32u);
+ old = odp_atomic_load_u32(a32u);
- while (odp_atomic_cas_u32(&a32u, &old, old - 1) == 0)
+ while (odp_atomic_cas_u32(a32u, &old, old - 1) == 0)
;
}
}
@@ -298,11 +296,12 @@ static void test_atomic_cas_inc_64(void)
{
int i;
uint64_t old;
+ odp_atomic_u64_t *a64u = &global_mem->a64u;
for (i = 0; i < CNT; i++) {
- old = odp_atomic_load_u64(&a64u);
+ old = odp_atomic_load_u64(a64u);
- while (odp_atomic_cas_u64(&a64u, &old, old + 1) == 0)
+ while (odp_atomic_cas_u64(a64u, &old, old + 1) == 0)
;
}
}
@@ -311,11 +310,12 @@ static void test_atomic_cas_dec_64(void)
{
int i;
uint64_t old;
+ odp_atomic_u64_t *a64u = &global_mem->a64u;
for (i = 0; i < CNT; i++) {
- old = odp_atomic_load_u64(&a64u);
+ old = odp_atomic_load_u64(a64u);
- while (odp_atomic_cas_u64(&a64u, &old, old - 1) == 0)
+ while (odp_atomic_cas_u64(a64u, &old, old - 1) == 0)
;
}
}
@@ -324,66 +324,74 @@ static void test_atomic_xchg_32(void)
{
uint32_t old, new;
int i;
+ odp_atomic_u32_t *a32u = &global_mem->a32u;
+ odp_atomic_u32_t *a32u_xchg = &global_mem->a32u_xchg;
for (i = 0; i < CNT; i++) {
- new = odp_atomic_fetch_inc_u32(&a32u);
- old = odp_atomic_xchg_u32(&a32u_xchg, new);
+ new = odp_atomic_fetch_inc_u32(a32u);
+ old = odp_atomic_xchg_u32(a32u_xchg, new);
if (old & 0x1)
- odp_atomic_xchg_u32(&a32u_xchg, 0);
+ odp_atomic_xchg_u32(a32u_xchg, 0);
else
- odp_atomic_xchg_u32(&a32u_xchg, 1);
+ odp_atomic_xchg_u32(a32u_xchg, 1);
}
- odp_atomic_sub_u32(&a32u, CNT);
- odp_atomic_xchg_u32(&a32u_xchg, U32_MAGIC);
+ odp_atomic_sub_u32(a32u, CNT);
+ odp_atomic_xchg_u32(a32u_xchg, U32_MAGIC);
}
static void test_atomic_xchg_64(void)
{
uint64_t old, new;
int i;
+ odp_atomic_u64_t *a64u = &global_mem->a64u;
+ odp_atomic_u64_t *a64u_xchg = &global_mem->a64u_xchg;
for (i = 0; i < CNT; i++) {
- new = odp_atomic_fetch_inc_u64(&a64u);
- old = odp_atomic_xchg_u64(&a64u_xchg, new);
+ new = odp_atomic_fetch_inc_u64(a64u);
+ old = odp_atomic_xchg_u64(a64u_xchg, new);
if (old & 0x1)
- odp_atomic_xchg_u64(&a64u_xchg, 0);
+ odp_atomic_xchg_u64(a64u_xchg, 0);
else
- odp_atomic_xchg_u64(&a64u_xchg, 1);
+ odp_atomic_xchg_u64(a64u_xchg, 1);
}
- odp_atomic_sub_u64(&a64u, CNT);
- odp_atomic_xchg_u64(&a64u_xchg, U64_MAGIC);
+ odp_atomic_sub_u64(a64u, CNT);
+ odp_atomic_xchg_u64(a64u_xchg, U64_MAGIC);
}
static void test_atomic_non_relaxed_32(void)
{
int i;
uint32_t tmp;
+ odp_atomic_u32_t *a32u = &global_mem->a32u;
+ odp_atomic_u32_t *a32u_min = &global_mem->a32u_min;
+ odp_atomic_u32_t *a32u_max = &global_mem->a32u_max;
+ odp_atomic_u32_t *a32u_xchg = &global_mem->a32u_xchg;
for (i = 0; i < CNT; i++) {
- tmp = odp_atomic_load_acq_u32(&a32u);
- odp_atomic_store_rel_u32(&a32u, tmp);
+ tmp = odp_atomic_load_acq_u32(a32u);
+ odp_atomic_store_rel_u32(a32u, tmp);
- tmp = odp_atomic_load_acq_u32(&a32u_max);
- odp_atomic_add_rel_u32(&a32u_max, 1);
+ tmp = odp_atomic_load_acq_u32(a32u_max);
+ odp_atomic_add_rel_u32(a32u_max, 1);
- tmp = odp_atomic_load_acq_u32(&a32u_min);
- odp_atomic_sub_rel_u32(&a32u_min, 1);
+ tmp = odp_atomic_load_acq_u32(a32u_min);
+ odp_atomic_sub_rel_u32(a32u_min, 1);
- tmp = odp_atomic_load_u32(&a32u_xchg);
- while (odp_atomic_cas_acq_u32(&a32u_xchg, &tmp, tmp + 1) == 0)
+ tmp = odp_atomic_load_u32(a32u_xchg);
+ while (odp_atomic_cas_acq_u32(a32u_xchg, &tmp, tmp + 1) == 0)
;
- tmp = odp_atomic_load_u32(&a32u_xchg);
- while (odp_atomic_cas_rel_u32(&a32u_xchg, &tmp, tmp + 1) == 0)
+ tmp = odp_atomic_load_u32(a32u_xchg);
+ while (odp_atomic_cas_rel_u32(a32u_xchg, &tmp, tmp + 1) == 0)
;
- tmp = odp_atomic_load_u32(&a32u_xchg);
+ tmp = odp_atomic_load_u32(a32u_xchg);
/* finally set value for validation */
- while (odp_atomic_cas_acq_rel_u32(&a32u_xchg, &tmp, U32_MAGIC)
+ while (odp_atomic_cas_acq_rel_u32(a32u_xchg, &tmp, U32_MAGIC)
== 0)
;
}
@@ -393,28 +401,32 @@ static void test_atomic_non_relaxed_64(void)
{
int i;
uint64_t tmp;
+ odp_atomic_u64_t *a64u = &global_mem->a64u;
+ odp_atomic_u64_t *a64u_min = &global_mem->a64u_min;
+ odp_atomic_u64_t *a64u_max = &global_mem->a64u_max;
+ odp_atomic_u64_t *a64u_xchg = &global_mem->a64u_xchg;
for (i = 0; i < CNT; i++) {
- tmp = odp_atomic_load_acq_u64(&a64u);
- odp_atomic_store_rel_u64(&a64u, tmp);
+ tmp = odp_atomic_load_acq_u64(a64u);
+ odp_atomic_store_rel_u64(a64u, tmp);
- tmp = odp_atomic_load_acq_u64(&a64u_max);
- odp_atomic_add_rel_u64(&a64u_max, 1);
+ tmp = odp_atomic_load_acq_u64(a64u_max);
+ odp_atomic_add_rel_u64(a64u_max, 1);
- tmp = odp_atomic_load_acq_u64(&a64u_min);
- odp_atomic_sub_rel_u64(&a64u_min, 1);
+ tmp = odp_atomic_load_acq_u64(a64u_min);
+ odp_atomic_sub_rel_u64(a64u_min, 1);
- tmp = odp_atomic_load_u64(&a64u_xchg);
- while (odp_atomic_cas_acq_u64(&a64u_xchg, &tmp, tmp + 1) == 0)
+ tmp = odp_atomic_load_u64(a64u_xchg);
+ while (odp_atomic_cas_acq_u64(a64u_xchg, &tmp, tmp + 1) == 0)
;
- tmp = odp_atomic_load_u64(&a64u_xchg);
- while (odp_atomic_cas_rel_u64(&a64u_xchg, &tmp, tmp + 1) == 0)
+ tmp = odp_atomic_load_u64(a64u_xchg);
+ while (odp_atomic_cas_rel_u64(a64u_xchg, &tmp, tmp + 1) == 0)
;
- tmp = odp_atomic_load_u64(&a64u_xchg);
+ tmp = odp_atomic_load_u64(a64u_xchg);
/* finally set value for validation */
- while (odp_atomic_cas_acq_rel_u64(&a64u_xchg, &tmp, U64_MAGIC)
+ while (odp_atomic_cas_acq_rel_u64(a64u_xchg, &tmp, U64_MAGIC)
== 0)
;
}
@@ -494,44 +506,46 @@ static void test_atomic_cas_inc_dec_64(void)
static void test_atomic_init(void)
{
- odp_atomic_init_u32(&a32u, 0);
- odp_atomic_init_u64(&a64u, 0);
- odp_atomic_init_u32(&a32u_min, 0);
- odp_atomic_init_u32(&a32u_max, 0);
- odp_atomic_init_u64(&a64u_min, 0);
- odp_atomic_init_u64(&a64u_max, 0);
- odp_atomic_init_u32(&a32u_xchg, 0);
- odp_atomic_init_u64(&a64u_xchg, 0);
+ odp_atomic_init_u32(&global_mem->a32u, 0);
+ odp_atomic_init_u64(&global_mem->a64u, 0);
+ odp_atomic_init_u32(&global_mem->a32u_min, 0);
+ odp_atomic_init_u32(&global_mem->a32u_max, 0);
+ odp_atomic_init_u64(&global_mem->a64u_min, 0);
+ odp_atomic_init_u64(&global_mem->a64u_max, 0);
+ odp_atomic_init_u32(&global_mem->a32u_xchg, 0);
+ odp_atomic_init_u64(&global_mem->a64u_xchg, 0);
}
static void test_atomic_store(void)
{
- odp_atomic_store_u32(&a32u, U32_INIT_VAL);
- odp_atomic_store_u64(&a64u, U64_INIT_VAL);
- odp_atomic_store_u32(&a32u_min, U32_INIT_VAL);
- odp_atomic_store_u32(&a32u_max, U32_INIT_VAL);
- odp_atomic_store_u64(&a64u_min, U64_INIT_VAL);
- odp_atomic_store_u64(&a64u_max, U64_INIT_VAL);
- odp_atomic_store_u32(&a32u_xchg, U32_INIT_VAL);
- odp_atomic_store_u64(&a64u_xchg, U64_INIT_VAL);
+ odp_atomic_store_u32(&global_mem->a32u, U32_INIT_VAL);
+ odp_atomic_store_u64(&global_mem->a64u, U64_INIT_VAL);
+ odp_atomic_store_u32(&global_mem->a32u_min, U32_INIT_VAL);
+ odp_atomic_store_u32(&global_mem->a32u_max, U32_INIT_VAL);
+ odp_atomic_store_u64(&global_mem->a64u_min, U64_INIT_VAL);
+ odp_atomic_store_u64(&global_mem->a64u_max, U64_INIT_VAL);
+ odp_atomic_store_u32(&global_mem->a32u_xchg, U32_INIT_VAL);
+ odp_atomic_store_u64(&global_mem->a64u_xchg, U64_INIT_VAL);
}
static void test_atomic_validate(int check)
{
- CU_ASSERT(U32_INIT_VAL == odp_atomic_load_u32(&a32u));
- CU_ASSERT(U64_INIT_VAL == odp_atomic_load_u64(&a64u));
+ CU_ASSERT(U32_INIT_VAL == odp_atomic_load_u32(&global_mem->a32u));
+ CU_ASSERT(U64_INIT_VAL == odp_atomic_load_u64(&global_mem->a64u));
if (check & CHECK_MAX_MIN) {
- CU_ASSERT(odp_atomic_load_u32(&a32u_max) >
- odp_atomic_load_u32(&a32u_min));
+ CU_ASSERT(odp_atomic_load_u32(&global_mem->a32u_max) >
+ odp_atomic_load_u32(&global_mem->a32u_min));
- CU_ASSERT(odp_atomic_load_u64(&a64u_max) >
- odp_atomic_load_u64(&a64u_min));
+ CU_ASSERT(odp_atomic_load_u64(&global_mem->a64u_max) >
+ odp_atomic_load_u64(&global_mem->a64u_min));
}
if (check & CHECK_XCHG) {
- CU_ASSERT(odp_atomic_load_u32(&a32u_xchg) == U32_MAGIC);
- CU_ASSERT(odp_atomic_load_u64(&a64u_xchg) == U64_MAGIC);
+ CU_ASSERT(odp_atomic_load_u32(&global_mem->a32u_xchg) ==
+ U32_MAGIC);
+ CU_ASSERT(odp_atomic_load_u64(&global_mem->a64u_xchg) ==
+ U64_MAGIC);
}
}
commit 84507e04c0d1e1cedaa0b83737c0baa8cdf8d265
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Mon Oct 1 13:55:40 2018 +0300
linux-gen: socket_mmap: reserve memory from shm
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_packet_socket.h b/platform/linux-generic/include/odp_packet_socket.h
index 6f9443a3..16cee16b 100644
--- a/platform/linux-generic/include/odp_packet_socket.h
+++ b/platform/linux-generic/include/odp_packet_socket.h
@@ -20,6 +20,7 @@
#include <odp/api/pool.h>
#include <odp/api/packet.h>
#include <odp/api/packet_io.h>
+#include <odp/api/shared_memory.h>
#include <linux/version.h>
@@ -43,6 +44,7 @@ struct ring {
unsigned frame_num;
int rd_num;
+ odp_shm_t shm;
int sock;
int type;
int version;
diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c
index 459c6552..03085728 100644
--- a/platform/linux-generic/pktio/socket_mmap.c
+++ b/platform/linux-generic/pktio/socket_mmap.c
@@ -38,6 +38,7 @@
#include <odp_classification_inlines.h>
#include <odp_classification_internal.h>
#include <odp/api/hints.h>
+#include <odp_global_data.h>
#include <protocols/eth.h>
#include <protocols/ip.h>
@@ -462,6 +463,8 @@ static int mmap_setup_ring(int sock, struct ring *ring, int type,
odp_pool_t pool_hdl, int fanout)
{
int ret = 0;
+ int flags = 0;
+ odp_shm_t shm;
ring->sock = sock;
ring->type = type;
@@ -477,10 +480,21 @@ static int mmap_setup_ring(int sock, struct ring *ring, int type,
}
ring->rd_len = ring->rd_num * sizeof(*ring->rd);
- ring->rd = malloc(ring->rd_len);
+
+ if (odp_global_ro.shm_single_va)
+ flags += ODP_SHM_SINGLE_VA;
+
+ shm = odp_shm_reserve(NULL, ring->rd_len, ODP_CACHE_LINE_SIZE, flags);
+
+ if (shm == ODP_SHM_INVALID) {
+ ODP_ERR("Reserving shm failed\n");
+ return -1;
+ }
+ ring->shm = shm;
+
+ ring->rd = odp_shm_addr(shm);
if (!ring->rd) {
- __odp_errno = errno;
- ODP_ERR("malloc(): %s\n", strerror(errno));
+ ODP_ERR("Reading shm addr failed\n");
return -1;
}
@@ -533,8 +547,10 @@ static int mmap_sock(pkt_sock_mmap_t *pkt_sock)
static int mmap_unmap_sock(pkt_sock_mmap_t *pkt_sock)
{
- free(pkt_sock->rx_ring.rd);
- free(pkt_sock->tx_ring.rd);
+ if (pkt_sock->rx_ring.shm != ODP_SHM_INVALID)
+ odp_shm_free(pkt_sock->rx_ring.shm);
+ if (pkt_sock->tx_ring.shm != ODP_SHM_INVALID)
+ odp_shm_free(pkt_sock->tx_ring.shm);
return munmap(pkt_sock->mmap_base, pkt_sock->mmap_len);
}
@@ -605,6 +621,8 @@ static int sock_mmap_open(odp_pktio_t id ODP_UNUSED,
pkt_sock->frame_offset = 0;
pkt_sock->pool = pool;
+ pkt_sock->rx_ring.shm = ODP_SHM_INVALID;
+ pkt_sock->tx_ring.shm = ODP_SHM_INVALID;
pkt_sock->sockfd = mmap_pkt_socket();
if (pkt_sock->sockfd == -1)
goto error;
commit c12678f1712dd291c7ce951243b52287f3028883
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Sep 21 15:50:31 2018 +0300
linux-gen: pcap: allocate tx buffer from stack
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c
index c6a817fc..9f783403 100644
--- a/platform/linux-generic/pktio/pcap.c
+++ b/platform/linux-generic/pktio/pcap.c
@@ -56,7 +56,6 @@ typedef struct {
void *tx; /**< tx pcap handle */
void *tx_dump; /**< tx pcap dumper handle */
odp_pool_t pool; /**< rx pool */
- unsigned char *buf; /**< per-pktio temp buffer */
int loops; /**< number of times to loop rx pcap */
int loop_cnt; /**< number of loops completed */
odp_bool_t promisc; /**< promiscuous mode state */
@@ -141,12 +140,6 @@ static int _pcapif_init_tx(pkt_pcap_t *pcap)
pcap->tx = tx;
}
- pcap->buf = malloc(PKTIO_PCAP_MTU);
- if (!pcap->buf) {
- ODP_ERR("failed to malloc temp buffer\n");
- return -1;
- }
-
pcap->tx_dump = pcap_dump_open(tx, pcap->fname_tx);
if (!pcap->tx_dump) {
ODP_ERR("failed to open dump file %s (%s)\n",
@@ -198,7 +191,6 @@ static int pcapif_close(pktio_entry_t *pktio_entry)
if (pcap->rx)
pcap_close(pcap->rx);
- free(pcap->buf);
free(pcap->fname_rx);
free(pcap->fname_tx);
@@ -298,6 +290,7 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED,
static int _pcapif_dump_pkt(pkt_pcap_t *pcap, odp_packet_t pkt)
{
struct pcap_pkthdr hdr;
+ uint8_t tx_buf[PKTIO_PCAP_MTU];
if (!pcap->tx_dump)
return 0;
@@ -306,10 +299,10 @@ static int _pcapif_dump_pkt(pkt_pcap_t *pcap, odp_packet_t pkt)
hdr.len = hdr.caplen;
(void)gettimeofday(&hdr.ts, NULL);
- if (odp_packet_copy_to_mem(pkt, 0, hdr.len, pcap->buf) != 0)
+ if (odp_packet_copy_to_mem(pkt, 0, hdr.len, tx_buf) != 0)
return -1;
- pcap_dump(pcap->tx_dump, &hdr, pcap->buf);
+ pcap_dump(pcap->tx_dump, &hdr, tx_buf);
(void)pcap_dump_flush(pcap->tx_dump);
return 0;
commit 07fb2ebf0a16f9ef54b2bdd15c99e2c46eda3afc
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Thu Sep 20 10:23:17 2018 +0300
linux-gen: hash: allocate crc table memory from shm
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_init_internal.h b/platform/linux-generic/include/odp_init_internal.h
index 79f710af..5fbf27e3 100644
--- a/platform/linux-generic/include/odp_init_internal.h
+++ b/platform/linux-generic/include/odp_init_internal.h
@@ -87,6 +87,7 @@ int _odp_ipsec_events_term_global(void);
int _odp_cpu_cycles_init_global(void);
int _odp_hash_init_global(void);
+int _odp_hash_term_global(void);
#ifdef __cplusplus
}
diff --git a/platform/linux-generic/odp_hash_crc_gen.c b/platform/linux-generic/odp_hash_crc_gen.c
index 1ea6d8cd..93ebe0e9 100644
--- a/platform/linux-generic/odp_hash_crc_gen.c
+++ b/platform/linux-generic/odp_hash_crc_gen.c
@@ -12,6 +12,7 @@
#include <odp/api/hash.h>
#include <odp/api/hints.h>
#include <odp/api/rwlock.h>
+#include <odp/api/shared_memory.h>
#include <odp_debug_internal.h>
#include <odp_init_internal.h>
@@ -22,16 +23,40 @@ typedef struct crc_table_t {
uint32_t poly;
int reflect;
odp_rwlock_t rwlock;
+ odp_shm_t shm;
} crc_table_t;
-static crc_table_t crc_table;
+static crc_table_t *crc_table;
int _odp_hash_init_global(void)
{
- memset(&crc_table, 0, sizeof(crc_table_t));
+ odp_shm_t shm;
- odp_rwlock_init(&crc_table.rwlock);
+ shm = odp_shm_reserve("_odp_hash_crc_gen", sizeof(crc_table_t),
+ ODP_CACHE_LINE_SIZE, 0);
+
+ crc_table = odp_shm_addr(shm);
+
+ if (crc_table == NULL) {
+ ODP_ERR("Shm reserve failed for odp_hash_crc_gen\n");
+ return -1;
+ }
+
+ memset(crc_table, 0, sizeof(crc_table_t));
+
+ crc_table->shm = shm;
+ odp_rwlock_init(&crc_table->rwlock);
+
+ return 0;
+}
+
+int _odp_hash_term_global(void)
+{
+ if (odp_shm_free(crc_table->shm)) {
+ ODP_ERR("Shm free failed for odp_hash_crc_gen\n");
+ return -1;
+ }
return 0;
}
@@ -98,9 +123,9 @@ static inline void crc_table_gen(uint32_t poly, int reflect, int width)
{
uint32_t i, crc, bit, shift, msb, mask;
- crc_table.width = width;
- crc_table.poly = poly;
- crc_table.reflect = reflect;
+ crc_table->width = width;
+ crc_table->poly = poly;
+ crc_table->reflect = reflect;
shift = width - 8;
mask = 0xffffffff >> (32 - width);
@@ -136,7 +161,7 @@ static inline void crc_table_gen(uint32_t poly, int reflect, int width)
}
}
- crc_table.crc[i] = crc & mask;
+ crc_table->crc[i] = crc & mask;
}
}
@@ -156,9 +181,10 @@ static inline uint32_t crc_calc(const uint8_t *data, uint32_t data_len,
byte = data[i];
if (reflect) {
- crc = crc_table.crc[(crc ^ byte) & 0xff] ^ (crc >> 8);
+ crc = crc_table->crc[(crc ^ byte) & 0xff] ^ (crc >> 8);
} else {
- crc = crc_table.crc[(crc >> shift) ^ byte] ^ (crc << 8);
+ crc = crc_table->crc[(crc >> shift) ^ byte] ^
+ (crc << 8);
crc = crc & mask;
}
}
@@ -192,16 +218,16 @@ int odp_hash_crc_gen64(const void *data_ptr, uint32_t data_len,
return -1;
}
- odp_rwlock_read_lock(&crc_table.rwlock);
+ odp_rwlock_read_lock(&crc_table->rwlock);
- update_table = (crc_table.width != width) ||
- (crc_table.poly != poly) ||
- (crc_table.reflect != reflect);
+ update_table = (crc_table->width != width) ||
+ (crc_table->poly != poly) ||
+ (crc_table->reflect != reflect);
/* Generate CRC table if not yet generated. */
if (odp_unlikely(update_table)) {
- odp_rwlock_read_unlock(&crc_table.rwlock);
- odp_rwlock_write_lock(&crc_table.rwlock);
+ odp_rwlock_read_unlock(&crc_table->rwlock);
+ odp_rwlock_write_lock(&crc_table->rwlock);
crc_table_gen(poly, reflect, width);
}
@@ -209,9 +235,9 @@ int odp_hash_crc_gen64(const void *data_ptr, uint32_t data_len,
crc = crc_calc(data_ptr, data_len, init_val, reflect, width);
if (odp_unlikely(update_table))
- odp_rwlock_write_unlock(&crc_table.rwlock);
+ odp_rwlock_write_unlock(&crc_table->rwlock);
else
- odp_rwlock_read_unlock(&crc_table.rwlock);
+ odp_rwlock_read_unlock(&crc_table->rwlock);
if (crc_param->xor_out)
crc = crc ^ (uint32_t)crc_param->xor_out;
diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c
index 2a4bad2e..dca06641 100644
--- a/platform/linux-generic/odp_init.c
+++ b/platform/linux-generic/odp_init.c
@@ -23,12 +23,12 @@ enum init_stage {
LIBCONFIG_INIT,
CPUMASK_INIT,
CPU_CYCLES_INIT,
- HASH_INIT,
TIME_INIT,
SYSINFO_INIT,
ISHM_INIT,
FDSERVER_INIT,
GLOBAL_RW_DATA_INIT,
+ HASH_INIT,
THREAD_INIT,
POOL_INIT,
QUEUE_INIT,
@@ -191,6 +191,13 @@ static int term_global(enum init_stage stage)
}
/* Fall through */
+ case HASH_INIT:
+ if (_odp_hash_term_global()) {
+ ODP_ERR("ODP hash term failed.\n");
+ rc = -1;
+ }
+ /* Fall through */
+
case GLOBAL_RW_DATA_INIT:
if (global_rw_data_term()) {
ODP_ERR("ODP global RW data term failed.\n");
@@ -226,8 +233,6 @@ static int term_global(enum init_stage stage)
}
/* Fall through */
- case HASH_INIT:
- /* Fall through */
case CPU_CYCLES_INIT:
/* Fall through */
case CPUMASK_INIT:
@@ -287,12 +292,6 @@ int odp_init_global(odp_instance_t *instance,
}
stage = CPU_CYCLES_INIT;
- if (_odp_hash_init_global()) {
- ODP_ERR("ODP hash init failed.\n");
- goto init_failed;
- }
- stage = HASH_INIT;
-
if (odp_time_init_global()) {
ODP_ERR("ODP time init failed.\n");
goto init_failed;
@@ -323,6 +322,12 @@ int odp_init_global(odp_instance_t *instance,
}
stage = GLOBAL_RW_DATA_INIT;
+ if (_odp_hash_init_global()) {
+ ODP_ERR("ODP hash init failed.\n");
+ goto init_failed;
+ }
+ stage = HASH_INIT;
+
if (odp_thread_init_global()) {
ODP_ERR("ODP thread init failed.\n");
goto init_failed;
commit 8002e2b5ce58a532615f9c630e14c793037f8ef7
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Wed Sep 19 16:05:27 2018 +0300
linux-gen: ipsec: allocate memory from shm
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index 4fdb4eee..63121744 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -27,6 +27,8 @@
#include <string.h>
+static odp_ipsec_config_t *ipsec_config;
+
int odp_ipsec_capability(odp_ipsec_capability_t *capa)
{
int rc;
@@ -145,14 +147,12 @@ void odp_ipsec_config_init(odp_ipsec_config_t *config)
config->inbound.lookup.max_spi = UINT32_MAX;
}
-static odp_ipsec_config_t ipsec_config;
-
int odp_ipsec_config(const odp_ipsec_config_t *config)
{
if (ODP_CONFIG_IPSEC_SAS > config->max_num_sa)
return -1;
- ipsec_config = *config;
+ *ipsec_config = *config;
return 0;
}
@@ -788,8 +788,8 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
parse_param.proto = state.is_ipv4 ? ODP_PROTO_IPV4 :
state.is_ipv6 ? ODP_PROTO_IPV6 :
ODP_PROTO_NONE;
- parse_param.last_layer = ipsec_config.inbound.parse_level;
- parse_param.chksums = ipsec_config.inbound.chksums;
+ parse_param.last_layer = ipsec_config->inbound.parse_level;
+ parse_param.chksums = ipsec_config->inbound.chksums;
/* We do not care about return code here.
* Parsing error should not result in IPsec error. */
@@ -1309,7 +1309,7 @@ static void ipsec_out_checksums(odp_packet_t pkt,
odp_bool_t ipv4_chksum_pkt, udp_chksum_pkt, tcp_chksum_pkt,
sctp_chksum_pkt;
odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
- odp_ipsec_outbound_config_t outbound = ipsec_config.outbound;
+ odp_ipsec_outbound_config_t outbound = ipsec_config->outbound;
ipv4_chksum_pkt = OL_TX_CHKSUM_PKT(outbound.chksum.inner_ipv4,
state->is_ipv4,
@@ -1657,7 +1657,7 @@ int odp_ipsec_in_enq(const odp_packet_t pkt_in[], int num_in,
queue = ipsec_sa->queue;
} else {
result->sa = ODP_IPSEC_SA_INVALID;
- queue = ipsec_config.inbound.default_queue;
+ queue = ipsec_config->inbound.default_queue;
}
if (odp_queue_enq(queue, odp_ipsec_packet_to_event(pkt))) {
@@ -1900,7 +1900,19 @@ odp_event_t odp_ipsec_packet_to_event(odp_packet_t pkt)
int _odp_ipsec_init_global(void)
{
- odp_ipsec_config_init(&ipsec_config);
+ odp_shm_t shm;
+
+ shm = odp_shm_reserve("_odp_ipsec", sizeof(odp_ipsec_config_t),
+ ODP_CACHE_LINE_SIZE, 0);
+
+ ipsec_config = odp_shm_addr(shm);
+
+ if (ipsec_config == NULL) {
+ ODP_ERR("Shm reserve failed for odp_ipsec\n");
+ return -1;
+ }
+
+ odp_ipsec_config_init(ipsec_config);
memset(&default_out_opt, 0, sizeof(default_out_opt));
@@ -1913,6 +1925,12 @@ int _odp_ipsec_init_global(void)
int _odp_ipsec_term_global(void)
{
- /* Do nothing for now */
+ odp_shm_t shm = odp_shm_lookup("_odp_ipsec");
+
+ if (shm == ODP_SHM_INVALID || odp_shm_free(shm)) {
+ ODP_ERR("Shm free failed for odp_ipsec");
+ return -1;
+ }
+
return 0;
}
commit 984ffe3caae07b8d5cd9dab14b7b93ca7d87a87d
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Sep 18 16:18:06 2018 +0300
linux-gen: timer: move global variables into timer_global_t
Enables using timers in process mode.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c
index ef3f7ec1..eeb86353 100644
--- a/platform/linux-generic/odp_timer.c
+++ b/platform/linux-generic/odp_timer.c
@@ -79,10 +79,6 @@ odp_bool_t inline_timers = false;
#define IDX2LOCK(idx) (&timer_global->locks[(idx) % NUM_LOCKS])
#endif
-/* Max timer resolution in nanoseconds */
-static uint64_t highest_res_ns = 500;
-static uint64_t min_res_ns = INT64_MAX;
-
/******************************************************************************
* Translation between timeout buffer and timeout header
*****************************************************************************/
@@ -211,6 +207,10 @@ typedef struct timer_pool_s {
typedef struct timer_global_t {
odp_ticketlock_t lock;
odp_shm_t shm;
+ /* Max timer resolution in nanoseconds */
+ uint64_t highest_res_ns;
+ uint64_t min_res_ns;
+ odp_time_t time_per_ratelimit_period;
int num_timer_pools;
uint8_t timer_pool_used[MAX_TIMER_POOLS];
timer_pool_t *timer_pool[MAX_TIMER_POOLS];
@@ -848,8 +848,6 @@ static unsigned process_timer_pools(void)
return nexp;
}
-static odp_time_t time_per_ratelimit_period;
-
unsigned _timer_run(void)
{
static __thread odp_time_t last_timer_run;
@@ -870,7 +868,7 @@ unsigned _timer_run(void)
now = odp_time_global();
if (odp_time_cmp(odp_time_diff(now, last_timer_run),
- time_per_ratelimit_period) == -1)
+ timer_global->time_per_ratelimit_period) == -1)
return 0;
last_timer_run = now;
@@ -973,7 +971,7 @@ static int timer_res_init(void)
/* Timer resolution start from 1ms */
res = ODP_TIME_MSEC_IN_NS;
/* Set initial value of timer_res */
- highest_res_ns = res;
+ timer_global->highest_res_ns = res;
sigemptyset(&sigset);
/* Add SIGUSR1 to sigset */
sigaddset(&sigset, SIGUSR1);
@@ -1006,13 +1004,13 @@ static int timer_res_init(void)
}
}
/* Set timer_res */
- highest_res_ns = res;
+ timer_global->highest_res_ns = res;
/* Test the next timer resolution candidate */
res /= 10;
}
timer_res_init_done:
- highest_res_ns *= TIMER_RES_ROUNDUP_FACTOR;
+ timer_global->highest_res_ns *= TIMER_RES_ROUNDUP_FACTOR;
if (timer_delete(timerid) != 0)
ODP_ABORT("timer_delete() returned error %s\n",
strerror(errno));
@@ -1084,7 +1082,7 @@ int odp_timer_capability(odp_timer_clk_src_t clk_src,
int ret = 0;
if (clk_src == ODP_CLOCK_CPU) {
- capa->highest_res_ns = highest_res_ns;
+ capa->highest_res_ns = timer_global->highest_res_ns;
} else {
ODP_ERR("ODP timer system doesn't support external clock source currently\n");
ret = -1;
@@ -1095,15 +1093,15 @@ int odp_timer_capability(odp_timer_clk_src_t clk_src,
odp_timer_pool_t odp_timer_pool_create(const char *name,
const odp_timer_pool_param_t *param)
{
- if (param->res_ns < highest_res_ns) {
+ if (param->res_ns < timer_global->highest_res_ns) {
__odp_errno = EINVAL;
return ODP_TIMER_POOL_INVALID;
}
- if (min_res_ns > param->res_ns) {
- min_res_ns = param->res_ns;
- time_per_ratelimit_period =
- odp_time_global_from_ns(min_res_ns / 2);
+ if (timer_global->min_res_ns > param->res_ns) {
+ timer_global->min_res_ns = param->res_ns;
+ timer_global->time_per_ratelimit_period =
+ odp_time_global_from_ns(timer_global->min_res_ns / 2);
}
return timer_pool_new(name, param);
@@ -1311,6 +1309,8 @@ int odp_timer_init_global(const odp_init_t *params)
memset(timer_global, 0, sizeof(timer_global_t));
odp_ticketlock_init(&timer_global->lock);
timer_global->shm = shm;
+ timer_global->highest_res_ns = 500;
+ timer_global->min_res_ns = INT64_MAX;
#ifndef ODP_ATOMIC_U128
uint32_t i;
@@ -1325,8 +1325,8 @@ int odp_timer_init_global(const odp_init_t *params)
!params->not_used.feat.schedule &&
!params->not_used.feat.timer;
- time_per_ratelimit_period =
- odp_time_global_from_ns(min_res_ns / 2);
+ timer_global->time_per_ratelimit_period =
+ odp_time_global_from_ns(timer_global->min_res_ns / 2);
if (!inline_timers) {
timer_res_init();
commit 194f82dac1ff10500ea10d2f25f9c010d67c6e5a
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Sep 18 16:11:03 2018 +0300
linux-gen: timer: move global variable 'locks' into timer_global_t
Enables using timers in process mode.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c
index fb73697f..ef3f7ec1 100644
--- a/platform/linux-generic/odp_timer.c
+++ b/platform/linux-generic/odp_timer.c
@@ -76,8 +76,7 @@ odp_bool_t inline_timers = false;
#ifndef ODP_ATOMIC_U128
#define NUM_LOCKS 1024
-static _odp_atomic_flag_t locks[NUM_LOCKS]; /* Multiple locks per cache line! */
-#define IDX2LOCK(idx) (&locks[(idx) % NUM_LOCKS])
+#define IDX2LOCK(idx) (&timer_global->locks[(idx) % NUM_LOCKS])
#endif
/* Max timer resolution in nanoseconds */
@@ -215,6 +214,10 @@ typedef struct timer_global_t {
int num_timer_pools;
uint8_t timer_pool_used[MAX_TIMER_POOLS];
timer_pool_t *timer_pool[MAX_TIMER_POOLS];
+#ifndef ODP_ATOMIC_U128
+ /* Multiple locks per cache line! */
+ _odp_atomic_flag_t ODP_ALIGNED_CACHE locks[NUM_LOCKS];
+#endif
} timer_global_t;
@@ -1312,7 +1315,7 @@ int odp_timer_init_global(const odp_init_t *params)
#ifndef ODP_ATOMIC_U128
uint32_t i;
for (i = 0; i < NUM_LOCKS; i++)
- _odp_atomic_flag_clear(&locks[i]);
+ _odp_atomic_flag_clear(&timer_global->locks[i]);
#else
ODP_DBG("Using lock-less timer implementation\n");
#endif
commit bfc46064595db98814a70a048ad9d4de70d12e56
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Sep 18 15:47:40 2018 +0300
linux-gen: timer: allocate global memory from shm
Enables using timers in process mode.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c
index e8682237..fb73697f 100644
--- a/platform/linux-generic/odp_timer.c
+++ b/platform/linux-generic/odp_timer.c
@@ -211,21 +211,22 @@ typedef struct timer_pool_s {
typedef struct timer_global_t {
odp_ticketlock_t lock;
+ odp_shm_t shm;
int num_timer_pools;
uint8_t timer_pool_used[MAX_TIMER_POOLS];
timer_pool_t *timer_pool[MAX_TIMER_POOLS];
} timer_global_t;
-static timer_global_t timer_global;
+static timer_global_t *timer_global;
static inline timer_pool_t *handle_to_tp(odp_timer_t hdl)
{
uint32_t tp_idx = _odp_typeval(hdl) >> INDEX_BITS;
if (odp_likely(tp_idx < MAX_TIMER_POOLS)) {
- timer_pool_t *tp = timer_global.timer_pool[tp_idx];
+ timer_pool_t *tp = timer_global->timer_pool[tp_idx];
if (odp_likely(tp != NULL))
- return timer_global.timer_pool[tp_idx];
+ return timer_global->timer_pool[tp_idx];
}
ODP_ABORT("Invalid timer handle %#x\n", hdl);
}
@@ -262,25 +263,25 @@ static odp_timer_pool_t timer_pool_new(const char *name,
if (odp_global_ro.shm_single_va)
flags |= ODP_SHM_SINGLE_VA;
- odp_ticketlock_lock(&timer_global.lock);
+ odp_ticketlock_lock(&timer_global->lock);
- if (timer_global.num_timer_pools >= MAX_TIMER_POOLS) {
- odp_ticketlock_unlock(&timer_global.lock);
+ if (timer_global->num_timer_pools >= MAX_TIMER_POOLS) {
+ odp_ticketlock_unlock(&timer_global->lock);
ODP_DBG("No more free timer pools\n");
return ODP_TIMER_POOL_INVALID;
}
for (i = 0; i < MAX_TIMER_POOLS; i++) {
- if (timer_global.timer_pool_used[i] == 0) {
- timer_global.timer_pool_used[i] = 1;
+ if (timer_global->timer_pool_used[i] == 0) {
+ timer_global->timer_pool_used[i] = 1;
break;
}
}
tp_idx = i;
- timer_global.num_timer_pools++;
+ timer_global->num_timer_pools++;
- odp_ticketlock_unlock(&timer_global.lock);
+ odp_ticketlock_unlock(&timer_global->lock);
sz0 = ROUNDUP_CACHE_LINE(sizeof(timer_pool_t));
sz1 = ROUNDUP_CACHE_LINE(sizeof(tick_buf_t) * param->num_timers);
@@ -327,9 +328,9 @@ static odp_timer_pool_t timer_pool_new(const char *name,
}
tp->tp_idx = tp_idx;
odp_spinlock_init(&tp->lock);
- odp_ticketlock_lock(&timer_global.lock);
- timer_global.timer_pool[tp_idx] = tp;
- odp_ticketlock_unlock(&timer_global.lock);
+ odp_ticketlock_lock(&timer_global->lock);
+ timer_global->timer_pool[tp_idx] = tp;
+ odp_ticketlock_unlock(&timer_global->lock);
if (!inline_timers) {
if (tp->param.clk_src == ODP_CLOCK_CPU)
itimer_init(tp);
@@ -381,12 +382,12 @@ static void odp_timer_pool_del(timer_pool_t *tp)
odp_spinlock_unlock(&tp->lock);
- odp_ticketlock_lock(&timer_global.lock);
+ odp_ticketlock_lock(&timer_global->lock);
shm = tp->shm;
- timer_global.timer_pool[tp->tp_idx] = NULL;
- timer_global.timer_pool_used[tp->tp_idx] = 0;
- timer_global.num_timer_pools--;
- odp_ticketlock_unlock(&timer_global.lock);
+ timer_global->timer_pool[tp->tp_idx] = NULL;
+ timer_global->timer_pool_used[tp->tp_idx] = 0;
+ timer_global->num_timer_pools--;
+ odp_ticketlock_unlock(&timer_global->lock);
rc = odp_shm_free(shm);
@@ -808,7 +809,7 @@ static unsigned process_timer_pools(void)
unsigned nexp = 0;
for (size_t i = 0; i < MAX_TIMER_POOLS; i++) {
- tp = timer_global.timer_pool[i];
+ tp = timer_global->timer_pool[i];
if (tp == NULL)
continue;
@@ -853,7 +854,7 @@ unsigned _timer_run(void)
CONFIG_TIMER_RUN_RATELIMIT_ROUNDS;
odp_time_t now;
- if (timer_global.num_timer_pools == 0)
+ if (timer_global->num_timer_pools == 0)
return 0;
/* Rate limit how often this thread checks the timer pools. */
@@ -1292,8 +1293,21 @@ void odp_timeout_free(odp_timeout_t tmo)
int odp_timer_init_global(const odp_init_t *params)
{
- memset(&timer_global, 0, sizeof(timer_global_t));
- odp_ticketlock_init(&timer_global.lock);
+ odp_shm_t shm;
+
+ shm = odp_shm_reserve("_odp_timer", sizeof(timer_global_t),
+ ODP_CACHE_LINE_SIZE, 0);
+
+ timer_global = odp_shm_addr(shm);
+
+ if (timer_global == NULL) {
+ ODP_ERR("Shm reserve failed for odp_timer\n");
+ return -1;
+ }
+
+ memset(timer_global, 0, sizeof(timer_global_t));
+ odp_ticketlock_init(&timer_global->lock);
+ timer_global->shm = shm;
#ifndef ODP_ATOMIC_U128
uint32_t i;
@@ -1321,5 +1335,10 @@ int odp_timer_init_global(const odp_init_t *params)
int odp_timer_term_global(void)
{
+ if (odp_shm_free(timer_global->shm)) {
+ ODP_ERR("Shm free failed for odp_timer\n");
+ return -1;
+ }
+
return 0;
}
commit bb3a47d7eb62cfe50b111b357435f8bd554f374f
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Sep 25 14:05:01 2018 +0300
linux-gen: dpdk: move dpdk_initialized global var into odp_global_data_rw_t
‘dpdk_initialized’ is modified after global init.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_global_data.h b/platform/linux-generic/include/odp_global_data.h
index f3ddae41..f1be1502 100644
--- a/platform/linux-generic/include/odp_global_data.h
+++ b/platform/linux-generic/include/odp_global_data.h
@@ -68,6 +68,7 @@ struct odp_global_data_rw_t {
int inotify_watch_fd;
pthread_t inotify_thread;
int inotify_pcapng_is_running;
+ odp_bool_t dpdk_initialized;
};
extern struct odp_global_data_ro_t odp_global_ro;
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index f1ace71f..578a94b0 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -139,9 +139,6 @@ static inline pkt_dpdk_t *pkt_priv(pktio_entry_t *pktio_entry)
static int disable_pktio; /** !0 this pktio disabled, 0 enabled */
-/* Has dpdk_pktio_init() been called */
-static odp_bool_t dpdk_initialized;
-
#ifndef RTE_BUILD_SHARED_LIB
#define MEMPOOL_OPS(hdl) \
extern void mp_hdlr_init_##hdl(void)
@@ -1260,7 +1257,7 @@ static void dpdk_mempool_free(struct rte_mempool *mp, void *arg ODP_UNUSED)
static int dpdk_pktio_term(void)
{
- if (!dpdk_initialized)
+ if (!odp_global_rw->dpdk_initialized)
return 0;
#if RTE_VERSION >= RTE_VERSION_NUM(17, 8, 0, 0)
@@ -1433,9 +1430,9 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED,
/* Initialize DPDK here instead of odp_init_global() to enable running
* 'make check' without root privileges */
- if (dpdk_initialized == 0) {
+ if (odp_global_rw->dpdk_initialized == 0) {
dpdk_pktio_init();
- dpdk_initialized = 1;
+ odp_global_rw->dpdk_initialized = 1;
}
/* Init pktio entry */
commit 22dcddaa3dcc82f88b4e9b97a6aa6deb632269f6
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Sep 25 13:52:15 2018 +0300
linux-gen: pcapng: move global data into odp_global_data_rw_t
Pcapng global variables are modified after global init.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_global_data.h b/platform/linux-generic/include/odp_global_data.h
index d647bb5e..f3ddae41 100644
--- a/platform/linux-generic/include/odp_global_data.h
+++ b/platform/linux-generic/include/odp_global_data.h
@@ -58,17 +58,16 @@ struct odp_global_data_ro_t {
int num_cpus_installed;
config_t libconfig_default;
config_t libconfig_runtime;
- int inotify_pcapng_fd;
- int inotify_watch_fd;
- pthread_t inotify_thread;
- int inotify_pcapng_is_running;
odp_random_kind_t ipsec_rand_kind;
};
/* Modifiable global data. Memory region is shared and synchronized amongst all
* worker processes. */
struct odp_global_data_rw_t {
- int dummy;
+ int inotify_pcapng_fd;
+ int inotify_watch_fd;
+ pthread_t inotify_thread;
+ int inotify_pcapng_is_running;
};
extern struct odp_global_data_ro_t odp_global_ro;
diff --git a/platform/linux-generic/odp_pcapng.c b/platform/linux-generic/odp_pcapng.c
index 07784c17..21fa7b2c 100644
--- a/platform/linux-generic/odp_pcapng.c
+++ b/platform/linux-generic/odp_pcapng.c
@@ -120,13 +120,13 @@ static void *inotify_update(void *arg)
while (1) {
offset = 0;
FD_ZERO(&rfds);
- FD_SET(odp_global_ro.inotify_pcapng_fd, &rfds);
+ FD_SET(odp_global_rw->inotify_pcapng_fd, &rfds);
time.tv_sec = 2;
time.tv_usec = 0;
- select(odp_global_ro.inotify_pcapng_fd + 1, &rfds, NULL,
+ select(odp_global_rw->inotify_pcapng_fd + 1, &rfds, NULL,
NULL, &time);
- if (FD_ISSET(odp_global_ro.inotify_pcapng_fd, &rfds)) {
- rdlen = read(odp_global_ro.inotify_pcapng_fd,
+ if (FD_ISSET(odp_global_rw->inotify_pcapng_fd, &rfds)) {
+ rdlen = read(odp_global_rw->inotify_pcapng_fd,
buffer, INOTIFY_BUF_LEN);
while (offset < rdlen) {
int qidx;
@@ -219,23 +219,23 @@ int pcapng_prepare(pktio_entry_t *entry)
}
/* already running from a previous pktio */
- if (odp_global_ro.inotify_pcapng_is_running == 1)
+ if (odp_global_rw->inotify_pcapng_is_running == 1)
return 0;
- odp_global_ro.inotify_pcapng_fd = -1;
- odp_global_ro.inotify_watch_fd = -1;
+ odp_global_rw->inotify_pcapng_fd = -1;
+ odp_global_rw->inotify_watch_fd = -1;
- odp_global_ro.inotify_pcapng_fd = inotify_init();
- if (odp_global_ro.inotify_pcapng_fd == -1) {
+ odp_global_rw->inotify_pcapng_fd = inotify_init();
+ if (odp_global_rw->inotify_pcapng_fd == -1) {
ODP_ERR("can't init inotify. pcap disabled\n");
goto out_destroy;
}
- odp_global_ro.inotify_watch_fd =
- inotify_add_watch(odp_global_ro.inotify_pcapng_fd,
+ odp_global_rw->inotify_watch_fd =
+ inotify_add_watch(odp_global_rw->inotify_pcapng_fd,
PCAPNG_WATCH_DIR, IN_CLOSE | IN_OPEN);
- if (odp_global_ro.inotify_watch_fd == -1) {
+ if (odp_global_rw->inotify_watch_fd == -1) {
ODP_ERR("can't register inotify for %s. pcap disabled\n",
strerror(errno));
goto out_destroy;
@@ -243,12 +243,12 @@ int pcapng_prepare(pktio_entry_t *entry)
/* create a thread to poll inotify triggers */
pthread_attr_init(&attr);
- ret = pthread_create(&odp_global_ro.inotify_thread, &attr,
+ ret = pthread_create(&odp_global_rw->inotify_thread, &attr,
inotify_update, entry);
if (ret)
ODP_ERR("can't start inotify thread. pcap disabled\n");
else
- odp_global_ro.inotify_pcapng_is_running = 1;
+ odp_global_rw->inotify_pcapng_is_running = 1;
return ret;
@@ -265,24 +265,24 @@ void pcapng_destroy(pktio_entry_t *entry)
unsigned int max_queue =
MAX(entry->s.num_in_queue, entry->s.num_out_queue);
- if (odp_global_ro.inotify_pcapng_is_running == 1) {
- ret = pthread_cancel(odp_global_ro.inotify_thread);
+ if (odp_global_rw->inotify_pcapng_is_running == 1) {
+ ret = pthread_cancel(odp_global_rw->inotify_thread);
if (ret)
ODP_ERR("can't cancel inotify thread %s\n",
strerror(errno));
}
/* fd's will be -1 in case of any failure */
- ret = inotify_rm_watch(odp_global_ro.inotify_pcapng_fd,
- odp_global_ro.inotify_watch_fd);
+ ret = inotify_rm_watch(odp_global_rw->inotify_pcapng_fd,
+ odp_global_rw->inotify_watch_fd);
if (ret)
ODP_ERR("can't deregister inotify %s\n", strerror(errno));
- if (odp_global_ro.inotify_pcapng_fd != -1)
- close(odp_global_ro.inotify_pcapng_fd);
+ if (odp_global_rw->inotify_pcapng_fd != -1)
+ close(odp_global_rw->inotify_pcapng_fd);
- if (odp_global_ro.inotify_watch_fd != -1)
- close(odp_global_ro.inotify_watch_fd);
+ if (odp_global_rw->inotify_watch_fd != -1)
+ close(odp_global_rw->inotify_watch_fd);
for (i = 0; i < max_queue; i++) {
char pcapng_name[128];
commit 9a4f8305e9c90f0ca0e7e4c240eb88d81b864ae0
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Sep 25 12:53:53 2018 +0300
linux-gen: split global data into RO and RW structs
RW global data is allocated from shm to enable process mode support.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_debug_internal.h b/platform/linux-generic/include/odp_debug_internal.h
index 2e92dd74..4dbe01b5 100644
--- a/platform/linux-generic/include/odp_debug_internal.h
+++ b/platform/linux-generic/include/odp_debug_internal.h
@@ -34,14 +34,14 @@ extern "C" {
#define ODP_ASSERT(cond) \
do { if ((ODP_DEBUG == 1) && (!(cond))) { \
ODP_ERR("%s\n", #cond); \
- odp_global_data.abort_fn(); } \
+ odp_global_ro.abort_fn(); } \
} while (0)
/**
* This macro is used to indicate when a given function is not implemented
*/
#define ODP_UNIMPLEMENTED() \
- odp_global_data.log_fn(ODP_LOG_UNIMPLEMENTED, \
+ odp_global_ro.log_fn(ODP_LOG_UNIMPLEMENTED, \
"%s:%d:The function %s() is not implemented\n", \
__FILE__, __LINE__, __func__)
/**
@@ -66,14 +66,14 @@ extern "C" {
#define ODP_ABORT(fmt, ...) \
do { \
ODP_LOG(ODP_LOG_ABORT, fmt, ##__VA_ARGS__); \
- odp_global_data.abort_fn(); \
+ odp_global_ro.abort_fn(); \
} while (0)
/**
* ODP LOG macro.
*/
#define ODP_LOG(level, fmt, ...) \
- odp_global_data.log_fn(level, "%s:%d:%s():" fmt, __FILE__, \
+ odp_global_ro.log_fn(level, "%s:%d:%s():" fmt, __FILE__, \
__LINE__, __func__, ##__VA_ARGS__)
/**
@@ -81,7 +81,7 @@ extern "C" {
* specifically for dumping internal data.
*/
#define ODP_PRINT(fmt, ...) \
- odp_global_data.log_fn(ODP_LOG_PRINT, fmt, ##__VA_ARGS__)
+ odp_global_ro.log_fn(ODP_LOG_PRINT, fmt, ##__VA_ARGS__)
#ifdef __cplusplus
}
diff --git a/platform/linux-generic/include/odp_global_data.h b/platform/linux-generic/include/odp_global_data.h
index 7b9e4653..d647bb5e 100644
--- a/platform/linux-generic/include/odp_global_data.h
+++ b/platform/linux-generic/include/odp_global_data.h
@@ -37,7 +37,9 @@ typedef struct {
char *default_huge_page_dir;
} hugepage_info_t;
-struct odp_global_data_s {
+/* Read-only global data. Members should not be modified after global init
+ * to enable process more support. */
+struct odp_global_data_ro_t {
/* directory for odp mmaped files */
char *shm_dir;
/* overload default with env */
@@ -63,7 +65,14 @@ struct odp_global_data_s {
odp_random_kind_t ipsec_rand_kind;
};
-extern struct odp_global_data_s odp_global_data;
+/* Modifiable global data. Memory region is shared and synchronized amongst all
+ * worker processes. */
+struct odp_global_data_rw_t {
+ int dummy;
+};
+
+extern struct odp_global_data_ro_t odp_global_ro;
+extern struct odp_global_data_rw_t *odp_global_rw;
#ifdef __cplusplus
}
diff --git a/platform/linux-generic/odp_cpumask.c b/platform/linux-generic/odp_cpumask.c
index 1b384d4e..551a80d8 100644
--- a/platform/linux-generic/odp_cpumask.c
+++ b/platform/linux-generic/odp_cpumask.c
@@ -236,8 +236,8 @@ static int get_available_cpus(void)
int ret;
/* Clear the global cpumasks for control and worker CPUs */
- odp_cpumask_zero(&odp_global_data.control_cpus);
- odp_cpumask_zero(&odp_global_data.worker_cpus);
+ odp_cpumask_zero(&odp_global_ro.control_cpus);
+ odp_cpumask_zero(&odp_global_ro.worker_cpus);
CPU_ZERO(&cpuset);
ret = sched_getaffinity(0, sizeof(cpuset), &cpuset);
@@ -249,12 +249,12 @@ static int get_available_cpus(void)
for (cpu_idnum = 0; cpu_idnum < CPU_SETSIZE - 1; cpu_idnum++) {
if (CPU_ISSET(cpu_idnum, &cpuset)) {
- odp_global_data.num_cpus_installed++;
+ odp_global_ro.num_cpus_installed++;
/* Add the CPU to our default cpumasks */
- odp_cpumask_set(&odp_global_data.control_cpus,
- (int)cpu_idnum);
- odp_cpumask_set(&odp_global_data.worker_cpus,
- (int)cpu_idnum);
+ odp_cpumask_set(&odp_global_ro.control_cpus,
+ (int)cpu_idnum);
+ odp_cpumask_set(&odp_global_ro.worker_cpus,
+ (int)cpu_idnum);
}
}
@@ -269,8 +269,8 @@ static int get_available_cpus(void)
*/
static void init_default_control_cpumask(int worker_cpus_default)
{
- odp_cpumask_t *control_mask = &odp_global_data.control_cpus;
- odp_cpumask_t *worker_mask = &odp_global_data.worker_cpus;
+ odp_cpumask_t *control_mask = &odp_global_ro.control_cpus;
+ odp_cpumask_t *worker_mask = &odp_global_ro.worker_cpus;
int i;
/* (Bits for all available CPUs are SET in control cpumask) */
@@ -281,7 +281,7 @@ static void init_default_control_cpumask(int worker_cpus_default)
* If only one or two CPUs installed, use CPU 0 for control.
* Otherwise leave it for the kernel and start with CPU 1.
*/
- if (odp_global_data.num_cpus_installed < 3) {
+ if (odp_global_ro.num_cpus_installed < 3) {
/*
* If only two CPUS, use CPU 0 for control and
* use CPU 1 for workers.
@@ -294,7 +294,7 @@ static void init_default_control_cpumask(int worker_cpus_default)
* reserve remaining CPUs for workers
*/
odp_cpumask_clr(control_mask, 0);
- for (i = 2; i < odp_global_data.num_cpus_installed; i++)
+ for (i = 2; i < odp_global_ro.num_cpus_installed; i++)
if (odp_cpumask_isset(worker_mask, i))
odp_cpumask_clr(control_mask, i);
}
@@ -303,7 +303,7 @@ static void init_default_control_cpumask(int worker_cpus_default)
* The worker cpumask was specified so first ensure
* the control cpumask does not overlap any worker CPUs
*/
- for (i = 0; i < odp_global_data.num_cpus_installed; i++)
+ for (i = 0; i < odp_global_ro.num_cpus_installed; i++)
if (odp_cpumask_isset(worker_mask, i))
odp_cpumask_clr(control_mask, i);
@@ -311,7 +311,7 @@ static void init_default_control_cpumask(int worker_cpus_default)
* If only one or two CPUs installed,
* ensure availability of CPU 0 for control threads
*/
- if (odp_global_data.num_cpus_installed < 3) {
+ if (odp_global_ro.num_cpus_installed < 3) {
odp_cpumask_set(control_mask, 0);
odp_cpumask_clr(control_mask, 1);
} else {
@@ -337,8 +337,8 @@ static void init_default_control_cpumask(int worker_cpus_default)
*/
static void init_default_worker_cpumask(int control_cpus_default)
{
- odp_cpumask_t *control_mask = &odp_global_data.control_cpus;
- odp_cpumask_t *worker_mask = &odp_global_data.worker_cpus;
+ odp_cpumask_t *control_mask = &odp_global_ro.control_cpus;
+ odp_cpumask_t *worker_mask = &odp_global_ro.worker_cpus;
int i;
/* (Bits for all available CPUs are SET in worker cpumask) */
@@ -348,10 +348,10 @@ static void init_default_worker_cpumask(int control_cpus_default)
* The control cpumask was also unspecified...
* CPU 0 is only used for workers on uniprocessor systems
*/
- if (odp_global_data.num_cpus_installed > 1)
+ if (odp_global_ro.num_cpus_installed > 1)
odp_cpumask_clr(worker_mask, 0);
- if (odp_global_data.num_cpus_installed > 2)
+ if (odp_global_ro.num_cpus_installed > 2)
/*
* If three or more CPUs, reserve CPU 0 for kernel,
* reserve CPU 1 for control, and
@@ -363,7 +363,7 @@ static void init_default_worker_cpumask(int control_cpus_default)
* The control cpumask was specified so first ensure
* the worker cpumask does not overlap any control CPUs
*/
- for (i = 0; i < odp_global_data.num_cpus_installed; i++)
+ for (i = 0; i < odp_global_ro.num_cpus_installed; i++)
if (odp_cpumask_isset(control_mask, i))
odp_cpumask_clr(worker_mask, i);
@@ -371,7 +371,7 @@ static void init_default_worker_cpumask(int control_cpus_default)
* If only one CPU installed, use CPU 0 for workers
* even though it is used for control as well.
*/
- if (odp_global_data.num_cpus_installed < 2)
+ if (odp_global_ro.num_cpus_installed < 2)
odp_cpumask_set(worker_mask, 0);
else
odp_cpumask_clr(worker_mask, 0);
@@ -386,8 +386,8 @@ static void init_default_worker_cpumask(int control_cpus_default)
*/
int odp_cpumask_init_global(const odp_init_t *params)
{
- odp_cpumask_t *control_mask = &odp_global_data.control_cpus;
- odp_cpumask_t *worker_mask = &odp_global_data.worker_cpus;
+ odp_cpumask_t *control_mask = &odp_global_ro.control_cpus;
+ odp_cpumask_t *worker_mask = &odp_global_ro.worker_cpus;
odp_cpumask_t check_mask;
int control_cpus_default = 1;
int worker_cpus_default = 1;
diff --git a/platform/linux-generic/odp_cpumask_task.c b/platform/linux-generic/odp_cpumask_task.c
index c1b79f07..c269116c 100644
--- a/platform/linux-generic/odp_cpumask_task.c
+++ b/platform/linux-generic/odp_cpumask_task.c
@@ -23,20 +23,20 @@ int odp_cpumask_default_worker(odp_cpumask_t *mask, int num)
* If no user supplied number or it's too large, then attempt
* to use all CPUs
*/
- cpu = odp_cpumask_count(&odp_global_data.worker_cpus);
+ cpu = odp_cpumask_count(&odp_global_ro.worker_cpus);
if (0 == num || cpu < num)
num = cpu;
/* build the mask, allocating down from highest numbered CPU */
odp_cpumask_zero(mask);
for (cpu = 0, i = CPU_SETSIZE - 1; i >= 0 && cpu < num; --i) {
- if (odp_cpumask_isset(&odp_global_data.worker_cpus, i)) {
+ if (odp_cpumask_isset(&odp_global_ro.worker_cpus, i)) {
odp_cpumask_set(mask, i);
cpu++;
}
}
- odp_cpumask_and(&overlap, mask, &odp_global_data.control_cpus);
+ odp_cpumask_and(&overlap, mask, &odp_global_ro.control_cpus);
if (odp_cpumask_count(&overlap))
ODP_DBG("\n\tWorker CPUs overlap with control CPUs...\n"
"\tthis will likely have a performance impact on the worker threads.\n");
@@ -59,7 +59,7 @@ int odp_cpumask_default_control(odp_cpumask_t *mask, int num)
* If user supplied number is too large, then attempt
* to use all installed control CPUs
*/
- cpu = odp_cpumask_count(&odp_global_data.control_cpus);
+ cpu = odp_cpumask_count(&odp_global_ro.control_cpus);
if (cpu < num)
num = cpu;
}
@@ -67,13 +67,13 @@ int odp_cpumask_default_control(odp_cpumask_t *mask, int num)
/* build the mask, allocating upwards from lowest numbered CPU */
odp_cpumask_zero(mask);
for (cpu = 0, i = 0; i < CPU_SETSIZE && cpu < num; i++) {
- if (odp_cpumask_isset(&odp_global_data.control_cpus, i)) {
+ if (odp_cpumask_isset(&odp_global_ro.control_cpus, i)) {
odp_cpumask_set(mask, i);
cpu++;
}
}
- odp_cpumask_and(&overlap, mask, &odp_global_data.worker_cpus);
+ odp_cpumask_and(&overlap, mask, &odp_global_ro.worker_cpus);
if (odp_cpumask_count(&overlap))
ODP_DBG("\n\tControl CPUs overlap with worker CPUs...\n"
"\tthis will likely have a performance impact on the worker threads.\n");
@@ -83,8 +83,8 @@ int odp_cpumask_default_control(odp_cpumask_t *mask, int num)
int odp_cpumask_all_available(odp_cpumask_t *mask)
{
- odp_cpumask_or(mask, &odp_global_data.worker_cpus,
- &odp_global_data.control_cpus);
+ odp_cpumask_or(mask, &odp_global_ro.worker_cpus,
+ &odp_global_ro.control_cpus);
return odp_cpumask_count(mask);
}
diff --git a/platform/linux-generic/odp_fdserver.c b/platform/linux-generic/odp_fdserver.c
index 0c9cc50e..232d7f4e 100644
--- a/platform/linux-generic/odp_fdserver.c
+++ b/platform/linux-generic/odp_fdserver.c
@@ -249,9 +249,9 @@ static int get_socket(void)
/* construct the named socket path: */
snprintf(sockpath, FDSERVER_SOCKPATH_MAXLEN, FDSERVER_SOCK_FORMAT,
- odp_global_data.shm_dir,
- odp_global_data.uid,
- odp_global_data.main_pid);
+ odp_global_ro.shm_dir,
+ odp_global_ro.uid,
+ odp_global_ro.main_pid);
s_sock = socket(AF_UNIX, SOCK_STREAM, 0);
if (s_sock == -1) {
@@ -566,16 +566,16 @@ int _odp_fdserver_init_global(void)
int res;
snprintf(sockpath, FDSERVER_SOCKPATH_MAXLEN, FDSERVER_SOCKDIR_FORMAT,
- odp_global_data.shm_dir,
- odp_global_data.uid);
+ odp_global_ro.shm_dir,
+ odp_global_ro.uid);
mkdir(sockpath, 0744);
/* construct the server named socket path: */
snprintf(sockpath, FDSERVER_SOCKPATH_MAXLEN, FDSERVER_SOCK_FORMAT,
- odp_global_data.shm_dir,
- odp_global_data.uid,
- odp_global_data.main_pid);
+ odp_global_ro.shm_dir,
+ odp_global_ro.uid,
+ odp_global_ro.main_pid);
/* create UNIX domain socket: */
sock = socket(AF_UNIX, SOCK_STREAM, 0);
@@ -692,17 +692,17 @@ int _odp_fdserver_term_global(void)
/* construct the server named socket path: */
snprintf(sockpath, FDSERVER_SOCKPATH_MAXLEN, FDSERVER_SOCK_FORMAT,
- odp_global_data.shm_dir,
- odp_global_data.uid,
- odp_global_data.main_pid);
+ odp_global_ro.shm_dir,
+ odp_global_ro.uid,
+ odp_global_ro.main_pid);
/* delete the UNIX domain socket: */
unlink(sockpath);
/* delete shm files directory */
snprintf(sockpath, FDSERVER_SOCKPATH_MAXLEN, FDSERVER_SOCKDIR_FORMAT,
- odp_global_data.shm_dir,
- odp_global_data.uid);
+ odp_global_ro.shm_dir,
+ odp_global_ro.uid);
rmdir(sockpath);
return 0;
diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c
index 28f94cd3..2a4bad2e 100644
--- a/platform/linux-generic/odp_init.c
+++ b/platform/linux-generic/odp_init.c
@@ -9,6 +9,7 @@
#include <odp_posix_extensions.h>
#include <odp/api/init.h>
+#include <odp/api/shared_memory.h>
#include <odp_debug_internal.h>
#include <odp_init_internal.h>
#include <odp_schedule_if.h>
@@ -27,6 +28,7 @@ enum init_stage {
SYSINFO_INIT,
ISHM_INIT,
FDSERVER_INIT,
+ GLOBAL_RW_DATA_INIT,
THREAD_INIT,
POOL_INIT,
QUEUE_INIT,
@@ -44,13 +46,51 @@ enum init_stage {
ALL_INIT /* All init stages completed */
};
-struct odp_global_data_s odp_global_data;
+struct odp_global_data_ro_t odp_global_ro;
+struct odp_global_data_rw_t *odp_global_rw;
void odp_init_param_init(odp_init_t *param)
{
memset(param, 0, sizeof(odp_init_t));
}
+static int global_rw_data_init(void)
+{
+ odp_shm_t shm;
+
+ shm = odp_shm_reserve("_odp_global_rw_data",
+ sizeof(struct odp_global_data_rw_t),
+ ODP_CACHE_LINE_SIZE, 0);
+
+ odp_global_rw = odp_shm_addr(shm);
+ if (odp_global_rw == NULL) {
+ ODP_ERR("Global RW data shm reserve failed.\n");
+ return -1;
+ }
+
+ memset(odp_global_rw, 0, sizeof(struct odp_global_data_rw_t));
+
+ return 0;
+}
+
+static int global_rw_data_term(void)
+{
+ odp_shm_t shm;
+
+ shm = odp_shm_lookup("_odp_global_rw_data");
+ if (shm == ODP_SHM_INVALID) {
+ ODP_ERR("Unable to find global RW data shm.\n");
+ return -1;
+ }
+
+ if (odp_shm_free(shm)) {
+ ODP_ERR("Global RW data shm free failed.\n");
+ return -1;
+ }
+
+ return 0;
+}
+
static int term_global(enum init_stage stage)
{
int rc = 0;
@@ -151,6 +191,13 @@ static int term_global(enum init_stage stage)
}
/* Fall through */
+ case GLOBAL_RW_DATA_INIT:
+ if (global_rw_data_term()) {
+ ODP_ERR("ODP global RW data term failed.\n");
+ rc = -1;
+ }
+ /* Fall through */
+
case FDSERVER_INIT:
if (_odp_fdserver_term_global()) {
ODP_ERR("ODP fdserver term failed.\n");
@@ -208,18 +255,18 @@ int odp_init_global(odp_instance_t *instance,
const odp_init_t *params,
const odp_platform_init_t *platform_params ODP_UNUSED)
{
- memset(&odp_global_data, 0, sizeof(struct odp_global_data_s));
- odp_global_data.main_pid = getpid();
+ memset(&odp_global_ro, 0, sizeof(struct odp_global_data_ro_t));
+ odp_global_ro.main_pid = getpid();
enum init_stage stage = NO_INIT;
- odp_global_data.log_fn = odp_override_log;
- odp_global_data.abort_fn = odp_override_abort;
+ odp_global_ro.log_fn = odp_override_log;
+ odp_global_ro.abort_fn = odp_override_abort;
if (params != NULL) {
if (params->log_fn != NULL)
- odp_global_data.log_fn = params->log_fn;
+ odp_global_ro.log_fn = params->log_fn;
if (params->abort_fn != NULL)
- odp_global_data.abort_fn = params->abort_fn;
+ odp_global_ro.abort_fn = params->abort_fn;
}
if (_odp_libconfig_init_global()) {
@@ -270,6 +317,12 @@ int odp_init_global(odp_instance_t *instance,
}
stage = FDSERVER_INIT;
+ if (global_rw_data_init()) {
+ ODP_ERR("ODP global RW data init failed.\n");
+ goto init_failed;
+ }
+ stage = GLOBAL_RW_DATA_INIT;
+
if (odp_thread_init_global()) {
ODP_ERR("ODP thread init failed.\n");
goto init_failed;
@@ -351,7 +404,7 @@ int odp_init_global(odp_instance_t *instance,
}
stage = IPSEC_INIT;
- *instance = (odp_instance_t)odp_global_data.main_pid;
+ *instance = (odp_instance_t)odp_global_ro.main_pid;
return 0;
@@ -362,7 +415,7 @@ init_failed:
int odp_term_global(odp_instance_t instance)
{
- if (instance != (odp_instance_t)odp_global_data.main_pid) {
+ if (instance != (odp_instance_t)odp_global_ro.main_pid) {
ODP_ERR("Bad instance.\n");
return -1;
}
@@ -441,7 +494,7 @@ int odp_init_local(odp_instance_t instance, odp_thread_type_t thr_type)
{
enum init_stage stage = NO_INIT;
- if (instance != (odp_instance_t)odp_global_data.main_pid) {
+ if (instance != (odp_instance_t)odp_global_ro.main_pid) {
ODP_ERR("Bad instance.\n");
goto init_fail;
}
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index 1bc549c2..4fdb4eee 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -1005,7 +1005,7 @@ static int ipsec_out_iv(ipsec_state_t *state,
uint32_t len;
len = odp_random_data(state->iv, ipsec_sa->esp_iv_len,
- odp_global_data.ipsec_rand_kind);
+ odp_global_ro.ipsec_rand_kind);
if (len != ipsec_sa->esp_iv_len)
return -1;
@@ -1904,9 +1904,9 @@ int _odp_ipsec_init_global(void)
memset(&default_out_opt, 0, sizeof(default_out_opt));
- odp_global_data.ipsec_rand_kind = ODP_RANDOM_CRYPTO;
- if (odp_global_data.ipsec_rand_kind > odp_random_max_kind())
- odp_global_data.ipsec_rand_kind = odp_random_max_kind();
+ odp_global_ro.ipsec_rand_kind = ODP_RANDOM_CRYPTO;
+ if (odp_global_ro.ipsec_rand_kind > odp_random_max_kind())
+ odp_global_ro.ipsec_rand_kind = odp_random_max_kind();
return 0;
}
diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c
index 1ed60c5f..1a4ca947 100644
--- a/platform/linux-generic/odp_ishm.c
+++ b/platform/linux-generic/odp_ishm.c
@@ -306,8 +306,8 @@ static void hp_init(void)
if (_odp_libconfig_lookup_ext_int("shm", NULL, "single_va",
&single_va)) {
- odp_global_data.shm_single_va = single_va;
- ODP_DBG("Shm single VA: %d\n", odp_global_data.shm_single_va);
+ odp_global_ro.shm_single_va = single_va;
+ ODP_DBG("Shm single VA: %d\n", odp_global_ro.shm_single_va);
}
if (!_odp_libconfig_lookup_ext_int("shm", NULL, "num_cached_hp",
@@ -320,14 +320,14 @@ static void hp_init(void)
ODP_DBG("Init HP cache with up to %d pages\n", count);
- if (!odp_global_data.hugepage_info.default_huge_page_dir) {
+ if (!odp_global_ro.hugepage_info.default_huge_page_dir) {
ODP_ERR("No huge page dir\n");
return;
}
snprintf(dir, ISHM_FILENAME_MAXLEN, "%s/%s",
- odp_global_data.hugepage_info.default_huge_page_dir,
- odp_global_data.uid);
+ odp_global_ro.hugepage_info.default_huge_page_dir,
+ odp_global_ro.uid);
if (mkdir(dir, 0744) != 0) {
if (errno != EEXIST) {
@@ -339,7 +339,7 @@ static void hp_init(void)
snprintf(filename, ISHM_FILENAME_MAXLEN,
"%s/odp-%d-ishm_cached",
dir,
- odp_global_data.main_pid);
+ odp_global_ro.main_pid);
addr = mmap(NULL,
sizeof(struct huge_page_cache) + sizeof(int) * count,
@@ -431,7 +431,7 @@ static void *alloc_fragment(uintptr_t size, int block_index, intptr_t align,
ishm_fragment_t *rem_fragmnt;
uintptr_t border;/* possible start of new fragment (next alignement) */
intptr_t left; /* room remaining after, if the segment is allocated */
- uintptr_t remainder = odp_global_data.shm_max_memory;
+ uintptr_t remainder = odp_global_ro.shm_max_memory;
/*
* search for the best bit, i.e. search for the unallocated fragment
@@ -607,22 +607,22 @@ static int create_file(int block_index, huge_flag_t huge, uint64_t len,
/* huge dir must be known to create files there!: */
if ((huge == HUGE) &&
- (!odp_global_data.hugepage_info.default_huge_page_dir))
+ (!odp_global_ro.hugepage_info.default_huge_page_dir))
return -1;
if (huge == HUGE)
snprintf(dir, ISHM_FILENAME_MAXLEN, "%s/%s",
- odp_global_data.hugepage_info.default_huge_page_dir,
- odp_global_data.uid);
+ odp_global_ro.hugepage_info.default_huge_page_dir,
+ odp_global_ro.uid);
else
snprintf(dir, ISHM_FILENAME_MAXLEN, "%s/%s",
- odp_global_data.shm_dir,
- odp_global_data.uid);
+ odp_global_ro.shm_dir,
+ odp_global_ro.uid);
snprintf(filename, ISHM_FILENAME_MAXLEN,
ISHM_FILENAME_FORMAT,
dir,
- odp_global_data.main_pid,
+ odp_global_ro.main_pid,
(name && name[0]) ? name : seq_string);
mkdir(dir, 0744);
@@ -651,9 +651,9 @@ static int create_file(int block_index, huge_flag_t huge, uint64_t len,
memcpy(new_block->filename, filename, ISHM_FILENAME_MAXLEN);
snprintf(new_block->exptname, ISHM_FILENAME_MAXLEN,
ISHM_EXPTNAME_FORMAT,
- odp_global_data.shm_dir,
- odp_global_data.uid,
- odp_global_data.main_pid,
+ odp_global_ro.shm_dir,
+ odp_global_ro.uid,
+ odp_global_ro.main_pid,
(name && name[0]) ? name : seq_string);
export_file = fopen(new_block->exptname, "w");
if (export_file == NULL) {
@@ -1223,8 +1223,8 @@ int _odp_ishm_find_exported(const char *remote_name, pid_t external_odp_pid,
/* try to read the block description file: */
snprintf(export_filename, ISHM_FILENAME_MAXLEN,
ISHM_EXPTNAME_FORMAT,
- odp_global_data.shm_dir,
- odp_global_data.uid,
+ odp_global_ro.shm_dir,
+ odp_global_ro.uid,
external_odp_pid,
remote_name);
@@ -1618,7 +1618,7 @@ int _odp_ishm_cleanup_files(const char *dirpath)
int p_len;
int f_len;
- snprintf(userdir, PATH_MAX, "%s/%s", dirpath, odp_global_data.uid);
+ snprintf(userdir, PATH_MAX, "%s/%s", dirpath, odp_global_ro.uid);
dir = opendir(userdir);
if (!dir) {
@@ -1627,7 +1627,7 @@ int _odp_ishm_cleanup_files(const char *dirpath)
dirpath, strerror(errno));
return 0;
}
- snprintf(prefix, PATH_MAX, _ODP_FILES_FMT, odp_global_data.main_pid);
+ snprintf(prefix, PATH_MAX, _ODP_FILES_FMT, odp_global_ro.main_pid);
p_len = strlen(prefix);
while ((e = readdir(dir)) != NULL) {
if (strncmp(e->d_name, prefix, p_len) == 0) {
@@ -1657,7 +1657,7 @@ int _odp_ishm_init_global(const odp_init_t *init)
void *spce_addr;
int i;
uid_t uid;
- char *hp_dir = odp_global_data.hugepage_info.default_huge_page_dir;
+ char *hp_dir = odp_global_ro.hugepage_info.default_huge_page_dir;
uint64_t align;
uint64_t max_memory = ODP_CONFIG_ISHM_VA_PREALLOC_SZ;
uint64_t internal = ODP_CONFIG_ISHM_VA_PREALLOC_SZ / 8;
@@ -1666,27 +1666,27 @@ int _odp_ishm_init_global(const odp_init_t *init)
if (init && init->shm.max_memory)
max_memory = init->shm.max_memory + internal;
- odp_global_data.shm_max_memory = max_memory;
- odp_global_data.shm_max_size = max_memory - internal;
- odp_global_data.main_pid = getpid();
- odp_global_data.shm_dir = getenv("ODP_SHM_DIR");
- if (odp_global_data.shm_dir) {
- odp_global_data.shm_dir_from_env = 1;
+ odp_global_ro.shm_max_memory = max_memory;
+ odp_global_ro.shm_max_size = max_memory - internal;
+ odp_global_ro.main_pid = getpid();
+ odp_global_ro.shm_dir = getenv("ODP_SHM_DIR");
+ if (odp_global_ro.shm_dir) {
+ odp_global_ro.shm_dir_from_env = 1;
} else {
- odp_global_data.shm_dir =
+ odp_global_ro.shm_dir =
calloc(1, sizeof(ISHM_FILENAME_NORMAL_PAGE_DIR));
- sprintf(odp_global_data.shm_dir, "%s",
+ sprintf(odp_global_ro.shm_dir, "%s",
ISHM_FILENAME_NORMAL_PAGE_DIR);
- odp_global_data.shm_dir_from_env = 0;
+ odp_global_ro.shm_dir_from_env = 0;
}
- ODP_DBG("ishm: using dir %s\n", odp_global_data.shm_dir);
+ ODP_DBG("ishm: using dir %s\n", odp_global_ro.shm_dir);
uid = getuid();
- snprintf(odp_global_data.uid, UID_MAXLEN, "%d",
+ snprintf(odp_global_ro.uid, UID_MAXLEN, "%d",
uid);
- if ((syscall(SYS_gettid)) != odp_global_data.main_pid) {
+ if ((syscall(SYS_gettid)) != odp_global_ro.main_pid) {
ODP_ERR("ishm init must be performed by the main "
"ODP process!\n.");
return -1;
@@ -1701,7 +1701,7 @@ int _odp_ishm_init_global(const odp_init_t *init)
align = odp_sys_huge_page_size();
}
- _odp_ishm_cleanup_files(odp_global_data.shm_dir);
+ _odp_ishm_cleanup_files(odp_global_ro.shm_dir);
/* allocate space for the internal shared mem block table: */
addr = mmap(NULL, sizeof(ishm_table_t),
@@ -1791,7 +1791,7 @@ int _odp_ishm_init_local(void)
* Do not re-run this for the main ODP process, as it has already
* been done in advance at _odp_ishm_init_global() time:
*/
- if ((getpid() == odp_global_data.main_pid) &&
+ if ((getpid() == odp_global_ro.main_pid) &&
(syscall(SYS_gettid) == getpid()))
return 0;
@@ -1874,7 +1874,7 @@ int _odp_ishm_term_global(void)
int index;
ishm_block_t *block;
- if ((getpid() != odp_global_data.main_pid) ||
+ if ((getpid() != odp_global_ro.main_pid) ||
(syscall(SYS_gettid) != getpid()))
ODP_ERR("odp_term_global() must be performed by the main "
"ODP process!\n.");
@@ -1908,8 +1908,8 @@ int _odp_ishm_term_global(void)
if (_odp_ishmphy_unbook_va())
ret |= -1;
- if (!odp_global_data.shm_dir_from_env)
- free(odp_global_data.shm_dir);
+ if (!odp_global_ro.shm_dir_from_env)
+ free(odp_global_ro.shm_dir);
hp_term();
diff --git a/platform/linux-generic/odp_libconfig.c b/platform/linux-generic/odp_libconfig.c
index 8caf9a53..baf825bb 100644
--- a/platform/linux-generic/odp_libconfig.c
+++ b/platform/linux-generic/odp_libconfig.c
@@ -23,8 +23,8 @@ int _odp_libconfig_init_global(void)
const char *vers_rt;
const char *ipml;
const char *ipml_rt;
- config_t *config = &odp_global_data.libconfig_default;
- config_t *config_rt = &odp_global_data.libconfig_runtime;
+ config_t *config = &odp_global_ro.libconfig_default;
+ config_t *config_rt = &odp_global_ro.libconfig_runtime;
config_init(config);
config_init(config_rt);
@@ -75,8 +75,8 @@ fail:
int _odp_libconfig_term_global(void)
{
- config_destroy(&odp_global_data.libconfig_default);
- config_destroy(&odp_global_data.libconfig_runtime);
+ config_destroy(&odp_global_ro.libconfig_default);
+ config_destroy(&odp_global_ro.libconfig_runtime);
return 0;
}
@@ -86,11 +86,11 @@ int _odp_libconfig_lookup_int(const char *path, int *value)
int ret_def = CONFIG_FALSE;
int ret_rt = CONFIG_FALSE;
- ret_def = config_lookup_int(&odp_global_data.libconfig_default, path,
+ ret_def = config_lookup_int(&odp_global_ro.libconfig_default, path,
value);
/* Runtime option overrides default value */
- ret_rt = config_lookup_int(&odp_global_data.libconfig_runtime, path,
+ ret_rt = config_lookup_int(&odp_global_ro.libconfig_runtime, path,
value);
return (ret_def == CONFIG_TRUE || ret_rt == CONFIG_TRUE) ? 1 : 0;
@@ -105,9 +105,9 @@ int _odp_libconfig_lookup_array(const char *path, int value[], int max_num)
for (j = 0; j < 2; j++) {
if (j == 0)
- config = &odp_global_data.libconfig_default;
+ config = &odp_global_ro.libconfig_default;
else
- config = &odp_global_data.libconfig_runtime;
+ config = &odp_global_ro.libconfig_runtime;
setting = config_lookup(config, path);
@@ -162,11 +162,11 @@ int _odp_libconfig_lookup_ext_int(const char *base_path,
const char *name,
int *value)
{
- if (lookup_int(&odp_global_data.libconfig_runtime,
+ if (lookup_int(&odp_global_ro.libconfig_runtime,
base_path, local_path, name, value))
return 1;
- if (lookup_int(&odp_global_data.libconfig_default,
+ if (lookup_int(&odp_global_ro.libconfig_default,
base_path, local_path, name, value))
return 1;
diff --git a/platform/linux-generic/odp_pcapng.c b/platform/linux-generic/odp_pcapng.c
index b8d29e5a..07784c17 100644
--- a/platform/linux-generic/odp_pcapng.c
+++ b/platform/linux-generic/odp_pcapng.c
@@ -74,7 +74,7 @@ static void get_pcapng_fifo_name(char *pcapng_entry, size_t len,
char *pktio_name, int qidx)
{
snprintf(pcapng_entry, len, "%d-%s-flow-%d",
- odp_global_data.main_pid, pktio_name, qidx);
+ odp_global_ro.main_pid, pktio_name, qidx);
pcapng_entry[len - 1] = 0;
}
@@ -120,13 +120,13 @@ static void *inotify_update(void *arg)
while (1) {
offset = 0;
FD_ZERO(&rfds);
- FD_SET(odp_global_data.inotify_pcapng_fd, &rfds);
+ FD_SET(odp_global_ro.inotify_pcapng_fd, &rfds);
time.tv_sec = 2;
time.tv_usec = 0;
- select(odp_global_data.inotify_pcapng_fd + 1, &rfds, NULL,
+ select(odp_global_ro.inotify_pcapng_fd + 1, &rfds, NULL,
NULL, &time);
- if (FD_ISSET(odp_global_data.inotify_pcapng_fd, &rfds)) {
- rdlen = read(odp_global_data.inotify_pcapng_fd,
+ if (FD_ISSET(odp_global_ro.inotify_pcapng_fd, &rfds)) {
+ rdlen = read(odp_global_ro.inotify_pcapng_fd,
buffer, INOTIFY_BUF_LEN);
while (offset < rdlen) {
int qidx;
@@ -219,23 +219,23 @@ int pcapng_prepare(pktio_entry_t *entry)
}
/* already running from a previous pktio */
- if (odp_global_data.inotify_pcapng_is_running == 1)
+ if (odp_global_ro.inotify_pcapng_is_running == 1)
return 0;
- odp_global_data.inotify_pcapng_fd = -1;
- odp_global_data.inotify_watch_fd = -1;
+ odp_global_ro.inotify_pcapng_fd = -1;
+ odp_global_ro.inotify_watch_fd = -1;
- odp_global_data.inotify_pcapng_fd = inotify_init();
- if (odp_global_data.inotify_pcapng_fd == -1) {
+ odp_global_ro.inotify_pcapng_fd = inotify_init();
+ if (odp_global_ro.inotify_pcapng_fd == -1) {
ODP_ERR("can't init inotify. pcap disabled\n");
goto out_destroy;
}
- odp_global_data.inotify_watch_fd =
- inotify_add_watch(odp_global_data.inotify_pcapng_fd,
+ odp_global_ro.inotify_watch_fd =
+ inotify_add_watch(odp_global_ro.inotify_pcapng_fd,
PCAPNG_WATCH_DIR, IN_CLOSE | IN_OPEN);
- if (odp_global_data.inotify_watch_fd == -1) {
+ if (odp_global_ro.inotify_watch_fd == -1) {
ODP_ERR("can't register inotify for %s. pcap disabled\n",
strerror(errno));
goto out_destroy;
@@ -243,12 +243,12 @@ int pcapng_prepare(pktio_entry_t *entry)
/* create a thread to poll inotify triggers */
pthread_attr_init(&attr);
- ret = pthread_create(&odp_global_data.inotify_thread, &attr,
+ ret = pthread_create(&odp_global_ro.inotify_thread, &attr,
inotify_update, entry);
if (ret)
ODP_ERR("can't start inotify thread. pcap disabled\n");
else
- odp_global_data.inotify_pcapng_is_running = 1;
+ odp_global_ro.inotify_pcapng_is_running = 1;
return ret;
@@ -265,24 +265,24 @@ void pcapng_destroy(pktio_entry_t *entry)
unsigned int max_queue =
MAX(entry->s.num_in_queue, entry->s.num_out_queue);
- if (odp_global_data.inotify_pcapng_is_running == 1) {
- ret = pthread_cancel(odp_global_data.inotify_thread);
+ if (odp_global_ro.inotify_pcapng_is_running == 1) {
+ ret = pthread_cancel(odp_global_ro.inotify_thread);
if (ret)
ODP_ERR("can't cancel inotify thread %s\n",
strerror(errno));
}
/* fd's will be -1 in case of any failure */
- ret = inotify_rm_watch(odp_global_data.inotify_pcapng_fd,
- odp_global_data.inotify_watch_fd);
+ ret = inotify_rm_watch(odp_global_ro.inotify_pcapng_fd,
+ odp_global_ro.inotify_watch_fd);
if (ret)
ODP_ERR("can't deregister inotify %s\n", strerror(errno));
- if (odp_global_data.inotify_pcapng_fd != -1)
- close(odp_global_data.inotify_pcapng_fd);
+ if (odp_global_ro.inotify_pcapng_fd != -1)
+ close(odp_global_ro.inotify_pcapng_fd);
- if (odp_global_data.inotify_watch_fd != -1)
- close(odp_global_data.inotify_watch_fd);
+ if (odp_global_ro.inotify_watch_fd != -1)
+ close(odp_global_ro.inotify_watch_fd);
for (i = 0; i < max_queue; i++) {
char pcapng_name[128];
diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c
index 5cb423b9..bb6aa98b 100644
--- a/platform/linux-generic/odp_pool.c
+++ b/platform/linux-generic/odp_pool.c
@@ -595,7 +595,7 @@ odp_pool_t odp_pool_create(const char *name, odp_pool_param_t *params)
if (params->type == ODP_POOL_PACKET)
shm_flags = ODP_SHM_PROC;
- if (odp_global_data.shm_single_va)
+ if (odp_global_ro.shm_single_va)
shm_flags |= ODP_SHM_SINGLE_VA;
return pool_create(name, params, shm_flags);
diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c
index 7bd323c9..5345cee8 100644
--- a/platform/linux-generic/odp_shared_memory.c
+++ b/platform/linux-generic/odp_shared_memory.c
@@ -49,7 +49,7 @@ int odp_shm_capability(odp_shm_capability_t *capa)
memset(capa, 0, sizeof(odp_shm_capability_t));
capa->max_blocks = ODP_CONFIG_SHM_BLOCKS;
- capa->max_size = odp_global_data.shm_max_size;
+ capa->max_size = odp_global_ro.shm_max_size;
capa->max_align = 0;
return 0;
diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c
index 608fa51e..733c3528 100644
--- a/platform/linux-generic/odp_system_info.c
+++ b/platform/linux-generic/odp_system_info.c
@@ -47,7 +47,7 @@
*/
static int sysconf_cpu_count(void)
{
- return odp_global_data.num_cpus_installed;
+ return odp_global_ro.num_cpus_installed;
}
#if defined __x86_64__ || defined __i386__ || defined __OCTEON__ || \
@@ -339,16 +339,16 @@ int odp_system_info_init(void)
int i;
FILE *file;
- memset(&odp_global_data.system_info, 0, sizeof(system_info_t));
+ memset(&odp_global_ro.system_info, 0, sizeof(system_info_t));
- odp_global_data.system_info.page_size = ODP_PAGE_SIZE;
+ odp_global_ro.system_info.page_size = ODP_PAGE_SIZE;
/* By default, read max frequency from a cpufreq file */
for (i = 0; i < CONFIG_NUM_CPU; i++) {
uint64_t cpu_hz_max = read_cpufreq("cpuinfo_max_freq", i);
if (cpu_hz_max)
- odp_global_data.system_info.cpu_hz_max[i] = cpu_hz_max;
+ odp_global_ro.system_info.cpu_hz_max[i] = cpu_hz_max;
}
file = fopen("/proc/cpuinfo", "rt");
@@ -358,16 +358,16 @@ int odp_system_info_init(void)
}
/* Read CPU model, and set max cpu frequency if not set from cpufreq. */
- cpuinfo_parser(file, &odp_global_data.system_info);
+ cpuinfo_parser(file, &odp_global_ro.system_info);
fclose(file);
- if (systemcpu(&odp_global_data.system_info)) {
+ if (systemcpu(&odp_global_ro.system_info)) {
ODP_ERR("systemcpu failed\n");
return -1;
}
- system_hp(&odp_global_data.hugepage_info);
+ system_hp(&odp_global_ro.hugepage_info);
return 0;
}
@@ -377,7 +377,7 @@ int odp_system_info_init(void)
*/
int odp_system_info_term(void)
{
- free(odp_global_data.hugepage_info.default_huge_page_dir);
+ free(odp_global_ro.hugepage_info.default_huge_page_dir);
return 0;
}
@@ -417,14 +417,14 @@ uint64_t odp_cpu_hz_max(void)
uint64_t odp_cpu_hz_max_id(int id)
{
if (id >= 0 && id < CONFIG_NUM_CPU)
- return odp_global_data.system_info.cpu_hz_max[id];
+ return odp_global_ro.system_info.cpu_hz_max[id];
else
return 0;
}
uint64_t odp_sys_huge_page_size(void)
{
- return odp_global_data.hugepage_info.default_huge_page_size;
+ return odp_global_ro.hugepage_info.default_huge_page_size;
}
static int pagesz_compare(const void *pagesz1, const void *pagesz2)
@@ -466,7 +466,7 @@ int odp_sys_huge_page_size_all(uint64_t size[], int num)
uint64_t odp_sys_page_size(void)
{
- return odp_global_data.system_info.page_size;
+ return odp_global_ro.system_info.page_size;
}
const char *odp_cpu_model_str(void)
@@ -477,19 +477,19 @@ const char *odp_cpu_model_str(void)
const char *odp_cpu_model_str_id(int id)
{
if (id >= 0 && id < CONFIG_NUM_CPU)
- return odp_global_data.system_info.model_str[id];
+ return odp_global_ro.system_info.model_str[id];
else
return NULL;
}
int odp_sys_cache_line_size(void)
{
- return odp_global_data.system_info.cache_line_size;
+ return odp_global_ro.system_info.cache_line_size;
}
int odp_cpu_count(void)
{
- return odp_global_data.system_info.cpu_count;
+ return odp_global_ro.system_info.cpu_count;
}
void odp_sys_info_print(void)
diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c
index 87d42f7c..e8682237 100644
--- a/platform/linux-generic/odp_timer.c
+++ b/platform/linux-generic/odp_timer.c
@@ -259,7 +259,7 @@ static odp_timer_pool_t timer_pool_new(const char *name,
size_t sz0, sz1, sz2;
uint32_t flags = ODP_SHM_SW_ONLY;
- if (odp_global_data.shm_single_va)
+ if (odp_global_ro.shm_single_va)
flags |= ODP_SHM_SINGLE_VA;
odp_ticketlock_lock(&timer_global.lock);
diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c
index 7ca1a4ce..cf2ce83e 100644
--- a/platform/linux-generic/odp_traffic_mngr.c
+++ b/platform/linux-generic/odp_traffic_mngr.c
@@ -2346,7 +2346,7 @@ static void *tm_system_thread(void *arg)
uint32_t destroying, work_queue_cnt, timer_cnt;
int rc;
- rc = odp_init_local((odp_instance_t)odp_global_data.main_pid,
+ rc = odp_init_local((odp_instance_t)odp_global_ro.main_pid,
ODP_THREAD_WORKER);
ODP_ASSERT(rc == 0);
tm_group = arg;
diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c
index 553ac4c3..74af0b97 100644
--- a/platform/linux-generic/pktio/ipc.c
+++ b/platform/linux-generic/pktio/ipc.c
@@ -233,7 +233,7 @@ static void _ipc_export_pool(struct pktio_info *pinfo,
snprintf(pinfo->slave.pool_name, ODP_POOL_NAME_LEN, "%s",
_ipc_odp_buffer_pool_shm_name(pool_hdl));
- pinfo->slave.pid = odp_global_data.main_pid;
+ pinfo->slave.pid = odp_global_ro.main_pid;
pinfo->slave.block_size = pool->block_size;
pinfo->slave.base_addr = pool->base_addr;
}
diff --git a/platform/linux-generic/pktio/ring.c b/platform/linux-generic/pktio/ring.c
index 6e03b44c..488dc1a1 100644
--- a/platform/linux-generic/pktio/ring.c
+++ b/platform/linux-generic/pktio/ring.c
@@ -172,7 +172,7 @@ _ring_create(const char *name, unsigned count, unsigned flags)
shm_flag = ODP_SHM_PROC | ODP_SHM_EXPORT;
else
shm_flag = 0;
- if (odp_global_data.shm_single_va)
+ if (odp_global_ro.shm_single_va)
shm_flag |= ODP_SHM_SINGLE_VA;
/* count must be a power of 2 */
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 15 ++
example/classifier/odp_classifier.c | 7 +-
example/generator/odp_generator.c | 15 +-
example/ipsec/odp_ipsec.c | 125 ++++++------
example/ipsec_api/odp_ipsec.c | 117 ++++++-----
example/ipsec_offload/odp_ipsec_offload.c | 98 ++++-----
example/l2fwd_simple/odp_l2fwd_simple.c | 102 ++++++----
example/l3fwd/odp_l3fwd.c | 112 ++++++-----
example/packet/odp_pktio.c | 34 +++-
example/switch/odp_switch.c | 19 +-
helper/threads.c | 9 +
.../linux-generic/include/odp_debug_internal.h | 10 +-
platform/linux-generic/include/odp_global_data.h | 15 +-
platform/linux-generic/include/odp_init_internal.h | 1 +
platform/linux-generic/include/odp_packet_socket.h | 2 +
platform/linux-generic/odp_cpumask.c | 42 ++--
platform/linux-generic/odp_cpumask_task.c | 16 +-
platform/linux-generic/odp_fdserver.c | 26 +--
platform/linux-generic/odp_hash_crc_gen.c | 60 ++++--
platform/linux-generic/odp_init.c | 96 +++++++--
platform/linux-generic/odp_ipsec.c | 44 ++--
platform/linux-generic/odp_ishm.c | 76 +++----
platform/linux-generic/odp_libconfig.c | 20 +-
platform/linux-generic/odp_pcapng.c | 46 ++---
platform/linux-generic/odp_pool.c | 2 +-
platform/linux-generic/odp_shared_memory.c | 2 +-
platform/linux-generic/odp_system_info.c | 28 +--
platform/linux-generic/odp_timer.c | 110 ++++++----
platform/linux-generic/odp_traffic_mngr.c | 2 +-
platform/linux-generic/pktio/dpdk.c | 9 +-
platform/linux-generic/pktio/ipc.c | 2 +-
platform/linux-generic/pktio/pcap.c | 13 +-
platform/linux-generic/pktio/ring.c | 2 +-
platform/linux-generic/pktio/socket_mmap.c | 28 ++-
.../test/mmap_vlan_ins/mmap_vlan_ins.c | 51 +++--
platform/linux-generic/test/process-mode.conf | 10 +
platform/linux-generic/test/ring/ring_stress.c | 61 ++++--
test/performance/odp_bench_packet.c | 12 +-
test/performance/odp_cpu_bench.c | 13 +-
test/performance/odp_l2fwd.c | 25 +--
test/performance/odp_pktio_ordered.c | 19 +-
test/performance/odp_pktio_ordered_run.sh | 3 +-
test/performance/odp_pktio_perf.c | 36 ++--
test/validation/api/atomic/atomic.c | 224 +++++++++++----------
test/validation/api/thread/thread.c | 77 ++++++-
test/validation/api/timer/timer.c | 125 +++++++++---
46 files changed, 1184 insertions(+), 777 deletions(-)
create mode 100644 platform/linux-generic/test/process-mode.conf
hooks/post-receive
--
6 years, 8 months
- 1
- 0
[COMMIT] branch master updated. v1.19.0.2_tigermoth-129-ga08beb4a
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via a08beb4afc6b7da7786cd7c827643689c1ee86d0 (commit)
via f14b2bb379065f70174cc46a3cb2f7577eaecf2c (commit)
from bb09ee5afa739db4c6775e4d1481ecf7b2c6ee4d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a08beb4afc6b7da7786cd7c827643689c1ee86d0
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Oct 1 17:21:10 2018 +0300
linux-gen: dpdk: prefetch packet data early
Prefetch packet data for pkt[i + 2], while working on pkt[i].
This improves performance when packet is parsed.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index 941de963..f1ace71f 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -749,9 +749,11 @@ fail:
static inline void prefetch_pkt(struct rte_mbuf *mbuf)
{
odp_packet_hdr_t *pkt_hdr = mbuf->userdata;
+ void *data = rte_pktmbuf_mtod(mbuf, char *);
odp_prefetch(pkt_hdr);
odp_prefetch(&pkt_hdr->p);
+ odp_prefetch(data);
}
static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry,
@@ -795,8 +797,6 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry,
}
data = rte_pktmbuf_mtod(mbuf, char *);
- odp_prefetch(data);
-
pkt_len = rte_pktmbuf_pkt_len(mbuf);
pkt = (odp_packet_t)mbuf->userdata;
commit f14b2bb379065f70174cc46a3cb2f7577eaecf2c
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Sep 28 12:59:10 2018 +0300
linux-gen: dpdk: prefetch pkt_hdr before packet init
Two most often referenced packet header cachelines are
prefetched. Improve effectiveness by prefetching pkt_hdr[i + 2],
while working on pkt_hdr[i].
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index caebdfe8..941de963 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -746,6 +746,14 @@ fail:
return i;
}
+static inline void prefetch_pkt(struct rte_mbuf *mbuf)
+{
+ odp_packet_hdr_t *pkt_hdr = mbuf->userdata;
+
+ odp_prefetch(pkt_hdr);
+ odp_prefetch(&pkt_hdr->p);
+}
+
static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry,
odp_packet_t pkt_table[],
struct rte_mbuf *mbuf_table[],
@@ -756,16 +764,29 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry,
uint16_t pkt_len;
struct rte_mbuf *mbuf;
void *data;
- int i;
- int nb_pkts = 0;
- odp_pool_t pool = pkt_priv(pktio_entry)->pool;
- odp_pktin_config_opt_t pktin_cfg = pktio_entry->s.config.pktin;
- odp_proto_layer_t parse_layer = pktio_entry->s.config.parser.layer;
- odp_pktio_t input = pktio_entry->s.handle;
+ int i, nb_pkts;
+ odp_pool_t pool;
+ odp_pktin_config_opt_t pktin_cfg;
+ odp_proto_layer_t parse_layer;
+ odp_pktio_t input;
+
+ prefetch_pkt(mbuf_table[0]);
+
+ nb_pkts = 0;
+ pool = pkt_priv(pktio_entry)->pool;
+ pktin_cfg = pktio_entry->s.config.pktin;
+ parse_layer = pktio_entry->s.config.parser.layer;
+ input = pktio_entry->s.handle;
+
+ if (odp_likely(mbuf_num > 1))
+ prefetch_pkt(mbuf_table[1]);
for (i = 0; i < mbuf_num; i++) {
odp_packet_hdr_t parsed_hdr;
+ if (odp_likely((i + 2) < mbuf_num))
+ prefetch_pkt(mbuf_table[i + 2]);
+
mbuf = mbuf_table[i];
if (odp_unlikely(mbuf->nb_segs != 1)) {
ODP_ERR("Segmented buffers not supported\n");
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/pktio/dpdk.c | 37 +++++++++++++++++++++++++++++--------
1 file changed, 29 insertions(+), 8 deletions(-)
hooks/post-receive
--
6 years, 8 months
- 1
- 0
[COMMIT] branch master updated. v1.19.0.2_tigermoth-127-gbb09ee5a
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via bb09ee5afa739db4c6775e4d1481ecf7b2c6ee4d (commit)
via 094e84c5635894f076e416c9d667fff7ae6d8acc (commit)
from 29483528be6b0878a73c5b0d34e91dd34ade3f43 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bb09ee5afa739db4c6775e4d1481ecf7b2c6ee4d
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Wed Sep 26 10:11:17 2018 +0300
example: packet_dump: run during make check
Run packet dump example with pcap input during make check.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/example/packet/Makefile.am b/example/packet/Makefile.am
index 458886ab..6b5fe231 100644
--- a/example/packet/Makefile.am
+++ b/example/packet/Makefile.am
@@ -9,7 +9,7 @@ odp_pktio_SOURCES = odp_pktio.c
if test_example
if HAVE_PCAP
-TESTS = pktio_run.sh
+TESTS = packet_dump_run.sh pktio_run.sh
endif
endif
-EXTRA_DIST = pktio_run.sh udp64.pcap
+EXTRA_DIST = packet_dump_run.sh pktio_run.sh udp64.pcap
diff --git a/example/packet/packet_dump_run.sh b/example/packet/packet_dump_run.sh
new file mode 100755
index 00000000..fe43aa27
--- /dev/null
+++ b/example/packet/packet_dump_run.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright (c) 2018, Linaro Limited
+# All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+PCAP_IN=`find . ${TEST_DIR} $(dirname $0) -name udp64.pcap -print -quit`
+
+echo "Packet dump test using PCAP_IN = ${PCAP_IN}"
+
+./odp_packet_dump${EXEEXT} -i pcap:in=${PCAP_IN}:loops=10 -n 10 -o 0 -l 64
+STATUS=$?
+if [ "$STATUS" -ne 0 ]; then
+ echo "Error: status was: $STATUS, expected 0"
+ exit 1
+fi
+
+exit 0
commit 094e84c5635894f076e416c9d667fff7ae6d8acc
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Sep 25 13:33:46 2018 +0300
example: packet_dump: add new example
This new example application prints received packet to terminal.
It may be used e.g. while debugging packet IO interfaces.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/example/packet/.gitignore b/example/packet/.gitignore
index 4610a192..02752853 100644
--- a/example/packet/.gitignore
+++ b/example/packet/.gitignore
@@ -1,3 +1,4 @@
+odp_packet_dump
odp_pktio
*.log
*.trs
diff --git a/example/packet/Makefile.am b/example/packet/Makefile.am
index 228c3506..458886ab 100644
--- a/example/packet/Makefile.am
+++ b/example/packet/Makefile.am
@@ -1,6 +1,9 @@
include $(top_srcdir)/example/Makefile.inc
-bin_PROGRAMS = odp_pktio
+bin_PROGRAMS = odp_packet_dump \
+ odp_pktio
+
+odp_packet_dump_SOURCES = odp_packet_dump.c
odp_pktio_SOURCES = odp_pktio.c
diff --git a/example/packet/odp_packet_dump.c b/example/packet/odp_packet_dump.c
new file mode 100644
index 00000000..5dcb7893
--- /dev/null
+++ b/example/packet/odp_packet_dump.c
@@ -0,0 +1,683 @@
+/* Copyright (c) 2018, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <getopt.h>
+
+#include <odp_api.h>
+
+#define MAX_PKTIOS 32
+#define MAX_PKTIO_NAME 255
+#define MAX_PKT_NUM 1024
+#define MAX_FILTERS 32
+
+typedef struct test_options_t {
+ uint64_t num_packet;
+ uint32_t data_offset;
+ uint32_t data_len;
+ int verbose;
+ int num_pktio;
+ char pktio_name[MAX_PKTIOS][MAX_PKTIO_NAME + 1];
+ int num_filter_l3;
+ int filter_l3[MAX_FILTERS];
+ int num_filter_l4;
+ int filter_l4[MAX_FILTERS];
+
+} test_options_t;
+
+typedef struct test_global_t {
+ test_options_t opt;
+ odp_pool_t pool;
+ int stop;
+
+ struct {
+ odp_pktio_t pktio;
+ int started;
+
+ } pktio[MAX_PKTIOS];
+
+} test_global_t;
+
+static test_global_t test_global;
+
+static void sig_handler(int signo)
+{
+ (void)signo;
+
+ test_global.stop = 1;
+ odp_mb_full();
+}
+
+static void print_usage(void)
+{
+ printf("\n"
+ "Print received packets\n"
+ "\n"
+ "OPTIONS:\n"
+ " -i, --interface <name> Packet IO interfaces (comma-separated, no spaces)\n"
+ " -n, --num_packet <number> Exit after this many packets. Use 0 to run infinitely. Default 0.\n"
+ " -o, --data_offset <number> Data print start offset in bytes. Default 0.\n"
+ " -l, --data_length <number> Data print length in bytes. Default 0.\n"
+ " --filter_l3 <type> Print only packets with matching L3 type. Comma-separated\n"
+ " list (no spaces) of ODP L3 type values (e.g. value of ODP_PROTO_L3_TYPE_IPV4).\n"
+ " --filter_l4 <type> Print only packets with matching L4 type. Comma-separated\n"
+ " list (no spaces) of ODP L4 type values (e.g. value of ODP_PROTO_L4_TYPE_TCP).\n"
+ " -v, --verbose Print extra packet information.\n"
+ " -h, --help Display help and exit.\n\n");
+}
+
+static int parse_int_list(char *str, int integer[], int max_num)
+{
+ int str_len, len;
+ int i = 0;
+
+ str_len = strlen(str);
+
+ while (str_len > 0) {
+ len = strcspn(str, ",");
+ str[len] = 0;
+
+ if (i == max_num) {
+ printf("Error: maximum number of options is %i\n",
+ max_num);
+ return -1;
+ }
+
+ integer[i] = atoi(str);
+
+ str_len -= len + 1;
+ str += len + 1;
+ i++;
+ }
+
+ return i;
+}
+
+static int parse_options(int argc, char *argv[], test_global_t *global)
+{
+ int i, opt, long_index;
+ char *name, *str;
+ int len, str_len, num;
+
+ const struct option longopts[] = {
+ {"interface", required_argument, NULL, 'i'},
+ {"num_packet", required_argument, NULL, 'n'},
+ {"data_offset", required_argument, NULL, 'o'},
+ {"data_length", required_argument, NULL, 'l'},
+ {"verbose", no_argument, NULL, 'v'},
+ {"help", no_argument, NULL, 'h'},
+ {"filter_l3", required_argument, NULL, 0 },
+ {"filter_l4", required_argument, NULL, 1 },
+ {NULL, 0, NULL, 0}
+ };
+ const char *shortopts = "+i:n:o:l:vh";
+ int ret = 0;
+
+ while (1) {
+ opt = getopt_long(argc, argv, shortopts, longopts, &long_index);
+
+ if (opt == -1)
+ break; /* No more options */
+
+ switch (opt) {
+ case 0:
+ /* --filter_l3 */
+ num = parse_int_list(optarg, global->opt.filter_l3,
+ MAX_FILTERS);
+ global->opt.num_filter_l3 = num;
+
+ if (num < 0)
+ ret = -1;
+ break;
+ case 1:
+ /* --filter_l4 */
+ num = parse_int_list(optarg, global->opt.filter_l4,
+ MAX_FILTERS);
+ global->opt.num_filter_l4 = num;
+
+ if (num < 0)
+ ret = -1;
+ break;
+ case 'i':
+ i = 0;
+ str = optarg;
+ str_len = strlen(str);
+
+ while (str_len > 0) {
+ len = strcspn(str, ",");
+ str_len -= len + 1;
+
+ if (i == MAX_PKTIOS) {
+ printf("Error: Too many interfaces\n");
+ ret = -1;
+ break;
+ }
+
+ if (len > MAX_PKTIO_NAME) {
+ printf("Error: Too long interface name %s\n",
+ str);
+ ret = -1;
+ break;
+ }
+
+ name = global->opt.pktio_name[i];
+ memcpy(name, str, len);
+ str += len + 1;
+ i++;
+ }
+
+ global->opt.num_pktio = i;
+
+ break;
+ case 'o':
+ global->opt.data_offset = atoi(optarg);
+ break;
+ case 'l':
+ global->opt.data_len = atoi(optarg);
+ break;
+ case 'n':
+ global->opt.num_packet = atoll(optarg);
+ break;
+ case 'v':
+ global->opt.verbose = 1;
+ break;
+ case 'h':
+ default:
+ print_usage();
+ return -1;
+ }
+ }
+
+ if (global->opt.num_pktio == 0) {
+ printf("Error: At least one pktio interface needed.\n");
+ ret = -1;
+ }
+
+ return ret;
+}
+
+static int open_pktios(test_global_t *global)
+{
+ odp_pool_param_t pool_param;
+ odp_pktio_param_t pktio_param;
+ odp_pool_t pool;
+ odp_pool_capability_t pool_capa;
+ odp_pktio_t pktio;
+ odp_pktio_config_t pktio_config;
+ odp_pktin_queue_param_t pktin_param;
+ char *name;
+ int i, num_pktio;
+ uint32_t num_pkt = MAX_PKT_NUM;
+
+ num_pktio = global->opt.num_pktio;
+
+ if (odp_pool_capability(&pool_capa)) {
+ printf("Error: Pool capability failed.\n");
+ return -1;
+ }
+
+ if (pool_capa.pkt.max_num < MAX_PKT_NUM)
+ num_pkt = pool_capa.pkt.max_num;
+
+ odp_pool_param_init(&pool_param);
+ pool_param.pkt.num = num_pkt;
+ pool_param.type = ODP_POOL_PACKET;
+
+ pool = odp_pool_create("packet pool", &pool_param);
+
+ global->pool = pool;
+
+ if (pool == ODP_POOL_INVALID) {
+ printf("Error: Pool create.\n");
+ return -1;
+ }
+
+ odp_pktio_param_init(&pktio_param);
+ pktio_param.in_mode = ODP_PKTIN_MODE_SCHED;
+ pktio_param.out_mode = ODP_PKTOUT_MODE_DISABLED;
+
+ for (i = 0; i < num_pktio; i++)
+ global->pktio[i].pktio = ODP_PKTIO_INVALID;
+
+ /* Open and configure interfaces */
+ for (i = 0; i < num_pktio; i++) {
+ name = global->opt.pktio_name[i];
+ pktio = odp_pktio_open(name, pool, &pktio_param);
+
+ if (pktio == ODP_PKTIO_INVALID) {
+ printf("Error (%s): Pktio open failed.\n", name);
+ return -1;
+ }
+
+ global->pktio[i].pktio = pktio;
+
+ odp_pktio_print(pktio);
+
+ odp_pktio_config_init(&pktio_config);
+ pktio_config.pktin.bit.ts_all = 1;
+ pktio_config.parser.layer = ODP_PROTO_LAYER_ALL;
+
+ odp_pktio_config(pktio, &pktio_config);
+
+ odp_pktin_queue_param_init(&pktin_param);
+
+ pktin_param.queue_param.sched.prio = ODP_SCHED_PRIO_DEFAULT;
+ pktin_param.queue_param.sched.sync = ODP_SCHED_SYNC_ATOMIC;
+ pktin_param.queue_param.sched.group = ODP_SCHED_GROUP_ALL;
+ pktin_param.num_queues = 1;
+
+ if (odp_pktin_queue_config(pktio, &pktin_param)) {
+ printf("Error (%s): Pktin config failed.\n", name);
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
+static int start_pktios(test_global_t *global)
+{
+ int i;
+
+ for (i = 0; i < global->opt.num_pktio; i++) {
+ if (odp_pktio_start(global->pktio[i].pktio)) {
+ printf("Error (%s): Pktio start failed.\n",
+ global->opt.pktio_name[i]);
+
+ return -1;
+ }
+
+ global->pktio[i].started = 1;
+ }
+
+ return 0;
+}
+
+static int stop_pktios(test_global_t *global)
+{
+ odp_pktio_t pktio;
+ int i, ret = 0;
+
+ for (i = 0; i < global->opt.num_pktio; i++) {
+ pktio = global->pktio[i].pktio;
+
+ if (pktio == ODP_PKTIO_INVALID || global->pktio[i].started == 0)
+ continue;
+
+ if (odp_pktio_stop(pktio)) {
+ printf("Error (%s): Pktio stop failed.\n",
+ global->opt.pktio_name[i]);
+ ret = -1;
+ }
+ }
+
+ return ret;
+}
+
+static void empty_queues(void)
+{
+ odp_event_t ev;
+ uint64_t wait_time = odp_schedule_wait_time(ODP_TIME_SEC_IN_NS / 2);
+
+ /* Drop all events from all queues */
+ while (1) {
+ ev = odp_schedule(NULL, wait_time);
+
+ if (ev == ODP_EVENT_INVALID)
+ break;
+
+ odp_event_free(ev);
+ }
+}
+
+static int close_pktios(test_global_t *global)
+{
+ odp_pktio_t pktio;
+ odp_pool_t pool;
+ int i, ret = 0;
+
+ for (i = 0; i < global->opt.num_pktio; i++) {
+ pktio = global->pktio[i].pktio;
+
+ if (pktio == ODP_PKTIO_INVALID)
+ continue;
+
+ if (odp_pktio_close(pktio)) {
+ printf("Error (%s): Pktio close failed.\n",
+ global->opt.pktio_name[i]);
+ ret = -1;
+ }
+ }
+
+ pool = global->pool;
+
+ if (pool == ODP_POOL_INVALID)
+ return ret;
+
+ if (odp_pool_destroy(pool)) {
+ printf("Error: Pool destroy failed.\n");
+ ret = -1;
+ }
+
+ return ret;
+}
+
+static void print_mac_addr(uint8_t *addr)
+{
+ printf("%02x:%02x:%02x:%02x:%02x:%02x\n",
+ addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+}
+
+static void print_ipv4_addr(uint8_t *addr)
+{
+ printf("%u.%u.%u.%u\n",
+ addr[0], addr[1], addr[2], addr[3]);
+}
+
+static void print_port(uint8_t *ptr)
+{
+ uint16_t *port = (uint16_t *)(uintptr_t)ptr;
+
+ printf("%u\n", odp_be_to_cpu_16(*port));
+}
+
+static void print_data(odp_packet_t pkt, uint32_t offset, uint32_t len)
+{
+ const uint32_t bytes_per_row = 16;
+ const uint32_t num_char = 1 + (bytes_per_row * 3) + 1;
+ uint8_t data[bytes_per_row];
+ char row[num_char];
+ uint32_t copy_len, i, j;
+ uint32_t data_len = odp_packet_len(pkt);
+
+ if (offset > data_len)
+ return;
+
+ if (offset + len > data_len)
+ len = data_len - offset;
+
+ while (len) {
+ i = 0;
+
+ if (len > bytes_per_row)
+ copy_len = bytes_per_row;
+ else
+ copy_len = len;
+
+ odp_packet_copy_to_mem(pkt, offset, copy_len, data);
+
+ i += snprintf(&row[i], num_char - i, " ");
+
+ for (j = 0; j < copy_len; j++)
+ i += snprintf(&row[i], num_char - i, " %02x", data[j]);
+
+ row[i] = 0;
+ printf("%s\n", row);
+
+ len -= copy_len;
+ offset += copy_len;
+ }
+}
+
+static int print_packet(test_global_t *global, odp_packet_t pkt,
+ uint64_t num_packet)
+{
+ odp_pktio_t pktio;
+ odp_pktio_info_t pktio_info;
+ odp_time_t time;
+ uint64_t sec, nsec;
+ uint32_t offset;
+ int i, type, match;
+ int num_filter_l3 = global->opt.num_filter_l3;
+ int num_filter_l4 = global->opt.num_filter_l4;
+ uint8_t *data = odp_packet_data(pkt);
+ uint32_t seg_len = odp_packet_seg_len(pkt);
+ uint32_t l2_offset = odp_packet_l2_offset(pkt);
+ uint32_t l3_offset = odp_packet_l3_offset(pkt);
+ uint32_t l4_offset = odp_packet_l4_offset(pkt);
+ int tcp = odp_packet_has_tcp(pkt);
+ int udp = odp_packet_has_udp(pkt);
+ int sctp = odp_packet_has_sctp(pkt);
+
+ if (odp_packet_has_ts(pkt))
+ time = odp_packet_ts(pkt);
+ else
+ time = odp_time_local();
+
+ /* Filter based on L3 type */
+ if (num_filter_l3) {
+ match = 0;
+
+ for (i = 0; i < num_filter_l3; i++) {
+ type = global->opt.filter_l3[i];
+
+ if (type == odp_packet_l3_type(pkt)) {
+ match = 1;
+ break;
+ }
+ }
+
+ if (!match)
+ return 0;
+ }
+
+ /* Filter based on L4 type */
+ if (num_filter_l4) {
+ match = 0;
+
+ for (i = 0; i < num_filter_l4; i++) {
+ type = global->opt.filter_l4[i];
+
+ if (type == odp_packet_l4_type(pkt)) {
+ match = 1;
+ break;
+ }
+ }
+
+ if (!match)
+ return 0;
+ }
+
+ nsec = odp_time_to_ns(time);
+ sec = nsec / ODP_TIME_SEC_IN_NS;
+ nsec = nsec - (sec * ODP_TIME_SEC_IN_NS);
+ pktio = odp_packet_input(pkt);
+
+ odp_pktio_info(pktio, &pktio_info);
+
+ printf("PACKET [%" PRIu64 "]\n", num_packet);
+ printf(" time: %" PRIu64 ".%09" PRIu64 " sec\n", sec, nsec);
+ printf(" interface name: %s\n", pktio_info.name);
+ printf(" packet length: %u bytes\n", odp_packet_len(pkt));
+
+ /* L2 */
+ if (odp_packet_has_eth(pkt)) {
+ printf(" Ethernet offset: %u bytes\n", l2_offset);
+ offset = l2_offset;
+ if (offset + 6 <= seg_len) {
+ printf(" dst address: ");
+ print_mac_addr(data + offset);
+ }
+
+ offset = l2_offset + 6;
+ if (offset + 6 <= seg_len) {
+ printf(" src address: ");
+ print_mac_addr(data + offset);
+ }
+ } else if (odp_packet_has_l2(pkt)) {
+ printf(" L2 (%i) offset: %u bytes\n",
+ odp_packet_l2_type(pkt), l2_offset);
+ }
+
+ /* L3 */
+ if (odp_packet_has_ipv4(pkt)) {
+ printf(" IPv4 offset: %u bytes\n", l3_offset);
+ offset = l3_offset + 12;
+ if (offset + 4 <= seg_len) {
+ printf(" src address: ");
+ print_ipv4_addr(data + offset);
+ }
+
+ offset = l3_offset + 16;
+ if (offset + 4 <= seg_len) {
+ printf(" dst address: ");
+ print_ipv4_addr(data + offset);
+ }
+ } else if (odp_packet_has_ipv6(pkt)) {
+ printf(" IPv6 offset: %u bytes\n", l3_offset);
+ } else if (odp_packet_has_l3(pkt)) {
+ printf(" L3 (%i) offset: %u bytes\n",
+ odp_packet_l3_type(pkt), l3_offset);
+ }
+
+ /* L4 */
+ if (tcp || udp || sctp) {
+ if (tcp)
+ printf(" TCP offset: %u bytes\n", l4_offset);
+ else if (udp)
+ printf(" UDP offset: %u bytes\n", l4_offset);
+ else
+ printf(" SCTP offset: %u bytes\n", l4_offset);
+
+ offset = l4_offset;
+ if (offset + 2 <= seg_len) {
+ printf(" src port: ");
+ print_port(data + offset);
+ }
+
+ offset = l4_offset + 2;
+ if (offset + 2 <= seg_len) {
+ printf(" dst port: ");
+ print_port(data + offset);
+ }
+ } else if (odp_packet_has_l4(pkt)) {
+ printf(" L4 (%i) offset: %u bytes\n",
+ odp_packet_l4_type(pkt), l4_offset);
+ }
+
+ /* User defined data range */
+ if (global->opt.data_len)
+ print_data(pkt, global->opt.data_offset, global->opt.data_len);
+
+ if (global->opt.verbose)
+ odp_packet_print(pkt);
+
+ printf("\n");
+
+ return 1;
+}
+
+static int receive_packets(test_global_t *global)
+{
+ odp_event_t ev;
+ odp_packet_t pkt;
+ int printed;
+ uint64_t num_packet = 0;
+
+ while (!global->stop) {
+ ev = odp_schedule(NULL, ODP_SCHED_NO_WAIT);
+
+ if (ev == ODP_EVENT_INVALID)
+ continue;
+
+ if (odp_event_type(ev) != ODP_EVENT_PACKET) {
+ printf("Bad event type: %i\n", odp_event_type(ev));
+ odp_event_free(ev);
+ continue;
+ }
+
+ pkt = odp_packet_from_event(ev);
+
+ printed = print_packet(global, pkt, num_packet);
+
+ odp_packet_free(pkt);
+
+ if (!printed)
+ continue;
+
+ num_packet++;
+ if (global->opt.num_packet &&
+ num_packet >= global->opt.num_packet)
+ break;
+ }
+
+ return 0;
+}
+
+int main(int argc, char *argv[])
+{
+ odp_instance_t instance;
+ test_global_t *global;
+ int ret = 0;
+
+ global = &test_global;
+ memset(global, 0, sizeof(test_global_t));
+
+ signal(SIGINT, sig_handler);
+
+ if (parse_options(argc, argv, global))
+ return -1;
+
+ /* Init ODP before calling anything else */
+ if (odp_init_global(&instance, NULL, NULL)) {
+ printf("Error: Global init failed.\n");
+ return -1;
+ }
+
+ /* Init this thread */
+ if (odp_init_local(instance, ODP_THREAD_CONTROL)) {
+ printf("Error: Local init failed.\n");
+ return -1;
+ }
+
+ global->pool = ODP_POOL_INVALID;
+
+ odp_sys_info_print();
+
+ if (open_pktios(global)) {
+ printf("Error: pktio open failed\n");
+ return -1;
+ }
+
+ if (start_pktios(global)) {
+ printf("Error: pktio start failed\n");
+ return -1;
+ }
+
+ if (receive_packets(global)) {
+ printf("Error: packet receive failed\n");
+ return -1;
+ }
+
+ if (stop_pktios(global)) {
+ printf("Error: pktio stop failed\n");
+ return -1;
+ }
+
+ empty_queues();
+
+ if (close_pktios(global)) {
+ printf("Error: pktio close failed\n");
+ return -1;
+ }
+
+ if (odp_term_local()) {
+ printf("Error: term local failed.\n");
+ return -1;
+ }
+
+ if (odp_term_global(instance)) {
+ printf("Error: term global failed.\n");
+ return -1;
+ }
+
+ return ret;
+}
-----------------------------------------------------------------------
Summary of changes:
example/packet/.gitignore | 1 +
example/packet/Makefile.am | 9 +-
example/packet/odp_packet_dump.c | 683 +++++++++++++++++++++
.../packet_dump_run.sh} | 11 +-
4 files changed, 694 insertions(+), 10 deletions(-)
create mode 100644 example/packet/odp_packet_dump.c
copy example/{generator/generator_null_test.sh => packet/packet_dump_run.sh} (53%)
hooks/post-receive
--
6 years, 9 months
- 1
- 0
[COMMIT] branch master updated. v1.19.0.2_tigermoth-125-g29483528
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via 29483528be6b0878a73c5b0d34e91dd34ade3f43 (commit)
from 50f15e48f30ddafcbeac77fa5dcfbd8eb6f55353 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 29483528be6b0878a73c5b0d34e91dd34ade3f43
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Sep 27 11:10:07 2018 +0300
test: ipc: reduce interface start poll frequency
This test fails frequently in Travis since log get filled with
debug prints from odp_pktio_start(). Reduce polling frequency to
once per 50ms. This gives both process time to start up, before
log is filled with unnecessary error messages.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/test/pktio_ipc/pktio_ipc1.c b/platform/linux-generic/test/pktio_ipc/pktio_ipc1.c
index e704d7a9..4f77306d 100644
--- a/platform/linux-generic/test/pktio_ipc/pktio_ipc1.c
+++ b/platform/linux-generic/test/pktio_ipc/pktio_ipc1.c
@@ -96,6 +96,9 @@ static int pktio_run_loop(odp_pool_t pool)
ret = odp_pktio_start(ipc_pktio);
if (!ret)
break;
+
+ /* Reduce polling frequency to once per 50ms */
+ odp_time_wait_ns(50 * ODP_TIME_MSEC_IN_NS);
}
/* packets loop */
diff --git a/platform/linux-generic/test/pktio_ipc/pktio_ipc2.c b/platform/linux-generic/test/pktio_ipc/pktio_ipc2.c
index 89ebea6d..e6270f89 100644
--- a/platform/linux-generic/test/pktio_ipc/pktio_ipc2.c
+++ b/platform/linux-generic/test/pktio_ipc/pktio_ipc2.c
@@ -97,6 +97,9 @@ static int ipc_second_process(int master_pid)
ret = odp_pktio_start(ipc_pktio);
if (!ret)
break;
+
+ /* Reduce polling frequency to once per 50ms */
+ odp_time_wait_ns(50 * ODP_TIME_MSEC_IN_NS);
}
for (;;) {
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/test/pktio_ipc/pktio_ipc1.c | 3 +++
platform/linux-generic/test/pktio_ipc/pktio_ipc2.c | 3 +++
2 files changed, 6 insertions(+)
hooks/post-receive
--
6 years, 9 months
- 1
- 0
[COMMIT] branch master updated. v1.19.0.2_tigermoth-124-g50f15e48
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via 50f15e48f30ddafcbeac77fa5dcfbd8eb6f55353 (commit)
from f8e019e23d8348506c1121c73d63ee4e1b584e6e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 50f15e48f30ddafcbeac77fa5dcfbd8eb6f55353
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Sep 27 10:24:34 2018 +0300
linux-gen: queue: fix error print format
Add missing '%' from printf formats. Also use hex instead of int
format as queue handles are pointers.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c
index 3f00cc11..9eb3c79e 100644
--- a/platform/linux-generic/odp_queue_basic.c
+++ b/platform/linux-generic/odp_queue_basic.c
@@ -559,7 +559,7 @@ static int error_enqueue(odp_queue_t handle, odp_buffer_hdr_t *buf_hdr)
{
(void)buf_hdr;
- ODP_ERR("Enqueue not supported (" PRIu64 ")\n",
+ ODP_ERR("Enqueue not supported (0x%" PRIx64 ")\n",
odp_queue_to_u64(handle));
return -1;
@@ -571,7 +571,7 @@ static int error_enqueue_multi(odp_queue_t handle,
(void)buf_hdr;
(void)num;
- ODP_ERR("Enqueue multi not supported (" PRIu64 ")\n",
+ ODP_ERR("Enqueue multi not supported (0x%" PRIx64 ")\n",
odp_queue_to_u64(handle));
return -1;
@@ -579,7 +579,7 @@ static int error_enqueue_multi(odp_queue_t handle,
static odp_buffer_hdr_t *error_dequeue(odp_queue_t handle)
{
- ODP_ERR("Dequeue not supported (" PRIu64 ")\n",
+ ODP_ERR("Dequeue not supported (0x%" PRIx64 ")\n",
odp_queue_to_u64(handle));
return NULL;
@@ -591,7 +591,7 @@ static int error_dequeue_multi(odp_queue_t handle,
(void)buf_hdr;
(void)num;
- ODP_ERR("Dequeue multi not supported (" PRIu64 ")\n",
+ ODP_ERR("Dequeue multi not supported (0x%" PRIx64 ")\n",
odp_queue_to_u64(handle));
return -1;
@@ -623,7 +623,7 @@ static int queue_info(odp_queue_t handle, odp_queue_info_t *info)
queue_id = queue_to_index(handle);
if (odp_unlikely(queue_id >= ODP_CONFIG_QUEUES)) {
- ODP_ERR("Invalid queue handle:%" PRIu64 "\n",
+ ODP_ERR("Invalid queue handle: 0x%" PRIx64 "\n",
odp_queue_to_u64(handle));
return -1;
}
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/odp_queue_basic.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
6 years, 9 months
- 1
- 0