Patch Comment List
List patch comments
GET /api/patches/287/comments/?format=api
[ { "id": 628, "web_url": "https://patches.dpdk.org/comment/628/", "msgid": "<CADNuJVqhOy6AfYO5OuUn=kmQsBVkwrRunXKXKkQ88bexPtWgsg@mail.gmail.com>", "list_archive_url": "https://inbox.dpdk.org/dev/CADNuJVqhOy6AfYO5OuUn=kmQsBVkwrRunXKXKkQ88bexPtWgsg@mail.gmail.com", "date": "2014-09-02T19:05:26", "subject": "Re: [dpdk-dev] [PATCH v2 14/17] e1000: clean log messages", "submitter": { "id": 61, "url": "https://patches.dpdk.org/api/people/61/?format=api", "name": "Jay Rolette", "email": "rolette@infiniteio.com" }, "content": "Couple of minor nits noted. The bigger feedback would be that if you could\nkeep the \"whitespace / line-wrapping / formatting\" only changes in separate\npatches, these reviews would be easier to get through.\n\nJay\n\n\nOn Mon, Sep 1, 2014 at 5:24 AM, David Marchand <david.marchand@6wind.com>\nwrote:\n\n> Clean log messages:\n> - remove leading \\n in some messages,\n> - remove trailing \\n in some messages,\n> - split multi lines messages,\n> - replace some PMD_INIT_LOG(DEBUG, \"some_func\") with PMD_INIT_FUNC_TRACE().\n>\n> Signed-off-by: David Marchand <david.marchand@6wind.com>\n> ---\n> lib/librte_pmd_e1000/e1000_logs.h | 4 +-\n> lib/librte_pmd_e1000/em_ethdev.c | 64 ++++++++++------------\n> lib/librte_pmd_e1000/em_rxtx.c | 109\n> ++++++++++++++++++-------------------\n> lib/librte_pmd_e1000/igb_ethdev.c | 91 +++++++++++++++----------------\n> lib/librte_pmd_e1000/igb_pf.c | 4 +-\n> lib/librte_pmd_e1000/igb_rxtx.c | 45 +++++++--------\n> 6 files changed, 153 insertions(+), 164 deletions(-)\n>\n> diff --git a/lib/librte_pmd_e1000/e1000_logs.h\n> b/lib/librte_pmd_e1000/e1000_logs.h\n> index fe6e023..4dd7208 100644\n> --- a/lib/librte_pmd_e1000/e1000_logs.h\n> +++ b/lib/librte_pmd_e1000/e1000_logs.h\n> @@ -37,8 +37,10 @@\n> #ifdef RTE_LIBRTE_E1000_DEBUG_INIT\n> #define PMD_INIT_LOG(level, fmt, args...) \\\n> RTE_LOG(level, PMD, \"%s(): \" fmt \"\\n\", __func__, ## args)\n> +#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, \" >>\")\n> #else\n> -#define PMD_INIT_LOG(level, fmt, args...) do { } while(0)\n> +#define PMD_INIT_LOG(level, fmt, args...) do { } while (0)\n> +#define PMD_INIT_FUNC_TRACE() do { } while (0)\n> #endif\n>\n> #ifdef RTE_LIBRTE_E1000_DEBUG_RX\n> diff --git a/lib/librte_pmd_e1000/em_ethdev.c\n> b/lib/librte_pmd_e1000/em_ethdev.c\n> index 4555294..fd36b37 100644\n> --- a/lib/librte_pmd_e1000/em_ethdev.c\n> +++ b/lib/librte_pmd_e1000/em_ethdev.c\n> @@ -249,9 +249,9 @@ eth_em_dev_init(__attribute__((unused)) struct\n> eth_driver *eth_drv,\n> if (e1000_setup_init_funcs(hw, TRUE) != E1000_SUCCESS ||\n> em_hw_init(hw) != 0) {\n> PMD_INIT_LOG(ERR, \"port_id %d vendorID=0x%x deviceID=0x%x:\n> \"\n> - \"failed to init HW\",\n> - eth_dev->data->port_id, pci_dev->id.vendor_id,\n> - pci_dev->id.device_id);\n> + \"failed to init HW\",\n> + eth_dev->data->port_id, pci_dev->id.vendor_id,\n> + pci_dev->id.device_id);\n> return -(ENODEV);\n> }\n>\n> @@ -260,8 +260,8 @@ eth_em_dev_init(__attribute__((unused)) struct\n> eth_driver *eth_drv,\n> hw->mac.rar_entry_count, 0);\n> if (eth_dev->data->mac_addrs == NULL) {\n> PMD_INIT_LOG(ERR, \"Failed to allocate %d bytes needed to \"\n> - \"store MAC addresses\",\n> - ETHER_ADDR_LEN * hw->mac.rar_entry_count);\n> + \"store MAC addresses\",\n> + ETHER_ADDR_LEN * hw->mac.rar_entry_count);\n> return -(ENOMEM);\n> }\n>\n> @@ -272,9 +272,9 @@ eth_em_dev_init(__attribute__((unused)) struct\n> eth_driver *eth_drv,\n> /* initialize the vfta */\n> memset(shadow_vfta, 0, sizeof(*shadow_vfta));\n>\n> - PMD_INIT_LOG(INFO, \"port_id %d vendorID=0x%x deviceID=0x%x\\n\",\n> - eth_dev->data->port_id, pci_dev->id.vendor_id,\n> - pci_dev->id.device_id);\n> + PMD_INIT_LOG(INFO, \"port_id %d vendorID=0x%x deviceID=0x%x\",\n> + eth_dev->data->port_id, pci_dev->id.vendor_id,\n> + pci_dev->id.device_id);\n>\n> rte_intr_callback_register(&(pci_dev->intr_handle),\n> eth_em_interrupt_handler, (void *)eth_dev);\n> @@ -306,17 +306,17 @@ em_hw_init(struct e1000_hw *hw)\n>\n> diag = hw->mac.ops.init_params(hw);\n> if (diag != 0) {\n> - PMD_INIT_LOG(ERR, \"MAC Initialization Error\\n\");\n> + PMD_INIT_LOG(ERR, \"MAC Initialization Error\");\n> return diag;\n> }\n> diag = hw->nvm.ops.init_params(hw);\n> if (diag != 0) {\n> - PMD_INIT_LOG(ERR, \"NVM Initialization Error\\n\");\n> + PMD_INIT_LOG(ERR, \"NVM Initialization Error\");\n> return diag;\n> }\n> diag = hw->phy.ops.init_params(hw);\n> if (diag != 0) {\n> - PMD_INIT_LOG(ERR, \"PHY Initialization Error\\n\");\n> + PMD_INIT_LOG(ERR, \"PHY Initialization Error\");\n> return diag;\n> }\n> (void) e1000_get_bus_info(hw);\n> @@ -375,7 +375,7 @@ em_hw_init(struct e1000_hw *hw)\n> diag = e1000_check_reset_block(hw);\n> if (diag < 0) {\n> PMD_INIT_LOG(ERR, \"PHY reset is blocked due to \"\n> - \"SOL/IDER session\");\n> + \"SOL/IDER session\");\n> }\n> return (0);\n>\n> @@ -390,11 +390,10 @@ eth_em_configure(struct rte_eth_dev *dev)\n> struct e1000_interrupt *intr =\n> E1000_DEV_PRIVATE_TO_INTR(dev->data->dev_private);\n>\n> - PMD_INIT_LOG(DEBUG, \">>\");\n> -\n> + PMD_INIT_FUNC_TRACE();\n> intr->flags |= E1000_FLAG_NEED_LINK_UPDATE;\n> + PMD_INIT_FUNC_TRACE();\n>\n> - PMD_INIT_LOG(DEBUG, \"<<\");\n> return (0);\n> }\n>\n> @@ -453,7 +452,7 @@ eth_em_start(struct rte_eth_dev *dev)\n> E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n> int ret, mask;\n>\n> - PMD_INIT_LOG(DEBUG, \">>\");\n> + PMD_INIT_FUNC_TRACE();\n>\n> eth_em_stop(dev);\n>\n> @@ -573,9 +572,9 @@ eth_em_start(struct rte_eth_dev *dev)\n> return (0);\n>\n> error_invalid_config:\n> - PMD_INIT_LOG(ERR, \"Invalid link_speed/link_duplex (%u/%u) for port\n> \"\n> - \"%u\\n\", dev->data->dev_conf.link_speed,\n> - dev->data->dev_conf.link_duplex,\n> dev->data->port_id);\n> + PMD_INIT_LOG(ERR, \"Invalid link_speed/link_duplex (%u/%u) for port\n> %u\",\n> + dev->data->dev_conf.link_speed,\n> + dev->data->dev_conf.link_duplex, dev->data->port_id);\n> em_dev_clear_queues(dev);\n> return (-EINVAL);\n> }\n> @@ -1296,20 +1295,17 @@ eth_em_interrupt_action(struct rte_eth_dev *dev)\n> memset(&link, 0, sizeof(link));\n> rte_em_dev_atomic_read_link_status(dev, &link);\n> if (link.link_status) {\n> - PMD_INIT_LOG(INFO,\n> - \" Port %d: Link Up - speed %u Mbps - %s\\n\",\n> - dev->data->port_id, (unsigned)link.link_speed,\n> - link.link_duplex == ETH_LINK_FULL_DUPLEX ?\n> - \"full-duplex\" : \"half-duplex\");\n> + PMD_INIT_LOG(INFO, \" Port %d: Link Up - speed %u Mbps -\n> %s\",\n> + dev->data->port_id, (unsigned)link.link_speed,\n> + link.link_duplex == ETH_LINK_FULL_DUPLEX ?\n> + \"full-duplex\" : \"half-duplex\");\n> } else {\n> - PMD_INIT_LOG(INFO, \" Port %d: Link Down\\n\",\n> - dev->data->port_id);\n> + PMD_INIT_LOG(INFO, \" Port %d: Link Down\",\n> + dev->data->port_id);\n> }\n> PMD_INIT_LOG(INFO, \"PCI Address: %04d:%02d:%02d:%d\",\n> - dev->pci_dev->addr.domain,\n> - dev->pci_dev->addr.bus,\n> - dev->pci_dev->addr.devid,\n> - dev->pci_dev->addr.function);\n> + dev->pci_dev->addr.domain, dev->pci_dev->addr.bus,\n> + dev->pci_dev->addr.devid,\n> dev->pci_dev->addr.function);\n> tctl = E1000_READ_REG(hw, E1000_TCTL);\n> rctl = E1000_READ_REG(hw, E1000_RCTL);\n> if (link.link_status) {\n> @@ -1429,14 +1425,14 @@ eth_em_flow_ctrl_set(struct rte_eth_dev *dev,\n> struct rte_eth_fc_conf *fc_conf)\n> if (fc_conf->autoneg != hw->mac.autoneg)\n> return -ENOTSUP;\n> rx_buf_size = em_get_rx_buffer_size(hw);\n> - PMD_INIT_LOG(DEBUG, \"Rx packet buffer size = 0x%x \\n\",\n> rx_buf_size);\n> + PMD_INIT_LOG(DEBUG, \"Rx packet buffer size = 0x%x\", rx_buf_size);\n>\n> /* At least reserve one Ethernet frame for watermark */\n> max_high_water = rx_buf_size - ETHER_MAX_LEN;\n> if ((fc_conf->high_water > max_high_water) ||\n> (fc_conf->high_water < fc_conf->low_water)) {\n> - PMD_INIT_LOG(ERR, \"e1000 incorrect high/low water value\n> \\n\");\n> - PMD_INIT_LOG(ERR, \"high water must <= 0x%x \\n\",\n> max_high_water);\n> + PMD_INIT_LOG(ERR, \"e1000 incorrect high/low water value\");\n> + PMD_INIT_LOG(ERR, \"high water must <= 0x%x\",\n> max_high_water);\n> return (-EINVAL);\n> }\n>\n> @@ -1466,7 +1462,7 @@ eth_em_flow_ctrl_set(struct rte_eth_dev *dev, struct\n> rte_eth_fc_conf *fc_conf)\n> return 0;\n> }\n>\n> - PMD_INIT_LOG(ERR, \"e1000_setup_link_generic = 0x%x \\n\", err);\n> + PMD_INIT_LOG(ERR, \"e1000_setup_link_generic = 0x%x\", err);\n> return (-EIO);\n> }\n>\n> diff --git a/lib/librte_pmd_e1000/em_rxtx.c\n> b/lib/librte_pmd_e1000/em_rxtx.c\n> index 01efa50..83ecb33 100644\n> --- a/lib/librte_pmd_e1000/em_rxtx.c\n> +++ b/lib/librte_pmd_e1000/em_rxtx.c\n> @@ -317,10 +317,8 @@ em_xmit_cleanup(struct em_tx_queue *txq)\n> desc_to_clean_to = sw_ring[desc_to_clean_to].last_id;\n> if (! (txr[desc_to_clean_to].upper.fields.status &\n> E1000_TXD_STAT_DD))\n> {\n> - PMD_TX_FREE_LOG(DEBUG,\n> - \"TX descriptor %4u is not done\"\n> - \"(port=%d queue=%d)\",\n> - desc_to_clean_to,\n> + PMD_TX_FREE_LOG(DEBUG, \"TX descriptor %4u is not done\"\n> + \"(port=%d queue=%d)\", desc_to_clean_to,\n> txq->port_id, txq->queue_id);\n> /* Failed to clean any descriptors, better luck next time\n> */\n> return -(1);\n> @@ -334,11 +332,10 @@ em_xmit_cleanup(struct em_tx_queue *txq)\n> nb_tx_to_clean = (uint16_t)(desc_to_clean_to -\n> last_desc_cleaned);\n>\n> - PMD_TX_FREE_LOG(DEBUG,\n> - \"Cleaning %4u TX descriptors: %4u to %4u \"\n> - \"(port=%d queue=%d)\",\n> - nb_tx_to_clean, last_desc_cleaned,\n> desc_to_clean_to,\n> - txq->port_id, txq->queue_id);\n> + PMD_TX_FREE_LOG(DEBUG, \"Cleaning %4u TX descriptors: %4u to %4u \"\n> + \"(port=%d queue=%d)\", nb_tx_to_clean,\n> + last_desc_cleaned, desc_to_clean_to, txq->port_id,\n> + txq->queue_id);\n>\n> /*\n> * The last descriptor to clean is done, so that means all the\n> @@ -451,12 +448,12 @@ eth_em_xmit_pkts(void *tx_queue, struct rte_mbuf\n> **tx_pkts,\n> tx_last = (uint16_t) (tx_last - txq->nb_tx_desc);\n>\n> PMD_TX_LOG(DEBUG, \"port_id=%u queue_id=%u pktlen=%u\"\n> - \" tx_first=%u tx_last=%u\\n\",\n> - (unsigned) txq->port_id,\n> - (unsigned) txq->queue_id,\n> - (unsigned) tx_pkt->pkt.pkt_len,\n> - (unsigned) tx_id,\n> - (unsigned) tx_last);\n> + \" tx_first=%u tx_last=%u\",\n> + (unsigned) txq->port_id,\n> + (unsigned) txq->queue_id,\n> + (unsigned) tx_pkt->pkt.pkt_len,\n> + (unsigned) tx_id,\n> + (unsigned) tx_last);\n>\n> /*\n> * Make sure there are enough TX descriptors available to\n> @@ -464,8 +461,7 @@ eth_em_xmit_pkts(void *tx_queue, struct rte_mbuf\n> **tx_pkts,\n> * nb_used better be less than or equal to\n> txq->tx_rs_thresh\n> */\n> while (unlikely (nb_used > txq->nb_tx_free)) {\n> - PMD_TX_FREE_LOG(DEBUG,\n> - \"Not enough free TX descriptors \"\n> + PMD_TX_FREE_LOG(DEBUG, \"Not enough free TX\n> descriptors \"\n> \"nb_used=%4u nb_free=%4u \"\n> \"(port=%d queue=%d)\",\n> nb_used, txq->nb_tx_free,\n> @@ -588,9 +584,8 @@ eth_em_xmit_pkts(void *tx_queue, struct rte_mbuf\n> **tx_pkts,\n>\n> /* Set RS bit only on threshold packets' last descriptor */\n> if (txq->nb_tx_used >= txq->tx_rs_thresh) {\n> - PMD_TX_FREE_LOG(DEBUG,\n> - \"Setting RS bit on TXD id=\"\n> - \"%4u (port=%d queue=%d)\",\n> + PMD_TX_FREE_LOG(DEBUG, \"Setting RS bit on TXD\n> id=%4u \"\n> + \"(port=%d queue=%d)\",\n> tx_last, txq->port_id,\n> txq->queue_id);\n>\n> cmd_type_len |= E1000_TXD_CMD_RS;\n> @@ -607,8 +602,8 @@ end_of_tx:\n> * Set the Transmit Descriptor Tail (TDT)\n> */\n> PMD_TX_LOG(DEBUG, \"port_id=%u queue_id=%u tx_tail=%u nb_tx=%u\",\n> - (unsigned) txq->port_id, (unsigned) txq->queue_id,\n> - (unsigned) tx_id, (unsigned) nb_tx);\n> + (unsigned) txq->port_id, (unsigned) txq->queue_id,\n> + (unsigned) tx_id, (unsigned) nb_tx);\n> E1000_PCI_REG_WRITE(txq->tdt_reg_addr, tx_id);\n> txq->tx_tail = tx_id;\n>\n> @@ -712,19 +707,19 @@ eth_em_recv_pkts(void *rx_queue, struct rte_mbuf\n> **rx_pkts,\n> * to happen by sending specific \"back-pressure\" flow\n> control\n> * frames to its peer(s).\n> */\n> - PMD_RX_LOG(DEBUG, \"\\nport_id=%u queue_id=%u rx_id=%u \"\n> - \"status=0x%x pkt_len=%u\\n\",\n> - (unsigned) rxq->port_id, (unsigned) rxq->queue_id,\n> - (unsigned) rx_id, (unsigned) status,\n> - (unsigned) rte_le_to_cpu_16(rxd.length));\n> + PMD_RX_LOG(DEBUG, \"port_id=%u queue_id=%u rx_id=%u \"\n> + \"status=0x%x pkt_len=%u\",\n> + (unsigned) rxq->port_id, (unsigned)\n> rxq->queue_id,\n> + (unsigned) rx_id, (unsigned) status,\n> + (unsigned) rte_le_to_cpu_16(rxd.length));\n>\n> nmb = rte_rxmbuf_alloc(rxq->mb_pool);\n> if (nmb == NULL) {\n> PMD_RX_LOG(DEBUG, \"RX mbuf alloc failed port_id=%u\n> \"\n> - \"queue_id=%u\\n\",\n> - (unsigned) rxq->port_id,\n> - (unsigned) rxq->queue_id);\n> -\n> rte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed++;\n> + \"queue_id=%u\",\n> + (unsigned) rxq->port_id,\n> + (unsigned) rxq->queue_id);\n> +\n> rte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed++;\n> break;\n> }\n>\n> @@ -806,10 +801,10 @@ eth_em_recv_pkts(void *rx_queue, struct rte_mbuf\n> **rx_pkts,\n> nb_hold = (uint16_t) (nb_hold + rxq->nb_rx_hold);\n> if (nb_hold > rxq->rx_free_thresh) {\n> PMD_RX_LOG(DEBUG, \"port_id=%u queue_id=%u rx_tail=%u \"\n> - \"nb_hold=%u nb_rx=%u\\n\",\n> - (unsigned) rxq->port_id, (unsigned) rxq->queue_id,\n> - (unsigned) rx_id, (unsigned) nb_hold,\n> - (unsigned) nb_rx);\n> + \"nb_hold=%u nb_rx=%u\",\n> + (unsigned) rxq->port_id, (unsigned)\n> rxq->queue_id,\n> + (unsigned) rx_id, (unsigned) nb_hold,\n> + (unsigned) nb_rx);\n> rx_id = (uint16_t) ((rx_id == 0) ?\n> (rxq->nb_rx_desc - 1) : (rx_id - 1));\n> E1000_PCI_REG_WRITE(rxq->rdt_reg_addr, rx_id);\n> @@ -892,17 +887,17 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct\n> rte_mbuf **rx_pkts,\n> * to happen by sending specific \"back-pressure\" flow\n> control\n> * frames to its peer(s).\n> */\n> - PMD_RX_LOG(DEBUG, \"\\nport_id=%u queue_id=%u rx_id=%u \"\n> - \"status=0x%x data_len=%u\\n\",\n> - (unsigned) rxq->port_id, (unsigned) rxq->queue_id,\n> - (unsigned) rx_id, (unsigned) status,\n> - (unsigned) rte_le_to_cpu_16(rxd.length));\n> + PMD_RX_LOG(DEBUG, \"port_id=%u queue_id=%u rx_id=%u \"\n> + \"status=0x%x data_len=%u\",\n> + (unsigned) rxq->port_id, (unsigned)\n> rxq->queue_id,\n> + (unsigned) rx_id, (unsigned) status,\n> + (unsigned) rte_le_to_cpu_16(rxd.length));\n>\n> nmb = rte_rxmbuf_alloc(rxq->mb_pool);\n> if (nmb == NULL) {\n> PMD_RX_LOG(DEBUG, \"RX mbuf alloc failed port_id=%u\n> \"\n> - \"queue_id=%u\\n\", (unsigned) rxq->port_id,\n> - (unsigned) rxq->queue_id);\n> + \"queue_id=%u\", (unsigned) rxq->port_id,\n> + (unsigned) rxq->queue_id);\n>\n> rte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed++;\n> break;\n> }\n> @@ -1050,10 +1045,10 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct\n> rte_mbuf **rx_pkts,\n> nb_hold = (uint16_t) (nb_hold + rxq->nb_rx_hold);\n> if (nb_hold > rxq->rx_free_thresh) {\n> PMD_RX_LOG(DEBUG, \"port_id=%u queue_id=%u rx_tail=%u \"\n> - \"nb_hold=%u nb_rx=%u\\n\",\n> - (unsigned) rxq->port_id, (unsigned) rxq->queue_id,\n> - (unsigned) rx_id, (unsigned) nb_hold,\n> - (unsigned) nb_rx);\n> + \"nb_hold=%u nb_rx=%u\",\n> + (unsigned) rxq->port_id, (unsigned)\n> rxq->queue_id,\n> + (unsigned) rx_id, (unsigned) nb_hold,\n> + (unsigned) nb_rx);\n> rx_id = (uint16_t) ((rx_id == 0) ?\n> (rxq->nb_rx_desc - 1) : (rx_id - 1));\n> E1000_PCI_REG_WRITE(rxq->rdt_reg_addr, rx_id);\n> @@ -1213,7 +1208,7 @@ eth_em_tx_queue_setup(struct rte_eth_dev *dev,\n> if (tx_free_thresh >= (nb_desc - 3)) {\n> PMD_INIT_LOG(ERR, \"tx_free_thresh must be less than the \"\n> \"number of TX descriptors minus 3. \"\n> - \"(tx_free_thresh=%u port=%d queue=%d)\\n\",\n> + \"(tx_free_thresh=%u port=%d queue=%d)\",\n> (unsigned int)tx_free_thresh,\n> (int)dev->data->port_id, (int)queue_idx);\n> return -(EINVAL);\n> @@ -1221,7 +1216,7 @@ eth_em_tx_queue_setup(struct rte_eth_dev *dev,\n> if (tx_rs_thresh > tx_free_thresh) {\n> PMD_INIT_LOG(ERR, \"tx_rs_thresh must be less than or equal\n> to \"\n> \"tx_free_thresh. (tx_free_thresh=%u \"\n> - \"tx_rs_thresh=%u port=%d queue=%d)\\n\",\n> + \"tx_rs_thresh=%u port=%d queue=%d)\",\n> (unsigned int)tx_free_thresh,\n> (unsigned int)tx_rs_thresh,\n> (int)dev->data->port_id,\n> @@ -1238,7 +1233,7 @@ eth_em_tx_queue_setup(struct rte_eth_dev *dev,\n> if (tx_conf->tx_thresh.wthresh != 0 && tx_rs_thresh != 1) {\n> PMD_INIT_LOG(ERR, \"TX WTHRESH must be set to 0 if \"\n> \"tx_rs_thresh is greater than 1.\n> (tx_rs_thresh=%u \"\n> - \"port=%d queue=%d)\\n\", (unsigned\n> int)tx_rs_thresh,\n> + \"port=%d queue=%d)\", (unsigned\n> int)tx_rs_thresh,\n> (int)dev->data->port_id, (int)queue_idx);\n> return -(EINVAL);\n> }\n> @@ -1289,8 +1284,8 @@ eth_em_tx_queue_setup(struct rte_eth_dev *dev,\n> #endif\n> txq->tx_ring = (struct e1000_data_desc *) tz->addr;\n>\n> - PMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p dma_addr=0x%\"PRIx64\"\\n\",\n> - txq->sw_ring, txq->tx_ring, txq->tx_ring_phys_addr);\n> + PMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p dma_addr=0x%\"PRIx64,\n> + txq->sw_ring, txq->tx_ring, txq->tx_ring_phys_addr);\n>\n> em_reset_tx_queue(txq);\n>\n> @@ -1370,7 +1365,7 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev,\n> */\n> if (rx_conf->rx_drop_en) {\n> PMD_INIT_LOG(ERR, \"drop_en functionality not supported by \"\n> - \"device\\n\");\n> + \"device\");\n> return (-EINVAL);\n> }\n>\n> @@ -1419,8 +1414,8 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev,\n> #endif\n> rxq->rx_ring = (struct e1000_rx_desc *) rz->addr;\n>\n> - PMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p dma_addr=0x%\"PRIx64\"\\n\",\n> - rxq->sw_ring, rxq->rx_ring, rxq->rx_ring_phys_addr);\n> + PMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p dma_addr=0x%\"PRIx64,\n> + rxq->sw_ring, rxq->rx_ring, rxq->rx_ring_phys_addr);\n>\n> dev->data->rx_queues[queue_idx] = rxq;\n> em_reset_rx_queue(rxq);\n> @@ -1437,7 +1432,7 @@ eth_em_rx_queue_count(struct rte_eth_dev *dev,\n> uint16_t rx_queue_id)\n> uint32_t desc = 0;\n>\n> if (rx_queue_id >= dev->data->nb_rx_queues) {\n> - PMD_RX_LOG(DEBUG,\"Invalid RX queue_id=%d\\n\", rx_queue_id);\n> + PMD_RX_LOG(DEBUG, \"Invalid RX queue_id=%d\", rx_queue_id);\n> return 0;\n> }\n>\n> @@ -1582,8 +1577,8 @@ em_alloc_rx_queue_mbufs(struct em_rx_queue *rxq)\n> struct rte_mbuf *mbuf = rte_rxmbuf_alloc(rxq->mb_pool);\n>\n> if (mbuf == NULL) {\n> - PMD_INIT_LOG(ERR, \"RX mbuf alloc failed \"\n> - \"queue_id=%hu\\n\", rxq->queue_id);\n> + PMD_INIT_LOG(ERR, \"RX mbuf alloc failed\n> queue_id=%hu\",\n> + rxq->queue_id);\n> return (-ENOMEM);\n> }\n>\n> diff --git a/lib/librte_pmd_e1000/igb_ethdev.c\n> b/lib/librte_pmd_e1000/igb_ethdev.c\n> index b45eb24..4dbf059 100644\n> --- a/lib/librte_pmd_e1000/igb_ethdev.c\n> +++ b/lib/librte_pmd_e1000/igb_ethdev.c\n> @@ -528,8 +528,8 @@ eth_igb_dev_init(__attribute__((unused)) struct\n> eth_driver *eth_drv,\n> ETHER_ADDR_LEN * hw->mac.rar_entry_count, 0);\n> if (eth_dev->data->mac_addrs == NULL) {\n> PMD_INIT_LOG(ERR, \"Failed to allocate %d bytes needed to \"\n> - \"store MAC addresses\",\n> - ETHER_ADDR_LEN * hw->mac.rar_entry_count);\n> + \"store MAC addresses\",\n> + ETHER_ADDR_LEN * hw->mac.rar_entry_count);\n> error = -ENOMEM;\n> goto err_late;\n> }\n> @@ -553,7 +553,7 @@ eth_igb_dev_init(__attribute__((unused)) struct\n> eth_driver *eth_drv,\n> /* Indicate SOL/IDER usage */\n> if (e1000_check_reset_block(hw) < 0) {\n> PMD_INIT_LOG(ERR, \"PHY reset is blocked due to\"\n> - \"SOL/IDER session\");\n> + \"SOL/IDER session\");\n> }\n>\n> /* initialize PF if max_vfs not zero */\n> @@ -565,7 +565,7 @@ eth_igb_dev_init(__attribute__((unused)) struct\n> eth_driver *eth_drv,\n> E1000_WRITE_REG(hw, E1000_CTRL_EXT, ctrl_ext);\n> E1000_WRITE_FLUSH(hw);\n>\n> - PMD_INIT_LOG(INFO, \"port_id %d vendorID=0x%x deviceID=0x%x\\n\",\n> + PMD_INIT_LOG(INFO, \"port_id %d vendorID=0x%x deviceID=0x%x\",\n> eth_dev->data->port_id, pci_dev->id.vendor_id,\n> pci_dev->id.device_id);\n>\n> @@ -598,7 +598,7 @@ eth_igbvf_dev_init(__attribute__((unused)) struct\n> eth_driver *eth_drv,\n> E1000_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);\n> int diag;\n>\n> - PMD_INIT_LOG(DEBUG, \"eth_igbvf_dev_init\");\n> + PMD_INIT_FUNC_TRACE();\n>\n> eth_dev->dev_ops = &igbvf_eth_dev_ops;\n> eth_dev->rx_pkt_burst = ð_igb_recv_pkts;\n> @@ -623,7 +623,7 @@ eth_igbvf_dev_init(__attribute__((unused)) struct\n> eth_driver *eth_drv,\n> diag = e1000_setup_init_funcs(hw, TRUE);\n> if (diag != 0) {\n> PMD_INIT_LOG(ERR, \"Shared code init failed for igbvf: %d\",\n> - diag);\n> + diag);\n> return -EIO;\n> }\n>\n> @@ -639,10 +639,9 @@ eth_igbvf_dev_init(__attribute__((unused)) struct\n> eth_driver *eth_drv,\n> eth_dev->data->mac_addrs = rte_zmalloc(\"igbvf\", ETHER_ADDR_LEN *\n> hw->mac.rar_entry_count, 0);\n> if (eth_dev->data->mac_addrs == NULL) {\n> - PMD_INIT_LOG(ERR,\n> - \"Failed to allocate %d bytes needed to store MAC \"\n> - \"addresses\",\n> - ETHER_ADDR_LEN * hw->mac.rar_entry_count);\n> + PMD_INIT_LOG(ERR, \"Failed to allocate %d bytes needed to \"\n> + \"store MAC addresses\",\n> + ETHER_ADDR_LEN * hw->mac.rar_entry_count);\n> return -ENOMEM;\n> }\n>\n> @@ -650,11 +649,9 @@ eth_igbvf_dev_init(__attribute__((unused)) struct\n> eth_driver *eth_drv,\n> ether_addr_copy((struct ether_addr *) hw->mac.perm_addr,\n> ð_dev->data->mac_addrs[0]);\n>\n> - PMD_INIT_LOG(DEBUG, \"\\nport %d vendorID=0x%x deviceID=0x%x \"\n> - \"mac.type=%s\\n\",\n> - eth_dev->data->port_id, pci_dev->id.vendor_id,\n> - pci_dev->id.device_id,\n> - \"igb_mac_82576_vf\");\n> + PMD_INIT_LOG(DEBUG, \"port %d vendorID=0x%x deviceID=0x%x\n> mac.type=%s\",\n> + eth_dev->data->port_id, pci_dev->id.vendor_id,\n> + pci_dev->id.device_id, \"igb_mac_82576_vf\");\n>\n> return 0;\n> }\n> @@ -720,11 +717,9 @@ eth_igb_configure(struct rte_eth_dev *dev)\n> struct e1000_interrupt *intr =\n> E1000_DEV_PRIVATE_TO_INTR(dev->data->dev_private);\n>\n> - PMD_INIT_LOG(DEBUG, \">>\");\n> -\n> + PMD_INIT_FUNC_TRACE();\n> intr->flags |= E1000_FLAG_NEED_LINK_UPDATE;\n> -\n> - PMD_INIT_LOG(DEBUG, \"<<\");\n> + PMD_INIT_FUNC_TRACE();\n>\n> return (0);\n> }\n> @@ -737,7 +732,7 @@ eth_igb_start(struct rte_eth_dev *dev)\n> int ret, i, mask;\n> uint32_t ctrl_ext;\n>\n> - PMD_INIT_LOG(DEBUG, \">>\");\n> + PMD_INIT_FUNC_TRACE();\n>\n> /* Power up the phy. Needed to make the link go Up */\n> e1000_power_up_phy(hw);\n> @@ -888,9 +883,9 @@ eth_igb_start(struct rte_eth_dev *dev)\n> return (0);\n>\n> error_invalid_config:\n> - PMD_INIT_LOG(ERR, \"Invalid link_speed/link_duplex (%u/%u) for port\n> %u\\n\",\n> - dev->data->dev_conf.link_speed,\n> - dev->data->dev_conf.link_duplex,\n> dev->data->port_id);\n> + PMD_INIT_LOG(ERR, \"Invalid link_speed/link_duplex (%u/%u) for port\n> %u\",\n> + dev->data->dev_conf.link_speed,\n> + dev->data->dev_conf.link_duplex, dev->data->port_id);\n> igb_dev_clear_queues(dev);\n> return (-EINVAL);\n> }\n> @@ -1789,20 +1784,20 @@ eth_igb_interrupt_action(struct rte_eth_dev *dev)\n> memset(&link, 0, sizeof(link));\n> rte_igb_dev_atomic_read_link_status(dev, &link);\n> if (link.link_status) {\n> - PMD_INIT_LOG(INFO,\n> - \" Port %d: Link Up - speed %u Mbps - %s\\n\",\n> - dev->data->port_id,\n> (unsigned)link.link_speed,\n> - link.link_duplex == ETH_LINK_FULL_DUPLEX ?\n> - \"full-duplex\" : \"half-duplex\");\n> + PMD_INIT_LOG(INFO, \" Port %d: Link Up - speed %u\n> Mbps \"\n> + \"- %s\", dev->data->port_id,\n> + (unsigned)link.link_speed,\n> + link.link_duplex ==\n> ETH_LINK_FULL_DUPLEX ?\n> + \"full-duplex\" : \"half-duplex\");\n> } else {\n> - PMD_INIT_LOG(INFO, \" Port %d: Link Down\\n\",\n> - dev->data->port_id);\n> + PMD_INIT_LOG(INFO, \" Port %d: Link Down\",\n> + dev->data->port_id);\n> }\n> PMD_INIT_LOG(INFO, \"PCI Address: %04d:%02d:%02d:%d\",\n> - dev->pci_dev->addr.domain,\n> - dev->pci_dev->addr.bus,\n> - dev->pci_dev->addr.devid,\n> - dev->pci_dev->addr.function);\n> + dev->pci_dev->addr.domain,\n> + dev->pci_dev->addr.bus,\n> + dev->pci_dev->addr.devid,\n> + dev->pci_dev->addr.function);\n> tctl = E1000_READ_REG(hw, E1000_TCTL);\n> rctl = E1000_READ_REG(hw, E1000_RCTL);\n> if (link.link_status) {\n> @@ -1923,14 +1918,14 @@ eth_igb_flow_ctrl_set(struct rte_eth_dev *dev,\n> struct rte_eth_fc_conf *fc_conf)\n> if (fc_conf->autoneg != hw->mac.autoneg)\n> return -ENOTSUP;\n> rx_buf_size = igb_get_rx_buffer_size(hw);\n> - PMD_INIT_LOG(DEBUG, \"Rx packet buffer size = 0x%x \\n\",\n> rx_buf_size);\n> + PMD_INIT_LOG(DEBUG, \"Rx packet buffer size = 0x%x\", rx_buf_size);\n>\n> /* At least reserve one Ethernet frame for watermark */\n> max_high_water = rx_buf_size - ETHER_MAX_LEN;\n> if ((fc_conf->high_water > max_high_water) ||\n> (fc_conf->high_water < fc_conf->low_water)) {\n> - PMD_INIT_LOG(ERR, \"e1000 incorrect high/low water value\n> \\n\");\n> - PMD_INIT_LOG(ERR, \"high water must <= 0x%x \\n\",\n> max_high_water);\n> + PMD_INIT_LOG(ERR, \"e1000 incorrect high/low water value\");\n> + PMD_INIT_LOG(ERR, \"high water must <= 0x%x\",\n> max_high_water);\n> return (-EINVAL);\n> }\n>\n> @@ -1960,7 +1955,7 @@ eth_igb_flow_ctrl_set(struct rte_eth_dev *dev,\n> struct rte_eth_fc_conf *fc_conf)\n> return 0;\n> }\n>\n> - PMD_INIT_LOG(ERR, \"e1000_setup_link_generic = 0x%x \\n\", err);\n> + PMD_INIT_LOG(ERR, \"e1000_setup_link_generic = 0x%x\", err);\n> return (-EIO);\n> }\n>\n> @@ -1995,7 +1990,7 @@ eth_igb_rar_clear(struct rte_eth_dev *dev, uint32_t\n> index)\n> static void\n> igbvf_intr_disable(struct e1000_hw *hw)\n> {\n> - PMD_INIT_LOG(DEBUG, \"igbvf_intr_disable\");\n> + PMD_INIT_FUNC_TRACE();\n>\n> /* Clear interrupt mask to stop from interrupts being generated */\n> E1000_WRITE_REG(hw, E1000_EIMC, 0xFFFF);\n> @@ -2077,8 +2072,8 @@ igbvf_dev_configure(struct rte_eth_dev *dev)\n> {\n> struct rte_eth_conf* conf = &dev->data->dev_conf;\n>\n> - PMD_INIT_LOG(DEBUG, \"\\nConfigured Virtual Function port id: %d\\n\",\n> - dev->data->port_id);\n> + PMD_INIT_LOG(DEBUG, \"Configured Virtual Function port id: %d\",\n> + dev->data->port_id);\n>\n> /*\n> * VF has no ability to enable/disable HW CRC\n> @@ -2086,12 +2081,12 @@ igbvf_dev_configure(struct rte_eth_dev *dev)\n> */\n> #ifndef RTE_LIBRTE_E1000_PF_DISABLE_STRIP_CRC\n> if (!conf->rxmode.hw_strip_crc) {\n> - PMD_INIT_LOG(INFO, \"VF can't disable HW CRC Strip\\n\");\n> + PMD_INIT_LOG(INFO, \"VF can't disable HW CRC Strip\");\n> conf->rxmode.hw_strip_crc = 1;\n> }\n> #else\n> if (conf->rxmode.hw_strip_crc) {\n> - PMD_INIT_LOG(INFO, \"VF can't enable HW CRC Strip\\n\");\n> + PMD_INIT_LOG(INFO, \"VF can't enable HW CRC Strip\");\n> conf->rxmode.hw_strip_crc = 0;\n> }\n> #endif\n> @@ -2106,7 +2101,7 @@ igbvf_dev_start(struct rte_eth_dev *dev)\n> E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n> int ret;\n>\n> - PMD_INIT_LOG(DEBUG, \"igbvf_dev_start\");\n> + PMD_INIT_FUNC_TRACE();\n>\n> hw->mac.ops.reset_hw(hw);\n>\n> @@ -2129,7 +2124,7 @@ igbvf_dev_start(struct rte_eth_dev *dev)\n> static void\n> igbvf_dev_stop(struct rte_eth_dev *dev)\n> {\n> - PMD_INIT_LOG(DEBUG, \"igbvf_dev_stop\");\n> + PMD_INIT_FUNC_TRACE();\n>\n> igbvf_stop_adapter(dev);\n>\n> @@ -2147,7 +2142,7 @@ igbvf_dev_close(struct rte_eth_dev *dev)\n> {\n> struct e1000_hw *hw =\n> E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n>\n> - PMD_INIT_LOG(DEBUG, \"igbvf_dev_close\");\n> + PMD_INIT_FUNC_TRACE();\n>\n> e1000_reset_hw(hw);\n>\n> @@ -2203,7 +2198,7 @@ igbvf_vlan_filter_set(struct rte_eth_dev *dev,\n> uint16_t vlan_id, int on)\n> uint32_t vid_bit = 0;\n> int ret = 0;\n>\n> - PMD_INIT_LOG(DEBUG, \"igbvf_vlan_filter_set\");\n> + PMD_INIT_FUNC_TRACE();\n>\n> /*vind is not used in VF driver, set to 0, check\n> ixgbe_set_vfta_vf*/\n> ret = igbvf_set_vfta(hw, vlan_id, !!on);\n> @@ -2432,7 +2427,7 @@ eth_igb_add_ethertype_filter(struct rte_eth_dev\n> *dev, uint16_t index,\n>\n> if (filter->priority_en) {\n> PMD_INIT_LOG(ERR, \"vlan and priority (%d) is not supported\"\n> - \" in E1000.\", filter->priority);\n> + \" in E1000.\", filter->priority);\n> return -EINVAL;\n> }\n>\n> diff --git a/lib/librte_pmd_e1000/igb_pf.c b/lib/librte_pmd_e1000/igb_pf.c\n> index 76033ad..bc3816a 100644\n> --- a/lib/librte_pmd_e1000/igb_pf.c\n> +++ b/lib/librte_pmd_e1000/igb_pf.c\n> @@ -404,7 +404,7 @@ igb_rcv_msg_from_vf(struct rte_eth_dev *dev, uint16_t\n> vf)\n>\n> retval = e1000_read_mbx(hw, msgbuf, mbx_size, vf);\n> if (retval) {\n> - PMD_INIT_LOG(ERR, \"Error mbx recv msg from VF %d\\n\", vf);\n> + PMD_INIT_LOG(ERR, \"Error mbx recv msg from VF %d\", vf);\n> return retval;\n> }\n>\n> @@ -432,7 +432,7 @@ igb_rcv_msg_from_vf(struct rte_eth_dev *dev, uint16_t\n> vf)\n> retval = igb_vf_set_vlan(dev, vf, msgbuf);\n> break;\n> default:\n> - PMD_INIT_LOG(DEBUG, \"Unhandled Msg %8.8x\\n\",\n> + PMD_INIT_LOG(DEBUG, \"Unhandled Msg %8.8x\",\n> (unsigned) msgbuf[0]);\n> retval = E1000_ERR_MBX;\n> break;\n> diff --git a/lib/librte_pmd_e1000/igb_rxtx.c\n> b/lib/librte_pmd_e1000/igb_rxtx.c\n> index 3aa9609..5ca06c9 100644\n> --- a/lib/librte_pmd_e1000/igb_rxtx.c\n> +++ b/lib/librte_pmd_e1000/igb_rxtx.c\n> @@ -396,7 +396,7 @@ eth_igb_xmit_pkts(void *tx_queue, struct rte_mbuf\n> **tx_pkts,\n> tx_last = (uint16_t) (tx_last - txq->nb_tx_desc);\n>\n> PMD_TX_LOG(DEBUG, \"port_id=%u queue_id=%u pktlen=%u\"\n> - \" tx_first=%u tx_last=%u\\n\",\n> + \" tx_first=%u tx_last=%u\",\n> (unsigned) txq->port_id,\n> (unsigned) txq->queue_id,\n> (unsigned) pkt_len,\n> @@ -548,7 +548,7 @@ eth_igb_xmit_pkts(void *tx_queue, struct rte_mbuf\n> **tx_pkts,\n> txd->read.cmd_type_len |=\n> rte_cpu_to_le_32(E1000_TXD_CMD_EOP |\n> E1000_TXD_CMD_RS);\n> }\n> - end_of_tx:\n> +end_of_tx:\n> rte_wmb();\n>\n> /*\n> @@ -697,8 +697,8 @@ eth_igb_recv_pkts(void *rx_queue, struct rte_mbuf\n> **rx_pkts,\n> * to happen by sending specific \"back-pressure\" flow\n> control\n> * frames to its peer(s).\n> */\n> - PMD_RX_LOG(DEBUG, \"\\nport_id=%u queue_id=%u rx_id=%u \"\n> - \"staterr=0x%x pkt_len=%u\\n\",\n> + PMD_RX_LOG(DEBUG, \"port_id=%u queue_id=%u rx_id=%u \"\n> + \"staterr=0x%x pkt_len=%u\",\n> (unsigned) rxq->port_id, (unsigned)\n> rxq->queue_id,\n> (unsigned) rx_id, (unsigned) staterr,\n> (unsigned)\n> rte_le_to_cpu_16(rxd.wb.upper.length));\n> @@ -706,7 +706,7 @@ eth_igb_recv_pkts(void *rx_queue, struct rte_mbuf\n> **rx_pkts,\n> nmb = rte_rxmbuf_alloc(rxq->mb_pool);\n> if (nmb == NULL) {\n> PMD_RX_LOG(DEBUG, \"RX mbuf alloc failed port_id=%u\n> \"\n> - \"queue_id=%u\\n\", (unsigned)\n> rxq->port_id,\n> + \"queue_id=%u\", (unsigned) rxq->port_id,\n> (unsigned) rxq->queue_id);\n>\n> rte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed++;\n> break;\n> @@ -794,7 +794,7 @@ eth_igb_recv_pkts(void *rx_queue, struct rte_mbuf\n> **rx_pkts,\n> nb_hold = (uint16_t) (nb_hold + rxq->nb_rx_hold);\n> if (nb_hold > rxq->rx_free_thresh) {\n> PMD_RX_LOG(DEBUG, \"port_id=%u queue_id=%u rx_tail=%u \"\n> - \"nb_hold=%u nb_rx=%u\\n\",\n> + \"nb_hold=%u nb_rx=%u\",\n> (unsigned) rxq->port_id, (unsigned)\n> rxq->queue_id,\n> (unsigned) rx_id, (unsigned) nb_hold,\n> (unsigned) nb_rx);\n> @@ -881,8 +881,8 @@ eth_igb_recv_scattered_pkts(void *rx_queue, struct\n> rte_mbuf **rx_pkts,\n> * to happen by sending specific \"back-pressure\" flow\n> control\n> * frames to its peer(s).\n> */\n> - PMD_RX_LOG(DEBUG, \"\\nport_id=%u queue_id=%u rx_id=%u \"\n> - \"staterr=0x%x data_len=%u\\n\",\n> + PMD_RX_LOG(DEBUG, \"port_id=%u queue_id=%u rx_id=%u \"\n> + \"staterr=0x%x data_len=%u\",\n> (unsigned) rxq->port_id, (unsigned)\n> rxq->queue_id,\n> (unsigned) rx_id, (unsigned) staterr,\n> (unsigned)\n> rte_le_to_cpu_16(rxd.wb.upper.length));\n> @@ -890,7 +890,7 @@ eth_igb_recv_scattered_pkts(void *rx_queue, struct\n> rte_mbuf **rx_pkts,\n> nmb = rte_rxmbuf_alloc(rxq->mb_pool);\n> if (nmb == NULL) {\n> PMD_RX_LOG(DEBUG, \"RX mbuf alloc failed port_id=%u\n> \"\n> - \"queue_id=%u\\n\", (unsigned)\n> rxq->port_id,\n> + \"queue_id=%u\", (unsigned) rxq->port_id,\n> (unsigned) rxq->queue_id);\n>\n> rte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed++;\n> break;\n> @@ -1049,7 +1049,7 @@ eth_igb_recv_scattered_pkts(void *rx_queue, struct\n> rte_mbuf **rx_pkts,\n> nb_hold = (uint16_t) (nb_hold + rxq->nb_rx_hold);\n> if (nb_hold > rxq->rx_free_thresh) {\n> PMD_RX_LOG(DEBUG, \"port_id=%u queue_id=%u rx_tail=%u \"\n> - \"nb_hold=%u nb_rx=%u\\n\",\n> + \"nb_hold=%u nb_rx=%u\",\n> (unsigned) rxq->port_id, (unsigned)\n> rxq->queue_id,\n> (unsigned) rx_id, (unsigned) nb_hold,\n> (unsigned) nb_rx);\n> @@ -1211,14 +1211,14 @@ eth_igb_tx_queue_setup(struct rte_eth_dev *dev,\n> */\n> if (tx_conf->tx_free_thresh != 0)\n> PMD_INIT_LOG(WARNING, \"The tx_free_thresh parameter is not\n> \"\n> - \"used for the 1G driver.\\n\");\n> + \"used for the 1G driver.\");\n> if (tx_conf->tx_rs_thresh != 0)\n> PMD_INIT_LOG(WARNING, \"The tx_rs_thresh parameter is not \"\n> - \"used for the 1G driver.\\n\");\n> + \"used for the 1G driver.\");\n> if (tx_conf->tx_thresh.wthresh == 0)\n> PMD_INIT_LOG(WARNING, \"To improve 1G driver performance, \"\n> \"consider setting the TX WTHRESH value to 4,\n> 8, \"\n> - \"or 16.\\n\");\n> + \"or 16.\");\n>\n> /* Free memory prior to re-allocation if needed */\n> if (dev->data->tx_queues[queue_idx] != NULL) {\n> @@ -1271,7 +1271,7 @@ eth_igb_tx_queue_setup(struct rte_eth_dev *dev,\n> igb_tx_queue_release(txq);\n> return (-ENOMEM);\n> }\n> - PMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p dma_addr=0x%\"PRIx64\"\\n\",\n> + PMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p dma_addr=0x%\"PRIx64\"\",\n>\nThe empty string after PRIx64 is extraneous\n\n\n> txq->sw_ring, txq->tx_ring, txq->tx_ring_phys_addr);\n>\n> igb_reset_tx_queue(txq, dev);\n> @@ -1409,7 +1409,7 @@ eth_igb_rx_queue_setup(struct rte_eth_dev *dev,\n> igb_rx_queue_release(rxq);\n> return (-ENOMEM);\n> }\n> - PMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p dma_addr=0x%\"PRIx64\"\\n\",\n> + PMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p dma_addr=0x%\"PRIx64\"\",\n>\nThe empty string after PRIx64 is extraneous\n\n\n> rxq->sw_ring, rxq->rx_ring, rxq->rx_ring_phys_addr);\n>\n> dev->data->rx_queues[queue_idx] = rxq;\n> @@ -1427,7 +1427,7 @@ eth_igb_rx_queue_count(struct rte_eth_dev *dev,\n> uint16_t rx_queue_id)\n> uint32_t desc = 0;\n>\n> if (rx_queue_id >= dev->data->nb_rx_queues) {\n> - PMD_RX_LOG(ERR, \"Invalid RX queue id=%d\\n\", rx_queue_id);\n> + PMD_RX_LOG(ERR, \"Invalid RX queue id=%d\", rx_queue_id);\n> return 0;\n> }\n>\n> @@ -1726,7 +1726,7 @@ igb_is_vmdq_supported(const struct rte_eth_dev *dev)\n> case e1000_i210:\n> case e1000_i211:\n> default:\n> - PMD_INIT_LOG(ERR, \"Cannot support VMDq feature\\n\");\n> + PMD_INIT_LOG(ERR, \"Cannot support VMDq feature\");\n> return 0;\n> }\n> }\n> @@ -1739,7 +1739,8 @@ igb_vmdq_rx_hw_configure(struct rte_eth_dev *dev)\n> uint32_t mrqc, vt_ctl, vmolr, rctl;\n> int i;\n>\n> - PMD_INIT_LOG(DEBUG, \">>\");\n> + PMD_INIT_FUNC_TRACE();\n> +\n> hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n> cfg = &dev->data->dev_conf.rx_adv_conf.vmdq_rx_conf;\n>\n> @@ -1827,8 +1828,8 @@ igb_alloc_rx_queue_mbufs(struct igb_rx_queue *rxq)\n> struct rte_mbuf *mbuf = rte_rxmbuf_alloc(rxq->mb_pool);\n>\n> if (mbuf == NULL) {\n> - PMD_INIT_LOG(ERR, \"RX mbuf alloc failed \"\n> - \"queue_id=%hu\\n\", rxq->queue_id);\n> + PMD_INIT_LOG(ERR, \"RX mbuf alloc failed\n> queue_id=%hu\",\n> + rxq->queue_id);\n> return (-ENOMEM);\n> }\n> dma_addr =\n> @@ -2273,7 +2274,7 @@ eth_igbvf_rx_init(struct rte_eth_dev *dev)\n> * to avoid Write-Back not triggered sometimes\n> */\n> rxdctl |= 0x10000;\n> - PMD_INIT_LOG(DEBUG, \"Force set RX WTHRESH to 1\n> !\\n\");\n> + PMD_INIT_LOG(DEBUG, \"Force set RX WTHRESH to 1 !\");\n> }\n> else\n> rxdctl |= ((rxq->wthresh & 0x1F) << 16);\n> @@ -2341,7 +2342,7 @@ eth_igbvf_tx_init(struct rte_eth_dev *dev)\n> * to avoid Write-Back not triggered sometimes\n> */\n> txdctl |= 0x10000;\n> - PMD_INIT_LOG(DEBUG, \"Force set TX WTHRESH to 1\n> !\\n\");\n> + PMD_INIT_LOG(DEBUG, \"Force set TX WTHRESH to 1 !\");\n> }\n> else\n> txdctl |= ((txq->wthresh & 0x1F) << 16);\n> --\n> 1.7.10.4\n>\n> Reviewed-by: Jay Rolette <rolette@infiniteio.com>", "headers": { "Return-Path": "<rolette@infiniteio.com>", "Received": [ "from mail-yh0-f42.google.com (mail-yh0-f42.google.com\n\t[209.85.213.42]) by dpdk.org (Postfix) with ESMTP id B86B8591A\n\tfor <dev@dpdk.org>; Tue, 2 Sep 2014 21:00:53 +0200 (CEST)", "by mail-yh0-f42.google.com with SMTP id v1so4567887yhn.1\n\tfor <dev@dpdk.org>; Tue, 02 Sep 2014 12:05:26 -0700 (PDT)", "by 10.170.96.213 with HTTP; Tue, 2 Sep 2014 12:05:26 -0700 (PDT)" ], "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:mime-version:in-reply-to:references:date\n\t:message-id:subject:from:to:cc:content-type;\n\tbh=hKJOWBtzN3286QdNVjLRoj6M/rZFlPIrWw0qEXz5a1Y=;\n\tb=Dz5xSRRh5z5sn+W3FxzKVTwITxjvBv4VAydk7mauR0eJ7auj0AGW0XvWWFBmezVVtS\n\t94XH1jYcGXqxSiOdGpvOUeTqW1q3raVgujKlN7y1y/I2ua5U4pFCKjlX70kQPGHHexQ3\n\tnta2ZFeLmG1RM36WvtJ+Vl+t1OlVMLWFeZ3hJZxjf3orHtdhtLgAdCJHA6+lFgbNY6PK\n\tsJ0jBchrYsjGmkPMIW0H4jjRkWGV82O8/FpasT4ln8961+qoqDQvqGI3ACJMaBlIk4cP\n\thFhcebbExvwa+PggFeaR5bDFCViYM35FP+F66T3WJ65QnI0IZd2zpUpcp/IM1HaI1VvA\n\tZmJA==", "X-Gm-Message-State": "ALoCoQk1PpylSkomdqyFI1hQegvefDa9VX1iMpxlkCvWJ5DZ4q5Hs7Yov4ejaF576a/3VBcfmSem", "MIME-Version": "1.0", "X-Received": "by 10.236.7.197 with SMTP id 45mr5626369yhp.113.1409684726335;\n\tTue, 02 Sep 2014 12:05:26 -0700 (PDT)", "In-Reply-To": "<1409567080-27083-15-git-send-email-david.marchand@6wind.com>", "References": "<1409567080-27083-1-git-send-email-david.marchand@6wind.com>\n\t<1409567080-27083-15-git-send-email-david.marchand@6wind.com>", "Date": "Tue, 2 Sep 2014 14:05:26 -0500", "Message-ID": "<CADNuJVqhOy6AfYO5OuUn=kmQsBVkwrRunXKXKkQ88bexPtWgsg@mail.gmail.com>", "From": "Jay Rolette <rolette@infiniteio.com>", "To": "David Marchand <david.marchand@6wind.com>", "Content-Type": "text/plain; charset=UTF-8", "X-Content-Filtered-By": "Mailman/MimeDel 2.1.15", "Cc": "\"dev@dpdk.org\" <dev@dpdk.org>", "Subject": "Re: [dpdk-dev] [PATCH v2 14/17] e1000: clean log messages", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "X-List-Received-Date": "Tue, 02 Sep 2014 19:00:54 -0000" }, "addressed": null }, { "id": 629, "web_url": "https://patches.dpdk.org/comment/629/", "msgid": "<CALwxeUvLyFthbf8aaEpGkbCvhsWy+M7dfQr4+VusurBAOddBvA@mail.gmail.com>", "list_archive_url": "https://inbox.dpdk.org/dev/CALwxeUvLyFthbf8aaEpGkbCvhsWy+M7dfQr4+VusurBAOddBvA@mail.gmail.com", "date": "2014-09-02T19:19:37", "subject": "Re: [dpdk-dev] [PATCH v2 14/17] e1000: clean log messages", "submitter": { "id": 3, "url": "https://patches.dpdk.org/api/people/3/?format=api", "name": "David Marchand", "email": "david.marchand@6wind.com" }, "content": "On Tue, Sep 2, 2014 at 9:05 PM, Jay Rolette <rolette@infiniteio.com> wrote:\n\n> Couple of minor nits noted. The bigger feedback would be that if you could\n> keep the \"whitespace / line-wrapping / formatting\" only changes in separate\n> patches, these reviews would be easier to get through.\n>\n\nHum, indeed, I should have done this.\nWill keep in mind.\n\n\n /* Free memory prior to re-allocation if needed */\n>> if (dev->data->tx_queues[queue_idx] != NULL) {\n>> @@ -1271,7 +1271,7 @@ eth_igb_tx_queue_setup(struct rte_eth_dev *dev,\n>> igb_tx_queue_release(txq);\n>> return (-ENOMEM);\n>> }\n>> - PMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p\n>> dma_addr=0x%\"PRIx64\"\\n\",\n>> + PMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p dma_addr=0x%\"PRIx64\"\",\n>>\n> The empty string after PRIx64 is extraneous\n>\n>\n>> txq->sw_ring, txq->tx_ring, txq->tx_ring_phys_addr);\n>>\n>> igb_reset_tx_queue(txq, dev);\n>> @@ -1409,7 +1409,7 @@ eth_igb_rx_queue_setup(struct rte_eth_dev *dev,\n>> igb_rx_queue_release(rxq);\n>> return (-ENOMEM);\n>> }\n>> - PMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p\n>> dma_addr=0x%\"PRIx64\"\\n\",\n>> + PMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p dma_addr=0x%\"PRIx64\"\",\n>>\n> The empty string after PRIx64 is extraneous\n>\n>\n\nOk, I will update.\n\nThanks.", "headers": { "Return-Path": "<david.marchand@6wind.com>", "Received": [ "from mail-ob0-f179.google.com (mail-ob0-f179.google.com\n\t[209.85.214.179]) by dpdk.org (Postfix) with ESMTP id 485E5591A\n\tfor <dev@dpdk.org>; Tue, 2 Sep 2014 21:15:05 +0200 (CEST)", "by mail-ob0-f179.google.com with SMTP id uz6so5266770obc.38\n\tfor <dev@dpdk.org>; Tue, 02 Sep 2014 12:19:37 -0700 (PDT)", "by 10.202.73.74 with HTTP; Tue, 2 Sep 2014 12:19:37 -0700 (PDT)" ], "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:mime-version:in-reply-to:references:date\n\t:message-id:subject:from:to:cc:content-type;\n\tbh=DzJlMjOfMcQRkSmkWYDYbNo/g9tibANjwgUKLnPAbIc=;\n\tb=MOxQUQ/nR8wQ3o1zihrtkkt9SV8k3S533fW1DZZWVKc7sC7kzvS+UnjxbdMK+Nd7n7\n\t1bHCUflMfHXgkfe6NTnzeCWVKJqk/x+q42/vmSaMN7YEuNHbaT98OgTnyOXMMstjHMrc\n\tGRq4/eQZ1FXpEVbAs9U5YdgNdGIGV2No9eMs8eTvNw0pS8gNLwC70T9eI7rgSiosw2XA\n\tRnv38YYwLLnzlkBkLBzbh7sSA7zwwtOSgYx9CU6YJAqWvEveujrnFyawQ1mNaIXZ/HJL\n\tBM4PdcSpDJ4ZVkehp5KZMNvUWVq8S73wX4JLztrPDpUDbvQj1bJD5A1LPLl1AkzjlPSO\n\tOZZg==", "X-Gm-Message-State": "ALoCoQmzHc6n5AVoZEUA2qRSHyrWfd8Ac+bHm/KmsQtcqLS4yf8fjoBF2x0f4TvS7fpm1cd8LhjX", "MIME-Version": "1.0", "X-Received": "by 10.182.231.170 with SMTP id th10mr33379822obc.8.1409685577419;\n\tTue, 02 Sep 2014 12:19:37 -0700 (PDT)", "In-Reply-To": "<CADNuJVqhOy6AfYO5OuUn=kmQsBVkwrRunXKXKkQ88bexPtWgsg@mail.gmail.com>", "References": "<1409567080-27083-1-git-send-email-david.marchand@6wind.com>\n\t<1409567080-27083-15-git-send-email-david.marchand@6wind.com>\n\t<CADNuJVqhOy6AfYO5OuUn=kmQsBVkwrRunXKXKkQ88bexPtWgsg@mail.gmail.com>", "Date": "Tue, 2 Sep 2014 21:19:37 +0200", "Message-ID": "<CALwxeUvLyFthbf8aaEpGkbCvhsWy+M7dfQr4+VusurBAOddBvA@mail.gmail.com>", "From": "David Marchand <david.marchand@6wind.com>", "To": "Jay Rolette <rolette@infiniteio.com>", "Content-Type": "text/plain; charset=UTF-8", "X-Content-Filtered-By": "Mailman/MimeDel 2.1.15", "Cc": "\"dev@dpdk.org\" <dev@dpdk.org>", "Subject": "Re: [dpdk-dev] [PATCH v2 14/17] e1000: clean log messages", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "X-List-Received-Date": "Tue, 02 Sep 2014 19:15:05 -0000" }, "addressed": null } ]