From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 14146A04B1 for ; Fri, 28 Aug 2020 12:14:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 06F29A3; Fri, 28 Aug 2020 12:14:11 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 9E6DE1C114 for ; Fri, 28 Aug 2020 12:14:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598609649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DySXDoBvMwWgIQA4NUMSReQ7f8MsPdhNTk1F4HNTYsk=; b=EZCXZgnrPdt5rNrCCm1g63BdKZKBdHgg6z5GofHV2v2hG7iW4POaRL6WpGLzfDQHz0ZN+D Iy+7Btd6ZXmkUSlZmY1fqHuD1DxTSDM1l0/51njQmnxQvuHGwzEKIgyjN5Xq6KFmUa6B/G yuQf1/AQnzoXjLItpXOc3KluCwU7TXI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-3-tZuvADpcOHe5ECuDSlUjyg-1; Fri, 28 Aug 2020 06:14:05 -0400 X-MC-Unique: tZuvADpcOHe5ECuDSlUjyg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 27F95802B76; Fri, 28 Aug 2020 10:14:04 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2357B19D7C; Fri, 28 Aug 2020 10:14:02 +0000 (UTC) From: Kevin Traynor To: Ruifeng Wang Cc: Gavin Hu , dpdk stable Date: Fri, 28 Aug 2020 11:12:46 +0100 Message-Id: <20200828101308.223767-20-ktraynor@redhat.com> In-Reply-To: <20200828101308.223767-1-ktraynor@redhat.com> References: <20200828101308.223767-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/cycles: restore default delay callback' has been queued to LTS release 18.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 18.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/02/20. 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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/cd89b1b7c32e558898bfb81af0f166ace3f01a6f Thanks. Kevin. --- >From cd89b1b7c32e558898bfb81af0f166ace3f01a6f Mon Sep 17 00:00:00 2001 From: Ruifeng Wang Date: Mon, 27 Jul 2020 18:21:50 +0800 Subject: [PATCH] test/cycles: restore default delay callback [ upstream commit ec0b862d5e52db12932c3125d06081307aea6af4 ] test_delay_us_sleep registers sleep based delay for testing. This changes the default delay function of testing environment. It is not expected. Restore default delay function after the test to fix the issue. Fixes: a51639cc720a ("eal: add nanosleep based delay function") Signed-off-by: Ruifeng Wang Reviewed-by: Gavin Hu --- test/test/test_cycles.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/test/test_cycles.c b/test/test/test_cycles.c index c78e6a5b12..97d42f3032 100644 --- a/test/test/test_cycles.c +++ b/test/test/test_cycles.c @@ -80,6 +80,12 @@ static int test_delay_us_sleep(void) { + int rv; + rte_delay_us_callback_register(rte_delay_us_sleep); - return check_wait_one_second(); + rv = check_wait_one_second(); + /* restore original delay function */ + rte_delay_us_callback_register(rte_delay_us_block); + + return rv; } -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-28 11:03:26.423272735 +0100 +++ 0020-test-cycles-restore-default-delay-callback.patch 2020-08-28 11:03:25.946955632 +0100 @@ -1 +1 @@ -From ec0b862d5e52db12932c3125d06081307aea6af4 Mon Sep 17 00:00:00 2001 +From cd89b1b7c32e558898bfb81af0f166ace3f01a6f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ec0b862d5e52db12932c3125d06081307aea6af4 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ - app/test/test_cycles.c | 8 +++++++- + test/test/test_cycles.c | 8 +++++++- @@ -21 +22 @@ -diff --git a/app/test/test_cycles.c b/app/test/test_cycles.c +diff --git a/test/test/test_cycles.c b/test/test/test_cycles.c @@ -23,2 +24,2 @@ ---- a/app/test/test_cycles.c -+++ b/app/test/test_cycles.c +--- a/test/test/test_cycles.c ++++ b/test/test/test_cycles.c