net/bonding: allow external state machine in mode 4

Provide functions to allow an external 802.3ad state machine to transmit
and receive LACPDUs and to set the collection/distribution flags on
slave interfaces.

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_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c
index c0ed44d..48a50e4 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -39,9 +39,12 @@
 #include <rte_malloc.h>
 #include <rte_errno.h>
 #include <rte_cycles.h>
+#include <rte_compat.h>
 
 #include "rte_eth_bond_private.h"
 
+static void bond_mode_8023ad_ext_periodic_cb(void *arg);
+
 #ifdef RTE_LIBRTE_BOND_DEBUG_8023AD
 #define MODE4_DEBUG(fmt, ...) RTE_LOG(DEBUG, PMD, "%6u [Port %u: %s] " fmt, \
                        bond_dbg_get_time_diff_ms(), slave_id, \
@@ -1005,7 +1008,7 @@ bond_mode_8023ad_mac_address_update(struct rte_eth_dev *bond_dev)
                bond_mode_8023ad_start(bond_dev);
 }
 
-void
+static void
 bond_mode_8023ad_conf_get(struct rte_eth_dev *dev,
                struct rte_eth_bond_8023ad_conf *conf)
 {
@@ -1023,26 +1026,36 @@ bond_mode_8023ad_conf_get(struct rte_eth_dev *dev,
        conf->rx_marker_period_ms = mode4->rx_marker_timeout / ms_ticks;
 }
 
-void
-bond_mode_8023ad_setup(struct rte_eth_dev *dev,
+static void
+bond_mode_8023ad_conf_get_v1607(struct rte_eth_dev *dev,
                struct rte_eth_bond_8023ad_conf *conf)
 {
-       struct rte_eth_bond_8023ad_conf def_conf;
        struct bond_dev_private *internals = dev->data->dev_private;
        struct mode8023ad_private *mode4 = &internals->mode4;
-       uint64_t ms_ticks = rte_get_tsc_hz() / 1000;
 
-       if (conf == NULL) {
-               conf = &def_conf;
-               conf->fast_periodic_ms = BOND_8023AD_FAST_PERIODIC_MS;
-               conf->slow_periodic_ms = BOND_8023AD_SLOW_PERIODIC_MS;
-               conf->short_timeout_ms = BOND_8023AD_SHORT_TIMEOUT_MS;
-               conf->long_timeout_ms = BOND_8023AD_LONG_TIMEOUT_MS;
-               conf->aggregate_wait_timeout_ms = BOND_8023AD_AGGREGATE_WAIT_TIMEOUT_MS;
-               conf->tx_period_ms = BOND_8023AD_TX_MACHINE_PERIOD_MS;
-               conf->rx_marker_period_ms = BOND_8023AD_RX_MARKER_PERIOD_MS;
-               conf->update_timeout_ms = BOND_MODE_8023AX_UPDATE_TIMEOUT_MS;
-       }
+       bond_mode_8023ad_conf_get(dev, conf);
+       conf->slowrx_cb = mode4->slowrx_cb;
+}
+
+static void
+bond_mode_8023ad_conf_get_default(struct rte_eth_bond_8023ad_conf *conf)
+{
+       conf->fast_periodic_ms = BOND_8023AD_FAST_PERIODIC_MS;
+       conf->slow_periodic_ms = BOND_8023AD_SLOW_PERIODIC_MS;
+       conf->short_timeout_ms = BOND_8023AD_SHORT_TIMEOUT_MS;
+       conf->long_timeout_ms = BOND_8023AD_LONG_TIMEOUT_MS;
+       conf->aggregate_wait_timeout_ms = BOND_8023AD_AGGREGATE_WAIT_TIMEOUT_MS;
+       conf->tx_period_ms = BOND_8023AD_TX_MACHINE_PERIOD_MS;
+       conf->rx_marker_period_ms = BOND_8023AD_RX_MARKER_PERIOD_MS;
+       conf->update_timeout_ms = BOND_MODE_8023AX_UPDATE_TIMEOUT_MS;
+       conf->slowrx_cb = NULL;
+}
+
+static void
+bond_mode_8023ad_conf_assign(struct mode8023ad_private *mode4,
+               struct rte_eth_bond_8023ad_conf *conf)
+{
+       uint64_t ms_ticks = rte_get_tsc_hz() / 1000;
 
        mode4->fast_periodic_timeout = conf->fast_periodic_ms * ms_ticks;
        mode4->slow_periodic_timeout = conf->slow_periodic_ms * ms_ticks;
@@ -1054,6 +1067,48 @@ bond_mode_8023ad_setup(struct rte_eth_dev *dev,
        mode4->update_timeout_us = conf->update_timeout_ms * 1000;
 }
 
+static void
+bond_mode_8023ad_setup_v1604(struct rte_eth_dev *dev,
+               struct rte_eth_bond_8023ad_conf *conf)
+{
+       struct rte_eth_bond_8023ad_conf def_conf;
+       struct bond_dev_private *internals = dev->data->dev_private;
+       struct mode8023ad_private *mode4 = &internals->mode4;
+
+       if (conf == NULL) {
+               conf = &def_conf;
+               bond_mode_8023ad_conf_get_default(conf);
+       }
+
+       bond_mode_8023ad_stop(dev);
+       bond_mode_8023ad_conf_assign(mode4, conf);
+
+       if (dev->data->dev_started)
+               bond_mode_8023ad_start(dev);
+}
+
+
+void
+bond_mode_8023ad_setup(struct rte_eth_dev *dev,
+               struct rte_eth_bond_8023ad_conf *conf)
+{
+       struct rte_eth_bond_8023ad_conf def_conf;
+       struct bond_dev_private *internals = dev->data->dev_private;
+       struct mode8023ad_private *mode4 = &internals->mode4;
+
+       if (conf == NULL) {
+               conf = &def_conf;
+               bond_mode_8023ad_conf_get_default(conf);
+       }
+
+       bond_mode_8023ad_stop(dev);
+       bond_mode_8023ad_conf_assign(mode4, conf);
+       mode4->slowrx_cb = conf->slowrx_cb;
+
+       if (dev->data->dev_started)
+               bond_mode_8023ad_start(dev);
+}
+
 int
 bond_mode_8023ad_enable(struct rte_eth_dev *bond_dev)
 {
@@ -1069,13 +1124,28 @@ bond_mode_8023ad_enable(struct rte_eth_dev *bond_dev)
 int
 bond_mode_8023ad_start(struct rte_eth_dev *bond_dev)
 {
-       return rte_eal_alarm_set(BOND_MODE_8023AX_UPDATE_TIMEOUT_MS * 1000,
-                       &bond_mode_8023ad_periodic_cb, bond_dev);
+       struct bond_dev_private *internals = bond_dev->data->dev_private;
+       struct mode8023ad_private *mode4 = &internals->mode4;
+       static const uint64_t us = BOND_MODE_8023AX_UPDATE_TIMEOUT_MS * 1000;
+
+       if (mode4->slowrx_cb)
+               return rte_eal_alarm_set(us, &bond_mode_8023ad_ext_periodic_cb,
+                                        bond_dev);
+
+       return rte_eal_alarm_set(us, &bond_mode_8023ad_periodic_cb, bond_dev);
 }
 
 void
 bond_mode_8023ad_stop(struct rte_eth_dev *bond_dev)
 {
+       struct bond_dev_private *internals = bond_dev->data->dev_private;
+       struct mode8023ad_private *mode4 = &internals->mode4;
+
+       if (mode4->slowrx_cb) {
+               rte_eal_alarm_cancel(&bond_mode_8023ad_ext_periodic_cb,
+                                    bond_dev);
+               return;
+       }
        rte_eal_alarm_cancel(&bond_mode_8023ad_periodic_cb, bond_dev);
 }
 
@@ -1144,7 +1214,7 @@ free_out:
 }
 
 int
-rte_eth_bond_8023ad_conf_get(uint8_t port_id,
+rte_eth_bond_8023ad_conf_get_v1604(uint8_t port_id,
                struct rte_eth_bond_8023ad_conf *conf)
 {
        struct rte_eth_dev *bond_dev;
@@ -1159,13 +1229,33 @@ rte_eth_bond_8023ad_conf_get(uint8_t port_id,
        bond_mode_8023ad_conf_get(bond_dev, conf);
        return 0;
 }
+VERSION_SYMBOL(rte_eth_bond_8023ad_conf_get, _v1604, 16.04);
 
 int
-rte_eth_bond_8023ad_setup(uint8_t port_id,
+rte_eth_bond_8023ad_conf_get_v1607(uint8_t port_id,
                struct rte_eth_bond_8023ad_conf *conf)
 {
        struct rte_eth_dev *bond_dev;
 
+       if (valid_bonded_port_id(port_id) != 0)
+               return -EINVAL;
+
+       if (conf == NULL)
+               return -EINVAL;
+
+       bond_dev = &rte_eth_devices[port_id];
+       bond_mode_8023ad_conf_get_v1607(bond_dev, conf);
+       return 0;
+}
+BIND_DEFAULT_SYMBOL(rte_eth_bond_8023ad_conf_get, _v1607, 16.07);
+MAP_STATIC_SYMBOL(int rte_eth_bond_8023ad_conf_get(uint8_t port_id,
+               struct rte_eth_bond_8023ad_conf *conf),
+               rte_eth_bond_8023ad_conf_get_v1607);
+
+static int
+bond_8023ad_setup_validate(uint8_t port_id,
+               struct rte_eth_bond_8023ad_conf *conf)
+{
        if (valid_bonded_port_id(port_id) != 0)
                return -EINVAL;
 
@@ -1184,11 +1274,47 @@ rte_eth_bond_8023ad_setup(uint8_t port_id,
                }
        }
 
+       return 0;
+}
+
+int
+rte_eth_bond_8023ad_setup_v1604(uint8_t port_id,
+               struct rte_eth_bond_8023ad_conf *conf)
+{
+       struct rte_eth_dev *bond_dev;
+       int err;
+
+       err = bond_8023ad_setup_validate(port_id, conf);
+       if (err != 0)
+               return err;
+
+       bond_dev = &rte_eth_devices[port_id];
+       bond_mode_8023ad_setup_v1604(bond_dev, conf);
+
+       return 0;
+}
+VERSION_SYMBOL(rte_eth_bond_8023ad_setup, _v1604, 16.04);
+
+int
+rte_eth_bond_8023ad_setup_v1607(uint8_t port_id,
+               struct rte_eth_bond_8023ad_conf *conf)
+{
+       struct rte_eth_dev *bond_dev;
+       int err;
+
+       err = bond_8023ad_setup_validate(port_id, conf);
+       if (err != 0)
+               return err;
+
        bond_dev = &rte_eth_devices[port_id];
        bond_mode_8023ad_setup(bond_dev, conf);
 
        return 0;
 }
+BIND_DEFAULT_SYMBOL(rte_eth_bond_8023ad_setup, _v1607, 16.07);
+MAP_STATIC_SYMBOL(int rte_eth_bond_8023ad_setup(uint8_t port_id,
+               struct rte_eth_bond_8023ad_conf *conf),
+               rte_eth_bond_8023ad_setup_v1607);
 
 int
 rte_eth_bond_8023ad_slave_info(uint8_t port_id, uint8_t slave_id,
@@ -1222,3 +1348,160 @@ rte_eth_bond_8023ad_slave_info(uint8_t port_id, uint8_t slave_id,
        info->agg_port_id = port->aggregator_port_id;
        return 0;
 }
+
+static int
+bond_8023ad_ext_validate(uint8_t port_id, uint8_t slave_id)
+{
+       struct rte_eth_dev *bond_dev;
+       struct bond_dev_private *internals;
+       struct mode8023ad_private *mode4;
+
+       if (rte_eth_bond_mode_get(port_id) != BONDING_MODE_8023AD)
+               return -EINVAL;
+
+       bond_dev = &rte_eth_devices[port_id];
+
+       if (!bond_dev->data->dev_started)
+               return -EINVAL;
+
+       internals = bond_dev->data->dev_private;
+       if (find_slave_by_id(internals->active_slaves,
+                       internals->active_slave_count, slave_id) ==
+                               internals->active_slave_count)
+               return -EINVAL;
+
+       mode4 = &internals->mode4;
+       if (mode4->slowrx_cb == NULL)
+               return -EINVAL;
+
+       return 0;
+}
+
+int
+rte_eth_bond_8023ad_ext_collect(uint8_t port_id, uint8_t slave_id, int enabled)
+{
+       struct port *port;
+       int res;
+
+       res = bond_8023ad_ext_validate(port_id, slave_id);
+       if (res != 0)
+               return res;
+
+       port = &mode_8023ad_ports[slave_id];
+
+       if (enabled)
+               ACTOR_STATE_SET(port, COLLECTING);
+       else
+               ACTOR_STATE_CLR(port, COLLECTING);
+
+       return 0;
+}
+
+int
+rte_eth_bond_8023ad_ext_distrib(uint8_t port_id, uint8_t slave_id, int enabled)
+{
+       struct port *port;
+       int res;
+
+       res = bond_8023ad_ext_validate(port_id, slave_id);
+       if (res != 0)
+               return res;
+
+       port = &mode_8023ad_ports[slave_id];
+
+       if (enabled)
+               ACTOR_STATE_SET(port, DISTRIBUTING);
+       else
+               ACTOR_STATE_CLR(port, DISTRIBUTING);
+
+       return 0;
+}
+
+int
+rte_eth_bond_8023ad_ext_distrib_get(uint8_t port_id, uint8_t slave_id)
+{
+       struct port *port;
+       int err;
+
+       err = bond_8023ad_ext_validate(port_id, slave_id);
+       if (err != 0)
+               return err;
+
+       port = &mode_8023ad_ports[slave_id];
+       return ACTOR_STATE(port, DISTRIBUTING);
+}
+
+int
+rte_eth_bond_8023ad_ext_collect_get(uint8_t port_id, uint8_t slave_id)
+{
+       struct port *port;
+       int err;
+
+       err = bond_8023ad_ext_validate(port_id, slave_id);
+       if (err != 0)
+               return err;
+
+       port = &mode_8023ad_ports[slave_id];
+       return ACTOR_STATE(port, COLLECTING);
+}
+
+int
+rte_eth_bond_8023ad_ext_slowtx(uint8_t port_id, uint8_t slave_id,
+               struct rte_mbuf *lacp_pkt)
+{
+       struct port *port;
+       int res;
+
+       res = bond_8023ad_ext_validate(port_id, slave_id);
+       if (res != 0)
+               return res;
+
+       port = &mode_8023ad_ports[slave_id];
+
+       if (rte_pktmbuf_pkt_len(lacp_pkt) < sizeof(struct lacpdu_header))
+               return -EINVAL;
+
+       struct lacpdu_header *lacp;
+
+       /* only enqueue LACPDUs */
+       lacp = rte_pktmbuf_mtod(lacp_pkt, struct lacpdu_header *);
+       if (lacp->lacpdu.subtype != SLOW_SUBTYPE_LACP)
+               return -EINVAL;
+
+       MODE4_DEBUG("sending LACP frame\n");
+
+       return rte_ring_enqueue(port->tx_ring, lacp_pkt);
+}
+
+static void
+bond_mode_8023ad_ext_periodic_cb(void *arg)
+{
+       struct rte_eth_dev *bond_dev = arg;
+       struct bond_dev_private *internals = bond_dev->data->dev_private;
+       struct mode8023ad_private *mode4 = &internals->mode4;
+       struct port *port;
+       void *pkt = NULL;
+       uint16_t i, slave_id;
+
+       for (i = 0; i < internals->active_slave_count; i++) {
+               slave_id = internals->active_slaves[i];
+               port = &mode_8023ad_ports[slave_id];
+
+               if (rte_ring_dequeue(port->rx_ring, &pkt) == 0) {
+                       struct rte_mbuf *lacp_pkt = pkt;
+                       struct lacpdu_header *lacp;
+
+                       lacp = rte_pktmbuf_mtod(lacp_pkt,
+                                               struct lacpdu_header *);
+                       RTE_VERIFY(lacp->lacpdu.subtype == SLOW_SUBTYPE_LACP);
+
+                       /* This is LACP frame so pass it to rx callback.
+                        * Callback is responsible for freeing mbuf.
+                        */
+                       mode4->slowrx_cb(slave_id, lacp_pkt);
+               }
+       }
+
+       rte_eal_alarm_set(internals->mode4.update_timeout_us,
+                       bond_mode_8023ad_ext_periodic_cb, arg);
+}

diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.h b/drivers/net/bonding/rte_eth_bond_8023ad.h
index ebd0e93..1de34bc 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_8023ad.h
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.h
@@ -64,6 +64,9 @@ extern "C" {
 #define MARKER_TLV_TYPE_INFO                0x01
 #define MARKER_TLV_TYPE_RESP                0x02
 
+typedef void (*rte_eth_bond_8023ad_ext_slowrx_fn)(uint8_t slave_id,
+                                                 struct rte_mbuf *lacp_pkt);
+
 enum rte_bond_8023ad_selection {
        UNSELECTED,
        STANDBY,
@@ -157,6 +160,7 @@ struct rte_eth_bond_8023ad_conf {
        uint32_t tx_period_ms;
        uint32_t rx_marker_period_ms;
        uint32_t update_timeout_ms;
+       rte_eth_bond_8023ad_ext_slowrx_fn slowrx_cb;
 };
 
 struct rte_eth_bond_8023ad_slave_info {
@@ -183,6 +187,12 @@ struct rte_eth_bond_8023ad_slave_info {
 int
 rte_eth_bond_8023ad_conf_get(uint8_t port_id,
                struct rte_eth_bond_8023ad_conf *conf);
+int
+rte_eth_bond_8023ad_conf_get_v1604(uint8_t port_id,
+               struct rte_eth_bond_8023ad_conf *conf);
+int
+rte_eth_bond_8023ad_conf_get_v1607(uint8_t port_id,
+               struct rte_eth_bond_8023ad_conf *conf);
 
 /**
  * @internal
@@ -198,6 +208,12 @@ rte_eth_bond_8023ad_conf_get(uint8_t port_id,
 int
 rte_eth_bond_8023ad_setup(uint8_t port_id,
                struct rte_eth_bond_8023ad_conf *conf);
+int
+rte_eth_bond_8023ad_setup_v1604(uint8_t port_id,
+               struct rte_eth_bond_8023ad_conf *conf);
+int
+rte_eth_bond_8023ad_setup_v1607(uint8_t port_id,
+               struct rte_eth_bond_8023ad_conf *conf);
 
 /**
  * @internal
@@ -219,4 +235,71 @@ rte_eth_bond_8023ad_slave_info(uint8_t port_id, uint8_t slave_id,
 }
 #endif
 
+/**
+ * Configure a slave port to start collecting.
+ *
+ * @param port_id      Bonding device id
+ * @param slave_id     Port id of valid slave.
+ * @param enabled      Non-zero when collection enabled.
+ * @return
+ *   0 - if ok
+ *   -EINVAL if slave is not valid.
+ */
+int
+rte_eth_bond_8023ad_ext_collect(uint8_t port_id, uint8_t slave_id, int enabled);
+
+/**
+ * Get COLLECTING flag from slave port actor state.
+ *
+ * @param port_id      Bonding device id
+ * @param slave_id     Port id of valid slave.
+ * @return
+ *   0 - if not set
+ *   1 - if set
+ *   -EINVAL if slave is not valid.
+ */
+int
+rte_eth_bond_8023ad_ext_collect_get(uint8_t port_id, uint8_t slave_id);
+
+/**
+ * Configure a slave port to start distributing.
+ *
+ * @param port_id      Bonding device id
+ * @param slave_id     Port id of valid slave.
+ * @param enabled      Non-zero when distribution enabled.
+ * @return
+ *   0 - if ok
+ *   -EINVAL if slave is not valid.
+ */
+int
+rte_eth_bond_8023ad_ext_distrib(uint8_t port_id, uint8_t slave_id, int enabled);
+
+/**
+ * Get DISTRIBUTING flag from slave port actor state.
+ *
+ * @param port_id      Bonding device id
+ * @param slave_id     Port id of valid slave.
+ * @return
+ *   0 - if not set
+ *   1 - if set
+ *   -EINVAL if slave is not valid.
+ */
+int
+rte_eth_bond_8023ad_ext_distrib_get(uint8_t port_id, uint8_t slave_id);
+
+/**
+ * LACPDU transmit path for external 802.3ad state machine.  Caller retains
+ * ownership of the packet on failure.
+ *
+ * @param port_id      Bonding device id
+ * @param slave_id     Port ID of valid slave device.
+ * @param lacp_pkt     mbuf containing LACPDU.
+ *
+ * @return
+ *   0 on success, negative value otherwise.
+ */
+int
+rte_eth_bond_8023ad_ext_slowtx(uint8_t port_id, uint8_t slave_id,
+               struct rte_mbuf *lacp_pkt);
+
 #endif /* RTE_ETH_BOND_8023AD_H_ */

diff --git a/drivers/net/bonding/rte_eth_bond_8023ad_private.h b/drivers/net/bonding/rte_eth_bond_8023ad_private.h
index 8adee70..ca8858b 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_8023ad_private.h
+++ b/drivers/net/bonding/rte_eth_bond_8023ad_private.h
@@ -173,6 +173,8 @@ struct mode8023ad_private {
        uint64_t tx_period_timeout;
        uint64_t rx_marker_timeout;
        uint64_t update_timeout_us;
+       rte_eth_bond_8023ad_ext_slowrx_fn slowrx_cb;
+       uint8_t external_sm;
 };
 
 /**
@@ -185,18 +187,6 @@ extern struct port mode_8023ad_ports[];
 /* Forward declaration */
 struct bond_dev_private;
 
-/**
- * @internal
- *
- * Get configuration of bonded interface.
- *
- *
- * @param dev Bonded interface
- * @param conf returned configuration
- */
-void
-bond_mode_8023ad_conf_get(struct rte_eth_dev *dev,
-               struct rte_eth_bond_8023ad_conf *conf);
 
 /**
  * @internal

diff --git a/drivers/net/bonding/rte_eth_bond_version.map b/drivers/net/bonding/rte_eth_bond_version.map
index 22bd920..2de0a7d 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_version.map
+++ b/drivers/net/bonding/rte_eth_bond_version.map
@@ -27,3 +27,19 @@ DPDK_2.1 {
        rte_eth_bond_free;
 
 } DPDK_2.0;
+
+DPDK_16.04 {
+};
+
+DPDK_16.07 {
+       global:
+
+       rte_eth_bond_8023ad_ext_collect;
+       rte_eth_bond_8023ad_ext_collect_get;
+       rte_eth_bond_8023ad_ext_distrib;
+       rte_eth_bond_8023ad_ext_distrib_get;
+       rte_eth_bond_8023ad_ext_slowtx;
+       rte_eth_bond_8023ad_conf_get;
+       rte_eth_bond_8023ad_setup;
+
+} DPDK_16.04;