net/bonding: inherit maximum Rx packet length

Instead of a hard-coded maximum receive length, allow the bonded interface
to inherit this limit from the slave interfaces.  This allows
an application that uses jumbo frames to pass realistic values to
rte_eth_dev_configure without causing an error.

Before the bonding interface is configured, allow slaves with any
max_rx_pktlen to be added and remember the lowest of these values as
a candidate value.  During dev_configure, set the bond device's
max_rx_pktlen to the candidate value.  After this point only slaves
with a max_rx_pktlen greater or equal to that of the bonding device
can be added.

If all slaves are removed, the bond device's pktlen is cleared.

Signed-off-by: Eric Kinzie <ehkinzie@gmail.com>
Acked-by: Declan Doherty <declan.doherty@intel.com>

diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c
index 53df9fe..203ebe9 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -243,6 +243,8 @@ rte_eth_bond_create(const char *name, uint8_t mode, uint8_t socket_id)
        internals->active_slave_count = 0;
        internals->rx_offload_capa = 0;
        internals->tx_offload_capa = 0;
+       internals->candidate_max_rx_pktlen = 0;
+       internals->max_rx_pktlen = 0;
 
        /* Initially allow to choose any offload type */
        internals->flow_type_rss_offloads = ETH_RSS_PROTO_MASK;
@@ -327,9 +329,15 @@ __eth_bond_slave_add_lock_free(uint8_t bonded_port_id, uint8_t slave_port_id)
 
        /* 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);
+       if (dev_info.max_rx_pktlen < internals->max_rx_pktlen) {
+               RTE_BOND_LOG(ERR, "Slave (port %u) max_rx_pktlen too small",
+                            slave_port_id);
+               return -1;
+       }
+
+       slave_add(internals, slave_eth_dev);
 
        /* We need to store slaves reta_size to be able to synchronize RETA for all
         * slave devices even if its sizes are different.
@@ -361,6 +369,9 @@ __eth_bond_slave_add_lock_free(uint8_t bonded_port_id, uint8_t slave_port_id)
                internals->tx_offload_capa = dev_info.tx_offload_capa;
                internals->flow_type_rss_offloads = dev_info.flow_type_rss_offloads;
 
+               /* Inherit first slave's max rx packet size */
+               internals->candidate_max_rx_pktlen = dev_info.max_rx_pktlen;
+
        } else {
                /* Check slave link properties are supported if props are set,
                 * all slaves must be the same */
@@ -387,6 +398,9 @@ __eth_bond_slave_add_lock_free(uint8_t bonded_port_id, uint8_t slave_port_id)
                if (internals->reta_size > dev_info.reta_size)
                        internals->reta_size = dev_info.reta_size;
 
+               if (!internals->max_rx_pktlen &&
+                   dev_info.max_rx_pktlen < internals->candidate_max_rx_pktlen)
+                       internals->candidate_max_rx_pktlen = dev_info.max_rx_pktlen;
        }
 
        bonded_eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf &=
@@ -532,6 +546,8 @@ __eth_bond_slave_remove_lock_free(uint8_t bonded_port_id, uint8_t slave_port_id)
                internals->tx_offload_capa = 0;
                internals->flow_type_rss_offloads = ETH_RSS_PROTO_MASK;
                internals->reta_size = 0;
+               internals->candidate_max_rx_pktlen = 0;
+               internals->max_rx_pktlen = 0;
        }
        return 0;
 }

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 129f04b..9a2518f 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1650,7 +1650,8 @@ bond_ethdev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 
        dev_info->max_mac_addrs = 1;
 
-       dev_info->max_rx_pktlen = (uint32_t)2048;
+       dev_info->max_rx_pktlen = internals->candidate_max_rx_pktlen ?
+                                 internals->candidate_max_rx_pktlen : 2048;
 
        dev_info->max_rx_queues = (uint16_t)128;
        dev_info->max_tx_queues = (uint16_t)512;
@@ -2293,6 +2294,9 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
                }
        }
 
+       /* set the max_rx_pktlen */
+       internals->max_rx_pktlen = internals->candidate_max_rx_pktlen;
+
        /*
         * if no kvlist, it means that this bonded device has been created
         * through the bonding api.

diff --git a/drivers/net/bonding/rte_eth_bond_private.h b/drivers/net/bonding/rte_eth_bond_private.h
index 8312397..2bdc9ef 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_private.h
+++ b/drivers/net/bonding/rte_eth_bond_private.h
@@ -169,6 +169,9 @@ struct bond_dev_private {
 
        struct rte_kvargs *kvlist;
        uint8_t slave_update_idx;
+
+       uint32_t candidate_max_rx_pktlen;
+       uint32_t max_rx_pktlen;
 };
 
 extern const struct eth_dev_ops default_dev_ops;