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 8D99AA04B5 for ; Tue, 3 Dec 2019 19:29:16 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7A2591BFC0; Tue, 3 Dec 2019 19:29:16 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 3298B235 for ; Tue, 3 Dec 2019 19:29:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575397754; 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=rDlYvdwPEKU3Opu8H0jp2yk0Mlq3TK4y7yjELyWq2bM=; b=Fkd5Riv3Ajdg8pZDkBQkdyETd8oXnLzWapLPnA+FL3Rd+J8VGbFOusvci61MKZnIGscb+b g/JUkTjW3wq0WRVzBewmEtx0Mf7YeUKKjkxVBR7sdGuOnkPPcg9oqOziUmaTncwklD9SYf yOkU1qjlv/jsIbAvEJZswVY+WBj/WY8= 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-324-A6o6T0V7NRiG2TlymKDC4w-1; Tue, 03 Dec 2019 13:29:11 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A4A918017CC; Tue, 3 Dec 2019 18:29:10 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-10.ams2.redhat.com [10.36.117.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id A541B5C240; Tue, 3 Dec 2019 18:29:09 +0000 (UTC) From: Kevin Traynor To: Krzysztof Kanas Cc: Ferruh Yigit , dpdk stable Date: Tue, 3 Dec 2019 18:27:06 +0000 Message-Id: <20191203182714.17297-57-ktraynor@redhat.com> In-Reply-To: <20191203182714.17297-1-ktraynor@redhat.com> References: <20191203182714.17297-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: A6o6T0V7NRiG2TlymKDC4w-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'test/bonding: fix LSC timeout unit' has been queued to LTS release 18.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/10/19. 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 rebasi= ng (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/92322df07531db0184= 7eb6fad9510d99e46bdcba Thanks. Kevin. --- >From 92322df07531db01847eb6fad9510d99e46bdcba Mon Sep 17 00:00:00 2001 From: Krzysztof Kanas Date: Fri, 23 Aug 2019 10:16:59 +0200 Subject: [PATCH] test/bonding: fix LSC timeout unit [ upstream commit 7de47c3c2377115ba5d37d3432c0b348a40572a9 ] Fixes: 76d29903f5f5 ("bond: support link status interrupt") Signed-off-by: Krzysztof Kanas Reviewed-by: Ferruh Yigit --- test/test/test_link_bonding.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/test/test_link_bonding.c b/test/test/test_link_bonding.c index 11cc2c9b2..7a44de168 100644 --- a/test/test/test_link_bonding.c +++ b/test/test/test_link_bonding.c @@ -1126,5 +1126,5 @@ test_adding_slave_after_bonded_device_started(void) =20 #define TEST_STATUS_INTERRUPT_SLAVE_COUNT=094 -#define TEST_LSC_WAIT_TIMEOUT_MS=09500 +#define TEST_LSC_WAIT_TIMEOUT_US=09500000 =20 int test_lsc_interrupt_count; @@ -1219,5 +1219,5 @@ test_status_interrupt(void) =09=09=09test_params->slave_port_ids[3], 0); =20 -=09TEST_ASSERT(lsc_timeout(TEST_LSC_WAIT_TIMEOUT_MS) =3D=3D 0, +=09TEST_ASSERT(lsc_timeout(TEST_LSC_WAIT_TIMEOUT_US) =3D=3D 0, =09=09=09"timed out waiting for interrupt"); =20 @@ -1238,5 +1238,5 @@ test_status_interrupt(void) =09=09=09test_params->slave_port_ids[0], 1); =20 -=09TEST_ASSERT(lsc_timeout(TEST_LSC_WAIT_TIMEOUT_MS) =3D=3D 0, +=09TEST_ASSERT(lsc_timeout(TEST_LSC_WAIT_TIMEOUT_US) =3D=3D 0, =09=09=09"timed out waiting for interrupt"); =20 @@ -1252,5 +1252,5 @@ test_status_interrupt(void) =09=09=09test_params->slave_port_ids[0], 1); =20 -=09TEST_ASSERT(lsc_timeout(TEST_LSC_WAIT_TIMEOUT_MS) !=3D 0, +=09TEST_ASSERT(lsc_timeout(TEST_LSC_WAIT_TIMEOUT_US) !=3D 0, =09=09=09"received unexpected interrupt"); =20 --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-03 17:29:55.037198356 +0000 +++ 0057-test-bonding-fix-LSC-timeout-unit.patch=092019-12-03 17:29:51.7847= 49245 +0000 @@ -1 +1 @@ -From 7de47c3c2377115ba5d37d3432c0b348a40572a9 Mon Sep 17 00:00:00 2001 +From 92322df07531db01847eb6fad9510d99e46bdcba Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7de47c3c2377115ba5d37d3432c0b348a40572a9 ] + @@ -7 +8,0 @@ -Cc: stable@dpdk.org @@ -12 +13 @@ - app/test/test_link_bonding.c | 8 ++++---- + test/test/test_link_bonding.c | 8 ++++---- @@ -15,5 +16,5 @@ -diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c -index b5ce9dbb4..3a46f943f 100644 ---- a/app/test/test_link_bonding.c -+++ b/app/test/test_link_bonding.c -@@ -1169,5 +1169,5 @@ test_adding_slave_after_bonded_device_started(void) +diff --git a/test/test/test_link_bonding.c b/test/test/test_link_bonding.c +index 11cc2c9b2..7a44de168 100644 +--- a/test/test/test_link_bonding.c ++++ b/test/test/test_link_bonding.c +@@ -1126,5 +1126,5 @@ test_adding_slave_after_bonded_device_started(void) @@ -26 +27 @@ -@@ -1262,5 +1262,5 @@ test_status_interrupt(void) +@@ -1219,5 +1219,5 @@ test_status_interrupt(void) @@ -33 +34 @@ -@@ -1281,5 +1281,5 @@ test_status_interrupt(void) +@@ -1238,5 +1238,5 @@ test_status_interrupt(void) @@ -40 +41 @@ -@@ -1295,5 +1295,5 @@ test_status_interrupt(void) +@@ -1252,5 +1252,5 @@ test_status_interrupt(void)