From patchwork Tue Aug 27 20:37:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rastislav Cernay X-Patchwork-Id: 58097 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BF8521C1C2; Tue, 27 Aug 2019 21:40:24 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 1946B1C1BE for ; Tue, 27 Aug 2019 21:40:23 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id r17so50285wme.0 for ; Tue, 27 Aug 2019 12:40:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netcope.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RQduCbwvb7FJTtrlgAf+d9QQ+7NlZW2Q9yRhNcUI7To=; b=VNDPRIvN5yyQ3X+/HH3Y7t0RDaHAfD7FFyFlIrbwAoaLIil5icSj5aVwb0hoEGC/b3 CP3VuyR9Df/ZDp7kdze/JN+Tmt3bFi0KPhnMyfiWJDAwY5A+ybA9qqgbwNEFDL1bhtNQ ZThgpfyCSy12LSrS/hLoZkQYZqK1zTTPfoONUEWC8ekzm9sawi+Oo/F7MqCKgX1OMOLM cP7fYnbiun1U6cQam3TTH4xFFrU+fNZMzUjkkQCLtkcZ/5pwJKPGRUSC3GSKbPatRgYd Ye3wShlcEqV0nSDAZHx9ZIgmElOesDrCjuq5m5ECGnaZyBSELv0jbuoOUv4L4Vb3R/qb 7htw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RQduCbwvb7FJTtrlgAf+d9QQ+7NlZW2Q9yRhNcUI7To=; b=MJtgTazsB0uZmewPDG5ffCXmbEMArQHkEicL18r2/dII4vk2J61muNGfQzBF//6CHE 7Vri5VU/gAcjontOFoCDH/aKezsH0gSnuRRxpZhO8at3dV037QckH8SZsnsirDdQdkj8 Su4+X6gfH1jyv5X7pFt5Ahl+igRg//mGqn/HHa7MHKQqYQMrmLqjHpDs7t3rbB8cD0Zr zCmEkF8ED733xfPhfzIUPWKr9oTMLR7yfwICMnbTPc0OCv+ETY+B+DalPmrxswpvQRaX YQeoyIdXzjC3fJGehdTOFSFQPgJHFSeMF148TaJYIn8WwX++R+wB8FXUnAKGh1K2nLmK NW3w== X-Gm-Message-State: APjAAAWVtoGwFyL1L0YZz4QH1FXb4hadNZwmkmEPOLPdflYJ7KE+5BN/ 84lQkQgNQ1evHV+SM2mPaVmxMk1X3Me45w== X-Google-Smtp-Source: APXvYqxWu2qXVydK4Xj+wjzKqJV2hcgpdYx9bwxf0KO+j3VAQIIQypIdWABnG8er1RLYwf5uEquYeA== X-Received: by 2002:a1c:c584:: with SMTP id v126mr211890wmf.27.1566934821762; Tue, 27 Aug 2019 12:40:21 -0700 (PDT) Received: from sw-c1.int.netcope.com ([5.180.196.50]) by smtp.gmail.com with ESMTPSA id 6sm118115wmf.23.2019.08.27.12.40.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Aug 2019 12:40:21 -0700 (PDT) From: Rastislav Cernay X-Google-Original-From: Rastislav Cernay To: dev@dpdk.org Cc: Rastislav Cernay Date: Tue, 27 Aug 2019 22:37:16 +0200 Message-Id: <1566938236-3521-1-git-send-email-cernay@netcope.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1565362745-152027-1-git-send-email-cernay@netcope.com> References: <1565362745-152027-1-git-send-email-cernay@netcope.com> Subject: [dpdk-dev] [PATCH v3] net/nfb: remove resources when port is closed X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Rastislav Cernay The rte_eth_dev_close() function now handles freeing resources for devices (e.g., mac_addrs). To conform with the new close() behaviour we are asserting the RTE_ETH_DEV_CLOSE_REMOVE flag so that rte_eth_dev_close() releases all device level dynamic memory. Signed-off-by: Rastislav Cernay Reviewed-by: Xiaolong Ye Acked-by: Jan Remes --- v2: remove unnecessary cast v3: send correct patch drivers/net/nfb/nfb_ethdev.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/net/nfb/nfb_ethdev.c b/drivers/net/nfb/nfb_ethdev.c index c3119a0..f4093d4 100644 --- a/drivers/net/nfb/nfb_ethdev.c +++ b/drivers/net/nfb/nfb_ethdev.c @@ -210,12 +210,16 @@ static void nfb_eth_dev_close(struct rte_eth_dev *dev) { + struct pmd_internals *internals = dev->data->dev_private; uint16_t i; uint16_t nb_rx = dev->data->nb_rx_queues; uint16_t nb_tx = dev->data->nb_tx_queues; nfb_eth_dev_stop(dev); + nfb_nc_rxmac_deinit(internals->rxmac, internals->max_rxmac); + nfb_nc_txmac_deinit(internals->txmac, internals->max_txmac); + for (i = 0; i < nb_rx; i++) { nfb_eth_rx_queue_release(dev->data->rx_queues[i]); dev->data->rx_queues[i] = NULL; @@ -226,6 +230,9 @@ dev->data->tx_queues[i] = NULL; } dev->data->nb_tx_queues = 0; + + rte_free(dev->data->mac_addrs); + dev->data->mac_addrs = NULL; } /** @@ -446,6 +453,9 @@ rte_kvargs_free(kvlist); } + /* Let rte_eth_dev_close() release the port resources */ + dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE; + /* * Get number of available DMA RX and TX queues, which is maximum * number of queues that can be created and store it in private device @@ -520,15 +530,10 @@ static int nfb_eth_dev_uninit(struct rte_eth_dev *dev) { - struct rte_eth_dev_data *data = dev->data; - struct pmd_internals *internals = (struct pmd_internals *) - data->dev_private; - struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); struct rte_pci_addr *pci_addr = &pci_dev->addr; - nfb_nc_rxmac_deinit(internals->rxmac, internals->max_rxmac); - nfb_nc_txmac_deinit(internals->txmac, internals->max_txmac); + nfb_eth_dev_close(dev); RTE_LOG(INFO, PMD, "NFB device (" PCI_PRI_FMT ") successfully uninitialized\n",