From patchwork Wed Oct 31 14:53:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Krawczyk X-Patchwork-Id: 47620 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 B71EDF94; Wed, 31 Oct 2018 15:53:33 +0100 (CET) Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) by dpdk.org (Postfix) with ESMTP id 2B62191 for ; Wed, 31 Oct 2018 15:53:32 +0100 (CET) Received: by mail-lj1-f195.google.com with SMTP id x85-v6so10893657ljb.2 for ; Wed, 31 Oct 2018 07:53:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=V6+9w7b9OJKddnogwCAjlUj5MhoLNZkBMx0gV8y4GIM=; b=maRnRHunV+Frig1tgrWsr8dZn1FxCEN/23Ufe8yn/GksCUurI1YtM87dOzZrchl9L2 B1Sw5mBuUCPQkzJhRfOxh5cICB97y/8bHuhNbXXnybIOIuXmZj33JPiUUq6hdbS+EEy2 9C7pgCKgd3Yt7bnMZ64c+Us4kb1kNqPfGmiV14BrWNC+MzV+rk8Rev9vOAHYiTm2VsiD 7uCy+iOrl8ta7U0YY6Wq1JDi0UAhughSTmevlB0JnibqyTqFm5J2g3nW1tfqndfUtE06 th1nQfKcQFyZx9qhRtKC4xzkrk4mdKACp7AJ5pZj2XrJ5Bj8fMk3WeeBi6gAhL706U+l zaaw== 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; bh=V6+9w7b9OJKddnogwCAjlUj5MhoLNZkBMx0gV8y4GIM=; b=iUWN9lnZ6CmRkmfS8uYLaOiGj3aeTzmElQpgMuNpiHkedVQVU5mrGJbXiDY50XUwFw moI7nRPgo/f3YmS6MDdlFD66w1Bhs8klvLnhyf19x4l/r5MI6f4tfODkU5Efqj3TRJaY mBHdZNNX/NFy7G5aIzs5lRtwn0w8cVF8G9+tP0k0qH9zc2A5uPBAkcFmB7FGJWn0X5d5 ujMZ6iJySkDcHQVXDpn9FkAaJ4+zr7d+zh32RaY7JU2vsKAykLUG1IWZTYa4rpz2SJ4Z mMnAmoFLOXmopOH+dA+OxSix3RWRUxHHmZHQlU3EWiRoJS1SuiLT44Kz2sQ1GFQZPyHY SCWQ== X-Gm-Message-State: AGRZ1gKRsKOWzTjkh/nt82vN/2N3YanxbUdtVNwXzvjs3x04Mlqds0rG BSVq+0IfiEucETh9hySfXK+Dew== X-Google-Smtp-Source: AJdET5fdb7VuKgL9IujSc1tx9hSj8FaNnKzqZ6Bgkq3O18uc4EeNEXjy2XSOkH8DvBD5yrrjfq98qQ== X-Received: by 2002:a2e:88cf:: with SMTP id a15-v6mr2279010ljk.76.1540997611468; Wed, 31 Oct 2018 07:53:31 -0700 (PDT) Received: from mkPC.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id h2-v6sm4517899lfb.27.2018.10.31.07.53.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Oct 2018 07:53:30 -0700 (PDT) From: Michal Krawczyk To: mw@semihalf.com, matua@amazon.com, gtzalik@amazon.com, zorik@amazon.com Cc: dev@dpdk.org, Michal Krawczyk Date: Wed, 31 Oct 2018 15:53:16 +0100 Message-Id: <20181031145316.7448-1-mk@semihalf.com> X-Mailer: git-send-email 2.14.1 Subject: [dpdk-dev] [PATCH] net/ena: remove resources when port is being 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" The new API introduced in 18.11 is suggesting, that the driver should release all it's resources at the dev_close routine. All resources previously released in uninit routine during PCI removal, are now being released at the dev_close and the PMD is indicating that it is supporting API changes by setting RTE_ETH_DEV_CLOSE_REMOVE flag. As the device is not allocating MAC addresses dynamically, it is setting mac_addrs field to NULL, so it wouldn't be released by the rte_eth_dev_release_port(). Signed-off-by: Michal Krawczyk --- drivers/net/ena/ena_ethdev.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 0c0ed9302..abe1e7bd0 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -509,6 +509,8 @@ static void ena_config_debug_area(struct ena_adapter *adapter) static void ena_close(struct rte_eth_dev *dev) { + struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); + struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; struct ena_adapter *adapter = (struct ena_adapter *)(dev->data->dev_private); @@ -518,6 +520,25 @@ static void ena_close(struct rte_eth_dev *dev) ena_rx_queue_release_all(dev); ena_tx_queue_release_all(dev); + + rte_free(adapter->drv_stats); + adapter->drv_stats = NULL; + + rte_intr_disable(intr_handle); + rte_intr_callback_unregister(intr_handle, + ena_interrupt_handler_rte, + adapter); + + /* + * Pass the information to the rte_eth_dev_close() that it should also + * release the private port resources. + */ + dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE; + /* + * MAC is not allocated dynamically. Setting NULL should prevent from + * release of the resource in the rte_eth_dev_release_port(). + */ + dev->data->mac_addrs = NULL; } static int @@ -1683,8 +1704,6 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev) static int eth_ena_dev_uninit(struct rte_eth_dev *eth_dev) { - struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev); - struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; struct ena_adapter *adapter = (struct ena_adapter *)(eth_dev->data->dev_private); @@ -1699,14 +1718,6 @@ static int eth_ena_dev_uninit(struct rte_eth_dev *eth_dev) eth_dev->tx_pkt_burst = NULL; eth_dev->tx_pkt_prepare = NULL; - rte_free(adapter->drv_stats); - adapter->drv_stats = NULL; - - rte_intr_disable(intr_handle); - rte_intr_callback_unregister(intr_handle, - ena_interrupt_handler_rte, - adapter); - adapter->state = ENA_ADAPTER_STATE_FREE; return 0;