X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_timer.c;h=bc07925e2409910315c5931368b24e62c52a8823;hb=775a8cfc46969a4bb0e7206a2e7b2a630f2f0966;hp=0eba5f7fe3d770895202bb58fa7b11d7a83440f8;hpb=591a9d7985c1230652d9f7ea1f9221e8c66ec188;p=dpdk.git diff --git a/app/test/test_timer.c b/app/test/test_timer.c index 0eba5f7fe3..bc07925e24 100644 --- a/app/test/test_timer.c +++ b/app/test/test_timer.c @@ -1,13 +1,13 @@ /*- * BSD LICENSE - * + * * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright @@ -17,7 +17,7 @@ * * Neither the name of Intel Corporation nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -33,7 +33,6 @@ #include "test.h" -#ifdef RTE_LIBRTE_TIMER /* * Timer * ===== @@ -130,7 +129,6 @@ #include #include #include -#include #include #include #include @@ -139,13 +137,13 @@ #include #include - -#define TEST_DURATION_S 20 /* in seconds */ +#define TEST_DURATION_S 1 /* in seconds */ #define NB_TIMER 4 #define RTE_LOGTYPE_TESTTIMER RTE_LOGTYPE_USER3 static volatile uint64_t end_time; +static volatile int test_failed; struct mytimerinfo { struct rte_timer tim; @@ -232,6 +230,64 @@ timer_stress_main_loop(__attribute__((unused)) void *arg) return 0; } +/* Need to synchronize slave lcores through multiple steps. */ +enum { SLAVE_WAITING = 1, SLAVE_RUN_SIGNAL, SLAVE_RUNNING, SLAVE_FINISHED }; +static rte_atomic16_t slave_state[RTE_MAX_LCORE]; + +static void +master_init_slaves(void) +{ + unsigned i; + + RTE_LCORE_FOREACH_SLAVE(i) { + rte_atomic16_set(&slave_state[i], SLAVE_WAITING); + } +} + +static void +master_start_slaves(void) +{ + unsigned i; + + RTE_LCORE_FOREACH_SLAVE(i) { + rte_atomic16_set(&slave_state[i], SLAVE_RUN_SIGNAL); + } + RTE_LCORE_FOREACH_SLAVE(i) { + while (rte_atomic16_read(&slave_state[i]) != SLAVE_RUNNING) + rte_pause(); + } +} + +static void +master_wait_for_slaves(void) +{ + unsigned i; + + RTE_LCORE_FOREACH_SLAVE(i) { + while (rte_atomic16_read(&slave_state[i]) != SLAVE_FINISHED) + rte_pause(); + } +} + +static void +slave_wait_to_start(void) +{ + unsigned lcore_id = rte_lcore_id(); + + while (rte_atomic16_read(&slave_state[lcore_id]) != SLAVE_RUN_SIGNAL) + rte_pause(); + rte_atomic16_set(&slave_state[lcore_id], SLAVE_RUNNING); +} + +static void +slave_finish(void) +{ + unsigned lcore_id = rte_lcore_id(); + + rte_atomic16_set(&slave_state[lcore_id], SLAVE_FINISHED); +} + + static volatile int cb_count = 0; /* callback for second stress test. will only be called @@ -248,78 +304,125 @@ static int timer_stress2_main_loop(__attribute__((unused)) void *arg) { static struct rte_timer *timers; - int i; - static volatile int ready = 0; - uint64_t delay = rte_get_timer_hz() / 4; + int i, ret; + uint64_t delay = rte_get_timer_hz() / 20; unsigned lcore_id = rte_lcore_id(); - - if (lcore_id == rte_get_master_lcore()) { + unsigned master = rte_get_master_lcore(); + int32_t my_collisions = 0; + static rte_atomic32_t collisions; + + if (lcore_id == master) { + cb_count = 0; + test_failed = 0; + rte_atomic32_set(&collisions, 0); + master_init_slaves(); timers = rte_malloc(NULL, sizeof(*timers) * NB_STRESS2_TIMERS, 0); if (timers == NULL) { printf("Test Failed\n"); printf("- Cannot allocate memory for timers\n" ); - return -1; + test_failed = 1; + master_start_slaves(); + goto cleanup; } for (i = 0; i < NB_STRESS2_TIMERS; i++) rte_timer_init(&timers[i]); - ready = 1; + master_start_slaves(); } else { - while (!ready) - rte_pause(); + slave_wait_to_start(); + if (test_failed) + goto cleanup; } /* have all cores schedule all timers on master lcore */ - for (i = 0; i < NB_STRESS2_TIMERS; i++) - rte_timer_reset(&timers[i], delay, SINGLE, rte_get_master_lcore(), + for (i = 0; i < NB_STRESS2_TIMERS; i++) { + ret = rte_timer_reset(&timers[i], delay, SINGLE, master, timer_stress2_cb, NULL); + /* there will be collisions when multiple cores simultaneously + * configure the same timers */ + if (ret != 0) + my_collisions++; + } + if (my_collisions != 0) + rte_atomic32_add(&collisions, my_collisions); + + /* wait long enough for timers to expire */ + rte_delay_ms(100); - ready = 0; - rte_delay_ms(500); + /* all cores rendezvous */ + if (lcore_id == master) { + master_wait_for_slaves(); + } else { + slave_finish(); + } /* now check that we get the right number of callbacks */ - if (lcore_id == rte_get_master_lcore()) { + if (lcore_id == master) { + my_collisions = rte_atomic32_read(&collisions); + if (my_collisions != 0) + printf("- %d timer reset collisions (OK)\n", my_collisions); rte_timer_manage(); if (cb_count != NB_STRESS2_TIMERS) { printf("Test Failed\n"); printf("- Stress test 2, part 1 failed\n"); printf("- Expected %d callbacks, got %d\n", NB_STRESS2_TIMERS, cb_count); - return -1; + test_failed = 1; + master_start_slaves(); + goto cleanup; } - ready = 1; + cb_count = 0; + + /* proceed */ + master_start_slaves(); } else { - while (!ready) - rte_pause(); + /* proceed */ + slave_wait_to_start(); + if (test_failed) + goto cleanup; } /* now test again, just stop and restart timers at random after init*/ for (i = 0; i < NB_STRESS2_TIMERS; i++) - rte_timer_reset(&timers[i], delay, SINGLE, rte_get_master_lcore(), + rte_timer_reset(&timers[i], delay, SINGLE, master, timer_stress2_cb, NULL); - cb_count = 0; /* pick random timer to reset, stopping them first half the time */ for (i = 0; i < 100000; i++) { int r = rand() % NB_STRESS2_TIMERS; if (i % 2) rte_timer_stop(&timers[r]); - rte_timer_reset(&timers[r], delay, SINGLE, rte_get_master_lcore(), + rte_timer_reset(&timers[r], delay, SINGLE, master, timer_stress2_cb, NULL); } - rte_delay_ms(500); + /* wait long enough for timers to expire */ + rte_delay_ms(100); /* now check that we get the right number of callbacks */ - if (lcore_id == rte_get_master_lcore()) { + if (lcore_id == master) { + master_wait_for_slaves(); + rte_timer_manage(); if (cb_count != NB_STRESS2_TIMERS) { printf("Test Failed\n"); printf("- Stress test 2, part 2 failed\n"); printf("- Expected %d callbacks, got %d\n", NB_STRESS2_TIMERS, cb_count); - return -1; + test_failed = 1; + } else { + printf("Test OK\n"); } - printf("Test OK\n"); + } + +cleanup: + if (lcore_id == master) { + master_wait_for_slaves(); + if (timers != NULL) { + rte_free(timers); + timers = NULL; + } + } else { + slave_finish(); } return 0; @@ -392,13 +495,13 @@ timer_basic_main_loop(__attribute__((unused)) void *arg) /* launch all timers on core 0 */ if (lcore_id == rte_get_master_lcore()) { - mytimer_reset(&mytiminfo[0], hz, SINGLE, lcore_id, + mytimer_reset(&mytiminfo[0], hz/4, SINGLE, lcore_id, timer_basic_cb); - mytimer_reset(&mytiminfo[1], hz*2, SINGLE, lcore_id, + mytimer_reset(&mytiminfo[1], hz/2, SINGLE, lcore_id, timer_basic_cb); - mytimer_reset(&mytiminfo[2], hz, PERIODICAL, lcore_id, + mytimer_reset(&mytiminfo[2], hz/4, PERIODICAL, lcore_id, timer_basic_cb); - mytimer_reset(&mytiminfo[3], hz, PERIODICAL, + mytimer_reset(&mytiminfo[3], hz/4, PERIODICAL, rte_get_next_lcore(lcore_id, 0, 1), timer_basic_cb); } @@ -457,7 +560,7 @@ timer_sanity_check(void) return 0; } -int +static int test_timer(void) { unsigned i; @@ -467,12 +570,12 @@ test_timer(void) /* sanity check our timer sources and timer config values */ if (timer_sanity_check() < 0) { printf("Timer sanity checks failed\n"); - return -1; + return TEST_FAILED; } if (rte_lcore_count() < 2) { printf("not enough lcores for this test\n"); - return -1; + return TEST_FAILED; } /* init timer */ @@ -488,7 +591,7 @@ test_timer(void) end_time = cur_time + (hz * TEST_DURATION_S); /* start other cores */ - printf("Start timer stress tests (%d seconds)\n", TEST_DURATION_S); + printf("Start timer stress tests\n"); rte_eal_mp_remote_launch(timer_stress_main_loop, NULL, CALL_MASTER); rte_eal_mp_wait_lcore(); @@ -496,9 +599,12 @@ test_timer(void) rte_timer_stop_sync(&mytiminfo[0].tim); /* run a second, slightly different set of stress tests */ - printf("Start timer stress tests 2\n"); + printf("\nStart timer stress tests 2\n"); + test_failed = 0; rte_eal_mp_remote_launch(timer_stress2_main_loop, NULL, CALL_MASTER); rte_eal_mp_wait_lcore(); + if (test_failed) + return TEST_FAILED; /* calculate the "end of test" time */ cur_time = rte_get_timer_cycles(); @@ -506,7 +612,7 @@ test_timer(void) end_time = cur_time + (hz * TEST_DURATION_S); /* start other cores */ - printf("Start timer basic tests (%d seconds)\n", TEST_DURATION_S); + printf("\nStart timer basic tests\n"); rte_eal_mp_remote_launch(timer_basic_main_loop, NULL, CALL_MASTER); rte_eal_mp_wait_lcore(); @@ -517,15 +623,11 @@ test_timer(void) rte_timer_dump_stats(stdout); - return 0; + return TEST_SUCCESS; } -#else - -int -test_timer(void) -{ - return 0; -} - -#endif +static struct test_command timer_cmd = { + .command = "timer_autotest", + .callback = test_timer, +}; +REGISTER_TEST_COMMAND(timer_cmd);