diff mbox

[dpdk-dev] librte_pmd_bond: remove memory alloc for rte_pci_driver

Message ID 1426196301-11138-1-git-send-email-jyu@vmware.com (mailing list archive)
State Superseded, archived
Headers

Commit Message

Jia Yu March 12, 2015, 9:38 p.m. UTC 
  eth_driver already contains rte_pci_driver data structure.
Allocating rte_pci_driver without referencing it after bond
creation causes memory leakage.
---
 lib/librte_pmd_bond/rte_eth_bond_api.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

Comments

Thomas Monjalon March 23, 2015, 11:31 a.m. UTC | #1 
Declan,
Any comment?

2015-03-12 14:38, Jia Yu:
> eth_driver already contains rte_pci_driver data structure.
> Allocating rte_pci_driver without referencing it after bond
> creation causes memory leakage.

Jia, Signed-off is missing.
Doherty, Declan March 26, 2015, 11:57 a.m. UTC | #2 
On 23/03/15 11:31, Thomas Monjalon wrote:
> Declan,
> Any comment?
>
> 2015-03-12 14:38, Jia Yu:
>> eth_driver already contains rte_pci_driver data structure.
>> Allocating rte_pci_driver without referencing it after bond
>> creation causes memory leakage.
>
> Jia, Signed-off is missing.
>

Hey Thomas, I've been away for a few days but this looks fine, I'll ack 
the v2.

Declan
diff mbox

Patch

diff --git a/lib/librte_pmd_bond/rte_eth_bond_api.c b/lib/librte_pmd_bond/rte_eth_bond_api.c
index 903b7c3..13f3941 100644
--- a/lib/librte_pmd_bond/rte_eth_bond_api.c
+++ b/lib/librte_pmd_bond/rte_eth_bond_api.c
@@ -230,11 +230,8 @@  rte_eth_bond_create(const char *name, uint8_t mode, uint8_t socket_id)
 		goto err;
 	}
 
-	pci_drv = rte_zmalloc_socket(name, sizeof(*pci_drv), 0, socket_id);
-	if (pci_drv == NULL) {
-		RTE_BOND_LOG(ERR, "Unable to malloc pci_drv on socket");
-		goto err;
-	}
+	pci_drv = &eth_drv->pci_drv;
+
 	pci_id_table = rte_zmalloc_socket(name, sizeof(*pci_id_table), 0, socket_id);
 	if (pci_id_table == NULL) {
 		RTE_BOND_LOG(ERR, "Unable to malloc pci_id_table on socket");
@@ -266,9 +263,7 @@  rte_eth_bond_create(const char *name, uint8_t mode, uint8_t socket_id)
 	pci_dev->numa_node = socket_id;
 	pci_drv->name = driver_name;
 
-	eth_drv->pci_drv = (struct rte_pci_driver)(*pci_drv);
 	eth_dev->driver = eth_drv;
-
 	eth_dev->data->dev_private = internals;
 	eth_dev->data->nb_rx_queues = (uint16_t)1;
 	eth_dev->data->nb_tx_queues = (uint16_t)1;
@@ -325,8 +320,6 @@  rte_eth_bond_create(const char *name, uint8_t mode, uint8_t socket_id)
 err:
 	if (pci_dev)
 		rte_free(pci_dev);
-	if (pci_drv)
-		rte_free(pci_drv);
 	if (pci_id_table)
 		rte_free(pci_id_table);
 	if (eth_drv)