From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <bairemon@ecsmtp.ir.intel.com>
Received: from mga14.intel.com (mga14.intel.com [192.55.52.115])
by dpdk.org (Postfix) with ESMTP id 77525567C
for <dev@dpdk.org>; Tue, 27 Oct 2015 17:04:55 +0100 (CET)
Received: from fmsmga003.fm.intel.com ([10.253.24.29])
by fmsmga103.fm.intel.com with ESMTP; 27 Oct 2015 09:03:24 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.20,205,1444719600"; d="scan'208";a="589009594"
Received: from irvmail001.ir.intel.com ([163.33.26.43])
by FMSMGA003.fm.intel.com with ESMTP; 27 Oct 2015 09:03:23 -0700
Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com
[10.237.217.45])
by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id
t9RG3Md4002245; Tue, 27 Oct 2015 16:03:22 GMT
Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1])
by sivswdev01.ir.intel.com with ESMTP id t9RG3MvF030585;
Tue, 27 Oct 2015 16:03:22 GMT
Received: (from bairemon@localhost)
by sivswdev01.ir.intel.com with id t9RG3Mt7030581;
Tue, 27 Oct 2015 16:03:22 GMT
From: Bernard Iremonger <bernard.iremonger@intel.com>
To: dev@dpdk.org
Date: Tue, 27 Oct 2015 16:03:14 +0000
Message-Id: <1445961794-30528-3-git-send-email-bernard.iremonger@intel.com>
X-Mailer: git-send-email 1.7.4.1
In-Reply-To: <1445961794-30528-1-git-send-email-bernard.iremonger@intel.com>
References: <PATCH v2>
<1445961794-30528-1-git-send-email-bernard.iremonger@intel.com>
Subject: [dpdk-dev] [PATCH v2 2/2] xenvirt: free queues in dev_close
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Oct 2015 16:04:55 -0000
Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
drivers/net/xenvirt/rte_eth_xenvirt.c | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/drivers/net/xenvirt/rte_eth_xenvirt.c b/drivers/net/xenvirt/rte_eth_xenvirt.c
index 084a753..6c2c067 100644
--- a/drivers/net/xenvirt/rte_eth_xenvirt.c
+++ b/drivers/net/xenvirt/rte_eth_xenvirt.c
@@ -75,6 +75,9 @@ static struct rte_eth_link pmd_link = {
.link_status = 0
};
+static void
+eth_xenvirt_free_queues(struct rte_eth_dev *dev);
+
static inline struct rte_mbuf *
rte_rxmbuf_alloc(struct rte_mempool *mp)
{
@@ -326,7 +329,7 @@ eth_dev_stop(struct rte_eth_dev *dev)
static void
eth_dev_close(struct rte_eth_dev *dev)
{
- RTE_SET_USED(dev);
+ eth_xenvirt_free_queues(dev);
}
static void
@@ -362,8 +365,9 @@ eth_stats_reset(struct rte_eth_dev *dev)
}
static void
-eth_queue_release(void *q __rte_unused)
+eth_queue_release(void *q)
{
+ rte_free(q);
}
static int
@@ -524,7 +528,23 @@ eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
return 0;
}
+static void
+eth_xenvirt_free_queues(struct rte_eth_dev *dev)
+{
+ int i;
+ for (i = 0; i < dev->data->nb_rx_queues; i++) {
+ eth_queue_release(dev->data->rx_queues[i]);
+ dev->data->rx_queues[i] = NULL;
+ }
+ dev->data->nb_rx_queues = 0;
+
+ for (i = 0; i < dev->data->nb_tx_queues; i++) {
+ eth_queue_release(dev->data->tx_queues[i]);
+ dev->data->tx_queues[i] = NULL;
+ }
+ dev->data->nb_tx_queues = 0;
+}
static const struct eth_dev_ops ops = {
.dev_start = eth_dev_start,
--
1.9.1