DPDK patches and discussions
 help / color / mirror / Atom feed
From: Jan Blunck <jblunck@infradead.org>
To: dev@dpdk.org
Cc: ferruh.yigit@intel.com, i.maximets@samsung.com,
	bruce.richardson@intel.com, declan.doherty@intel.com
Subject: [dpdk-dev] [PATCH 1/4] ethdev: Call rx/tx_queue_release before rx/tx_queue_setup
Date: Wed, 23 Nov 2016 20:38:29 +0100	[thread overview]
Message-ID: <1479929912-32079-1-git-send-email-jblunck@infradead.org> (raw)
In-Reply-To: <CALe+Z02_342X4H9aFsvpaOJVw9Yb8F_qjmRH8XKUseP=QfjdWw@mail.gmail.com>

If a queue has been setup before lets release it before we setup.
Otherwise we might leak resources.

Signed-off-by: Jan Blunck <jblunck@infradead.org>
---
 lib/librte_ether/rte_ethdev.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index fde8112..8c4b6cd 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -1010,6 +1010,7 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,
 	uint32_t mbp_buf_size;
 	struct rte_eth_dev *dev;
 	struct rte_eth_dev_info dev_info;
+	void **rxq;
 
 	RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
@@ -1068,6 +1069,14 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,
 		return -EINVAL;
 	}
 
+	rxq = dev->data->rx_queues;
+	if (rxq[rx_queue_id]) {
+		RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_release,
+					-ENOTSUP);
+		(*dev->dev_ops->rx_queue_release)(rxq[rx_queue_id]);
+		rxq[rx_queue_id] = NULL;
+	}
+
 	if (rx_conf == NULL)
 		rx_conf = &dev_info.default_rxconf;
 
@@ -1089,6 +1098,7 @@ rte_eth_tx_queue_setup(uint8_t port_id, uint16_t tx_queue_id,
 {
 	struct rte_eth_dev *dev;
 	struct rte_eth_dev_info dev_info;
+	void **txq;
 
 	RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
@@ -1121,6 +1131,14 @@ rte_eth_tx_queue_setup(uint8_t port_id, uint16_t tx_queue_id,
 		return -EINVAL;
 	}
 
+	txq = dev->data->tx_queues;
+	if (txq[tx_queue_id]) {
+		RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_release,
+					-ENOTSUP);
+		(*dev->dev_ops->tx_queue_release)(txq[tx_queue_id]);
+		txq[tx_queue_id] = NULL;
+	}
+
 	if (tx_conf == NULL)
 		tx_conf = &dev_info.default_txconf;
 
-- 
2.7.4

  parent reply	other threads:[~2016-11-23 19:40 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-07 12:28 [dpdk-dev] [PATCH] Revert "bonding: use existing enslaved device queues" Ilya Maximets
     [not found] ` <CGME20160916050359eucas1p22998d07e190781e165082cdd9c917470@eucas1p2.samsung.com>
2016-09-16  5:03   ` Ilya Maximets
2016-10-06 14:32 ` Declan Doherty
2016-10-19  9:55   ` Bruce Richardson
2016-10-25 13:59     ` Bruce Richardson
2016-10-07  2:02 ` Eric Kinzie
2016-10-12 13:24   ` Ilya Maximets
2016-10-12 15:24     ` Bruce Richardson
2016-10-13 23:37       ` Eric Kinzie
2016-10-24 11:02         ` Declan Doherty
2016-10-24 14:51           ` Jan Blunck
2016-10-24 15:07             ` Declan Doherty
2016-10-25 12:57               ` Bruce Richardson
2016-10-25 13:48                 ` Declan Doherty
2016-10-25 14:00                   ` Bruce Richardson
2016-11-21 11:30                     ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
2016-11-21 11:39                       ` Jan Blunck
2016-11-21 12:49                         ` Ilya Maximets
2016-11-21 13:11                           ` Ilya Maximets
2016-11-23 20:35                             ` Jan Blunck
2016-11-23 19:38                         ` Jan Blunck [this message]
2016-11-23 19:38                           ` [dpdk-dev] [PATCH 2/4] ethdev: Free rx/tx_queues after releasing all queues Jan Blunck
2016-11-23 19:38                           ` [dpdk-dev] [PATCH 3/4] ethdev: Add DPDK internal _rte_eth_dev_reset() Jan Blunck
2016-11-23 19:38                           ` [dpdk-dev] [PATCH 4/4] bond: Force reconfiguration of removed slave interfaces Jan Blunck
2016-10-18 12:28 ` [dpdk-dev] [PATCH] Revert "bonding: use existing enslaved device queues" Jan Blunck
2016-10-18 12:49   ` Ilya Maximets
2016-10-18 15:19     ` Jan Blunck
2016-10-19  9:47       ` Ilya Maximets
2016-10-24 14:54         ` Jan Blunck
2016-10-25  6:26           ` Ilya Maximets
2016-10-28  6:14             ` Ilya Maximets
2016-11-11  9:16               ` Ilya Maximets

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1479929912-32079-1-git-send-email-jblunck@infradead.org \
    --to=jblunck@infradead.org \
    --cc=bruce.richardson@intel.com \
    --cc=declan.doherty@intel.com \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@intel.com \
    --cc=i.maximets@samsung.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).