git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
net: add rte prefix to ether defines
[dpdk.git] / drivers / net / bonding / rte_eth_bond_8023ad.c
diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c
index f8cea4b..d764dad 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -126,11 +126,11 @@ bond_print_lacp(struct lacpdu *l)
 #define MODE4_DEBUG(fmt, ...) do { } while (0)
 #endif
 
-static const struct ether_addr lacp_mac_addr = {
+static const struct rte_ether_addr lacp_mac_addr = {
        .addr_bytes = { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x02 }
 };
 
-struct port mode_8023ad_ports[RTE_MAX_ETHPORTS];
+struct port bond_mode_8023ad_ports[RTE_MAX_ETHPORTS];
 
 static void
 timer_cancel(uint64_t *timer)
@@ -187,7 +187,7 @@ set_warning_flags(struct port *port, uint16_t flags)
 static void
 show_warnings(uint16_t slave_id)
 {
-       struct port *port = &mode_8023ad_ports[slave_id];
+       struct port *port = &bond_mode_8023ad_ports[slave_id];
        uint8_t warnings;
 
        do {
@@ -260,7 +260,7 @@ static void
 rx_machine(struct bond_dev_private *internals, uint16_t slave_id,
                struct lacpdu *lacp)
 {
-       struct port *agg, *port = &mode_8023ad_ports[slave_id];
+       struct port *agg, *port = &bond_mode_8023ad_ports[slave_id];
        uint64_t timeout;
 
        if (SM_FLAG(port, BEGIN)) {
@@ -319,10 +319,10 @@ rx_machine(struct bond_dev_private *internals, uint16_t slave_id,
                ACTOR_STATE_CLR(port, DEFAULTED);
 
                /* If LACP partner params match this port actor params */
-               agg = &mode_8023ad_ports[port->aggregator_port_id];
+               agg = &bond_mode_8023ad_ports[port->aggregator_port_id];
                bool match = port->actor.system_priority ==
                        lacp->partner.port_params.system_priority &&
-                       is_same_ether_addr(&agg->actor.system,
+                       rte_is_same_ether_addr(&agg->actor.system,
                        &lacp->partner.port_params.system) &&
                        port->actor.port_priority ==
                        lacp->partner.port_params.port_priority &&
@@ -380,7 +380,7 @@ rx_machine(struct bond_dev_private *internals, uint16_t slave_id,
 static void
 periodic_machine(struct bond_dev_private *internals, uint16_t slave_id)
 {
-       struct port *port = &mode_8023ad_ports[slave_id];
+       struct port *port = &bond_mode_8023ad_ports[slave_id];
        /* Calculate if either site is LACP enabled */
        uint64_t timeout;
        uint8_t active = ACTOR_STATE(port, LACP_ACTIVE) ||
@@ -442,7 +442,7 @@ periodic_machine(struct bond_dev_private *internals, uint16_t slave_id)
 static void
 mux_machine(struct bond_dev_private *internals, uint16_t slave_id)
 {
-       struct port *port = &mode_8023ad_ports[slave_id];
+       struct port *port = &bond_mode_8023ad_ports[slave_id];
 
        /* Save current state for later use */
        const uint8_t state_mask = STATE_SYNCHRONIZATION | STATE_DISTRIBUTING |
@@ -545,7 +545,7 @@ mux_machine(struct bond_dev_private *internals, uint16_t slave_id)
 static void
 tx_machine(struct bond_dev_private *internals, uint16_t slave_id)
 {
-       struct port *agg, *port = &mode_8023ad_ports[slave_id];
+       struct port *agg, *port = &bond_mode_8023ad_ports[slave_id];
 
        struct rte_mbuf *lacp_pkt = NULL;
        struct lacpdu_header *hdr;
@@ -575,9 +575,9 @@ tx_machine(struct bond_dev_private *internals, uint16_t slave_id)
        hdr = rte_pktmbuf_mtod(lacp_pkt, struct lacpdu_header *);
 
        /* Source and destination MAC */
-       ether_addr_copy(&lacp_mac_addr, &hdr->eth_hdr.d_addr);
+       rte_ether_addr_copy(&lacp_mac_addr, &hdr->eth_hdr.d_addr);
        rte_eth_macaddr_get(slave_id, &hdr->eth_hdr.s_addr);
-       hdr->eth_hdr.ether_type = rte_cpu_to_be_16(ETHER_TYPE_SLOW);
+       hdr->eth_hdr.ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_SLOW);
 
        lacpdu = &hdr->lacpdu;
        memset(lacpdu, 0, sizeof(*lacpdu));
@@ -591,8 +591,9 @@ tx_machine(struct bond_dev_private *internals, uint16_t slave_id)
        lacpdu->actor.info_length = sizeof(struct lacpdu_actor_partner_params);
        memcpy(&hdr->lacpdu.actor.port_params, &port->actor,
                        sizeof(port->actor));
-       agg = &mode_8023ad_ports[port->aggregator_port_id];
-       ether_addr_copy(&agg->actor.system, &hdr->lacpdu.actor.port_params.system);
+       agg = &bond_mode_8023ad_ports[port->aggregator_port_id];
+       rte_ether_addr_copy(&agg->actor.system,
+                       &hdr->lacpdu.actor.port_params.system);
        lacpdu->actor.state = port->actor_state;
 
        /* PARTNER */
@@ -664,7 +665,7 @@ max_index(uint64_t *a, int n)
  * @param port_pos                     Port to assign.
  */
 static void
-selection_logic(struct bond_dev_private *internals, uint8_t slave_id)
+selection_logic(struct bond_dev_private *internals, uint16_t slave_id)
 {
        struct port *agg, *port;
        uint16_t slaves_count, new_agg_id, i, j = 0;
@@ -677,11 +678,11 @@ selection_logic(struct bond_dev_private *internals, uint8_t slave_id)
 
        slaves = internals->active_slaves;
        slaves_count = internals->active_slave_count;
-       port = &mode_8023ad_ports[slave_id];
+       port = &bond_mode_8023ad_ports[slave_id];
 
        /* Search for aggregator suitable for this port */
        for (i = 0; i < slaves_count; ++i) {
-               agg = &mode_8023ad_ports[slaves[i]];
+               agg = &bond_mode_8023ad_ports[slaves[i]];
                /* Skip ports that are not aggreagators */
                if (agg->aggregator_port_id != slaves[i])
                        continue;
@@ -694,9 +695,10 @@ selection_logic(struct bond_dev_private *internals, uint8_t slave_id)
                 * ID (MAC address). */
                if ((agg->actor.key == port->actor.key &&
                        agg->partner.system_priority == port->partner.system_priority &&
-                       is_same_ether_addr(&agg->partner.system, &port->partner.system) == 1
+                       rte_is_same_ether_addr(&agg->partner.system,
+                                       &port->partner.system) == 1
                        && (agg->partner.key == port->partner.key)) &&
-                       is_zero_ether_addr(&port->partner.system) != 1 &&
+                       rte_is_zero_ether_addr(&port->partner.system) != 1 &&
                        (agg->actor.key &
                                rte_cpu_to_be_16(BOND_LINK_FULL_DUPLEX_KEY)) != 0) {
 
@@ -781,16 +783,23 @@ link_speed_key(uint16_t speed) {
 }
 
 static void
-rx_machine_update(struct bond_dev_private *internals, uint8_t slave_id,
+rx_machine_update(struct bond_dev_private *internals, uint16_t slave_id,
                struct rte_mbuf *lacp_pkt) {
        struct lacpdu_header *lacp;
+       struct lacpdu_actor_partner_params *partner;
 
        if (lacp_pkt != NULL) {
                lacp = rte_pktmbuf_mtod(lacp_pkt, struct lacpdu_header *);
                RTE_ASSERT(lacp->lacpdu.subtype == SLOW_SUBTYPE_LACP);
 
-               /* This is LACP frame so pass it to rx_machine */
-               rx_machine(internals, slave_id, &lacp->lacpdu);
+               partner = &lacp->lacpdu.partner;
+               if (rte_is_same_ether_addr(&partner->port_params.system,
+                       &internals->mode4.mac_addr)) {
+                       /* This LACP frame is sending to the bonding port
+                        * so pass it to rx_machine.
+                        */
+                       rx_machine(internals, slave_id, &lacp->lacpdu);
+               }
                rte_pktmbuf_free(lacp_pkt);
        } else
                rx_machine(internals, slave_id, NULL);
@@ -803,10 +812,10 @@ bond_mode_8023ad_periodic_cb(void *arg)
        struct bond_dev_private *internals = bond_dev->data->dev_private;
        struct port *port;
        struct rte_eth_link link_info;
-       struct ether_addr slave_addr;
+       struct rte_ether_addr slave_addr;
        struct rte_mbuf *lacp_pkt = NULL;
-
-       uint8_t i, slave_id;
+       uint16_t slave_id;
+       uint16_t i;
 
 
        /* Update link status on each port */
@@ -824,7 +833,7 @@ bond_mode_8023ad_periodic_cb(void *arg)
                } else
                        key = 0;
 
-               port = &mode_8023ad_ports[slave_id];
+               port = &bond_mode_8023ad_ports[slave_id];
 
                key = rte_cpu_to_be_16(key);
                if (key != port->actor.key) {
@@ -835,8 +844,8 @@ bond_mode_8023ad_periodic_cb(void *arg)
                        SM_FLAG_SET(port, NTT);
                }
 
-               if (!is_same_ether_addr(&port->actor.system, &slave_addr)) {
-                       ether_addr_copy(&slave_addr, &port->actor.system);
+               if (!rte_is_same_ether_addr(&port->actor.system, &slave_addr)) {
+                       rte_ether_addr_copy(&slave_addr, &port->actor.system);
                        if (port->aggregator_port_id == slave_id)
                                SM_FLAG_SET(port, NTT);
                }
@@ -844,7 +853,7 @@ bond_mode_8023ad_periodic_cb(void *arg)
 
        for (i = 0; i < internals->active_slave_count; i++) {
                slave_id = internals->active_slaves[i];
-               port = &mode_8023ad_ports[slave_id];
+               port = &bond_mode_8023ad_ports[slave_id];
 
                if ((port->actor.key &
                                rte_cpu_to_be_16(BOND_LINK_FULL_DUPLEX_KEY)) == 0) {
@@ -907,7 +916,7 @@ bond_mode_8023ad_activate_slave(struct rte_eth_dev *bond_dev,
 {
        struct bond_dev_private *internals = bond_dev->data->dev_private;
 
-       struct port *port = &mode_8023ad_ports[slave_id];
+       struct port *port = &bond_mode_8023ad_ports[slave_id];
        struct port_params initial = {
                        .system = { { 0 } },
                        .system_priority = rte_cpu_to_be_16(0xFFFF),
@@ -1008,7 +1017,7 @@ bond_mode_8023ad_deactivate_slave(struct rte_eth_dev *bond_dev __rte_unused,
        struct port *port = NULL;
        uint8_t old_partner_state;
 
-       port = &mode_8023ad_ports[slave_id];
+       port = &bond_mode_8023ad_ports[slave_id];
 
        ACTOR_STATE_CLR(port, AGGREGATION);
        port->selected = UNSELECTED;
@@ -1037,7 +1046,7 @@ void
 bond_mode_8023ad_mac_address_update(struct rte_eth_dev *bond_dev)
 {
        struct bond_dev_private *internals = bond_dev->data->dev_private;
-       struct ether_addr slave_addr;
+       struct rte_ether_addr slave_addr;
        struct port *slave, *agg_slave;
        uint16_t slave_id, i, j;
 
@@ -1045,20 +1054,20 @@ bond_mode_8023ad_mac_address_update(struct rte_eth_dev *bond_dev)
 
        for (i = 0; i < internals->active_slave_count; i++) {
                slave_id = internals->active_slaves[i];
-               slave = &mode_8023ad_ports[slave_id];
+               slave = &bond_mode_8023ad_ports[slave_id];
                rte_eth_macaddr_get(slave_id, &slave_addr);
 
-               if (is_same_ether_addr(&slave_addr, &slave->actor.system))
+               if (rte_is_same_ether_addr(&slave_addr, &slave->actor.system))
                        continue;
 
-               ether_addr_copy(&slave_addr, &slave->actor.system);
+               rte_ether_addr_copy(&slave_addr, &slave->actor.system);
                /* Do nothing if this port is not an aggregator. In other case
                 * Set NTT flag on every port that use this aggregator. */
                if (slave->aggregator_port_id != slave_id)
                        continue;
 
                for (j = 0; j < internals->active_slave_count; j++) {
-                       agg_slave = &mode_8023ad_ports[internals->active_slaves[j]];
+                       agg_slave = &bond_mode_8023ad_ports[internals->active_slaves[j]];
                        if (agg_slave->aggregator_port_id == slave_id)
                                SM_FLAG_SET(agg_slave, NTT);
                }
@@ -1149,7 +1158,7 @@ int
 bond_mode_8023ad_enable(struct rte_eth_dev *bond_dev)
 {
        struct bond_dev_private *internals = bond_dev->data->dev_private;
-       uint8_t i;
+       uint16_t i;
 
        for (i = 0; i < internals->active_slave_count; i++)
                bond_mode_8023ad_activate_slave(bond_dev,
@@ -1165,6 +1174,7 @@ bond_mode_8023ad_start(struct rte_eth_dev *bond_dev)
        struct mode8023ad_private *mode4 = &internals->mode4;
        static const uint64_t us = BOND_MODE_8023AX_UPDATE_TIMEOUT_MS * 1000;
 
+       rte_eth_macaddr_get(internals->port_id, &mode4->mac_addr);
        if (mode4->slowrx_cb)
                return rte_eal_alarm_set(us, &bond_mode_8023ad_ext_periodic_cb,
                                         bond_dev);
@@ -1191,7 +1201,7 @@ bond_mode_8023ad_handle_slow_pkt(struct bond_dev_private *internals,
                                  uint16_t slave_id, struct rte_mbuf *pkt)
 {
        struct mode8023ad_private *mode4 = &internals->mode4;
-       struct port *port = &mode_8023ad_ports[slave_id];
+       struct port *port = &bond_mode_8023ad_ports[slave_id];
        struct marker_header *m_hdr;
        uint64_t marker_timer, old_marker_timer;
        int retval;
@@ -1395,7 +1405,7 @@ rte_eth_bond_8023ad_slave_info(uint16_t port_id, uint16_t slave_id,
                                internals->active_slave_count)
                return -EINVAL;
 
-       port = &mode_8023ad_ports[slave_id];
+       port = &bond_mode_8023ad_ports[slave_id];
        info->selected = port->selected;
 
        info->actor_state = port->actor_state;
@@ -1447,7 +1457,7 @@ rte_eth_bond_8023ad_ext_collect(uint16_t port_id, uint16_t slave_id,
        if (res != 0)
                return res;
 
-       port = &mode_8023ad_ports[slave_id];
+       port = &bond_mode_8023ad_ports[slave_id];
 
        if (enabled)
                ACTOR_STATE_SET(port, COLLECTING);
@@ -1468,7 +1478,7 @@ rte_eth_bond_8023ad_ext_distrib(uint16_t port_id, uint16_t slave_id,
        if (res != 0)
                return res;
 
-       port = &mode_8023ad_ports[slave_id];
+       port = &bond_mode_8023ad_ports[slave_id];
 
        if (enabled)
                ACTOR_STATE_SET(port, DISTRIBUTING);
@@ -1488,7 +1498,7 @@ rte_eth_bond_8023ad_ext_distrib_get(uint16_t port_id, uint16_t slave_id)
        if (err != 0)
                return err;
 
-       port = &mode_8023ad_ports[slave_id];
+       port = &bond_mode_8023ad_ports[slave_id];
        return ACTOR_STATE(port, DISTRIBUTING);
 }
 
@@ -1502,7 +1512,7 @@ rte_eth_bond_8023ad_ext_collect_get(uint16_t port_id, uint16_t slave_id)
        if (err != 0)
                return err;
 
-       port = &mode_8023ad_ports[slave_id];
+       port = &bond_mode_8023ad_ports[slave_id];
        return ACTOR_STATE(port, COLLECTING);
 }
 
@@ -1517,7 +1527,7 @@ rte_eth_bond_8023ad_ext_slowtx(uint16_t port_id, uint16_t slave_id,
        if (res != 0)
                return res;
 
-       port = &mode_8023ad_ports[slave_id];
+       port = &bond_mode_8023ad_ports[slave_id];
 
        if (rte_pktmbuf_pkt_len(lacp_pkt) < sizeof(struct lacpdu_header))
                return -EINVAL;
@@ -1546,7 +1556,7 @@ bond_mode_8023ad_ext_periodic_cb(void *arg)
 
        for (i = 0; i < internals->active_slave_count; i++) {
                slave_id = internals->active_slaves[i];
-               port = &mode_8023ad_ports[slave_id];
+               port = &bond_mode_8023ad_ports[slave_id];
 
                if (rte_ring_dequeue(port->rx_ring, &pkt) == 0) {
                        struct rte_mbuf *lacp_pkt = pkt;
DPDK repo used for reviews