patch 'net/ena: fix control path interrupt mode' has been queued to stable release 24.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.11.3

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

Thanks.

Kevin

---
>From 95dd517436d94f47a593af53ac8ddc6d4c6e4969 Mon Sep 17 00:00:00 2001
From: Shai Brandes <shaibran at amazon.com>
Date: Mon, 30 Jun 2025 14:15:25 +0300
Subject: [PATCH] net/ena: fix control path interrupt mode

[ upstream commit 99bfe66911cabf8f2ae1c17e05970e969bbfe794 ]

Fixed the device initialization routine to correctly handle
failure during the registration or enabling of interrupts
when operating in control path interrupt mode.

Fixes: ca1dfa85f0d3 ("net/ena: add control path pure polling mode")

Signed-off-by: Shai Brandes <shaibran at amazon.com>
Reviewed-by: Amit Bernstein <amitbern at amazon.com>
Reviewed-by: Yosef Raisman <yraisman at amazon.com>
---
 drivers/net/ena/ena_ethdev.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index aea2e5c929..93dca8f146 100644
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -2434,6 +2434,14 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)
 	if (!adapter->control_path_poll_interval) {
 		/* Control path interrupt mode */
-		rte_intr_callback_register(intr_handle, ena_control_path_handler, eth_dev);
-		rte_intr_enable(intr_handle);
+		rc = rte_intr_callback_register(intr_handle, ena_control_path_handler, eth_dev);
+		if (unlikely(rc < 0)) {
+			PMD_DRV_LOG_LINE(ERR, "Failed to register control path interrupt");
+			goto err_stats_destroy;
+		}
+		rc = rte_intr_enable(intr_handle);
+		if (unlikely(rc < 0)) {
+			PMD_DRV_LOG_LINE(ERR, "Failed to enable control path interrupt");
+			goto err_control_path_destroy;
+		}
 		ena_com_set_admin_polling_mode(ena_dev, false);
 	} else {
@@ -2454,4 +2462,12 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)
 	return 0;
 err_control_path_destroy:
+	if (!adapter->control_path_poll_interval) {
+		rc = rte_intr_callback_unregister_sync(intr_handle,
+					ena_control_path_handler,
+					eth_dev);
+		if (unlikely(rc < 0))
+			PMD_INIT_LOG_LINE(ERR, "Failed to unregister interrupt handler");
+	}
+err_stats_destroy:
 	rte_free(adapter->drv_stats);
 err_rss_destroy:
-- 
2.50.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-07-18 20:29:17.075419975 +0100
+++ 0174-net-ena-fix-control-path-interrupt-mode.patch	2025-07-18 20:29:11.193908137 +0100
@@ -1 +1 @@
-From 99bfe66911cabf8f2ae1c17e05970e969bbfe794 Mon Sep 17 00:00:00 2001
+From 95dd517436d94f47a593af53ac8ddc6d4c6e4969 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 99bfe66911cabf8f2ae1c17e05970e969bbfe794 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -17,3 +18,2 @@
- doc/guides/rel_notes/release_25_07.rst |  2 ++
- drivers/net/ena/ena_ethdev.c           | 20 ++++++++++++++++++--
- 2 files changed, 20 insertions(+), 2 deletions(-)
+ drivers/net/ena/ena_ethdev.c | 20 ++++++++++++++++++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
@@ -21,11 +20,0 @@
-diff --git a/doc/guides/rel_notes/release_25_07.rst b/doc/guides/rel_notes/release_25_07.rst
-index 54e2634794..017bada33e 100644
---- a/doc/guides/rel_notes/release_25_07.rst
-+++ b/doc/guides/rel_notes/release_25_07.rst
-@@ -77,4 +77,6 @@ New Features
-   * Added support for enabling fragment bypass mode for egress packets.
-     This mode bypasses the PPS limit enforced by EC2 for fragmented egress packets on every ENI.
-+  * Fixed the device initialization routine to correctly handle failure during the registration
-+    or enabling of interrupts when operating in control path interrupt mode.
- 
- * **Added Mucse rnp net driver.**
@@ -33 +22 @@
-index 8ef6e55248..eb33ca2c6e 100644
+index aea2e5c929..93dca8f146 100644
@@ -36 +25 @@
-@@ -2466,6 +2466,14 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)
+@@ -2434,6 +2434,14 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)
@@ -53 +42 @@
-@@ -2486,4 +2494,12 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)
+@@ -2454,4 +2462,12 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)
@@ -65 +54 @@
- err_indirect_table_destroy:
+ err_rss_destroy: