From patchwork Fri Jul 26 16:33:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ferruh Yigit X-Patchwork-Id: 57177 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 E394C1C4A4; Fri, 26 Jul 2019 18:33:09 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 3FA501BEBE for ; Fri, 26 Jul 2019 18:33:08 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jul 2019 09:33:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,311,1559545200"; d="scan'208";a="161352095" Received: from silpixa00399752.ir.intel.com (HELO silpixa00399752.ger.corp.intel.com) ([10.237.223.78]) by orsmga007.jf.intel.com with ESMTP; 26 Jul 2019 09:33:06 -0700 From: Ferruh Yigit To: dev@dpdk.org Date: Fri, 26 Jul 2019 17:33:04 +0100 Message-Id: <20190726163304.67773-1-ferruh.yigit@intel.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] net/kni: 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" Add .dev_close to clean resources on device close, also set RTE_ETH_DEV_CLOSE_REMOVE device flag to cause all ethdev resources removed on 'rte_eth_dev_close()' call. Signed-off-by: Ferruh Yigit --- drivers/net/kni/rte_eth_kni.c | 38 +++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c index 9e0c6bd2f..d12b49aaf 100644 --- a/drivers/net/kni/rte_eth_kni.c +++ b/drivers/net/kni/rte_eth_kni.c @@ -197,6 +197,24 @@ eth_kni_dev_stop(struct rte_eth_dev *dev) dev->data->dev_link.link_status = 0; } +static void +eth_kni_close(struct rte_eth_dev *eth_dev) +{ + struct pmd_internals *internals; + int ret; + + eth_kni_dev_stop(eth_dev); + + /* mac_addrs must not be freed alone because part of dev_private */ + eth_dev->data->mac_addrs = NULL; + + internals = eth_dev->data->dev_private; + ret = rte_kni_release(internals->kni); + if (ret) + PMD_LOG(WARNING, "Not able to release kni for %s", + eth_dev->data->name); +} + static int eth_kni_dev_configure(struct rte_eth_dev *dev __rte_unused) { @@ -327,6 +345,7 @@ eth_kni_stats_reset(struct rte_eth_dev *dev) static const struct eth_dev_ops eth_kni_ops = { .dev_start = eth_kni_dev_start, .dev_stop = eth_kni_dev_stop, + .dev_close = eth_kni_close, .dev_configure = eth_kni_dev_configure, .dev_infos_get = eth_kni_dev_info, .rx_queue_setup = eth_kni_rx_queue_setup, @@ -362,6 +381,8 @@ eth_kni_create(struct rte_vdev_device *vdev, data->dev_link = pmd_link; data->mac_addrs = &internals->eth_addr; + data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE; + rte_eth_random_addr(internals->eth_addr.addr_bytes); eth_dev->dev_ops = ð_kni_ops; @@ -456,9 +477,7 @@ static int eth_kni_remove(struct rte_vdev_device *vdev) { struct rte_eth_dev *eth_dev; - struct pmd_internals *internals; const char *name; - int ret; name = rte_vdev_device_name(vdev); PMD_LOG(INFO, "Un-Initializing eth_kni for %s", name); @@ -468,19 +487,12 @@ eth_kni_remove(struct rte_vdev_device *vdev) if (eth_dev == NULL) return -1; - /* mac_addrs must not be freed alone because part of dev_private */ - eth_dev->data->mac_addrs = NULL; - - if (rte_eal_process_type() != RTE_PROC_PRIMARY) + if (rte_eal_process_type() != RTE_PROC_PRIMARY) { + eth_kni_dev_stop(eth_dev); return rte_eth_dev_release_port(eth_dev); + } - eth_kni_dev_stop(eth_dev); - - internals = eth_dev->data->dev_private; - ret = rte_kni_release(internals->kni); - if (ret) - PMD_LOG(WARNING, "Not able to release kni for %s", name); - + eth_kni_close(eth_dev); rte_eth_dev_release_port(eth_dev); is_kni_initialized--;