From: <netanel@amazon.com>
To: <davem@davemloft.net>, <netdev@vger.kernel.org>
Cc: Netanel Belgazal <netanel@amazon.com>, <dwmw@amazon.com>,
<zorik@amazon.com>, <matua@amazon.com>, <saeedb@amazon.com>,
<msw@amazon.com>, <aliguori@amazon.com>, <nafea@amazon.com>,
<evgenys@amazon.com>, <gtzalik@amazon.com>
Subject: [PATCH net V2 5/7] net: ena: fix missing lock during device destruction
Date: Sun, 9 Sep 2018 08:15:24 +0000 [thread overview]
Message-ID: <20180909081526.83979-6-netanel@amazon.com> (raw)
In-Reply-To: <20180909081526.83979-1-netanel@amazon.com>
From: Netanel Belgazal <netanel@amazon.com>
acquire the rtnl_lock during device destruction to avoid
using partially destroyed device.
ena_remove() shares almost the same logic as ena_destroy_device(),
so use ena_destroy_device() and avoid duplications.
Signed-off-by: Netanel Belgazal <netanel@amazon.com>
---
drivers/net/ethernet/amazon/ena/ena_netdev.c | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index a68c2a8d4da2..b9ce2a6a87ed 100644
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -3421,24 +3421,18 @@ static void ena_remove(struct pci_dev *pdev)
unregister_netdev(netdev);
- /* Reset the device only if the device is running. */
+ /* If the device is running then we want to make sure the device will be
+ * reset to make sure no more events will be issued by the device.
+ */
if (test_bit(ENA_FLAG_DEVICE_RUNNING, &adapter->flags))
- ena_com_dev_reset(ena_dev, adapter->reset_reason);
-
- ena_free_mgmnt_irq(adapter);
+ set_bit(ENA_FLAG_TRIGGER_RESET, &adapter->flags);
- ena_disable_msix(adapter);
+ rtnl_lock();
+ ena_destroy_device(adapter, true);
+ rtnl_unlock();
free_netdev(netdev);
- ena_com_mmio_reg_read_request_destroy(ena_dev);
-
- ena_com_abort_admin_commands(ena_dev);
-
- ena_com_wait_for_abort_completion(ena_dev);
-
- ena_com_admin_destroy(ena_dev);
-
ena_com_rss_destroy(ena_dev);
ena_com_delete_debug_area(ena_dev);
--
2.15.2.AMZN
next prev parent reply other threads:[~2018-09-09 13:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-09 8:15 [PATCH net V2 0/7] bug fixes for ENA Ethernet driver netanel
2018-09-09 8:15 ` [PATCH net V2 1/7] net: ena: fix surprise unplug NULL dereference kernel crash netanel
2018-09-09 8:15 ` [PATCH net V2 2/7] net: ena: fix driver when PAGE_SIZE == 64kB netanel
2018-09-09 8:15 ` [PATCH net V2 3/7] net: ena: fix device destruction to gracefully free resources netanel
2018-09-09 8:15 ` [PATCH net V2 4/7] net: ena: fix potential double ena_destroy_device() netanel
2018-09-09 8:15 ` netanel [this message]
2018-09-09 8:15 ` [PATCH net V2 6/7] net: ena: fix missing calls to READ_ONCE netanel
2018-09-09 8:15 ` [PATCH net V2 7/7] net: ena: fix incorrect usage of memory barriers netanel
2018-09-09 16:41 ` [PATCH net V2 0/7] bug fixes for ENA Ethernet driver David Miller
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=20180909081526.83979-6-netanel@amazon.com \
--to=netanel@amazon.com \
--cc=aliguori@amazon.com \
--cc=davem@davemloft.net \
--cc=dwmw@amazon.com \
--cc=evgenys@amazon.com \
--cc=gtzalik@amazon.com \
--cc=matua@amazon.com \
--cc=msw@amazon.com \
--cc=nafea@amazon.com \
--cc=netdev@vger.kernel.org \
--cc=saeedb@amazon.com \
--cc=zorik@amazon.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).