From patchwork Mon Mar 23 21:53:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jia Yu X-Patchwork-Id: 4121 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 7B1739AB3; Tue, 24 Mar 2015 07:06:02 +0100 (CET) Received: from smtp-outbound-2.vmware.com (smtp-outbound-2.vmware.com [208.91.2.13]) by dpdk.org (Postfix) with ESMTP id 5D3269AB1 for ; Tue, 24 Mar 2015 07:06:01 +0100 (CET) Received: from sc9-mailhost1.vmware.com (sc9-mailhost1.vmware.com [10.113.161.71]) by smtp-outbound-2.vmware.com (Postfix) with ESMTP id DD29A28500; Mon, 23 Mar 2015 23:05:59 -0700 (PDT) Received: from prmh-edge-ivybridge-13.eng.vmware.com (unknown [10.114.9.10]) by sc9-mailhost1.vmware.com (Postfix) with ESMTP id B0615183EB; Mon, 23 Mar 2015 23:05:59 -0700 (PDT) From: Jia Yu To: dev@dpdk.org Date: Mon, 23 Mar 2015 14:53:56 -0700 Message-Id: <1427147636-45003-1-git-send-email-jyu@vmware.com> X-Mailer: git-send-email 1.9.1 Subject: [dpdk-dev] [PATCH v2] librte_pmd_bond: remove memory alloc for rte_pci_driver X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" eth_driver already contains rte_pci_driver data structure. Allocating rte_pci_driver without referencing it after bond creation causes memory leakage. Added signed off information. Signed-off-by: Jia Yu Acked-by: Declan Doherty --- lib/librte_pmd_bond/rte_eth_bond_api.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) 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 = ð_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)