examples/power: fix buffer overrun
[dpdk.git] / app / test / test_link_bonding_mode4.c
index 590daad..e539f07 100644 (file)
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <string.h>
 
 #define SLAVE_COUNT (4)
 
-#define RX_RING_SIZE 128
-#define TX_RING_SIZE 512
+#define RX_RING_SIZE 1024
+#define TX_RING_SIZE 1024
 
-#define MBUF_DATA_SIZE          (2048 + RTE_PKTMBUF_HEADROOM)
 #define MBUF_CACHE_SIZE         (250)
 #define BURST_SIZE              (32)
 
-#define DEFAULT_MBUF_DATA_SIZE  (2048)
 #define TEST_RX_DESC_MAX        (2048)
 #define TEST_TX_DESC_MAX        (2048)
 #define MAX_PKT_BURST           (32)
 #define DEF_PKT_BURST           (16)
 
-#define BONDED_DEV_NAME         ("unit_test_mode4_bond_dev")
+#define BONDED_DEV_NAME         ("net_bonding_m4_bond_dev")
 
-#define SLAVE_DEV_NAME_FMT      ("unit_test_mode4_slave_%d")
-#define SLAVE_RX_QUEUE_FMT      ("unit_test_mode4_slave_%d_rx")
-#define SLAVE_TX_QUEUE_FMT      ("unit_test_mode4_slave_%d_tx")
+#define SLAVE_DEV_NAME_FMT      ("net_virt_%d")
+#define SLAVE_RX_QUEUE_FMT      ("net_virt_%d_rx")
+#define SLAVE_TX_QUEUE_FMT      ("net_virt_%d_tx")
 
 #define INVALID_SOCKET_ID       (-1)
 #define INVALID_PORT_ID         (0xFF)
@@ -104,7 +73,7 @@ static const struct ether_addr slow_protocol_mac_addr = {
 struct slave_conf {
        struct rte_ring *rx_queue;
        struct rte_ring *tx_queue;
-       uint8_t port_id;
+       uint16_t port_id;
        uint8_t bonded : 1;
 
        uint8_t lacp_parnter_state;
@@ -141,11 +110,6 @@ static struct rte_eth_conf default_pmd_conf = {
                .mq_mode = ETH_MQ_RX_NONE,
                .max_rx_pkt_len = ETHER_MAX_LEN,
                .split_hdr_size = 0,
-               .header_split   = 0, /**< Header Split disabled */
-               .hw_ip_checksum = 0, /**< IP checksum offload enabled */
-               .hw_vlan_filter = 0, /**< VLAN filtering disabled */
-               .jumbo_frame    = 0, /**< Jumbo Frame Support disabled */
-               .hw_strip_crc   = 0, /**< CRC stripped by hardware */
        },
        .txmode = {
                .mq_mode = ETH_MQ_TX_NONE,
@@ -153,6 +117,8 @@ static struct rte_eth_conf default_pmd_conf = {
        .lpbk_mode = 0,
 };
 
+static uint8_t lacpdu_rx_count[RTE_MAX_ETHPORTS] = {0, };
+
 #define FOR_EACH(_i, _item, _array, _size) \
        for (_i = 0, _item = &_array[0]; _i < _size && (_item = &_array[_i]); _i++)
 
@@ -193,7 +159,8 @@ static struct rte_eth_conf default_pmd_conf = {
 static int
 slave_get_pkts(struct slave_conf *slave, struct rte_mbuf **buf, uint16_t size)
 {
-       return rte_ring_dequeue_burst(slave->tx_queue, (void **)buf, size);
+       return rte_ring_dequeue_burst(slave->tx_queue, (void **)buf,
+                       size, NULL);
 }
 
 /*
@@ -206,7 +173,8 @@ slave_get_pkts(struct slave_conf *slave, struct rte_mbuf **buf, uint16_t size)
 static int
 slave_put_pkts(struct slave_conf *slave, struct rte_mbuf **buf, uint16_t size)
 {
-       return rte_ring_enqueue_burst(slave->rx_queue, (void **)buf, size);
+       return rte_ring_enqueue_burst(slave->rx_queue, (void **)buf,
+                       size, NULL);
 }
 
 static uint16_t
@@ -233,7 +201,7 @@ free_pkts(struct rte_mbuf **pkts, uint16_t count)
 }
 
 static int
-configure_ethdev(uint8_t port_id, uint8_t start)
+configure_ethdev(uint16_t port_id, uint8_t start)
 {
        TEST_ASSERT(rte_eth_dev_configure(port_id, 1, 1, &default_pmd_conf) == 0,
                "Failed to configure device %u", port_id);
@@ -322,8 +290,26 @@ remove_slave(struct slave_conf *slave)
        return 0;
 }
 
+static void
+lacp_recv_cb(uint16_t slave_id, struct rte_mbuf *lacp_pkt)
+{
+       struct ether_hdr *hdr;
+       struct slow_protocol_frame *slow_hdr;
+
+       RTE_VERIFY(lacp_pkt != NULL);
+
+       hdr = rte_pktmbuf_mtod(lacp_pkt, struct ether_hdr *);
+       RTE_VERIFY(hdr->ether_type == rte_cpu_to_be_16(ETHER_TYPE_SLOW));
+
+       slow_hdr = rte_pktmbuf_mtod(lacp_pkt, struct slow_protocol_frame *);
+       RTE_VERIFY(slow_hdr->slow_protocol.subtype == SLOW_SUBTYPE_LACP);
+
+       lacpdu_rx_count[slave_id]++;
+       rte_pktmbuf_free(lacp_pkt);
+}
+
 static int
-initialize_bonded_device_with_slaves(uint8_t slave_count, uint8_t start)
+initialize_bonded_device_with_slaves(uint16_t slave_count, uint8_t external_sm)
 {
        uint8_t i;
 
@@ -339,9 +325,17 @@ initialize_bonded_device_with_slaves(uint8_t slave_count, uint8_t start)
        rte_eth_bond_8023ad_setup(test_params.bonded_port_id, NULL);
        rte_eth_promiscuous_disable(test_params.bonded_port_id);
 
-       if (start)
-               TEST_ASSERT_SUCCESS(rte_eth_dev_start(test_params.bonded_port_id),
-                       "Failed to start bonded device");
+       if (external_sm) {
+               struct rte_eth_bond_8023ad_conf conf;
+
+               rte_eth_bond_8023ad_conf_get(test_params.bonded_port_id, &conf);
+               conf.slowrx_cb = lacp_recv_cb;
+               rte_eth_bond_8023ad_setup(test_params.bonded_port_id, &conf);
+
+       }
+
+       TEST_ASSERT_SUCCESS(rte_eth_dev_start(test_params.bonded_port_id),
+               "Failed to start bonded device");
 
        return TEST_SUCCESS;
 }
@@ -351,8 +345,8 @@ remove_slaves_and_stop_bonded_device(void)
 {
        struct slave_conf *slave;
        int retval;
-       uint8_t slaves[RTE_MAX_ETHPORTS];
-       uint8_t i;
+       uint16_t slaves[RTE_MAX_ETHPORTS];
+       uint16_t i;
 
        rte_eth_dev_stop(test_params.bonded_port_id);
 
@@ -383,14 +377,14 @@ test_setup(void)
        char name[RTE_ETH_NAME_MAX_LEN];
        struct slave_conf *port;
        const uint8_t socket_id = rte_socket_id();
-       uint8_t i;
+       uint16_t i;
 
        if (test_params.mbuf_pool == NULL) {
                nb_mbuf_per_pool = TEST_RX_DESC_MAX + DEF_PKT_BURST +
                                        TEST_TX_DESC_MAX + MAX_PKT_BURST;
                test_params.mbuf_pool = rte_pktmbuf_pool_create("TEST_MODE4",
-                       nb_mbuf_per_pool, MBUF_CACHE_SIZE, 0, MBUF_DATA_SIZE,
-                       socket_id);
+                       nb_mbuf_per_pool, MBUF_CACHE_SIZE, 0,
+                       RTE_MBUF_DEFAULT_BUF_SIZE, socket_id);
 
                TEST_ASSERT(test_params.mbuf_pool != NULL,
                        "rte_mempool_create failed\n");
@@ -426,7 +420,7 @@ test_setup(void)
                        TEST_ASSERT(retval >= 0,
                                "Failed to create ring ethdev '%s'\n", name);
 
-                       port->port_id = rte_eth_dev_count() - 1;
+                       port->port_id = rte_eth_dev_count_avail() - 1;
                }
 
                retval = configure_ethdev(port->port_id, 1);
@@ -455,7 +449,7 @@ test_setup(void)
        return 0;
 }
 
-static int
+static void
 testsuite_teardown(void)
 {
        struct slave_conf *port;
@@ -469,8 +463,6 @@ testsuite_teardown(void)
 
        FOR_EACH_PORT(i, port)
                rte_eth_dev_stop(port->port_id);
-
-       return 0;
 }
 
 /*
@@ -635,7 +627,7 @@ bond_handshake(void)
        TEST_ASSERT_EQUAL(all_slaves_done, 1, "Bond handshake failed\n");
 
        /* If flags doesn't match - report failure */
-       return all_slaves_done = 1 ? TEST_SUCCESS : TEST_FAILED;
+       return all_slaves_done == 1 ? TEST_SUCCESS : TEST_FAILED;
 }
 
 #define TEST_LACP_SLAVE_COUT RTE_DIM(test_params.slave_ports)
@@ -644,7 +636,7 @@ test_mode4_lacp(void)
 {
        int retval;
 
-       retval = initialize_bonded_device_with_slaves(TEST_LACP_SLAVE_COUT, 1);
+       retval = initialize_bonded_device_with_slaves(TEST_LACP_SLAVE_COUT, 0);
        TEST_ASSERT_SUCCESS(retval, "Failed to initialize bonded device");
 
        /* Test LACP handshake function */
@@ -656,6 +648,74 @@ test_mode4_lacp(void)
 
        return TEST_SUCCESS;
 }
+static int
+test_mode4_agg_mode_selection(void)
+{
+       int retval;
+       /* Test and verify for Stable mode */
+       retval = initialize_bonded_device_with_slaves(TEST_LACP_SLAVE_COUT, 0);
+       TEST_ASSERT_SUCCESS(retval, "Failed to initialize bonded device");
+
+
+       retval = rte_eth_bond_8023ad_agg_selection_set(
+                       test_params.bonded_port_id, AGG_STABLE);
+       TEST_ASSERT_SUCCESS(retval, "Failed to initialize bond aggregation mode");
+       retval = bond_handshake();
+       TEST_ASSERT_SUCCESS(retval, "Initial handshake failed");
+
+
+       retval = rte_eth_bond_8023ad_agg_selection_get(
+                       test_params.bonded_port_id);
+       TEST_ASSERT_EQUAL(retval, AGG_STABLE,
+                       "Wrong agg mode received from bonding device");
+
+       retval = remove_slaves_and_stop_bonded_device();
+       TEST_ASSERT_SUCCESS(retval, "Test cleanup failed.");
+
+
+       /* test and verify for Bandwidth mode */
+       retval = initialize_bonded_device_with_slaves(TEST_LACP_SLAVE_COUT, 0);
+       TEST_ASSERT_SUCCESS(retval, "Failed to initialize bonded device");
+
+
+       retval = rte_eth_bond_8023ad_agg_selection_set(
+                       test_params.bonded_port_id,
+                       AGG_BANDWIDTH);
+       TEST_ASSERT_SUCCESS(retval,
+                       "Failed to initialize bond aggregation mode");
+       retval = bond_handshake();
+       TEST_ASSERT_SUCCESS(retval, "Initial handshake failed");
+
+       retval = rte_eth_bond_8023ad_agg_selection_get(
+                       test_params.bonded_port_id);
+       TEST_ASSERT_EQUAL(retval, AGG_BANDWIDTH,
+                       "Wrong agg mode received from bonding device");
+
+       retval = remove_slaves_and_stop_bonded_device();
+       TEST_ASSERT_SUCCESS(retval, "Test cleanup failed.");
+
+       /* test and verify selection for count mode */
+       retval = initialize_bonded_device_with_slaves(TEST_LACP_SLAVE_COUT, 0);
+       TEST_ASSERT_SUCCESS(retval, "Failed to initialize bonded device");
+
+
+       retval = rte_eth_bond_8023ad_agg_selection_set(
+                       test_params.bonded_port_id, AGG_COUNT);
+       TEST_ASSERT_SUCCESS(retval,
+                       "Failed to initialize bond aggregation mode");
+       retval = bond_handshake();
+       TEST_ASSERT_SUCCESS(retval, "Initial handshake failed");
+
+       retval = rte_eth_bond_8023ad_agg_selection_get(
+                       test_params.bonded_port_id);
+       TEST_ASSERT_EQUAL(retval, AGG_COUNT,
+                       "Wrong agg mode received from bonding device");
+
+       retval = remove_slaves_and_stop_bonded_device();
+       TEST_ASSERT_SUCCESS(retval, "Test cleanup failed.");
+
+       return TEST_SUCCESS;
+}
 
 static int
 generate_packets(struct ether_addr *src_mac,
@@ -742,7 +802,8 @@ test_mode4_rx(void)
        struct ether_addr dst_mac;
        struct ether_addr bonded_mac;
 
-       retval = initialize_bonded_device_with_slaves(TEST_PROMISC_SLAVE_COUNT, 1);
+       retval = initialize_bonded_device_with_slaves(TEST_PROMISC_SLAVE_COUNT,
+                                                     0);
        TEST_ASSERT_SUCCESS(retval, "Failed to initialize bonded device");
 
        retval = bond_handshake();
@@ -751,8 +812,11 @@ test_mode4_rx(void)
        rte_eth_macaddr_get(test_params.bonded_port_id, &bonded_mac);
        ether_addr_copy(&bonded_mac, &dst_mac);
 
-       /* Assert that dst address is not bonding address */
-       dst_mac.addr_bytes[0]++;
+       /* Assert that dst address is not bonding address.  Do not set the
+        * least significant bit of the zero byte as this would create a
+        * multicast address.
+        */
+       dst_mac.addr_bytes[0] += 2;
 
        /* First try with promiscuous mode enabled.
         * Add 2 packets to each slave. First with bonding MAC address, second with
@@ -791,7 +855,7 @@ test_mode4_rx(void)
                TEST_ASSERT(cnt[0] == expected_pkts_cnt / 2 &&
                        cnt[1] == expected_pkts_cnt / 2,
                        "Expected %u packets with the same MAC and %u with different but "
-                       "got %u with the same and %u with diffrent MAC",
+                       "got %u with the same and %u with different MAC",
                        expected_pkts_cnt / 2, expected_pkts_cnt / 2, cnt[1], cnt[0]);
        } else if (retval > 0)
                free_pkts(pkts, retval);
@@ -895,7 +959,7 @@ test_mode4_rx(void)
                                break;
                }
 
-               TEST_ASSERT(j < 5, "Failed to agregate slave after link up");
+               TEST_ASSERT(j < 5, "Failed to aggregate slave after link up");
        }
 
        remove_slaves_and_stop_bonded_device();
@@ -916,7 +980,7 @@ test_mode4_tx_burst(void)
        struct ether_addr dst_mac = { { 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00 } };
        struct ether_addr bonded_mac;
 
-       retval = initialize_bonded_device_with_slaves(TEST_TX_SLAVE_COUNT, 1);
+       retval = initialize_bonded_device_with_slaves(TEST_TX_SLAVE_COUNT, 0);
        TEST_ASSERT_SUCCESS(retval, "Failed to initialize bonded device");
 
        retval = bond_handshake();
@@ -1100,7 +1164,8 @@ test_mode4_marker(void)
        uint8_t i, j;
        const uint16_t ethtype_slow_be = rte_be_to_cpu_16(ETHER_TYPE_SLOW);
 
-       retval = initialize_bonded_device_with_slaves(TEST_MARKER_SLAVE_COUT, 1);
+       retval = initialize_bonded_device_with_slaves(TEST_MARKER_SLAVE_COUT,
+                                                     0);
        TEST_ASSERT_SUCCESS(retval, "Failed to initialize bonded device");
 
        /* Test LACP handshake function */
@@ -1185,7 +1250,8 @@ test_mode4_expired(void)
 
        struct rte_eth_bond_8023ad_conf conf;
 
-       retval = initialize_bonded_device_with_slaves(TEST_EXPIRED_SLAVE_COUNT, 1);
+       retval = initialize_bonded_device_with_slaves(TEST_EXPIRED_SLAVE_COUNT,
+                                                     0);
        /* Set custom timeouts to make test last shorter. */
        rte_eth_bond_8023ad_conf_get(test_params.bonded_port_id, &conf);
        conf.fast_periodic_ms = 100;
@@ -1231,7 +1297,7 @@ test_mode4_expired(void)
                        retval = bond_handshake_reply(slave);
                        TEST_ASSERT(retval >= 0, "Handshake failed");
 
-                       /* Remove replay for slave that supose to be expired. */
+                       /* Remove replay for slave that suppose to be expired. */
                        if (slave == exp_slave) {
                                while (rte_ring_count(slave->rx_queue) > 0) {
                                        void *pkt = NULL;
@@ -1266,12 +1332,162 @@ test_mode4_expired(void)
        return TEST_SUCCESS;
 }
 
+static int
+test_mode4_ext_ctrl(void)
+{
+       /*
+        * configure bonded interface without the external sm enabled
+        *   . try to transmit lacpdu (should fail)
+        *   . try to set collecting and distributing flags (should fail)
+        * reconfigure w/external sm
+        *   . transmit one lacpdu on each slave using new api
+        *   . make sure each slave receives one lacpdu using the callback api
+        *   . transmit one data pdu on each slave (should fail)
+        *   . enable distribution and collection, send one data pdu each again
+        */
+
+       int retval;
+       struct slave_conf *slave = NULL;
+       uint8_t i;
+
+       struct rte_mbuf *lacp_tx_buf[SLAVE_COUNT];
+       struct ether_addr src_mac, dst_mac;
+       struct lacpdu_header lacpdu = {
+               .lacpdu = {
+                       .subtype = SLOW_SUBTYPE_LACP,
+               },
+       };
+
+       ether_addr_copy(&parnter_system, &src_mac);
+       ether_addr_copy(&slow_protocol_mac_addr, &dst_mac);
+
+       initialize_eth_header(&lacpdu.eth_hdr, &src_mac, &dst_mac,
+                             ETHER_TYPE_SLOW, 0, 0);
+
+       for (i = 0; i < SLAVE_COUNT; i++) {
+               lacp_tx_buf[i] = rte_pktmbuf_alloc(test_params.mbuf_pool);
+               rte_memcpy(rte_pktmbuf_mtod(lacp_tx_buf[i], char *),
+                          &lacpdu, sizeof(lacpdu));
+               rte_pktmbuf_pkt_len(lacp_tx_buf[i]) = sizeof(lacpdu);
+       }
+
+       retval = initialize_bonded_device_with_slaves(TEST_TX_SLAVE_COUNT, 0);
+       TEST_ASSERT_SUCCESS(retval, "Failed to initialize bonded device");
+
+       FOR_EACH_SLAVE(i, slave) {
+               TEST_ASSERT_FAIL(rte_eth_bond_8023ad_ext_slowtx(
+                                               test_params.bonded_port_id,
+                                               slave->port_id, lacp_tx_buf[i]),
+                                "Slave should not allow manual LACP xmit");
+               TEST_ASSERT_FAIL(rte_eth_bond_8023ad_ext_collect(
+                                               test_params.bonded_port_id,
+                                               slave->port_id, 1),
+                                "Slave should not allow external state controls");
+       }
+
+       free_pkts(lacp_tx_buf, RTE_DIM(lacp_tx_buf));
+
+       retval = remove_slaves_and_stop_bonded_device();
+       TEST_ASSERT_SUCCESS(retval, "Bonded device cleanup failed.");
+
+       return TEST_SUCCESS;
+}
+
+
+static int
+test_mode4_ext_lacp(void)
+{
+       int retval;
+       struct slave_conf *slave = NULL;
+       uint8_t all_slaves_done = 0, i;
+       uint16_t nb_pkts;
+       const unsigned int delay = bond_get_update_timeout_ms();
+
+       struct rte_mbuf *lacp_tx_buf[SLAVE_COUNT];
+       struct rte_mbuf *buf[SLAVE_COUNT];
+       struct ether_addr src_mac, dst_mac;
+       struct lacpdu_header lacpdu = {
+               .lacpdu = {
+                       .subtype = SLOW_SUBTYPE_LACP,
+               },
+       };
+
+       ether_addr_copy(&parnter_system, &src_mac);
+       ether_addr_copy(&slow_protocol_mac_addr, &dst_mac);
+
+       initialize_eth_header(&lacpdu.eth_hdr, &src_mac, &dst_mac,
+                             ETHER_TYPE_SLOW, 0, 0);
+
+       for (i = 0; i < SLAVE_COUNT; i++) {
+               lacp_tx_buf[i] = rte_pktmbuf_alloc(test_params.mbuf_pool);
+               rte_memcpy(rte_pktmbuf_mtod(lacp_tx_buf[i], char *),
+                          &lacpdu, sizeof(lacpdu));
+               rte_pktmbuf_pkt_len(lacp_tx_buf[i]) = sizeof(lacpdu);
+       }
+
+       retval = initialize_bonded_device_with_slaves(TEST_TX_SLAVE_COUNT, 1);
+       TEST_ASSERT_SUCCESS(retval, "Failed to initialize bonded device");
+
+       memset(lacpdu_rx_count, 0, sizeof(lacpdu_rx_count));
+
+       /* Wait for new settings to be applied. */
+       for (i = 0; i < 30; ++i)
+               rte_delay_ms(delay);
+
+       FOR_EACH_SLAVE(i, slave) {
+               retval = rte_eth_bond_8023ad_ext_slowtx(
+                                               test_params.bonded_port_id,
+                                               slave->port_id, lacp_tx_buf[i]);
+               TEST_ASSERT_SUCCESS(retval,
+                                   "Slave should allow manual LACP xmit");
+       }
+
+       nb_pkts = bond_tx(NULL, 0);
+       TEST_ASSERT_EQUAL(nb_pkts, 0, "Packets transmitted unexpectedly");
+
+       FOR_EACH_SLAVE(i, slave) {
+               nb_pkts = slave_get_pkts(slave, buf, RTE_DIM(buf));
+               TEST_ASSERT_EQUAL(nb_pkts, 1, "found %u packets on slave %d\n",
+                                 nb_pkts, i);
+               slave_put_pkts(slave, buf, nb_pkts);
+       }
+
+       nb_pkts = bond_rx(buf, RTE_DIM(buf));
+       free_pkts(buf, nb_pkts);
+       TEST_ASSERT_EQUAL(nb_pkts, 0, "Packets received unexpectedly");
+
+       /* wait for the periodic callback to run */
+       for (i = 0; i < 30 && all_slaves_done == 0; ++i) {
+               uint8_t s, total = 0;
+
+               rte_delay_ms(delay);
+               FOR_EACH_SLAVE(s, slave) {
+                       total += lacpdu_rx_count[slave->port_id];
+               }
+
+               if (total >= SLAVE_COUNT)
+                       all_slaves_done = 1;
+       }
+
+       FOR_EACH_SLAVE(i, slave) {
+               TEST_ASSERT_EQUAL(lacpdu_rx_count[slave->port_id], 1,
+                                 "Slave port %u should have received 1 lacpdu (count=%u)",
+                                 slave->port_id,
+                                 lacpdu_rx_count[slave->port_id]);
+       }
+
+       retval = remove_slaves_and_stop_bonded_device();
+       TEST_ASSERT_SUCCESS(retval, "Test cleanup failed.");
+
+       return TEST_SUCCESS;
+}
+
 static int
 check_environment(void)
 {
        struct slave_conf *port;
        uint8_t i, env_state;
-       uint8_t slaves[RTE_DIM(test_params.slave_ports)];
+       uint16_t slaves[RTE_DIM(test_params.slave_ports)];
        int slaves_count;
 
        env_state = 0;
@@ -1352,6 +1568,11 @@ test_mode4_executor(int (*test_func)(void))
        return test_result;
 }
 
+static int
+test_mode4_agg_mode_selection_wrapper(void){
+       return test_mode4_executor(&test_mode4_agg_mode_selection);
+}
+
 static int
 test_mode4_lacp_wrapper(void)
 {
@@ -1382,17 +1603,36 @@ test_mode4_expired_wrapper(void)
        return test_mode4_executor(&test_mode4_expired);
 }
 
+static int
+test_mode4_ext_ctrl_wrapper(void)
+{
+       return test_mode4_executor(&test_mode4_ext_ctrl);
+}
+
+static int
+test_mode4_ext_lacp_wrapper(void)
+{
+       return test_mode4_executor(&test_mode4_ext_lacp);
+}
+
 static struct unit_test_suite link_bonding_mode4_test_suite  = {
        .suite_name = "Link Bonding mode 4 Unit Test Suite",
        .setup = test_setup,
        .teardown = testsuite_teardown,
        .unit_test_cases = {
+               TEST_CASE_NAMED("test_mode4_agg_mode_selection",
+                               test_mode4_agg_mode_selection_wrapper),
                TEST_CASE_NAMED("test_mode4_lacp", test_mode4_lacp_wrapper),
                TEST_CASE_NAMED("test_mode4_rx", test_mode4_rx_wrapper),
                TEST_CASE_NAMED("test_mode4_tx_burst", test_mode4_tx_burst_wrapper),
                TEST_CASE_NAMED("test_mode4_marker", test_mode4_marker_wrapper),
                TEST_CASE_NAMED("test_mode4_expired", test_mode4_expired_wrapper),
-               { NULL, NULL, NULL, NULL, NULL } /**< NULL terminate unit test array */
+               TEST_CASE_NAMED("test_mode4_ext_ctrl",
+                               test_mode4_ext_ctrl_wrapper),
+               TEST_CASE_NAMED("test_mode4_ext_lacp",
+                               test_mode4_ext_lacp_wrapper),
+
+               TEST_CASES_END() /**< NULL terminate unit test array */
        }
 };
 
@@ -1402,9 +1642,4 @@ test_link_bonding_mode4(void)
        return unit_test_suite_runner(&link_bonding_mode4_test_suite);
 }
 
-static struct test_command link_bonding_cmd = {
-       .command = "link_bonding_mode4_autotest",
-       .callback = test_link_bonding_mode4,
-};
-
-REGISTER_TEST_COMMAND(link_bonding_cmd);
+REGISTER_TEST_COMMAND(link_bonding_mode4_autotest, test_link_bonding_mode4);