From patchwork Tue Feb 3 20:42:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Sanford X-Patchwork-Id: 2934 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 1A6EBAD88; Tue, 3 Feb 2015 21:42:20 +0100 (CET) Received: from mail-yk0-f171.google.com (mail-yk0-f171.google.com [209.85.160.171]) by dpdk.org (Postfix) with ESMTP id 3256DAD86 for ; Tue, 3 Feb 2015 21:42:19 +0100 (CET) Received: by mail-yk0-f171.google.com with SMTP id 10so25464661ykt.2 for ; Tue, 03 Feb 2015 12:42:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=XfLTrZp+ttRBAMIugJq0ouKs1uKj8erxh6BxjtaQ08w=; b=krJTi4+JJiVxb9+8zutXpw7AU+8MLzmH9rm8ic1UcXgfsZKtsx9HqRJE+s/k+KowY8 /2RH55qLAzkvKrY0EPiC3oktgfvP+x0NHm92tWuLasOmvr8vKEzpIK9lfUVcxJZSJb8T sjrCoC0+CBlNxH4N0aZsuFF31Gf/TrROljkiuoc+zkaGRRuKKGefI2cbmr3PZGm2y1hw WornaUh5FjExst+Icc0AqBkXyqxPrvtuzyrchv4H1zhZsdzHU9tzVXkeoR1slj3kksua ieW7kfXMNBuT4dgM5RD4P8JDnBj2+EOHNvZaKPrBw+jx5bvlm7OsHrnN/9fj6MzdfLBE TcEw== X-Received: by 10.236.1.234 with SMTP id 70mr11453777yhd.64.1422996138597; Tue, 03 Feb 2015 12:42:18 -0800 (PST) Received: from localhost.localdomain ([23.79.237.14]) by mx.google.com with ESMTPSA id 35sm14900358yhu.32.2015.02.03.12.42.16 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Feb 2015 12:42:17 -0800 (PST) From: rsanford2@gmail.com To: dev@dpdk.org Date: Tue, 3 Feb 2015 15:42:07 -0500 Message-Id: <1422996127-64370-1-git-send-email-rsanford2@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [dpdk-dev] [RFC PATCH] rte_timer: Fix rte_timer_reset return value X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Robert Sanford - API rte_timer_reset() should return -1 when the timer is in the RUNNING or CONFIG state. Instead, it ignores the return value of internal function __rte_timer_reset() and always returns 0. We change rte_timer_reset() to return the value returned by __rte_timer_reset(). - Change API rte_timer_reset_sync() to invoke rte_pause() while spin-waiting for rte_timer_reset() to succeed. - Enhance timer stress test 2 to report how many timer reset collisions occur, i.e., how many times rte_timer_reset() fails due to a timer being in the CONFIG state. Signed-off-by: Robert Sanford Acked-by: Olivier Matz --- app/test/test_timer.c | 25 ++++++++++++++++++++++--- lib/librte_timer/rte_timer.c | 7 +++---- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/app/test/test_timer.c b/app/test/test_timer.c index 4b4800b..2f27f84 100644 --- a/app/test/test_timer.c +++ b/app/test/test_timer.c @@ -247,12 +247,15 @@ static int timer_stress2_main_loop(__attribute__((unused)) void *arg) { static struct rte_timer *timers; - int i; + int i, ret; static volatile int ready = 0; uint64_t delay = rte_get_timer_hz() / 4; unsigned lcore_id = rte_lcore_id(); + int32_t my_collisions = 0; + static rte_atomic32_t collisions = RTE_ATOMIC32_INIT(0); if (lcore_id == rte_get_master_lcore()) { + cb_count = 0; timers = rte_malloc(NULL, sizeof(*timers) * NB_STRESS2_TIMERS, 0); if (timers == NULL) { printf("Test Failed\n"); @@ -268,15 +271,24 @@ timer_stress2_main_loop(__attribute__((unused)) void *arg) } /* 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, rte_get_master_lcore(), 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); ready = 0; rte_delay_ms(500); /* now check that we get the right number of callbacks */ if (lcore_id == rte_get_master_lcore()) { + if ((my_collisions = rte_atomic32_read(&collisions)) != 0) + printf("- %d timer reset collisions (OK)\n", my_collisions); rte_timer_manage(); if (cb_count != NB_STRESS2_TIMERS) { printf("Test Failed\n"); @@ -311,6 +323,13 @@ timer_stress2_main_loop(__attribute__((unused)) void *arg) /* now check that we get the right number of callbacks */ if (lcore_id == rte_get_master_lcore()) { rte_timer_manage(); + + /* clean up statics, in case we run again */ + rte_free(timers); + timers = 0; + ready = 0; + rte_atomic32_set(&collisions, 0); + if (cb_count != NB_STRESS2_TIMERS) { printf("Test Failed\n"); printf("- Stress test 2, part 2 failed\n"); diff --git a/lib/librte_timer/rte_timer.c b/lib/librte_timer/rte_timer.c index 269a992..d18abf5 100644 --- a/lib/librte_timer/rte_timer.c +++ b/lib/librte_timer/rte_timer.c @@ -424,10 +424,8 @@ rte_timer_reset(struct rte_timer *tim, uint64_t ticks, else period = 0; - __rte_timer_reset(tim, cur_time + ticks, period, tim_lcore, + return __rte_timer_reset(tim, cur_time + ticks, period, tim_lcore, fct, arg, 0); - - return 0; } /* loop until rte_timer_reset() succeed */ @@ -437,7 +435,8 @@ rte_timer_reset_sync(struct rte_timer *tim, uint64_t ticks, rte_timer_cb_t fct, void *arg) { while (rte_timer_reset(tim, ticks, type, tim_lcore, - fct, arg) != 0); + fct, arg) != 0) + rte_pause(); } /* Stop the timer associated with the timer handle tim */