[dpdk-stable] patch 'test/bonding: fix LSC related cases' has been queued to LTS release 17.11.10

luca.boccassi at gmail.com luca.boccassi at gmail.com
Thu Dec 19 15:33:24 CET 2019


Hi,

FYI, your patch has been queued to LTS release 17.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 12/21/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 rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 31ac35409378d56405e3da055a640f7a9f2a66be Mon Sep 17 00:00:00 2001
From: Krzysztof Kanas <kkanas at marvell.com>
Date: Fri, 23 Aug 2019 10:16:58 +0200
Subject: [PATCH] test/bonding: fix LSC related cases

[ upstream commit 88524d6b8b339278c95df3a0a894054c365daf13 ]

On rare situation test_link_bonding test case fail due to timespec
tv_nsec overflow, which causes pthread_cond_timedwait to return EINVAL
and test to fail.

Fixes: 76d29903f5f5 ("bond: support link status interrupt")

Signed-off-by: Krzysztof Kanas <kkanas at marvell.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 test/test/test_link_bonding.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/test/test_link_bonding.c b/test/test/test_link_bonding.c
index c6e3a725bd..0d5101cee0 100644
--- a/test/test/test_link_bonding.c
+++ b/test/test/test_link_bonding.c
@@ -1207,6 +1207,11 @@ lsc_timeout(int wait_us)
 	ts.tv_sec = tp.tv_sec;
 	ts.tv_nsec = tp.tv_usec * 1000;
 	ts.tv_nsec += wait_us * 1000;
+	/* Normalize tv_nsec to [0,999999999L] */
+	while (ts.tv_nsec > 1000000000L) {
+		ts.tv_nsec -= 1000000000L;
+		ts.tv_sec += 1;
+	}
 
 	pthread_mutex_lock(&mutex);
 	if (test_lsc_interrupt_count < 1)
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:28.586305112 +0000
+++ 0057-test-bonding-fix-LSC-related-cases.patch	2019-12-19 14:32:26.105297825 +0000
@@ -1,26 +1,27 @@
-From 88524d6b8b339278c95df3a0a894054c365daf13 Mon Sep 17 00:00:00 2001
+From 31ac35409378d56405e3da055a640f7a9f2a66be Mon Sep 17 00:00:00 2001
 From: Krzysztof Kanas <kkanas at marvell.com>
 Date: Fri, 23 Aug 2019 10:16:58 +0200
 Subject: [PATCH] test/bonding: fix LSC related cases
 
+[ upstream commit 88524d6b8b339278c95df3a0a894054c365daf13 ]
+
 On rare situation test_link_bonding test case fail due to timespec
 tv_nsec overflow, which causes pthread_cond_timedwait to return EINVAL
 and test to fail.
 
 Fixes: 76d29903f5f5 ("bond: support link status interrupt")
-Cc: stable at dpdk.org
 
 Signed-off-by: Krzysztof Kanas <kkanas at marvell.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
 ---
- app/test/test_link_bonding.c | 5 +++++
+ test/test/test_link_bonding.c | 5 +++++
  1 file changed, 5 insertions(+)
 
-diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c
-index a9b9d0c42a..b5ce9dbb47 100644
---- a/app/test/test_link_bonding.c
-+++ b/app/test/test_link_bonding.c
-@@ -1202,6 +1202,11 @@ lsc_timeout(int wait_us)
+diff --git a/test/test/test_link_bonding.c b/test/test/test_link_bonding.c
+index c6e3a725bd..0d5101cee0 100644
+--- a/test/test/test_link_bonding.c
++++ b/test/test/test_link_bonding.c
+@@ -1207,6 +1207,11 @@ lsc_timeout(int wait_us)
  	ts.tv_sec = tp.tv_sec;
  	ts.tv_nsec = tp.tv_usec * 1000;
  	ts.tv_nsec += wait_us * 1000;


More information about the stable mailing list