From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 51DA2A0C45 for ; Thu, 10 Jun 2021 14:07:00 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4BA214069B; Thu, 10 Jun 2021 14:07:00 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 6AF914069B for ; Thu, 10 Jun 2021 14:06:58 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lrJSc-0008PG-85; Thu, 10 Jun 2021 12:06:58 +0000 From: Christian Ehrhardt To: Chengchang Tang Cc: Min Hu , dpdk stable Date: Thu, 10 Jun 2021 14:05:54 +0200 Message-Id: <20210610120641.885862-6-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210610120641.885862-1-christian.ehrhardt@canonical.com> References: <20210610120641.885862-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples/timer: fix time interval' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/12/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/075ddf5387cf934e36f60e7e9b495ea5f27ebc91 Thanks. Christian Ehrhardt --- >From 075ddf5387cf934e36f60e7e9b495ea5f27ebc91 Mon Sep 17 00:00:00 2001 From: Chengchang Tang Date: Thu, 6 May 2021 17:29:36 +0800 Subject: [PATCH] examples/timer: fix time interval [ upstream commit 80aa15c4dff24e7a3b549f8dca37c16ae7220920 ] Timer sample example assumes that the frequency of the timer is about 2Ghz to control the period of calling rte_timer_manage(). But this assumption is easy to fail. For example. the frequency of tsc on ARM64 is much less than 2Ghz. This patch uses the frequency of the current timer to calculate the correct time interval to ensure consistent result on all platforms. In addition, the rte_rdtsc() is replaced with the more recommended rte_get_timer_cycles function in this patch. Fixes: af75078fece3 ("first public release") Signed-off-by: Chengchang Tang Signed-off-by: Min Hu (Connor) --- examples/timer/main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/timer/main.c b/examples/timer/main.c index 9f1730f932..065d1ccb68 100644 --- a/examples/timer/main.c +++ b/examples/timer/main.c @@ -18,8 +18,7 @@ #include #include -#define TIMER_RESOLUTION_CYCLES 20000000ULL /* around 10ms at 2 Ghz */ - +static uint64_t timer_resolution_cycles; static struct rte_timer timer0; static struct rte_timer timer1; @@ -66,15 +65,14 @@ lcore_mainloop(__attribute__((unused)) void *arg) while (1) { /* - * Call the timer handler on each core: as we don't - * need a very precise timer, so only call - * rte_timer_manage() every ~10ms (at 2Ghz). In a real - * application, this will enhance performances as - * reading the HPET timer is not efficient. + * Call the timer handler on each core: as we don't need a + * very precise timer, so only call rte_timer_manage() + * every ~10ms. In a real application, this will enhance + * performances as reading the HPET timer is not efficient. */ - cur_tsc = rte_rdtsc(); + cur_tsc = rte_get_timer_cycles(); diff_tsc = cur_tsc - prev_tsc; - if (diff_tsc > TIMER_RESOLUTION_CYCLES) { + if (diff_tsc > timer_resolution_cycles) { rte_timer_manage(); prev_tsc = cur_tsc; } @@ -100,8 +98,10 @@ main(int argc, char **argv) rte_timer_init(&timer0); rte_timer_init(&timer1); - /* load timer0, every second, on master lcore, reloaded automatically */ hz = rte_get_timer_hz(); + timer_resolution_cycles = hz * 10 / 1000; /* around 10ms */ + + /* load timer0, every second, on main lcore, reloaded automatically */ lcore_id = rte_lcore_id(); rte_timer_reset(&timer0, hz, PERIODICAL, lcore_id, timer0_cb, NULL); -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-10 14:04:58.384538034 +0200 +++ 0006-examples-timer-fix-time-interval.patch 2021-06-10 14:04:57.998024139 +0200 @@ -1 +1 @@ -From 80aa15c4dff24e7a3b549f8dca37c16ae7220920 Mon Sep 17 00:00:00 2001 +From 075ddf5387cf934e36f60e7e9b495ea5f27ebc91 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 80aa15c4dff24e7a3b549f8dca37c16ae7220920 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index d67301e3c4..d270ce49dc 100644 +index 9f1730f932..065d1ccb68 100644 @@ -40 +41 @@ -@@ -66,15 +65,14 @@ lcore_mainloop(__rte_unused void *arg) +@@ -66,15 +65,14 @@ lcore_mainloop(__attribute__((unused)) void *arg) @@ -66 +67 @@ -- /* load timer0, every second, on main lcore, reloaded automatically */ +- /* load timer0, every second, on master lcore, reloaded automatically */