diff mbox

[dpdk-dev] bond: use existing enslaved device queues

Message ID 1458856798-13036-1-git-send-email-ehkinzie@gmail.com (mailing list archive)
State Accepted, archived
Delegated to: Bruce Richardson
Headers

Commit Message

Eric Kinzie March 24, 2016, 9:59 p.m. UTC 
  This solves issues when an active device is added to a bond.

If a device to be enslaved already has transmit and/or receive queues
allocated, use those and then create any additional queues that are
necessary.

Fixes: 2efb58cbab6e ("bond: new link bonding library")

Signed-off-by: Eric Kinzie <ehkinzie@gmail.com>
---
 drivers/net/bonding/rte_eth_bond_pmd.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Comments

Iremonger, Bernard March 25, 2016, 1:28 p.m. UTC | #1 
> -----Original Message-----
> From: Eric Kinzie [mailto:ehkinzie@gmail.com]
> Sent: Thursday, March 24, 2016 10:00 PM
> To: dev@dpdk.org
> Cc: tkiely@brocade.com; Doherty, Declan <declan.doherty@intel.com>;
> Iremonger, Bernard <bernard.iremonger@intel.com>; ekinzie@brocade.com
> Subject: [PATCH] bond: use existing enslaved device queues
> 
> This solves issues when an active device is added to a bond.
> 
> If a device to be enslaved already has transmit and/or receive queues
> allocated, use those and then create any additional queues that are
> necessary.
> 
> Fixes: 2efb58cbab6e ("bond: new link bonding library")
> 
> Signed-off-by: Eric Kinzie <ehkinzie@gmail.com>

Acked-by: Bernard Iremonger<Bernard.iremonger@intel.com>
Bruce Richardson March 25, 2016, 3:55 p.m. UTC | #2 
On Fri, Mar 25, 2016 at 01:28:05PM +0000, Iremonger, Bernard wrote:
> > -----Original Message-----
> > From: Eric Kinzie [mailto:ehkinzie@gmail.com]
> > Sent: Thursday, March 24, 2016 10:00 PM
> > To: dev@dpdk.org
> > Cc: tkiely@brocade.com; Doherty, Declan <declan.doherty@intel.com>;
> > Iremonger, Bernard <bernard.iremonger@intel.com>; ekinzie@brocade.com
> > Subject: [PATCH] bond: use existing enslaved device queues
> > 
> > This solves issues when an active device is added to a bond.
> > 
> > If a device to be enslaved already has transmit and/or receive queues
> > allocated, use those and then create any additional queues that are
> > necessary.
> > 
> > Fixes: 2efb58cbab6e ("bond: new link bonding library")
> > 
> > Signed-off-by: Eric Kinzie <ehkinzie@gmail.com>
> 
> Acked-by: Bernard Iremonger<Bernard.iremonger@intel.com>

Applied to dpdk-next-net/rel_16_04

/Bruce
diff mbox

Patch

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 011150a..7472e9d 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1305,6 +1305,8 @@  slave_configure(struct rte_eth_dev *bonded_eth_dev,
 	struct bond_rx_queue *bd_rx_q;
 	struct bond_tx_queue *bd_tx_q;
 
+	uint16_t old_nb_tx_queues = slave_eth_dev->data->nb_tx_queues;
+	uint16_t old_nb_rx_queues = slave_eth_dev->data->nb_rx_queues;
 	int errval;
 	uint16_t q_id;
 
@@ -1345,7 +1347,9 @@  slave_configure(struct rte_eth_dev *bonded_eth_dev,
 	}
 
 	/* Setup Rx Queues */
-	for (q_id = 0; q_id < bonded_eth_dev->data->nb_rx_queues; q_id++) {
+	/* Use existing queues, if any */
+	for (q_id = old_nb_rx_queues;
+	     q_id < bonded_eth_dev->data->nb_rx_queues; q_id++) {
 		bd_rx_q = (struct bond_rx_queue *)bonded_eth_dev->data->rx_queues[q_id];
 
 		errval = rte_eth_rx_queue_setup(slave_eth_dev->data->port_id, q_id,
@@ -1361,7 +1365,9 @@  slave_configure(struct rte_eth_dev *bonded_eth_dev,
 	}
 
 	/* Setup Tx Queues */
-	for (q_id = 0; q_id < bonded_eth_dev->data->nb_tx_queues; q_id++) {
+	/* Use existing queues, if any */
+	for (q_id = old_nb_tx_queues;
+	     q_id < bonded_eth_dev->data->nb_tx_queues; q_id++) {
 		bd_tx_q = (struct bond_tx_queue *)bonded_eth_dev->data->tx_queues[q_id];
 
 		errval = rte_eth_tx_queue_setup(slave_eth_dev->data->port_id, q_id,