From: <shaibran@amazon.com>
To: <ferruh.yigit@amd.com>
Cc: <dev@dpdk.org>, Shai Brandes <shaibran@amazon.com>
Subject: [PATCH 30/33] net/ena: exhaust interrupt callbacks in device close
Date: Mon, 4 Mar 2024 11:01:33 +0200 [thread overview]
Message-ID: <20240304090136.861-31-shaibran@amazon.com> (raw)
In-Reply-To: <20240304090136.861-1-shaibran@amazon.com>
From: Shai Brandes <shaibran@amazon.com>
Change rte_intr_callback_unregister to its synchronous variant to
ensure all active interrupt callbacks are completed before proceeding
with the flow. Relocate the interrupt deregistration to precede the
release of stats memory, thereby preventing the interrupt handler
from accessing memory that has already been freed.
Signed-off-by: Shai Brandes <shaibran@amazon.com>
Reviewed-by: Amit Bernstein <amitbern@amazon.com>
---
drivers/net/ena/ena_ethdev.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index 2a7b7c0cba..d73e321d0f 100644
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -871,6 +871,7 @@ static int ena_close(struct rte_eth_dev *dev)
struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
struct ena_adapter *adapter = dev->data->dev_private;
int ret = 0;
+ int rc;
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
@@ -879,17 +880,17 @@ static int ena_close(struct rte_eth_dev *dev)
ret = ena_stop(dev);
adapter->state = ENA_ADAPTER_STATE_CLOSED;
+ rte_intr_disable(intr_handle);
+ rc = rte_intr_callback_unregister_sync(intr_handle, ena_interrupt_handler_rte, dev);
+ if (unlikely(rc != 0))
+ PMD_INIT_LOG(ERR, "Failed to unregister interrupt handler\n");
+
ena_rx_queue_release_all(dev);
ena_tx_queue_release_all(dev);
rte_free(adapter->drv_stats);
adapter->drv_stats = NULL;
- rte_intr_disable(intr_handle);
- rte_intr_callback_unregister(intr_handle,
- ena_interrupt_handler_rte,
- dev);
-
/*
* MAC is not allocated dynamically. Setting NULL should prevent from
* release of the resource in the rte_eth_dev_release_port().
--
2.17.1
next prev parent reply other threads:[~2024-03-04 9:06 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-04 9:01 [PATCH 00/33] net/ena: v2.9.0 driver release shaibran
2024-03-04 9:01 ` [PATCH 01/33] net/ena: rework the metrics multi-process functions shaibran
2024-03-04 9:01 ` [PATCH 02/33] net/ena: report new supported link speed capabilities shaibran
2024-03-04 9:01 ` [PATCH 03/33] net/ena: update imissed stat with Rx overruns shaibran
2024-03-04 9:01 ` [PATCH 04/33] net/ena: sub-optimal configuration notifications support shaibran
2024-03-04 9:01 ` [PATCH 05/33] net/ena: fix fast mbuf free shaibran
2024-03-04 9:01 ` [PATCH 06/33] net/ena: rename base folder to hal shaibran
2024-03-04 9:01 ` [PATCH 07/33] net/ena: restructure the llq policy setting process shaibran
2024-03-04 9:01 ` [PATCH 08/33] net/ena/hal: exponential backoff exp limit shaibran
2024-03-04 9:01 ` [PATCH 09/33] net/ena/hal: add a new csum offload bit shaibran
2024-03-04 9:01 ` [PATCH 10/33] net/ena/hal: added a bus parameter to ena memcpy macro shaibran
2024-03-04 9:01 ` [PATCH 11/33] net/ena/hal: optimize Rx ring submission queue shaibran
2024-03-04 9:01 ` [PATCH 12/33] net/ena/hal: rename fields in completion descriptors shaibran
2024-03-04 9:01 ` [PATCH 13/33] net/ena/hal: use correct read once on u8 field shaibran
2024-03-04 9:01 ` [PATCH 14/33] net/ena/hal: add completion descriptor corruption check shaibran
2024-03-04 9:01 ` [PATCH 15/33] net/ena/hal: malformed Tx descriptor error reason shaibran
2024-03-04 9:01 ` [PATCH 16/33] net/ena/hal: phc feature modifications shaibran
2024-03-04 9:01 ` [PATCH 17/33] net/ena/hal: restructure interrupt handling shaibran
2024-03-04 9:01 ` [PATCH 18/33] net/ena/hal: add unlikely to error checks shaibran
2024-03-04 9:01 ` [PATCH 19/33] net/ena/hal: missing admin interrupt reset reason shaibran
2024-03-04 9:01 ` [PATCH 20/33] net/ena/hal: check for existing keep alive notification shaibran
2024-03-04 9:01 ` [PATCH 21/33] net/ena/hal: modify memory barrier comment shaibran
2024-03-04 9:01 ` [PATCH 22/33] net/ena/hal: rework Rx ring submission queue shaibran
2024-03-04 9:01 ` [PATCH 23/33] net/ena/hal: remove operating system type enum shaibran
2024-03-04 9:01 ` [PATCH 24/33] net/ena/hal: handle command abort shaibran
2024-03-04 9:01 ` [PATCH 25/33] net/ena/hal: add support for device reset request shaibran
2024-03-04 9:01 ` [PATCH 26/33] net/ena: cosmetic changes shaibran
2024-03-04 9:01 ` [PATCH 27/33] net/ena/hal: modify customer metrics memory management shaibran
2024-03-04 9:01 ` [PATCH 28/33] net/ena/hal: cosmetic changes shaibran
2024-03-04 9:01 ` [PATCH 29/33] net/ena: update device-preferred size of rings shaibran
2024-03-04 9:01 ` shaibran [this message]
2024-03-04 9:01 ` [PATCH 31/33] net/ena: support max large llq depth from the device shaibran
2024-03-04 9:01 ` [PATCH 32/33] net/ena: control path pure polling mode shaibran
2024-03-04 9:01 ` [PATCH 33/33] net/ena: upgrade driver version to 2.9.0 shaibran
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240304090136.861-31-shaibran@amazon.com \
--to=shaibran@amazon.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).