[dpdk-stable] patch 'test: fix division by zero' has been queued to stable release 20.11.2
Xueming Li
xuemingl at nvidia.com
Sat Jun 12 01:04:12 CEST 2021
Hi,
FYI, your patch has been queued to stable release 20.11.2
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/14/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/steevenlee/dpdk
This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/934abbb8b8cd9156856c98daac1105558a3f4501
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From 934abbb8b8cd9156856c98daac1105558a3f4501 Mon Sep 17 00:00:00 2001
From: "Min Hu (Connor)" <humin29 at huawei.com>
Date: Thu, 13 May 2021 09:10:37 +0800
Subject: [PATCH] test: fix division by zero
Cc: Luca Boccassi <bluca at debian.org>
[ upstream commit 07b3c7d8e3b6513044d8f5cc45359cc42c14eb18 ]
Variable i is used as a denominator which may be zero, and
this may result in segmentation fault.
This patch fixed it.
Fixes: 948bc3d6d095 ("test: add reciprocal based division")
Signed-off-by: Min Hu (Connor) <humin29 at huawei.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
app/test/test_reciprocal_division_perf.c | 41 ++++++++++++++----------
1 file changed, 24 insertions(+), 17 deletions(-)
diff --git a/app/test/test_reciprocal_division_perf.c b/app/test/test_reciprocal_division_perf.c
index a7be8aa71a..4f625873e5 100644
--- a/app/test/test_reciprocal_division_perf.c
+++ b/app/test/test_reciprocal_division_perf.c
@@ -71,10 +71,12 @@ test_reciprocal_division_perf(void)
tot_cyc_n);
printf("Total number of cycles reciprocal division : %"PRIu64"\n",
tot_cyc_r);
- printf("Cycles per division(normal) : %3.2f\n",
- ((double)tot_cyc_n)/i);
- printf("Cycles per division(reciprocal) : %3.2f\n\n",
- ((double)tot_cyc_r)/i);
+ if (i != 0) {
+ printf("Cycles per division(normal) : %3.2f\n",
+ ((double)tot_cyc_n)/i);
+ printf("Cycles per division(reciprocal) : %3.2f\n\n",
+ ((double)tot_cyc_r)/i);
+ }
tot_cyc_n = 0;
tot_cyc_r = 0;
@@ -111,11 +113,12 @@ test_reciprocal_division_perf(void)
tot_cyc_n);
printf("Total number of cycles reciprocal division : %"PRIu64"\n",
tot_cyc_r);
- printf("Cycles per division(normal) : %3.2f\n",
- ((double)tot_cyc_n)/i);
- printf("Cycles per division(reciprocal) : %3.2f\n\n",
- ((double)tot_cyc_r)/i);
-
+ if (i != 0) {
+ printf("Cycles per division(normal) : %3.2f\n",
+ ((double)tot_cyc_n)/i);
+ printf("Cycles per division(reciprocal) : %3.2f\n\n",
+ ((double)tot_cyc_r)/i);
+ }
tot_cyc_n = 0;
tot_cyc_r = 0;
@@ -152,10 +155,12 @@ test_reciprocal_division_perf(void)
tot_cyc_n);
printf("Total number of cycles reciprocal division : %"PRIu64"\n",
tot_cyc_r);
- printf("Cycles per division(normal) : %3.2f\n",
- ((double)tot_cyc_n)/i);
- printf("Cycles per division(reciprocal) : %3.2f\n\n",
- ((double)tot_cyc_r)/i);
+ if (i != 0) {
+ printf("Cycles per division(normal) : %3.2f\n",
+ ((double)tot_cyc_n)/i);
+ printf("Cycles per division(reciprocal) : %3.2f\n\n",
+ ((double)tot_cyc_r)/i);
+ }
tot_cyc_n = 0;
tot_cyc_r = 0;
@@ -190,10 +195,12 @@ test_reciprocal_division_perf(void)
tot_cyc_n);
printf("Total number of cycles reciprocal division : %"PRIu64"\n",
tot_cyc_r);
- printf("Cycles per division(normal) : %3.2f\n",
- ((double)tot_cyc_n)/i);
- printf("Cycles per division(reciprocal) : %3.2f\n",
- ((double)tot_cyc_r)/i);
+ if (i != 0) {
+ printf("Cycles per division(normal) : %3.2f\n",
+ ((double)tot_cyc_n)/i);
+ printf("Cycles per division(reciprocal) : %3.2f\n",
+ ((double)tot_cyc_r)/i);
+ }
return result;
}
--
2.25.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2021-06-12 06:54:00.557539800 +0800
+++ 0158-test-fix-division-by-zero.patch 2021-06-12 06:53:56.620000000 +0800
@@ -1 +1 @@
-From 07b3c7d8e3b6513044d8f5cc45359cc42c14eb18 Mon Sep 17 00:00:00 2001
+From 934abbb8b8cd9156856c98daac1105558a3f4501 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit 07b3c7d8e3b6513044d8f5cc45359cc42c14eb18 ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
More information about the stable
mailing list