patch 'net/ena/base: limit exponential backoff' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 04/09/24. 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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/cb98b1b26d3f886fdec0ca5fc0e2cdc471490c3d

Thanks.

Kevin

---
>From cb98b1b26d3f886fdec0ca5fc0e2cdc471490c3d Mon Sep 17 00:00:00 2001
From: Shai Brandes <shaibran at amazon.com>
Date: Tue, 12 Mar 2024 20:06:52 +0200
Subject: [PATCH] net/ena/base: limit exponential backoff

[ upstream commit 4b378679c88ff231b97b71aaedc2d424e82f1aba ]

Limit the value of the exponent used for this backoff
at (1<<16) to prevent it from reaching to an excessive
value (1<<32) or potentially even overflowing.
In addition, for uniformity and readability purposes,
the min/max parameter in the calls of ENA_MIN32 and
ENA_MAX32 macros was changed to be first.

Fixes: 0c84e04824db ("net/ena/base: make delay exponential in polling functions")

Signed-off-by: Shai Brandes <shaibran at amazon.com>
Reviewed-by: Amit Bernstein <amitbern at amazon.com>
---
 drivers/net/ena/base/ena_com.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c
index 5ca36ab6d9..4bd85f29f5 100644
--- a/drivers/net/ena/base/ena_com.c
+++ b/drivers/net/ena/base/ena_com.c
@@ -35,4 +35,6 @@
 #define ENA_REGS_ADMIN_INTR_MASK 1
 
+#define ENA_MAX_BACKOFF_DELAY_EXP 16U
+
 #define ENA_MIN_ADMIN_POLL_US 100
 
@@ -540,6 +542,7 @@ static int ena_com_comp_status_to_errno(struct ena_com_admin_queue *admin_queue,
 static void ena_delay_exponential_backoff_us(u32 exp, u32 delay_us)
 {
+	exp = ENA_MIN32(ENA_MAX_BACKOFF_DELAY_EXP, exp);
 	delay_us = ENA_MAX32(ENA_MIN_ADMIN_POLL_US, delay_us);
-	delay_us = ENA_MIN32(delay_us * (1U << exp), ENA_MAX_ADMIN_POLL_US);
+	delay_us = ENA_MIN32(ENA_MAX_ADMIN_POLL_US, delay_us * (1U << exp));
 	ENA_USLEEP(delay_us);
 }
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:33.979250354 +0100
+++ 0004-net-ena-base-limit-exponential-backoff.patch	2024-04-04 10:49:33.698457600 +0100
@@ -1 +1 @@
-From 4b378679c88ff231b97b71aaedc2d424e82f1aba Mon Sep 17 00:00:00 2001
+From cb98b1b26d3f886fdec0ca5fc0e2cdc471490c3d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4b378679c88ff231b97b71aaedc2d424e82f1aba ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index 6953a1fa33..31c37b0ab3 100644
+index 5ca36ab6d9..4bd85f29f5 100644
@@ -33 +34 @@
-@@ -546,6 +548,7 @@ static int ena_com_comp_status_to_errno(struct ena_com_admin_queue *admin_queue,
+@@ -540,6 +542,7 @@ static int ena_com_comp_status_to_errno(struct ena_com_admin_queue *admin_queue,