From: Aaron Brown <aaron.f.brown@intel.com>
To: davem@davemloft.net
Cc: Mitch Williams <mitch.a.williams@intel.com>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Aaron Brown <aaron.f.brown@intel.com>
Subject: [net-next 12/14] i40evf: don't leak queue vectors
Date: Fri, 1 Aug 2014 13:27:13 -0700 [thread overview]
Message-ID: <1406924835-31550-13-git-send-email-aaron.f.brown@intel.com> (raw)
In-Reply-To: <1406924835-31550-1-git-send-email-aaron.f.brown@intel.com>
From: Mitch Williams <mitch.a.williams@intel.com>
Fix a memory leak. Driver was allocating memory for queue vectors on
init but not freeing them on shutdown. These need to be freed at two
different times: during module unload, and during reset recovery when
the driver cannot contact the PF driver and needs to give up.
Change-ID: I7c1d0157a776e960d4da432dfe309035aad7c670
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Tested-by: Sibai Li <sibai.li@intel.com>
Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
---
drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 2aca9cf..0c4f7baf 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -1542,6 +1542,7 @@ static void i40evf_reset_task(struct work_struct *work)
i40evf_free_misc_irq(adapter);
i40evf_reset_interrupt_capability(adapter);
i40evf_free_queues(adapter);
+ i40evf_free_q_vectors(adapter);
kfree(adapter->vf_res);
i40evf_shutdown_adminq(hw);
adapter->netdev->flags &= ~IFF_UP;
@@ -2429,6 +2430,7 @@ static void i40evf_remove(struct pci_dev *pdev)
i40evf_misc_irq_disable(adapter);
i40evf_free_misc_irq(adapter);
i40evf_reset_interrupt_capability(adapter);
+ i40evf_free_q_vectors(adapter);
}
if (adapter->watchdog_timer.function)
--
1.9.3
next prev parent reply other threads:[~2014-08-01 20:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-01 20:27 [net-next 00/14] Intel Wired LAN Driver Updates Aaron Brown
2014-08-01 20:27 ` [net-next 01/14] i40e: adds FCoE code to the i40e driver Aaron Brown
2014-08-01 20:27 ` [net-next 02/14] i40e: Adds FCoE related code to i40e core driver Aaron Brown
2014-08-01 20:27 ` [net-next 03/14] i40e: adds FCoE to build and updates its documentation Aaron Brown
2014-08-01 20:27 ` [net-next 04/14] i40e: expose debug_write_register request Aaron Brown
2014-08-01 20:27 ` [net-next 05/14] i40e: use correct vf_id offset for virtchnl message Aaron Brown
2014-08-01 20:27 ` [net-next 06/14] i40e: disable local loopback on vmdq vsi Aaron Brown
2014-08-01 20:27 ` [net-next 07/14] i40evf: fix scan warning on sprintf Aaron Brown
2014-08-01 20:27 ` [net-next 08/14] i40e: Minor comment changes Aaron Brown
2014-08-01 20:27 ` [net-next 09/14] i40e: remove support for vf unicast promiscuous mode Aaron Brown
2014-08-01 20:27 ` [net-next 10/14] i40evf: future-proof vfr_stat state check Aaron Brown
2014-08-01 20:27 ` [net-next 11/14] i40evf: do not re-arm watchdog after remove Aaron Brown
2014-08-01 20:27 ` Aaron Brown [this message]
2014-08-01 20:27 ` [net-next 13/14] i40evf: fix memory leak on unused interfaces Aaron Brown
2014-08-01 20:27 ` [net-next 14/14] i40evf: Fixed guest OS panic when removing vf driver Aaron Brown
2014-08-01 20:31 ` [net-next 00/14] Intel Wired LAN Driver Updates Brown, Aaron F
2014-08-03 2:41 ` 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=1406924835-31550-13-git-send-email-aaron.f.brown@intel.com \
--to=aaron.f.brown@intel.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.com \
--cc=mitch.a.williams@intel.com \
--cc=netdev@vger.kernel.org \
--cc=sassmann@redhat.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).