151 lines
5.4 KiB
Diff
151 lines
5.4 KiB
Diff
Description: backport of dpdk 16.04-rc1 fix for LP: #1559981
|
|
|
|
Forwarded: n/a (already upstream)
|
|
Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
|
|
Last-Update: 2016-03-20
|
|
|
|
From df3e8ad73f4c92b4eb8f49ff33271d4a09e6a04a Mon Sep 17 00:00:00 2001
|
|
From: Bernard Iremonger <bernard.iremonger@intel.com>
|
|
Date: Wed, 10 Feb 2016 10:13:45 +0000
|
|
Subject: [PATCH] bonding: fix detach of slave devices
|
|
|
|
Ensure that a bonded slave device is not detached,
|
|
until it is removed from the bonded device.
|
|
|
|
Fixes: 2efb58cbab6e ("bond: new link bonding library")
|
|
Fixes: a45b288ef21a ("bond: support link status polling")
|
|
Fixes: 494adb7f63f2 ("ethdev: add device fields from PCI layer")
|
|
Fixes: b1fb53a39d88 ("ethdev: remove some PCI specific handling")
|
|
|
|
Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
|
|
Acked-by: Declan Doherty <declan.doherty@intel.com>
|
|
---
|
|
drivers/net/bonding/rte_eth_bond_api.c | 33 +++++++++++----------------------
|
|
lib/librte_ether/rte_ethdev.c | 8 ++++++--
|
|
lib/librte_ether/rte_ethdev.h | 2 ++
|
|
3 files changed, 19 insertions(+), 24 deletions(-)
|
|
|
|
Index: dpdk/drivers/net/bonding/rte_eth_bond_api.c
|
|
===================================================================
|
|
--- dpdk.orig/drivers/net/bonding/rte_eth_bond_api.c
|
|
+++ dpdk/drivers/net/bonding/rte_eth_bond_api.c
|
|
@@ -314,38 +314,23 @@ __eth_bond_slave_add_lock_free(uint8_t b
|
|
{
|
|
struct rte_eth_dev *bonded_eth_dev, *slave_eth_dev;
|
|
struct bond_dev_private *internals;
|
|
- struct bond_dev_private *temp_internals;
|
|
struct rte_eth_link link_props;
|
|
struct rte_eth_dev_info dev_info;
|
|
|
|
- int i, j;
|
|
-
|
|
if (valid_slave_port_id(slave_port_id) != 0)
|
|
return -1;
|
|
|
|
bonded_eth_dev = &rte_eth_devices[bonded_port_id];
|
|
internals = bonded_eth_dev->data->dev_private;
|
|
|
|
- /* Verify that new slave device is not already a slave of another
|
|
- * bonded device */
|
|
- for (i = rte_eth_dev_count()-1; i >= 0; i--) {
|
|
- if (check_for_bonded_ethdev(&rte_eth_devices[i]) == 0) {
|
|
- temp_internals = rte_eth_devices[i].data->dev_private;
|
|
-
|
|
- for (j = 0; j < temp_internals->slave_count; j++) {
|
|
- /* Device already a slave of a bonded device */
|
|
- if (temp_internals->slaves[j].port_id == slave_port_id) {
|
|
- RTE_BOND_LOG(ERR, "Slave port %d is already a slave",
|
|
- slave_port_id);
|
|
- return -1;
|
|
- }
|
|
- }
|
|
- }
|
|
- }
|
|
-
|
|
slave_eth_dev = &rte_eth_devices[slave_port_id];
|
|
+ if (slave_eth_dev->data->dev_flags & RTE_ETH_DEV_BONDED_SLAVE) {
|
|
+ RTE_BOND_LOG(ERR, "Slave device is already a slave of a bonded device");
|
|
+ return -1;
|
|
+ }
|
|
|
|
/* Add slave details to bonded device */
|
|
+ slave_eth_dev->data->dev_flags |= RTE_ETH_DEV_BONDED_SLAVE;
|
|
slave_add(internals, slave_eth_dev);
|
|
|
|
rte_eth_dev_info_get(slave_port_id, &dev_info);
|
|
@@ -385,6 +370,7 @@ __eth_bond_slave_add_lock_free(uint8_t b
|
|
if (internals->link_props_set) {
|
|
if (link_properties_valid(&(bonded_eth_dev->data->dev_link),
|
|
&(slave_eth_dev->data->dev_link))) {
|
|
+ slave_eth_dev->data->dev_flags &= (~RTE_ETH_DEV_BONDED_SLAVE);
|
|
RTE_BOND_LOG(ERR,
|
|
"Slave port %d link speed/duplex not supported",
|
|
slave_port_id);
|
|
@@ -416,6 +402,7 @@ __eth_bond_slave_add_lock_free(uint8_t b
|
|
|
|
if (bonded_eth_dev->data->dev_started) {
|
|
if (slave_configure(bonded_eth_dev, slave_eth_dev) != 0) {
|
|
+ slave_eth_dev->data->dev_flags &= (~RTE_ETH_DEV_BONDED_SLAVE);
|
|
RTE_BOND_LOG(ERR, "rte_bond_slaves_configure: port=%d",
|
|
slave_port_id);
|
|
return -1;
|
|
@@ -468,7 +455,7 @@ __eth_bond_slave_remove_lock_free(uint8_
|
|
{
|
|
struct rte_eth_dev *bonded_eth_dev;
|
|
struct bond_dev_private *internals;
|
|
-
|
|
+ struct rte_eth_dev *slave_eth_dev;
|
|
int i, slave_idx;
|
|
|
|
if (valid_slave_port_id(slave_port_id) != 0)
|
|
@@ -508,7 +495,9 @@ __eth_bond_slave_remove_lock_free(uint8_
|
|
mac_address_set(&rte_eth_devices[slave_port_id],
|
|
&(internals->slaves[slave_idx].persisted_mac_addr));
|
|
|
|
- slave_remove(internals, &rte_eth_devices[slave_port_id]);
|
|
+ slave_eth_dev = &rte_eth_devices[slave_port_id];
|
|
+ slave_remove(internals, slave_eth_dev);
|
|
+ slave_eth_dev->data->dev_flags &= (~RTE_ETH_DEV_BONDED_SLAVE);
|
|
|
|
/* first slave in the active list will be the primary by default,
|
|
* otherwise use first device in list */
|
|
Index: dpdk/lib/librte_ether/rte_ethdev.c
|
|
===================================================================
|
|
--- dpdk.orig/lib/librte_ether/rte_ethdev.c
|
|
+++ dpdk/lib/librte_ether/rte_ethdev.c
|
|
@@ -1,7 +1,7 @@
|
|
/*-
|
|
* BSD LICENSE
|
|
*
|
|
- * Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
|
|
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
@@ -498,7 +498,11 @@ rte_eth_dev_is_detachable(uint8_t port_i
|
|
return -ENOTSUP;
|
|
}
|
|
dev_flags = rte_eth_devices[port_id].data->dev_flags;
|
|
- return !(dev_flags & RTE_ETH_DEV_DETACHABLE);
|
|
+ if ((dev_flags & RTE_ETH_DEV_DETACHABLE) &&
|
|
+ (!(dev_flags & RTE_ETH_DEV_BONDED_SLAVE)))
|
|
+ return 0;
|
|
+ else
|
|
+ return 1;
|
|
}
|
|
|
|
/* attach the new physical device, then store port_id of the device */
|
|
Index: dpdk/lib/librte_ether/rte_ethdev.h
|
|
===================================================================
|
|
--- dpdk.orig/lib/librte_ether/rte_ethdev.h
|
|
+++ dpdk/lib/librte_ether/rte_ethdev.h
|
|
@@ -1616,6 +1616,8 @@ struct rte_eth_dev_data {
|
|
#define RTE_ETH_DEV_DETACHABLE 0x0001
|
|
/** Device supports link state interrupt */
|
|
#define RTE_ETH_DEV_INTR_LSC 0x0002
|
|
+/** Device is a bonded slave */
|
|
+#define RTE_ETH_DEV_BONDED_SLAVE 0x0004
|
|
|
|
/**
|
|
* @internal
|