X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Funittest%2Fsvm_fifo_test.c;h=8b43ee370f1f9709899fa45c8e17155cddcff665;hb=b020806806c0e6c54886cdb4347a5fd1f19504b0;hp=bf633b78c222fad6e86fe2fa82b8026e5289456c;hpb=6aa9f5f8dc14cec4005b8bac33b5a8697168548e;p=vpp.git diff --git a/src/plugins/unittest/svm_fifo_test.c b/src/plugins/unittest/svm_fifo_test.c index bf633b78c22..8b43ee370f1 100644 --- a/src/plugins/unittest/svm_fifo_test.c +++ b/src/plugins/unittest/svm_fifo_test.c @@ -14,6 +14,7 @@ */ #include #include +#include #include #define SFIFO_TEST_I(_cond, _comment, _args...) \ @@ -706,7 +707,6 @@ sfifo_test_fifo3 (vlib_main_t * vm, unformat_input_t * input) SFIFO_TEST (0, "[%d] peeked %u expected %u", j, data_buf[j], data_pattern[j]); } - vec_reset_length (data_buf); /* * Dequeue or drop all data @@ -717,6 +717,7 @@ sfifo_test_fifo3 (vlib_main_t * vm, unformat_input_t * input) } else { + memset (data_buf, 0, vec_len (data_pattern)); svm_fifo_dequeue (f, vec_len (data_pattern), data_buf); if (compare_data (data_buf, data_pattern, 0, vec_len (data_pattern), &j)) @@ -1193,8 +1194,8 @@ sfifo_test_fifo_grow (vlib_main_t * vm, unformat_input_t * input) int test_n_bytes, deq_bytes, enq_bytes, n_deqs, n_enqs; svm_fifo_chunk_t *c, *next, *prev; u8 *test_data = 0, *data_buf = 0; + u32 old_tail, offset; svm_fifo_t *f; - u32 old_tail; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { @@ -1225,6 +1226,7 @@ sfifo_test_fifo_grow (vlib_main_t * vm, unformat_input_t * input) fifo_size + 100, f->size); SFIFO_TEST (c->start_byte == fifo_size, "start byte expected %u is %u", fifo_size, c->start_byte); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* * Add with fifo wrapped @@ -1243,6 +1245,7 @@ sfifo_test_fifo_grow (vlib_main_t * vm, unformat_input_t * input) fifo_size + 100, f->size); SFIFO_TEST (c->start_byte == fifo_size + 100, "start byte expected %u is " " %u", fifo_size + 100, c->start_byte); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* * Unwrap fifo @@ -1255,6 +1258,7 @@ sfifo_test_fifo_grow (vlib_main_t * vm, unformat_input_t * input) fifo_size + 200, f->size); SFIFO_TEST (c->start_byte == fifo_size + 100, "start byte expected %u is " "%u", fifo_size + 100, c->start_byte); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* * Add N chunks @@ -1274,6 +1278,7 @@ sfifo_test_fifo_grow (vlib_main_t * vm, unformat_input_t * input) svm_fifo_add_chunk (f, c); SFIFO_TEST (f->size == fifo_size + 200, "size expected %u is %u", fifo_size + 200, f->size); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); prev = 0; for (i = 0; i < 5; i++) @@ -1296,6 +1301,7 @@ sfifo_test_fifo_grow (vlib_main_t * vm, unformat_input_t * input) fifo_size + 200 + 10 * 100, f->size); SFIFO_TEST (f->tail == old_tail, "new tail expected %u is %u", old_tail, f->tail); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* * Enqueue/dequeue tests @@ -1351,6 +1357,7 @@ sfifo_test_fifo_grow (vlib_main_t * vm, unformat_input_t * input) vlib_cli_output (vm, "[%d] dequeued %u expected %u", j, data_buf[j], test_data[j]); SFIFO_TEST ((rv == 0), "dequeued compared to original returned %d", rv); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* * Simple enqueue/deq and data validation (2) @@ -1377,6 +1384,42 @@ sfifo_test_fifo_grow (vlib_main_t * vm, unformat_input_t * input) vlib_cli_output (vm, "[%d] dequeued %u expected %u", j, data_buf[j], test_data[j]); SFIFO_TEST ((rv == 0), "dequeued compared to original returned %d", rv); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); + + /* + * Simple enqueue and drop + */ + for (i = 0; i <= n_enqs; i++) + { + rv = svm_fifo_enqueue (f, enq_bytes, test_data + i * enq_bytes); + if (rv < 0) + SFIFO_TEST (0, "failed to enqueue"); + } + + rv = svm_fifo_dequeue_drop (f, test_n_bytes / 2); + SFIFO_TEST (rv == test_n_bytes / 2, "drop should be equal"); + SFIFO_TEST (svm_fifo_is_sane (f), "head chunk should be valid"); + rv = svm_fifo_dequeue_drop (f, test_n_bytes / 2); + SFIFO_TEST (rv == test_n_bytes / 2, "drop should be equal"); + SFIFO_TEST (svm_fifo_is_sane (f), "head chunk should be valid"); + SFIFO_TEST (svm_fifo_max_dequeue (f) == 0, "should be empty"); + + /* + * Simple enqueue and drop all + */ + + /* Enqueue just enough data to make sure fifo is not full */ + for (i = 0; i <= n_enqs / 2; i++) + { + rv = svm_fifo_enqueue (f, enq_bytes, test_data + i * enq_bytes); + if (rv < 0) + SFIFO_TEST (0, "failed to enqueue"); + } + + /* check drop all as well */ + svm_fifo_dequeue_drop_all (f); + SFIFO_TEST (svm_fifo_is_sane (f), "head chunk should be valid"); + SFIFO_TEST (svm_fifo_max_dequeue (f) == 0, "should be empty"); /* * OOO enqueues/dequeues and data validation (1) @@ -1393,14 +1436,22 @@ sfifo_test_fifo_grow (vlib_main_t * vm, unformat_input_t * input) } } + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); SFIFO_TEST (svm_fifo_max_dequeue (f) == 0, "max deq expected %u is %u", 0, svm_fifo_max_dequeue (f)); svm_fifo_enqueue (f, sizeof (u8), &test_data[0]); memset (data_buf, 0, vec_len (data_buf)); + offset = 0; for (i = 0; i <= n_deqs; i++) - svm_fifo_dequeue (f, deq_bytes, data_buf + i * deq_bytes); + { + rv = svm_fifo_peek (f, offset, deq_bytes, data_buf + i * deq_bytes); + if (rv < 0 || (rv != deq_bytes && i != n_deqs)) + SFIFO_TEST (0, "unexpected peek %d", rv); + offset += rv; + } + svm_fifo_dequeue_drop (f, offset); rv = compare_data (data_buf, test_data, 0, vec_len (test_data), (u32 *) & j); @@ -1408,6 +1459,7 @@ sfifo_test_fifo_grow (vlib_main_t * vm, unformat_input_t * input) vlib_cli_output (vm, "[%d] dequeued %u expected %u", j, data_buf[j], test_data[j]); SFIFO_TEST ((rv == 0), "dequeued compared to original returned %d", rv); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* * OOO enqueues/dequeues and data validation (2) @@ -1427,8 +1479,10 @@ sfifo_test_fifo_grow (vlib_main_t * vm, unformat_input_t * input) goto cleanup; } } + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); svm_fifo_enqueue (f, enq_bytes, &test_data[0]); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); memset (data_buf, 0, vec_len (data_buf)); for (i = 0; i <= n_deqs; i++) @@ -1440,6 +1494,7 @@ sfifo_test_fifo_grow (vlib_main_t * vm, unformat_input_t * input) vlib_cli_output (vm, "[%d] dequeued %u expected %u", j, data_buf[j], test_data[j]); SFIFO_TEST ((rv == 0), "dequeued compared to original returned %d", rv); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* * Cleanup @@ -1554,6 +1609,7 @@ sfifo_test_fifo_shrink (vlib_main_t * vm, unformat_input_t * input) SFIFO_TEST (f->size == 12 * chunk_size + 1, "size expected %u is %u", 12 * chunk_size + 1, f->size); SFIFO_TEST (f->flags & SVM_FIFO_F_SHRINK, "shrink flag should be set"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* Check enqueue space to force size reduction */ (void) svm_fifo_max_enqueue (f); @@ -1564,6 +1620,7 @@ sfifo_test_fifo_shrink (vlib_main_t * vm, unformat_input_t * input) " be set"); SFIFO_TEST (!(f->flags & SVM_FIFO_F_SHRINK), "shrink flag should not be" " set"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); collected = c = svm_fifo_collect_chunks (f); rv = chunk_list_len (c); @@ -1572,6 +1629,7 @@ sfifo_test_fifo_shrink (vlib_main_t * vm, unformat_input_t * input) SFIFO_TEST (rv == 11, "expected %u chunks got %u", 11, rv); SFIFO_TEST (!(f->flags & SVM_FIFO_F_COLLECT_CHUNKS), "collect flag should" " not be set"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* * Fifo wrap and multiple chunks used @@ -1600,6 +1658,7 @@ sfifo_test_fifo_shrink (vlib_main_t * vm, unformat_input_t * input) SFIFO_TEST (f->size == 11 * chunk_size + 1, "size expected %u is %u", 11 * chunk_size + 1, f->size); SFIFO_TEST (f->flags & SVM_FIFO_F_SHRINK, "shrink flag should be set"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* Check enqueue space to try size reduction. Should not work */ rv = svm_fifo_max_enqueue (f); @@ -1610,6 +1669,7 @@ sfifo_test_fifo_shrink (vlib_main_t * vm, unformat_input_t * input) SFIFO_TEST (f->flags & SVM_FIFO_F_SHRINK, "shrink flag should be set"); SFIFO_TEST (!(f->flags & SVM_FIFO_F_COLLECT_CHUNKS), "collect flag should" " not be set"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* Dequeue byte-by-byte up to last byte on last chunk */ deq_bytes = f->size - f->size / 2 - 1; @@ -1620,6 +1680,7 @@ sfifo_test_fifo_shrink (vlib_main_t * vm, unformat_input_t * input) if (rv < 0) SFIFO_TEST (0, "dequeue returned"); } + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); rv = svm_fifo_max_enqueue (f); @@ -1635,6 +1696,7 @@ sfifo_test_fifo_shrink (vlib_main_t * vm, unformat_input_t * input) SFIFO_TEST (f->flags & SVM_FIFO_F_SHRINK, "shrink flag should be set"); SFIFO_TEST (!(f->flags & SVM_FIFO_F_COLLECT_CHUNKS), "collect flag should" " not be set"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* Dequeue one more such that head goes beyond last chunk */ rv = svm_fifo_dequeue (f, 1, &data_buf[deq_bytes]); @@ -1651,6 +1713,7 @@ sfifo_test_fifo_shrink (vlib_main_t * vm, unformat_input_t * input) " set"); SFIFO_TEST (f->flags & SVM_FIFO_F_COLLECT_CHUNKS, "collect flag should" " be set"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* Dequeue the rest of the data */ deq_bytes += 1; @@ -1681,6 +1744,7 @@ sfifo_test_fifo_shrink (vlib_main_t * vm, unformat_input_t * input) SFIFO_TEST (rv == 8, "expected %u chunks got %u", 8, rv); SFIFO_TEST (!(f->flags & SVM_FIFO_F_COLLECT_CHUNKS), "collect flag should" " not be set"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* * OOO segment on chunk that should be removed @@ -1695,11 +1759,13 @@ sfifo_test_fifo_shrink (vlib_main_t * vm, unformat_input_t * input) svm_fifo_enqueue (f, 200, test_data); svm_fifo_enqueue_with_offset (f, 50, vec_len (test_data) - 250, &test_data[250]); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* Free space */ rv = svm_fifo_max_enqueue (f); SFIFO_TEST (rv == vec_len (test_data) - 200, "free space expected %u is %u", vec_len (test_data) - 200, rv); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* Ask to reduce size */ rv = svm_fifo_reduce_size (f, 3.5 * chunk_size, 0); @@ -1708,6 +1774,7 @@ sfifo_test_fifo_shrink (vlib_main_t * vm, unformat_input_t * input) SFIFO_TEST (f->size == 11 * chunk_size + 1, "size expected %u is %u", 11 * chunk_size + 1, f->size); SFIFO_TEST (f->flags & SVM_FIFO_F_SHRINK, "shrink flag should be set"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* Try to force size reduction but it should fail */ rv = svm_fifo_max_enqueue (f); @@ -1719,6 +1786,7 @@ sfifo_test_fifo_shrink (vlib_main_t * vm, unformat_input_t * input) SFIFO_TEST (f->flags & SVM_FIFO_F_SHRINK, "shrink flag should be set"); SFIFO_TEST (!(f->flags & SVM_FIFO_F_COLLECT_CHUNKS), "collect flag should" " not be set"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* Dequeue the in order data. This should shrink nitems */ rv = svm_fifo_dequeue (f, 200, data_buf); @@ -1735,11 +1803,13 @@ sfifo_test_fifo_shrink (vlib_main_t * vm, unformat_input_t * input) SFIFO_TEST (f->flags & SVM_FIFO_F_SHRINK, "shrink flag should be set"); SFIFO_TEST (!(f->flags & SVM_FIFO_F_COLLECT_CHUNKS), "collect flag should" " not be set"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* Enqueue the missing 50 bytes. Fifo will become full */ rv = svm_fifo_enqueue (f, 50, &test_data[200]); SFIFO_TEST (rv == vec_len (test_data) - 200, "free space expected %u is %u", vec_len (test_data) - 200, rv); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); rv = svm_fifo_max_enqueue (f); @@ -1749,6 +1819,7 @@ sfifo_test_fifo_shrink (vlib_main_t * vm, unformat_input_t * input) SFIFO_TEST (f->flags & SVM_FIFO_F_SHRINK, "shrink flag should be set"); SFIFO_TEST (!(f->flags & SVM_FIFO_F_COLLECT_CHUNKS), "collect flag should" " not be set"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* Dequeue a chunk and check nitems shrink but fifo still full */ @@ -1764,6 +1835,7 @@ sfifo_test_fifo_shrink (vlib_main_t * vm, unformat_input_t * input) SFIFO_TEST (f->flags & SVM_FIFO_F_SHRINK, "shrink flag should be set"); SFIFO_TEST (!(f->flags & SVM_FIFO_F_COLLECT_CHUNKS), "collect flag should" " not be set"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* Dequeue enough to unwrap the fifo */ deq_bytes = f->size - f->size / 2 - 300; @@ -1781,6 +1853,7 @@ sfifo_test_fifo_shrink (vlib_main_t * vm, unformat_input_t * input) " set"); SFIFO_TEST (f->flags & SVM_FIFO_F_COLLECT_CHUNKS, "collect flag should" " be set"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* Dequeue the rest */ svm_fifo_dequeue (f, test_n_bytes / 2, &data_buf[300 + deq_bytes]); @@ -1797,13 +1870,16 @@ sfifo_test_fifo_shrink (vlib_main_t * vm, unformat_input_t * input) SFIFO_TEST (rv == 8, "expected %u chunks got %u", 8, rv); SFIFO_TEST (!(f->flags & SVM_FIFO_F_COLLECT_CHUNKS), "collect flag should" " not be set"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); chunk_list_splice (collected, c); /* - * Remove all chunks possible + * Remove all chunks possible (1) + * + * Tail and head are in first chunk that is not removed */ - svm_fifo_init_pointers (f, 601, 601); + svm_fifo_init_pointers (f, 600, 600); rv = svm_fifo_reduce_size (f, 8 * chunk_size, 1); SFIFO_TEST (rv == 7 * chunk_size, "actual len expected %u is %u", 7 * chunk_size, rv); @@ -1814,10 +1890,12 @@ sfifo_test_fifo_shrink (vlib_main_t * vm, unformat_input_t * input) SFIFO_TEST (f->flags & SVM_FIFO_F_SHRINK, "shrink flag should be set"); SFIFO_TEST (!(f->flags & SVM_FIFO_F_COLLECT_CHUNKS), "collect flag should" " not be set"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); rv = svm_fifo_max_enqueue (f); SFIFO_TEST (rv == chunk_size, "free space expected %u is %u", chunk_size, rv); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* Force head/tail to move to first chunk */ svm_fifo_enqueue (f, 1, test_data); @@ -1832,6 +1910,57 @@ sfifo_test_fifo_shrink (vlib_main_t * vm, unformat_input_t * input) " set"); SFIFO_TEST (f->flags & SVM_FIFO_F_COLLECT_CHUNKS, "collect flag should" " be set"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); + + c = svm_fifo_collect_chunks (f); + rv = chunk_list_len (c); + SFIFO_TEST (rv == 7, "expected %u chunks got %u", 7, rv); + SFIFO_TEST (!(f->flags & SVM_FIFO_F_COLLECT_CHUNKS), "collect flag should" + " not be set"); + SFIFO_TEST (!(f->flags & SVM_FIFO_F_MULTI_CHUNK), "multi-chunk flag should" + " not be set"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); + + /* re-add chunks for next test */ + svm_fifo_add_chunk (f, c); + + /* + * Remove all chunks possible (2) + * + * Tail and head are in the first chunk that should eventually be removed + */ + svm_fifo_init_pointers (f, 601, 601); + rv = svm_fifo_reduce_size (f, 8 * chunk_size, 1); + SFIFO_TEST (rv == 7 * chunk_size, "actual len expected %u is %u", + 7 * chunk_size, rv); + SFIFO_TEST (f->size == 7 * chunk_size + 1, "size expected %u is %u", + 7 * chunk_size + 1, f->size); + SFIFO_TEST (f->nitems == 1 * chunk_size, "nitems expected %u is %u", + 1 * chunk_size, f->nitems); + SFIFO_TEST (f->flags & SVM_FIFO_F_SHRINK, "shrink flag should be set"); + SFIFO_TEST (!(f->flags & SVM_FIFO_F_COLLECT_CHUNKS), "collect flag should" + " not be set"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); + + rv = svm_fifo_max_enqueue (f); + SFIFO_TEST (rv == chunk_size, "free space expected %u is %u", chunk_size, + rv); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); + + /* Force head/tail to move to first chunk */ + svm_fifo_enqueue (f, chunk_size, test_data); + svm_fifo_dequeue (f, chunk_size, data_buf); + rv = svm_fifo_max_enqueue (f); + + SFIFO_TEST (rv == chunk_size, "free space expected %u is %u", chunk_size, + rv); + SFIFO_TEST (f->size == chunk_size + 1, "size expected %u is %u", + chunk_size + 1, f->size); + SFIFO_TEST (!(f->flags & SVM_FIFO_F_SHRINK), "shrink flag should not be" + " set"); + SFIFO_TEST (f->flags & SVM_FIFO_F_COLLECT_CHUNKS, "collect flag should" + " be set"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); c = svm_fifo_collect_chunks (f); rv = chunk_list_len (c); @@ -1840,6 +1969,7 @@ sfifo_test_fifo_shrink (vlib_main_t * vm, unformat_input_t * input) " not be set"); SFIFO_TEST (!(f->flags & SVM_FIFO_F_MULTI_CHUNK), "multi-chunk flag should" " not be set"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); chunk_list_splice (collected, c); @@ -1893,6 +2023,13 @@ sfifo_test_fifo_replay (vlib_main_t * vm, unformat_input_t * input) static fifo_segment_main_t segment_main; +static svm_fifo_t * +fifo_segment_alloc_fifo (fifo_segment_t * fs, u32 data_bytes, + fifo_segment_ftype_t ftype) +{ + return fifo_segment_alloc_fifo_w_slice (fs, 0, data_bytes, ftype); +} + static int sfifo_test_fifo_segment_hello_world (int verbose) { @@ -1982,6 +2119,7 @@ sfifo_test_fifo_segment_fifo_grow (int verbose) fifo_segment_grow_fifo (fs, f, fifo_size); SFIFO_TEST (f->size == 2 * fifo_size, "fifo size should be %u is %u", 2 * fifo_size, f->size); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); n_chunks = fifo_segment_num_free_chunks (fs, fifo_size); SFIFO_TEST (n_chunks == n_batch - 2, "free 2^10B chunks " @@ -2063,6 +2201,7 @@ sfifo_test_fifo_segment_fifo_grow (int verbose) SFIFO_TEST (n_free_chunk_bytes - 16 * fifo_size == rv, "free chunk bytes " "expected %u is %u", n_free_chunk_bytes - 16 * fifo_size, rv); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); fifo_segment_free_fifo (fs, f); rv = fifo_segment_fl_chunk_bytes (fs); @@ -2081,6 +2220,8 @@ sfifo_test_fifo_segment_fifo_grow (int verbose) 32 * fifo_size); f = fifo_segment_alloc_fifo (fs, 17 * fifo_size, FIFO_SEGMENT_RX_FIFO); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); + rv = fifo_segment_fl_chunk_bytes (fs); /* Make sure that the non-power of two chunk freed above is correctly @@ -2100,6 +2241,7 @@ sfifo_test_fifo_segment_fifo_grow (int verbose) */ f = fifo_segment_alloc_fifo (fs, n_free_chunk_bytes, FIFO_SEGMENT_RX_FIFO); SFIFO_TEST (f != 0, "allocation should work"); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); fifo_segment_free_fifo (fs, f); @@ -2216,9 +2358,7 @@ sfifo_test_fifo_segment_slave (int verbose) fifo_segment_create_args_t _a, *a = &_a; fifo_segment_main_t *sm = &segment_main; u8 *test_data, *retrieved_data = 0; - fifo_segment_t *sp; - fifo_segment_header_t *fsh; - ssvm_shared_header_t *sh; + fifo_segment_t *fs; svm_fifo_t *f; u32 *result; int rv, i; @@ -2233,13 +2373,11 @@ sfifo_test_fifo_segment_slave (int verbose) SFIFO_TEST (!rv, "svm_fifo_segment_attach returned %d", rv); - sp = fifo_segment_get_segment (sm, a->new_segment_indices[0]); + fs = fifo_segment_get_segment (sm, a->new_segment_indices[0]); vec_free (a->new_segment_indices); - sh = sp->ssvm.sh; - fsh = (fifo_segment_header_t *) sh->opaque[0]; /* might wanna wait.. */ - f = fsh->fifos; + f = fifo_segment_get_slice_fifo_list (fs, 0); /* Lazy bastards united */ test_data = format (0, "Hello world%c", 0); @@ -2388,7 +2526,7 @@ sfifo_test_fifo_segment_prealloc (int verbose) u32 max_pairs, pairs_req, free_space, pair_mem; svm_fifo_t *f, *old; fifo_segment_t *fs; - int rv; + int rv, alloc; clib_memset (a, 0, sizeof (*a)); @@ -2406,7 +2544,7 @@ sfifo_test_fifo_segment_prealloc (int verbose) free_space = fifo_segment_free_bytes (fs); SFIFO_TEST (free_space <= 256 << 10, "free space expected %u is %u", 256 << 10, free_space); - rv = fifo_segment_prealloc_fifo_chunks (fs, 4096, 50); + rv = fifo_segment_prealloc_fifo_chunks (fs, 0, 4096, 50); SFIFO_TEST (rv == 0, "chunk prealloc should work"); rv = fifo_segment_num_free_chunks (fs, 4096); SFIFO_TEST (rv == 50, "prealloc chunks expected %u is %u", 50, rv); @@ -2418,7 +2556,7 @@ sfifo_test_fifo_segment_prealloc (int verbose) SFIFO_TEST (rv == 4096 * 50, "chunk free space expected %u is %u", 4096 * 50, rv); - rv = fifo_segment_prealloc_fifo_hdrs (fs, 50); + rv = fifo_segment_prealloc_fifo_hdrs (fs, 0, 50); SFIFO_TEST (rv == 0, "fifo hdr prealloc should work"); rv = fifo_segment_num_free_fifos (fs); SFIFO_TEST (rv == 50, "prealloc fifo hdrs expected %u is %u", 50, rv); @@ -2438,26 +2576,39 @@ sfifo_test_fifo_segment_prealloc (int verbose) SFIFO_TEST (rv == 0, "prealloc chunks expected %u is %u", 0, rv); rv = fifo_segment_fl_chunk_bytes (fs); SFIFO_TEST (rv == 0, "chunk free space expected %u is %u", 0, rv); + SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); /* * Multiple preallocs that consume the remaining space */ + fifo_segment_update_free_bytes (fs); + free_space = fifo_segment_free_bytes (fs); pair_mem = 2 * (4096 + sizeof (*f) + sizeof (svm_fifo_chunk_t)); - max_pairs = pairs_req = free_space / pair_mem - 1; + max_pairs = pairs_req = (free_space / pair_mem) - 1; fifo_segment_preallocate_fifo_pairs (fs, 4096, 4096, &pairs_req); - SFIFO_TEST (pairs_req == 0, "prealloc pairs should work"); + SFIFO_TEST (pairs_req == 0, "prealloc pairs should work req %u", max_pairs); rv = fifo_segment_num_free_chunks (fs, 4096); SFIFO_TEST (rv == max_pairs * 2, "prealloc chunks expected %u is %u", max_pairs * 2, rv); - rv = fifo_segment_prealloc_fifo_chunks (fs, 4096, 2); - SFIFO_TEST (rv == 0, "chunk prealloc should work"); + fifo_segment_update_free_bytes (fs); + rv = fifo_segment_free_bytes (fs); + SFIFO_TEST (rv < 2 * pair_mem, "free bytes %u less than %u", rv, + 2 * pair_mem); + + /* Preallocate as many more chunks as possible. Heap is almost full + * so we may not use all the free space*/ + alloc = 0; + while (!fifo_segment_prealloc_fifo_chunks (fs, 0, 4096, 1)) + alloc++; + SFIFO_TEST (alloc, "chunk prealloc should work %u", alloc); rv = fifo_segment_num_free_chunks (fs, 4096); - SFIFO_TEST (rv == (max_pairs + 1) * 2, "prealloc chunks expected %u is %u", - (max_pairs + 1) * 2, rv); + SFIFO_TEST (rv == max_pairs * 2 + alloc, "prealloc chunks expected %u " + "is %u", max_pairs * 2 + alloc, rv); - free_space = fifo_segment_free_bytes (fs); - SFIFO_TEST (rv < 8192, "free bytes expected less than %u is %u", 8192, rv); + rv = fifo_segment_free_bytes (fs); + SFIFO_TEST (rv < pair_mem, "free bytes expected less than %u is %u", + pair_mem, rv); /* * Test negative prealloc cases @@ -2470,10 +2621,10 @@ sfifo_test_fifo_segment_prealloc (int verbose) f = fifo_segment_alloc_fifo (fs, 200 << 10, FIFO_SEGMENT_RX_FIFO); SFIFO_TEST (f == 0, "fifo alloc should fail"); - rv = fifo_segment_prealloc_fifo_chunks (fs, 4096, 50); + rv = fifo_segment_prealloc_fifo_chunks (fs, 0, 4096, 50); SFIFO_TEST (rv == -1, "chunk prealloc should fail"); - rv = fifo_segment_prealloc_fifo_hdrs (fs, 50); + rv = fifo_segment_prealloc_fifo_hdrs (fs, 0, 50); SFIFO_TEST (rv == -1, "fifo hdr prealloc should fail"); /* @@ -2490,7 +2641,7 @@ sfifo_test_fifo_segment (vlib_main_t * vm, unformat_input_t * input) { int rv, verbose = 0; - fifo_segment_main_init (&segment_main, 3ULL << 30, 5); + fifo_segment_main_init (&segment_main, HIGH_SEGMENT_BASEVA, 5); while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { if (unformat (input, "verbose"))