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 56761A0351 for ; Thu, 6 Aug 2020 11:57:44 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4FE221C0B9; Thu, 6 Aug 2020 11:57:44 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 6B5E41C0B9 for ; Thu, 6 Aug 2020 11:57:43 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id z18so39827068wrm.12 for ; Thu, 06 Aug 2020 02:57:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FzjXqVdjuZHQXY9lAyhSkfmL0roGReTPtmm68dvPCSs=; b=AnqtxMXiqEMuRYopf7bgJLDlvnKInt95vQDW3zPK43EibPuNv1yzqCjGxk9miICBOb 3VQ1NYSGBgEO89hGT5W5mE9OTQjZzZ0wbNzUnUr9sJWIXi8bZqwPUfnG/u6DzLXvrGq+ KBoO2zfn6j4Qt0MZCtmSy5NOyKTJTrb0wlvQ9jaiSOA873OvPmxWSwaUVoltNPF13yVX 8JE+1hZhNfVLDDNyfXk45L4cXBhV1IFg7P10W3NgfdtbRsTofNbPVMC12bfZfrRJa4V2 nNPJwQWL1jQWOcOcnJeos4l6HmizQz49nk2rzQPqro9b/JLgIkjdfPJTnnMuaRvzjssX Fv5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FzjXqVdjuZHQXY9lAyhSkfmL0roGReTPtmm68dvPCSs=; b=WvGhRrnfphbe1Df63gWAK/68cG0k/kpKy/lP7qG6Efc3iSYvlCymgMevqOQJHzh2CG Je9lEHcN8egJgSfrYcmJEJybvffng6G/7xJ+tZ/3m0U59hjitmSOCzYCnzqX46sFG060 fxdaEehILj6rJ8EaoZtSjHVCAIRLB8QxFFF+7LKAB9SMkYzrajOiaZZSxPZvXF5LjGap 35UZA0IONbnq83X2XduAumnWECieo7Uu3cAKeYzk5nXzLvUENaU+ZA5eBlWNC9mOnCLX MbGYPRzclqgNcTXrjQ634hpoRbvMBWiVoaAsqguIS4CcrJVdnMqi8DMC4Kxkecd8aoM8 rpqA== X-Gm-Message-State: AOAM531P9ZekCDfm3xV1ZG+GFgN1ubt0i7UG5AO3zOac6fdOyROsH7V/ eJ1EIDtDYQKumOBHKaW9Pss67BFcvYs= X-Google-Smtp-Source: ABdhPJx/JWCU1Gcjuf7xQPlZq+1Q4DJelB8fsFOk1utkEJ32c8TXoQlDqLpJXAm+rloAGd7mEfC9pA== X-Received: by 2002:adf:fa09:: with SMTP id m9mr6539867wrr.130.1596707863185; Thu, 06 Aug 2020 02:57:43 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id v12sm5818809wri.47.2020.08.06.02.57.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 02:57:42 -0700 (PDT) From: luca.boccassi@gmail.com To: Ruifeng Wang Cc: Gavin Hu , dpdk stable Date: Thu, 6 Aug 2020 10:53:30 +0100 Message-Id: <20200806095411.774624-2-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200806095411.774624-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> <20200806095411.774624-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/cycles: restore default delay callback' has been queued to stable release 19.11.4 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 stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/08/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. Thanks. Luca Boccassi --- >From 1f1c4cff4cef1b647fabcf91aed4341340d8caa4 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 --- app/test/test_cycles.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/test/test_cycles.c b/app/test/test_cycles.c index c78e6a5b1..97d42f303 100644 --- a/app/test/test_cycles.c +++ b/app/test/test_cycles.c @@ -79,8 +79,14 @@ REGISTER_TEST_COMMAND(cycles_autotest, test_cycles); 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; } REGISTER_TEST_COMMAND(delay_us_sleep_autotest, test_delay_us_sleep); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-06 10:53:15.898561098 +0100 +++ 0002-test-cycles-restore-default-delay-callback.patch 2020-08-06 10:53:15.696595342 +0100 @@ -1,8 +1,10 @@ -From ec0b862d5e52db12932c3125d06081307aea6af4 Mon Sep 17 00:00:00 2001 +From 1f1c4cff4cef1b647fabcf91aed4341340d8caa4 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. @@ -10,7 +12,6 @@ Restore default delay function after the test to fix the issue. Fixes: a51639cc720a ("eal: add nanosleep based delay function") -Cc: stable@dpdk.org Signed-off-by: Ruifeng Wang Reviewed-by: Gavin Hu