net/bonding: always update bonding link status
[dpdk.git] / drivers / net / bonding / rte_eth_bond_pmd.c
index 815e0e4..f155ff7 100644 (file)
@@ -571,34 +571,21 @@ update_client_stats(uint32_t addr, uint16_t port, uint32_t *TXorRXindicator)
 }
 
 #ifdef RTE_LIBRTE_BOND_DEBUG_ALB
-#define MODE6_DEBUG(info, src_ip, dst_ip, eth_h, arp_op, port, burstnumber)    \
-               RTE_LOG(DEBUG, PMD, \
-               "%s " \
-               "port:%d " \
-               "SrcMAC:%02X:%02X:%02X:%02X:%02X:%02X " \
-               "SrcIP:%s " \
-               "DstMAC:%02X:%02X:%02X:%02X:%02X:%02X " \
-               "DstIP:%s " \
-               "%s " \
-               "%d\n", \
-               info, \
-               port, \
-               eth_h->s_addr.addr_bytes[0], \
-               eth_h->s_addr.addr_bytes[1], \
-               eth_h->s_addr.addr_bytes[2], \
-               eth_h->s_addr.addr_bytes[3], \
-               eth_h->s_addr.addr_bytes[4], \
-               eth_h->s_addr.addr_bytes[5], \
-               src_ip, \
-               eth_h->d_addr.addr_bytes[0], \
-               eth_h->d_addr.addr_bytes[1], \
-               eth_h->d_addr.addr_bytes[2], \
-               eth_h->d_addr.addr_bytes[3], \
-               eth_h->d_addr.addr_bytes[4], \
-               eth_h->d_addr.addr_bytes[5], \
-               dst_ip, \
-               arp_op, \
-               ++burstnumber)
+#define MODE6_DEBUG(info, src_ip, dst_ip, eth_h, arp_op, port, burstnumber) \
+       rte_log(RTE_LOG_DEBUG, bond_logtype,                            \
+               "%s port:%d SrcMAC:%02X:%02X:%02X:%02X:%02X:%02X SrcIP:%s " \
+               "DstMAC:%02X:%02X:%02X:%02X:%02X:%02X DstIP:%s %s %d\n", \
+               info,                                                   \
+               port,                                                   \
+               eth_h->s_addr.addr_bytes[0], eth_h->s_addr.addr_bytes[1], \
+               eth_h->s_addr.addr_bytes[2], eth_h->s_addr.addr_bytes[3], \
+               eth_h->s_addr.addr_bytes[4], eth_h->s_addr.addr_bytes[5], \
+               src_ip,                                                 \
+               eth_h->d_addr.addr_bytes[0], eth_h->d_addr.addr_bytes[1], \
+               eth_h->d_addr.addr_bytes[2], eth_h->d_addr.addr_bytes[3], \
+               eth_h->d_addr.addr_bytes[4], eth_h->d_addr.addr_bytes[5], \
+               dst_ip,                                                 \
+               arp_op, ++burstnumber)
 #endif
 
 static void
@@ -1139,7 +1126,8 @@ bond_ethdev_tx_burst_alb(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
                                /* Allocate new packet to send ARP update on current slave */
                                upd_pkt = rte_pktmbuf_alloc(internals->mode6.mempool);
                                if (upd_pkt == NULL) {
-                                       RTE_LOG(ERR, PMD, "Failed to allocate ARP packet from pool\n");
+                                       RTE_BOND_LOG(ERR,
+                                                    "Failed to allocate ARP packet from pool");
                                        continue;
                                }
                                pkt_size = sizeof(struct ether_hdr) + sizeof(struct arp_hdr)
@@ -1561,12 +1549,12 @@ mac_address_get(struct rte_eth_dev *eth_dev, struct ether_addr *dst_mac_addr)
        struct ether_addr *mac_addr;
 
        if (eth_dev == NULL) {
-               RTE_LOG(ERR, PMD, "%s: NULL pointer eth_dev specified\n", __func__);
+               RTE_BOND_LOG(ERR, "NULL pointer eth_dev specified");
                return -1;
        }
 
        if (dst_mac_addr == NULL) {
-               RTE_LOG(ERR, PMD, "%s: NULL pointer MAC specified\n", __func__);
+               RTE_BOND_LOG(ERR, "NULL pointer MAC specified");
                return -1;
        }
 
@@ -1687,9 +1675,9 @@ bond_ethdev_mode_set(struct rte_eth_dev *eth_dev, int mode)
                if (internals->mode4.dedicated_queues.enabled == 0) {
                        eth_dev->rx_pkt_burst = bond_ethdev_rx_burst_8023ad;
                        eth_dev->tx_pkt_burst = bond_ethdev_tx_burst_8023ad;
-                       RTE_LOG(WARNING, PMD,
+                       RTE_BOND_LOG(WARNING,
                                "Using mode 4, it is necessary to do TX burst "
-                               "and RX burst at least every 100ms.\n");
+                               "and RX burst at least every 100ms.");
                } else {
                        /* Use flow director's optimization */
                        eth_dev->rx_pkt_burst =
@@ -1850,7 +1838,7 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
                        nb_rx_queues, nb_tx_queues,
                        &(slave_eth_dev->data->dev_conf));
        if (errval != 0) {
-               RTE_BOND_LOG(ERR, "Cannot configure slave device: port %u , err (%d)",
+               RTE_BOND_LOG(ERR, "Cannot configure slave device: port %u, err (%d)",
                                slave_eth_dev->data->port_id, errval);
                return errval;
        }
@@ -1932,10 +1920,10 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
                                                &internals->reta_conf[0],
                                                internals->slaves[i].reta_size);
                                if (errval != 0) {
-                                       RTE_LOG(WARNING, PMD,
-                                                       "rte_eth_dev_rss_reta_update on slave port %d fails (err %d)."
-                                                       " RSS Configuration for bonding may be inconsistent.\n",
-                                                       slave_eth_dev->data->port_id, errval);
+                                       RTE_BOND_LOG(WARNING,
+                                                    "rte_eth_dev_rss_reta_update on slave port %d fails (err %d)."
+                                                    " RSS Configuration for bonding may be inconsistent.",
+                                                    slave_eth_dev->data->port_id, errval);
                                }
                                break;
                        }
@@ -1964,10 +1952,19 @@ slave_remove(struct bond_dev_private *internals,
                                slave_eth_dev->data->port_id)
                        break;
 
-       if (i < (internals->slave_count - 1))
+       if (i < (internals->slave_count - 1)) {
+               struct rte_flow *flow;
+
                memmove(&internals->slaves[i], &internals->slaves[i + 1],
                                sizeof(internals->slaves[0]) *
                                (internals->slave_count - i - 1));
+               TAILQ_FOREACH(flow, &internals->flow_list, next) {
+                       memmove(&flow->flows[i], &flow->flows[i + 1],
+                               sizeof(flow->flows[0]) *
+                               (internals->slave_count - i - 1));
+                       flow->flows[internals->slave_count - 1] = NULL;
+               }
+       }
 
        internals->slave_count--;
 
@@ -2191,20 +2188,22 @@ bond_ethdev_close(struct rte_eth_dev *dev)
        struct bond_dev_private *internals = dev->data->dev_private;
        uint8_t bond_port_id = internals->port_id;
        int skipped = 0;
+       struct rte_flow_error ferror;
 
-       RTE_LOG(INFO, EAL, "Closing bonded device %s\n", dev->device->name);
+       RTE_BOND_LOG(INFO, "Closing bonded device %s", dev->device->name);
        while (internals->slave_count != skipped) {
                uint16_t port_id = internals->slaves[skipped].port_id;
 
                rte_eth_dev_stop(port_id);
 
                if (rte_eth_bond_slave_remove(bond_port_id, port_id) != 0) {
-                       RTE_LOG(ERR, EAL,
-                               "Failed to remove port %d from bonded device "
-                               "%s\n", port_id, dev->device->name);
+                       RTE_BOND_LOG(ERR,
+                                    "Failed to remove port %d from bonded device %s",
+                                    port_id, dev->device->name);
                        skipped++;
                }
        }
+       bond_flow_ops.flush(dev, &ferror);
        bond_ethdev_free_queues(dev);
        rte_bitmap_reset(internals->vlan_filter_bmp);
 }
@@ -2290,9 +2289,9 @@ bond_ethdev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
 
                res = rte_eth_dev_vlan_filter(port_id, vlan_id, on);
                if (res == ENOTSUP)
-                       RTE_LOG(WARNING, PMD,
-                               "Setting VLAN filter on slave port %u not supported.\n",
-                               port_id);
+                       RTE_BOND_LOG(WARNING,
+                                    "Setting VLAN filter on slave port %u not supported.",
+                                    port_id);
        }
 
        rte_spinlock_unlock(&internals->lock);
@@ -2654,6 +2653,11 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,
        if (!valid_slave)
                return rc;
 
+       /* Synchronize lsc callback parallel calls either by real link event
+        * from the slaves PMDs or by the bonding PMD itself.
+        */
+       rte_spinlock_lock(&internals->lsc_lock);
+
        /* Search for port in active port list */
        active_pos = find_slave_by_id(internals->active_slaves,
                        internals->active_slave_count, port_id);
@@ -2661,7 +2665,7 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,
        rte_eth_link_get_nowait(port_id, &link);
        if (link.link_status) {
                if (active_pos < internals->active_slave_count)
-                       return rc;
+                       goto link_update;
 
                /* if no active slave ports then set this port to be primary port */
                if (internals->active_slave_count < 1) {
@@ -2681,7 +2685,7 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,
                        bond_ethdev_primary_set(internals, port_id);
        } else {
                if (active_pos == internals->active_slave_count)
-                       return rc;
+                       goto link_update;
 
                /* Remove from active slave list */
                deactivate_slave(bonded_eth_dev, port_id);
@@ -2700,6 +2704,7 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,
                }
        }
 
+link_update:
        /**
         * Update bonded device link properties after any change to active
         * slaves
@@ -2734,7 +2739,10 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,
                                                NULL);
                }
        }
-       return 0;
+
+       rte_spinlock_unlock(&internals->lsc_lock);
+
+       return rc;
 }
 
 static int
@@ -2883,6 +2891,17 @@ bond_ethdev_mac_address_set(struct rte_eth_dev *dev, struct ether_addr *addr)
        return 0;
 }
 
+static int
+bond_filter_ctrl(struct rte_eth_dev *dev __rte_unused,
+                enum rte_filter_type type, enum rte_filter_op op, void *arg)
+{
+       if (type == RTE_ETH_FILTER_GENERIC && op == RTE_ETH_FILTER_GET) {
+               *(const void **)arg = &bond_flow_ops;
+               return 0;
+       }
+       return -ENOTSUP;
+}
+
 const struct eth_dev_ops default_dev_ops = {
        .dev_start            = bond_ethdev_start,
        .dev_stop             = bond_ethdev_stop,
@@ -2904,7 +2923,8 @@ const struct eth_dev_ops default_dev_ops = {
        .rss_hash_update      = bond_ethdev_rss_hash_update,
        .rss_hash_conf_get    = bond_ethdev_rss_hash_conf_get,
        .mtu_set              = bond_ethdev_mtu_set,
-       .mac_addr_set         = bond_ethdev_mac_address_set
+       .mac_addr_set         = bond_ethdev_mac_address_set,
+       .filter_ctrl          = bond_filter_ctrl
 };
 
 static int
@@ -2942,6 +2962,7 @@ bond_alloc(struct rte_vdev_device *dev, uint8_t mode)
        eth_dev->data->dev_flags = RTE_ETH_DEV_INTR_LSC;
 
        rte_spinlock_init(&internals->lock);
+       rte_spinlock_init(&internals->lsc_lock);
 
        internals->port_id = eth_dev->data->port_id;
        internals->mode = BONDING_MODE_INVALID;
@@ -2972,10 +2993,13 @@ bond_alloc(struct rte_vdev_device *dev, uint8_t mode)
        memset(internals->active_slaves, 0, sizeof(internals->active_slaves));
        memset(internals->slaves, 0, sizeof(internals->slaves));
 
+       TAILQ_INIT(&internals->flow_list);
+       internals->flow_isolated_valid = 0;
+
        /* Set mode 4 default configuration */
        bond_mode_8023ad_setup(eth_dev, NULL);
        if (bond_ethdev_mode_set(eth_dev, mode)) {
-               RTE_BOND_LOG(ERR, "Failed to set bonded device %d mode too %d",
+               RTE_BOND_LOG(ERR, "Failed to set bonded device %d mode to %d",
                                 eth_dev->data->port_id, mode);
                goto err;
        }
@@ -2986,7 +3010,7 @@ bond_alloc(struct rte_vdev_device *dev, uint8_t mode)
                                                   RTE_CACHE_LINE_SIZE);
        if (internals->vlan_filter_bmpmem == NULL) {
                RTE_BOND_LOG(ERR,
-                            "Failed to allocate vlan bitmap for bonded device %u\n",
+                            "Failed to allocate vlan bitmap for bonded device %u",
                             eth_dev->data->port_id);
                goto err;
        }
@@ -2995,7 +3019,7 @@ bond_alloc(struct rte_vdev_device *dev, uint8_t mode)
                        internals->vlan_filter_bmpmem, vlan_filter_bmp_size);
        if (internals->vlan_filter_bmp == NULL) {
                RTE_BOND_LOG(ERR,
-                            "Failed to init vlan bitmap for bonded device %u\n",
+                            "Failed to init vlan bitmap for bonded device %u",
                             eth_dev->data->port_id);
                rte_free(internals->vlan_filter_bmpmem);
                goto err;
@@ -3021,12 +3045,26 @@ bond_probe(struct rte_vdev_device *dev)
        uint8_t bonding_mode, socket_id/*, agg_mode*/;
        int  arg_count, port_id;
        uint8_t agg_mode;
+       struct rte_eth_dev *eth_dev;
 
        if (!dev)
                return -EINVAL;
 
        name = rte_vdev_device_name(dev);
-       RTE_LOG(INFO, EAL, "Initializing pmd_bond for %s\n", name);
+       RTE_BOND_LOG(INFO, "Initializing pmd_bond for %s", name);
+
+       if (rte_eal_process_type() == RTE_PROC_SECONDARY &&
+           strlen(rte_vdev_device_args(dev)) == 0) {
+               eth_dev = rte_eth_dev_attach_secondary(name);
+               if (!eth_dev) {
+                       RTE_BOND_LOG(ERR, "Failed to probe %s", name);
+                       return -1;
+               }
+               /* TODO: request info from primary to set up Rx and Tx */
+               eth_dev->dev_ops = &default_dev_ops;
+               rte_eth_dev_probing_finish(eth_dev);
+               return 0;
+       }
 
        kvlist = rte_kvargs_parse(rte_vdev_device_args(dev),
                pmd_bond_init_valid_arguments);
@@ -3038,13 +3076,13 @@ bond_probe(struct rte_vdev_device *dev)
                if (rte_kvargs_process(kvlist, PMD_BOND_MODE_KVARG,
                                &bond_ethdev_parse_slave_mode_kvarg,
                                &bonding_mode) != 0) {
-                       RTE_LOG(ERR, EAL, "Invalid mode for bonded device %s\n",
+                       RTE_BOND_LOG(ERR, "Invalid mode for bonded device %s",
                                        name);
                        goto parse_error;
                }
        } else {
-               RTE_LOG(ERR, EAL, "Mode must be specified only once for bonded "
-                               "device %s\n", name);
+               RTE_BOND_LOG(ERR, "Mode must be specified only once for bonded "
+                               "device %s", name);
                goto parse_error;
        }
 
@@ -3054,13 +3092,13 @@ bond_probe(struct rte_vdev_device *dev)
                if (rte_kvargs_process(kvlist, PMD_BOND_SOCKET_ID_KVARG,
                                &bond_ethdev_parse_socket_id_kvarg, &socket_id)
                                != 0) {
-                       RTE_LOG(ERR, EAL, "Invalid socket Id specified for "
-                                       "bonded device %s\n", name);
+                       RTE_BOND_LOG(ERR, "Invalid socket Id specified for "
+                                       "bonded device %s", name);
                        goto parse_error;
                }
        } else if (arg_count > 1) {
-               RTE_LOG(ERR, EAL, "Socket Id can be specified only once for "
-                               "bonded device %s\n", name);
+               RTE_BOND_LOG(ERR, "Socket Id can be specified only once for "
+                               "bonded device %s", name);
                goto parse_error;
        } else {
                socket_id = rte_socket_id();
@@ -3071,8 +3109,8 @@ bond_probe(struct rte_vdev_device *dev)
        /* Create link bonding eth device */
        port_id = bond_alloc(dev, bonding_mode);
        if (port_id < 0) {
-               RTE_LOG(ERR, EAL, "Failed to create socket %s in mode %u on "
-                               "socket %u.\n", name, bonding_mode, socket_id);
+               RTE_BOND_LOG(ERR, "Failed to create socket %s in mode %u on "
+                               "socket %u.",   name, bonding_mode, socket_id);
                goto parse_error;
        }
        internals = rte_eth_devices[port_id].data->dev_private;
@@ -3084,8 +3122,8 @@ bond_probe(struct rte_vdev_device *dev)
                                PMD_BOND_AGG_MODE_KVARG,
                                &bond_ethdev_parse_slave_agg_mode_kvarg,
                                &agg_mode) != 0) {
-                       RTE_LOG(ERR, EAL,
-                                       "Failed to parse agg selection mode for bonded device %s\n",
+                       RTE_BOND_LOG(ERR,
+                                       "Failed to parse agg selection mode for bonded device %s",
                                        name);
                        goto parse_error;
                }
@@ -3097,8 +3135,9 @@ bond_probe(struct rte_vdev_device *dev)
                rte_eth_bond_8023ad_agg_selection_set(port_id, AGG_STABLE);
        }
 
-       RTE_LOG(INFO, EAL, "Create bonded device %s on port %d in mode %u on "
-                       "socket %u.\n", name, port_id, bonding_mode, socket_id);
+       rte_eth_dev_probing_finish(&rte_eth_devices[port_id]);
+       RTE_BOND_LOG(INFO, "Create bonded device %s on port %d in mode %u on "
+                       "socket %u.",   name, port_id, bonding_mode, socket_id);
        return 0;
 
 parse_error:
@@ -3118,7 +3157,7 @@ bond_remove(struct rte_vdev_device *dev)
                return -EINVAL;
 
        name = rte_vdev_device_name(dev);
-       RTE_LOG(INFO, EAL, "Uninitializing pmd_bond for %s\n", name);
+       RTE_BOND_LOG(INFO, "Uninitializing pmd_bond for %s", name);
 
        /* now free all data allocation - for eth_dev structure,
         * dummy pci driver and internal (private) data
@@ -3209,23 +3248,23 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
                struct ether_addr bond_mac;
 
                if (rte_kvargs_process(kvlist, PMD_BOND_MAC_ADDR_KVARG,
-                               &bond_ethdev_parse_bond_mac_addr_kvarg, &bond_mac) < 0) {
-                       RTE_LOG(INFO, EAL, "Invalid mac address for bonded device %s\n",
-                                       name);
+                                      &bond_ethdev_parse_bond_mac_addr_kvarg, &bond_mac) < 0) {
+                       RTE_BOND_LOG(INFO, "Invalid mac address for bonded device %s",
+                                    name);
                        return -1;
                }
 
                /* Set MAC address */
                if (rte_eth_bond_mac_address_set(port_id, &bond_mac) != 0) {
-                       RTE_LOG(ERR, EAL,
-                                       "Failed to set mac address on bonded device %s\n",
-                                       name);
+                       RTE_BOND_LOG(ERR,
+                                    "Failed to set mac address on bonded device %s",
+                                    name);
                        return -1;
                }
        } else if (arg_count > 1) {
-               RTE_LOG(ERR, EAL,
-                               "MAC address can be specified only once for bonded device %s\n",
-                               name);
+               RTE_BOND_LOG(ERR,
+                            "MAC address can be specified only once for bonded device %s",
+                            name);
                return -1;
        }
 
@@ -3235,40 +3274,40 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
                uint8_t xmit_policy;
 
                if (rte_kvargs_process(kvlist, PMD_BOND_XMIT_POLICY_KVARG,
-                               &bond_ethdev_parse_balance_xmit_policy_kvarg, &xmit_policy) !=
-                                               0) {
-                       RTE_LOG(INFO, EAL,
-                                       "Invalid xmit policy specified for bonded device %s\n",
-                                       name);
+                                      &bond_ethdev_parse_balance_xmit_policy_kvarg, &xmit_policy) !=
+                   0) {
+                       RTE_BOND_LOG(INFO,
+                                    "Invalid xmit policy specified for bonded device %s",
+                                    name);
                        return -1;
                }
 
                /* Set balance mode transmit policy*/
                if (rte_eth_bond_xmit_policy_set(port_id, xmit_policy) != 0) {
-                       RTE_LOG(ERR, EAL,
-                                       "Failed to set balance xmit policy on bonded device %s\n",
-                                       name);
+                       RTE_BOND_LOG(ERR,
+                                    "Failed to set balance xmit policy on bonded device %s",
+                                    name);
                        return -1;
                }
        } else if (arg_count > 1) {
-               RTE_LOG(ERR, EAL,
-                               "Transmit policy can be specified only once for bonded device"
-                               " %s\n", name);
+               RTE_BOND_LOG(ERR,
+                            "Transmit policy can be specified only once for bonded device %s",
+                            name);
                return -1;
        }
 
        if (rte_kvargs_count(kvlist, PMD_BOND_AGG_MODE_KVARG) == 1) {
                if (rte_kvargs_process(kvlist,
-                               PMD_BOND_AGG_MODE_KVARG,
-                               &bond_ethdev_parse_slave_agg_mode_kvarg,
-                               &agg_mode) != 0) {
-                       RTE_LOG(ERR, EAL,
-                                       "Failed to parse agg selection mode for bonded device %s\n",
-                                       name);
+                                      PMD_BOND_AGG_MODE_KVARG,
+                                      &bond_ethdev_parse_slave_agg_mode_kvarg,
+                                      &agg_mode) != 0) {
+                       RTE_BOND_LOG(ERR,
+                                    "Failed to parse agg selection mode for bonded device %s",
+                                    name);
                }
                if (internals->mode == BONDING_MODE_8023AD)
-                               rte_eth_bond_8023ad_agg_selection_set(port_id,
-                                               agg_mode);
+                       rte_eth_bond_8023ad_agg_selection_set(port_id,
+                                                             agg_mode);
        }
 
        /* Parse/add slave ports to bonded device */
@@ -3279,23 +3318,23 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
                memset(&slave_ports, 0, sizeof(slave_ports));
 
                if (rte_kvargs_process(kvlist, PMD_BOND_SLAVE_PORT_KVARG,
-                               &bond_ethdev_parse_slave_port_kvarg, &slave_ports) != 0) {
-                       RTE_LOG(ERR, EAL,
-                                       "Failed to parse slave ports for bonded device %s\n",
-                                       name);
+                                      &bond_ethdev_parse_slave_port_kvarg, &slave_ports) != 0) {
+                       RTE_BOND_LOG(ERR,
+                                    "Failed to parse slave ports for bonded device %s",
+                                    name);
                        return -1;
                }
 
                for (i = 0; i < slave_ports.slave_count; i++) {
                        if (rte_eth_bond_slave_add(port_id, slave_ports.slaves[i]) != 0) {
-                               RTE_LOG(ERR, EAL,
-                                               "Failed to add port %d as slave to bonded device %s\n",
-                                               slave_ports.slaves[i], name);
+                               RTE_BOND_LOG(ERR,
+                                            "Failed to add port %d as slave to bonded device %s",
+                                            slave_ports.slaves[i], name);
                        }
                }
 
        } else {
-               RTE_LOG(INFO, EAL, "No slaves specified for bonded device %s\n", name);
+               RTE_BOND_LOG(INFO, "No slaves specified for bonded device %s", name);
                return -1;
        }
 
@@ -3305,27 +3344,27 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
                uint16_t primary_slave_port_id;
 
                if (rte_kvargs_process(kvlist,
-                               PMD_BOND_PRIMARY_SLAVE_KVARG,
-                               &bond_ethdev_parse_primary_slave_port_id_kvarg,
-                               &primary_slave_port_id) < 0) {
-                       RTE_LOG(INFO, EAL,
-                                       "Invalid primary slave port id specified for bonded device"
-                                       " %s\n", name);
+                                      PMD_BOND_PRIMARY_SLAVE_KVARG,
+                                      &bond_ethdev_parse_primary_slave_port_id_kvarg,
+                                      &primary_slave_port_id) < 0) {
+                       RTE_BOND_LOG(INFO,
+                                    "Invalid primary slave port id specified for bonded device %s",
+                                    name);
                        return -1;
                }
 
                /* Set balance mode transmit policy*/
                if (rte_eth_bond_primary_set(port_id, primary_slave_port_id)
-                               != 0) {
-                       RTE_LOG(ERR, EAL,
-                                       "Failed to set primary slave port %d on bonded device %s\n",
-                                       primary_slave_port_id, name);
+                   != 0) {
+                       RTE_BOND_LOG(ERR,
+                                    "Failed to set primary slave port %d on bonded device %s",
+                                    primary_slave_port_id, name);
                        return -1;
                }
        } else if (arg_count > 1) {
-               RTE_LOG(INFO, EAL,
-                               "Primary slave can be specified only once for bonded device"
-                               " %s\n", name);
+               RTE_BOND_LOG(INFO,
+                            "Primary slave can be specified only once for bonded device %s",
+                            name);
                return -1;
        }
 
@@ -3335,26 +3374,26 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
                uint32_t lsc_poll_interval_ms;
 
                if (rte_kvargs_process(kvlist,
-                               PMD_BOND_LSC_POLL_PERIOD_KVARG,
-                               &bond_ethdev_parse_time_ms_kvarg,
-                               &lsc_poll_interval_ms) < 0) {
-                       RTE_LOG(INFO, EAL,
-                                       "Invalid lsc polling interval value specified for bonded"
-                                       " device %s\n", name);
+                                      PMD_BOND_LSC_POLL_PERIOD_KVARG,
+                                      &bond_ethdev_parse_time_ms_kvarg,
+                                      &lsc_poll_interval_ms) < 0) {
+                       RTE_BOND_LOG(INFO,
+                                    "Invalid lsc polling interval value specified for bonded"
+                                    " device %s", name);
                        return -1;
                }
 
                if (rte_eth_bond_link_monitoring_set(port_id, lsc_poll_interval_ms)
-                               != 0) {
-                       RTE_LOG(ERR, EAL,
-                                       "Failed to set lsc monitor polling interval (%u ms) on"
-                                       " bonded device %s\n", lsc_poll_interval_ms, name);
+                   != 0) {
+                       RTE_BOND_LOG(ERR,
+                                    "Failed to set lsc monitor polling interval (%u ms) on bonded device %s",
+                                    lsc_poll_interval_ms, name);
                        return -1;
                }
        } else if (arg_count > 1) {
-               RTE_LOG(INFO, EAL,
-                               "LSC polling interval can be specified only once for bonded"
-                               " device %s\n", name);
+               RTE_BOND_LOG(INFO,
+                            "LSC polling interval can be specified only once for bonded"
+                            " device %s", name);
                return -1;
        }
 
@@ -3364,27 +3403,27 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
                uint32_t link_up_delay_ms;
 
                if (rte_kvargs_process(kvlist,
-                               PMD_BOND_LINK_UP_PROP_DELAY_KVARG,
-                               &bond_ethdev_parse_time_ms_kvarg,
-                               &link_up_delay_ms) < 0) {
-                       RTE_LOG(INFO, EAL,
-                                       "Invalid link up propagation delay value specified for"
-                                       " bonded device %s\n", name);
+                                      PMD_BOND_LINK_UP_PROP_DELAY_KVARG,
+                                      &bond_ethdev_parse_time_ms_kvarg,
+                                      &link_up_delay_ms) < 0) {
+                       RTE_BOND_LOG(INFO,
+                                    "Invalid link up propagation delay value specified for"
+                                    " bonded device %s", name);
                        return -1;
                }
 
                /* Set balance mode transmit policy*/
                if (rte_eth_bond_link_up_prop_delay_set(port_id, link_up_delay_ms)
-                               != 0) {
-                       RTE_LOG(ERR, EAL,
-                                       "Failed to set link up propagation delay (%u ms) on bonded"
-                                       " device %s\n", link_up_delay_ms, name);
+                   != 0) {
+                       RTE_BOND_LOG(ERR,
+                                    "Failed to set link up propagation delay (%u ms) on bonded"
+                                    " device %s", link_up_delay_ms, name);
                        return -1;
                }
        } else if (arg_count > 1) {
-               RTE_LOG(INFO, EAL,
-                               "Link up propagation delay can be specified only once for"
-                               " bonded device %s\n", name);
+               RTE_BOND_LOG(INFO,
+                            "Link up propagation delay can be specified only once for"
+                            " bonded device %s", name);
                return -1;
        }
 
@@ -3394,27 +3433,27 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
                uint32_t link_down_delay_ms;
 
                if (rte_kvargs_process(kvlist,
-                               PMD_BOND_LINK_DOWN_PROP_DELAY_KVARG,
-                               &bond_ethdev_parse_time_ms_kvarg,
-                               &link_down_delay_ms) < 0) {
-                       RTE_LOG(INFO, EAL,
-                                       "Invalid link down propagation delay value specified for"
-                                       " bonded device %s\n", name);
+                                      PMD_BOND_LINK_DOWN_PROP_DELAY_KVARG,
+                                      &bond_ethdev_parse_time_ms_kvarg,
+                                      &link_down_delay_ms) < 0) {
+                       RTE_BOND_LOG(INFO,
+                                    "Invalid link down propagation delay value specified for"
+                                    " bonded device %s", name);
                        return -1;
                }
 
                /* Set balance mode transmit policy*/
                if (rte_eth_bond_link_down_prop_delay_set(port_id, link_down_delay_ms)
-                               != 0) {
-                       RTE_LOG(ERR, EAL,
-                                       "Failed to set link down propagation delay (%u ms) on"
-                                       " bonded device %s\n", link_down_delay_ms, name);
+                   != 0) {
+                       RTE_BOND_LOG(ERR,
+                                    "Failed to set link down propagation delay (%u ms) on bonded device %s",
+                                    link_down_delay_ms, name);
                        return -1;
                }
        } else if (arg_count > 1) {
-               RTE_LOG(INFO, EAL,
-                               "Link down propagation delay can be specified only once for"
-                               " bonded device %s\n", name);
+               RTE_BOND_LOG(INFO,
+                            "Link down propagation delay can be specified only once for  bonded device %s",
+                            name);
                return -1;
        }
 
@@ -3440,3 +3479,14 @@ RTE_PMD_REGISTER_PARAM_STRING(net_bonding,
        "lsc_poll_period_ms=<int> "
        "up_delay=<int> "
        "down_delay=<int>");
+
+int bond_logtype;
+
+RTE_INIT(bond_init_log);
+static void
+bond_init_log(void)
+{
+       bond_logtype = rte_log_register("pmd.net.bon");
+       if (bond_logtype >= 0)
+               rte_log_set_level(bond_logtype, RTE_LOG_NOTICE);
+}