Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 287,
    "url": "http://patches.dpdk.org/api/patches/287/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/1409567080-27083-15-git-send-email-david.marchand@6wind.com/",
    "project": {
        "id": 1,
        "url": "http://patches.dpdk.org/api/projects/1/?format=api",
        "name": "DPDK",
        "link_name": "dpdk",
        "list_id": "dev.dpdk.org",
        "list_email": "dev@dpdk.org",
        "web_url": "http://core.dpdk.org",
        "scm_url": "git://dpdk.org/dpdk",
        "webscm_url": "http://git.dpdk.org/dpdk",
        "list_archive_url": "https://inbox.dpdk.org/dev",
        "list_archive_url_format": "https://inbox.dpdk.org/dev/{}",
        "commit_url_format": ""
    },
    "msgid": "<1409567080-27083-15-git-send-email-david.marchand@6wind.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1409567080-27083-15-git-send-email-david.marchand@6wind.com",
    "date": "2014-09-01T10:24:37",
    "name": "[dpdk-dev,v2,14/17] e1000: clean log messages",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "4e7347e820cac3e18b0b7739a8ff9d6ac3cc8d81",
    "submitter": {
        "id": 3,
        "url": "http://patches.dpdk.org/api/people/3/?format=api",
        "name": "David Marchand",
        "email": "david.marchand@6wind.com"
    },
    "delegate": null,
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/1409567080-27083-15-git-send-email-david.marchand@6wind.com/mbox/",
    "series": [],
    "comments": "http://patches.dpdk.org/api/patches/287/comments/",
    "check": "pending",
    "checks": "http://patches.dpdk.org/api/patches/287/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<david.marchand@6wind.com>",
        "Received": [
            "from mail-wg0-f45.google.com (mail-wg0-f45.google.com\n\t[74.125.82.45]) by dpdk.org (Postfix) with ESMTP id A9253B39A\n\tfor <dev@dpdk.org>; Mon,  1 Sep 2014 12:20:46 +0200 (CEST)",
            "by mail-wg0-f45.google.com with SMTP id k14so5064555wgh.28\n\tfor <dev@dpdk.org>; Mon, 01 Sep 2014 03:25:13 -0700 (PDT)",
            "from alcyon.dev.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net.\n\t[82.239.227.177]) by mx.google.com with ESMTPSA id\n\tlm18sm24287018wic.22.2014.09.01.03.25.11 for <dev@dpdk.org>\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 01 Sep 2014 03:25:12 -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:from:to:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=zm2MBZN/JFKHQH45sw41vaRxovOWJn8SI+3IZRzrPsU=;\n\tb=kB3WdLqdnux9wQY6Y1HWNUF2UsQAGE+MuBOg95W7nbDqtuII70aLFgqXQtuhDqAAZY\n\t7PguX37++ZA9T4Pu6G5CCZ0WdGDRSGeBjdHHF9gPkhs4SNRGyget1qt/03VUuS5KI+M2\n\tZjHZqiCaofP1bIg3/dWrpWRI5xASuhFdxgEN5PgguPNgkjPBP0b9L4h/l8iun+0isSuA\n\tSQ7SezW2cKR0Poox2NJV5A4nwz2Ra89OewSG4GczNVjgg83aQOZgP6Br7j91XzOY1deq\n\t6sbJtLIaeQhqIWpgJkAZfa5Dm6RWPIp2HfXopeEwtA0KLhxUwwpzH0bCwm7KSRM17J4y\n\tn5dw==",
        "X-Gm-Message-State": "ALoCoQkAsBRN3wGQAo9WbFI3hj+EAw6RUzfD2OvCAsgAkUCpgMpGr+X0WnDFC5VgdbhM7/ICDhGN",
        "X-Received": "by 10.194.203.8 with SMTP id km8mr31309888wjc.51.1409567113549; \n\tMon, 01 Sep 2014 03:25:13 -0700 (PDT)",
        "From": "David Marchand <david.marchand@6wind.com>",
        "To": "dev@dpdk.org",
        "Date": "Mon,  1 Sep 2014 12:24:37 +0200",
        "Message-Id": "<1409567080-27083-15-git-send-email-david.marchand@6wind.com>",
        "X-Mailer": "git-send-email 1.7.10.4",
        "In-Reply-To": "<1409567080-27083-1-git-send-email-david.marchand@6wind.com>",
        "References": "<1409567080-27083-1-git-send-email-david.marchand@6wind.com>",
        "Subject": "[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": "Mon, 01 Sep 2014 10:20:46 -0000"
    },
    "content": "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\nSigned-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 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(-)",
    "diff": "diff --git a/lib/librte_pmd_e1000/e1000_logs.h b/lib/librte_pmd_e1000/e1000_logs.h\nindex 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 \tRTE_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\ndiff --git a/lib/librte_pmd_e1000/em_ethdev.c b/lib/librte_pmd_e1000/em_ethdev.c\nindex 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 eth_driver *eth_drv,\n \tif (e1000_setup_init_funcs(hw, TRUE) != E1000_SUCCESS ||\n \t\t\tem_hw_init(hw) != 0) {\n \t\tPMD_INIT_LOG(ERR, \"port_id %d vendorID=0x%x deviceID=0x%x: \"\n-\t\t\t\"failed to init HW\",\n-\t\t\teth_dev->data->port_id, pci_dev->id.vendor_id,\n-\t\t\tpci_dev->id.device_id);\n+\t\t\t     \"failed to init HW\",\n+\t\t\t     eth_dev->data->port_id, pci_dev->id.vendor_id,\n+\t\t\t     pci_dev->id.device_id);\n \t\treturn -(ENODEV);\n \t}\n \n@@ -260,8 +260,8 @@ eth_em_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,\n \t\t\thw->mac.rar_entry_count, 0);\n \tif (eth_dev->data->mac_addrs == NULL) {\n \t\tPMD_INIT_LOG(ERR, \"Failed to allocate %d bytes needed to \"\n-\t\t\t\"store MAC addresses\",\n-\t\t\tETHER_ADDR_LEN * hw->mac.rar_entry_count);\n+\t\t\t     \"store MAC addresses\",\n+\t\t\t     ETHER_ADDR_LEN * hw->mac.rar_entry_count);\n \t\treturn -(ENOMEM);\n \t}\n \n@@ -272,9 +272,9 @@ eth_em_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,\n \t/* initialize the vfta */\n \tmemset(shadow_vfta, 0, sizeof(*shadow_vfta));\n \n-\tPMD_INIT_LOG(INFO, \"port_id %d vendorID=0x%x deviceID=0x%x\\n\",\n-\t\t\teth_dev->data->port_id, pci_dev->id.vendor_id,\n-\t\t\tpci_dev->id.device_id);\n+\tPMD_INIT_LOG(INFO, \"port_id %d vendorID=0x%x deviceID=0x%x\",\n+\t\t     eth_dev->data->port_id, pci_dev->id.vendor_id,\n+\t\t     pci_dev->id.device_id);\n \n \trte_intr_callback_register(&(pci_dev->intr_handle),\n \t\teth_em_interrupt_handler, (void *)eth_dev);\n@@ -306,17 +306,17 @@ em_hw_init(struct e1000_hw *hw)\n \n \tdiag = hw->mac.ops.init_params(hw);\n \tif (diag != 0) {\n-\t\tPMD_INIT_LOG(ERR, \"MAC Initialization Error\\n\");\n+\t\tPMD_INIT_LOG(ERR, \"MAC Initialization Error\");\n \t\treturn diag;\n \t}\n \tdiag = hw->nvm.ops.init_params(hw);\n \tif (diag != 0) {\n-\t\tPMD_INIT_LOG(ERR, \"NVM Initialization Error\\n\");\n+\t\tPMD_INIT_LOG(ERR, \"NVM Initialization Error\");\n \t\treturn diag;\n \t}\n \tdiag = hw->phy.ops.init_params(hw);\n \tif (diag != 0) {\n-\t\tPMD_INIT_LOG(ERR, \"PHY Initialization Error\\n\");\n+\t\tPMD_INIT_LOG(ERR, \"PHY Initialization Error\");\n \t\treturn diag;\n \t}\n \t(void) e1000_get_bus_info(hw);\n@@ -375,7 +375,7 @@ em_hw_init(struct e1000_hw *hw)\n \tdiag = e1000_check_reset_block(hw);\n \tif (diag < 0) {\n \t\tPMD_INIT_LOG(ERR, \"PHY reset is blocked due to \"\n-\t\t\t\"SOL/IDER session\");\n+\t\t\t     \"SOL/IDER session\");\n \t}\n \treturn (0);\n \n@@ -390,11 +390,10 @@ eth_em_configure(struct rte_eth_dev *dev)\n \tstruct e1000_interrupt *intr =\n \t\tE1000_DEV_PRIVATE_TO_INTR(dev->data->dev_private);\n \n-\tPMD_INIT_LOG(DEBUG, \">>\");\n-\n+\tPMD_INIT_FUNC_TRACE();\n \tintr->flags |= E1000_FLAG_NEED_LINK_UPDATE;\n+\tPMD_INIT_FUNC_TRACE();\n \n-\tPMD_INIT_LOG(DEBUG, \"<<\");\n \treturn (0);\n }\n \n@@ -453,7 +452,7 @@ eth_em_start(struct rte_eth_dev *dev)\n \t\tE1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tint ret, mask;\n \n-\tPMD_INIT_LOG(DEBUG, \">>\");\n+\tPMD_INIT_FUNC_TRACE();\n \n \teth_em_stop(dev);\n \n@@ -573,9 +572,9 @@ eth_em_start(struct rte_eth_dev *dev)\n \treturn (0);\n \n error_invalid_config:\n-\tPMD_INIT_LOG(ERR, \"Invalid link_speed/link_duplex (%u/%u) for port \"\n-\t\t\t\t\"%u\\n\", dev->data->dev_conf.link_speed,\n-\t\t\tdev->data->dev_conf.link_duplex, dev->data->port_id);\n+\tPMD_INIT_LOG(ERR, \"Invalid link_speed/link_duplex (%u/%u) for port %u\",\n+\t\t     dev->data->dev_conf.link_speed,\n+\t\t     dev->data->dev_conf.link_duplex, dev->data->port_id);\n \tem_dev_clear_queues(dev);\n \treturn (-EINVAL);\n }\n@@ -1296,20 +1295,17 @@ eth_em_interrupt_action(struct rte_eth_dev *dev)\n \tmemset(&link, 0, sizeof(link));\n \trte_em_dev_atomic_read_link_status(dev, &link);\n \tif (link.link_status) {\n-\t\tPMD_INIT_LOG(INFO,\n-\t\t\t\" Port %d: Link Up - speed %u Mbps - %s\\n\",\n-\t\t\tdev->data->port_id, (unsigned)link.link_speed,\n-\t\t\tlink.link_duplex == ETH_LINK_FULL_DUPLEX ?\n-\t\t\t\t\"full-duplex\" : \"half-duplex\");\n+\t\tPMD_INIT_LOG(INFO, \" Port %d: Link Up - speed %u Mbps - %s\",\n+\t\t\t     dev->data->port_id, (unsigned)link.link_speed,\n+\t\t\t     link.link_duplex == ETH_LINK_FULL_DUPLEX ?\n+\t\t\t     \"full-duplex\" : \"half-duplex\");\n \t} else {\n-\t\tPMD_INIT_LOG(INFO, \" Port %d: Link Down\\n\",\n-\t\t\t\t\tdev->data->port_id);\n+\t\tPMD_INIT_LOG(INFO, \" Port %d: Link Down\",\n+\t\t\t     dev->data->port_id);\n \t}\n \tPMD_INIT_LOG(INFO, \"PCI Address: %04d:%02d:%02d:%d\",\n-\t\t\t\tdev->pci_dev->addr.domain,\n-\t\t\t\tdev->pci_dev->addr.bus,\n-\t\t\t\tdev->pci_dev->addr.devid,\n-\t\t\t\tdev->pci_dev->addr.function);\n+\t\t     dev->pci_dev->addr.domain, dev->pci_dev->addr.bus,\n+\t\t     dev->pci_dev->addr.devid, dev->pci_dev->addr.function);\n \ttctl = E1000_READ_REG(hw, E1000_TCTL);\n \trctl = E1000_READ_REG(hw, E1000_RCTL);\n \tif (link.link_status) {\n@@ -1429,14 +1425,14 @@ eth_em_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)\n \tif (fc_conf->autoneg != hw->mac.autoneg)\n \t\treturn -ENOTSUP;\n \trx_buf_size = em_get_rx_buffer_size(hw);\n-\tPMD_INIT_LOG(DEBUG, \"Rx packet buffer size = 0x%x \\n\", rx_buf_size);\n+\tPMD_INIT_LOG(DEBUG, \"Rx packet buffer size = 0x%x\", rx_buf_size);\n \n \t/* At least reserve one Ethernet frame for watermark */\n \tmax_high_water = rx_buf_size - ETHER_MAX_LEN;\n \tif ((fc_conf->high_water > max_high_water) ||\n \t\t(fc_conf->high_water < fc_conf->low_water)) {\n-\t\tPMD_INIT_LOG(ERR, \"e1000 incorrect high/low water value \\n\");\n-\t\tPMD_INIT_LOG(ERR, \"high water must <= 0x%x \\n\", max_high_water);\n+\t\tPMD_INIT_LOG(ERR, \"e1000 incorrect high/low water value\");\n+\t\tPMD_INIT_LOG(ERR, \"high water must <= 0x%x\", max_high_water);\n \t\treturn (-EINVAL);\n \t}\n \n@@ -1466,7 +1462,7 @@ eth_em_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)\n \t\treturn 0;\n \t}\n \n-\tPMD_INIT_LOG(ERR, \"e1000_setup_link_generic = 0x%x \\n\", err);\n+\tPMD_INIT_LOG(ERR, \"e1000_setup_link_generic = 0x%x\", err);\n \treturn (-EIO);\n }\n \ndiff --git a/lib/librte_pmd_e1000/em_rxtx.c b/lib/librte_pmd_e1000/em_rxtx.c\nindex 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 \tdesc_to_clean_to = sw_ring[desc_to_clean_to].last_id;\n \tif (! (txr[desc_to_clean_to].upper.fields.status & E1000_TXD_STAT_DD))\n \t{\n-\t\tPMD_TX_FREE_LOG(DEBUG,\n-\t\t\t\t\"TX descriptor %4u is not done\"\n-\t\t\t\t\"(port=%d queue=%d)\",\n-\t\t\t\tdesc_to_clean_to,\n+\t\tPMD_TX_FREE_LOG(DEBUG, \"TX descriptor %4u is not done\"\n+\t\t\t\t\"(port=%d queue=%d)\", desc_to_clean_to,\n \t\t\t\ttxq->port_id, txq->queue_id);\n \t\t/* Failed to clean any descriptors, better luck next time */\n \t\treturn -(1);\n@@ -334,11 +332,10 @@ em_xmit_cleanup(struct em_tx_queue *txq)\n \t\tnb_tx_to_clean = (uint16_t)(desc_to_clean_to -\n \t\t\t\t\t\tlast_desc_cleaned);\n \n-\tPMD_TX_FREE_LOG(DEBUG,\n-\t\t\t\"Cleaning %4u TX descriptors: %4u to %4u \"\n-\t\t\t\"(port=%d queue=%d)\",\n-\t\t\tnb_tx_to_clean, last_desc_cleaned, desc_to_clean_to,\n-\t\t\ttxq->port_id, txq->queue_id);\n+\tPMD_TX_FREE_LOG(DEBUG, \"Cleaning %4u TX descriptors: %4u to %4u \"\n+\t\t\t\"(port=%d queue=%d)\", nb_tx_to_clean,\n+\t\t\tlast_desc_cleaned, desc_to_clean_to, txq->port_id,\n+\t\t\ttxq->queue_id);\n \n \t/*\n \t * 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 **tx_pkts,\n \t\t\ttx_last = (uint16_t) (tx_last - txq->nb_tx_desc);\n \n \t\tPMD_TX_LOG(DEBUG, \"port_id=%u queue_id=%u pktlen=%u\"\n-\t\t\t\" tx_first=%u tx_last=%u\\n\",\n-\t\t\t(unsigned) txq->port_id,\n-\t\t\t(unsigned) txq->queue_id,\n-\t\t\t(unsigned) tx_pkt->pkt.pkt_len,\n-\t\t\t(unsigned) tx_id,\n-\t\t\t(unsigned) tx_last);\n+\t\t\t   \" tx_first=%u tx_last=%u\",\n+\t\t\t   (unsigned) txq->port_id,\n+\t\t\t   (unsigned) txq->queue_id,\n+\t\t\t   (unsigned) tx_pkt->pkt.pkt_len,\n+\t\t\t   (unsigned) tx_id,\n+\t\t\t   (unsigned) tx_last);\n \n \t\t/*\n \t\t * Make sure there are enough TX descriptors available to\n@@ -464,8 +461,7 @@ eth_em_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\t * nb_used better be less than or equal to txq->tx_rs_thresh\n \t\t */\n \t\twhile (unlikely (nb_used > txq->nb_tx_free)) {\n-\t\t\tPMD_TX_FREE_LOG(DEBUG,\n-\t\t\t\t\t\"Not enough free TX descriptors \"\n+\t\t\tPMD_TX_FREE_LOG(DEBUG, \"Not enough free TX descriptors \"\n \t\t\t\t\t\"nb_used=%4u nb_free=%4u \"\n \t\t\t\t\t\"(port=%d queue=%d)\",\n \t\t\t\t\tnb_used, txq->nb_tx_free,\n@@ -588,9 +584,8 @@ eth_em_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \n \t\t/* Set RS bit only on threshold packets' last descriptor */\n \t\tif (txq->nb_tx_used >= txq->tx_rs_thresh) {\n-\t\t\tPMD_TX_FREE_LOG(DEBUG,\n-\t\t\t\t\t\"Setting RS bit on TXD id=\"\n-\t\t\t\t\t\"%4u (port=%d queue=%d)\",\n+\t\t\tPMD_TX_FREE_LOG(DEBUG, \"Setting RS bit on TXD id=%4u \"\n+\t\t\t\t\t\"(port=%d queue=%d)\",\n \t\t\t\t\ttx_last, txq->port_id, txq->queue_id);\n \n \t\t\tcmd_type_len |= E1000_TXD_CMD_RS;\n@@ -607,8 +602,8 @@ end_of_tx:\n \t * Set the Transmit Descriptor Tail (TDT)\n \t */\n \tPMD_TX_LOG(DEBUG, \"port_id=%u queue_id=%u tx_tail=%u nb_tx=%u\",\n-\t\t(unsigned) txq->port_id, (unsigned) txq->queue_id,\n-\t\t(unsigned) tx_id, (unsigned) nb_tx);\n+\t\t   (unsigned) txq->port_id, (unsigned) txq->queue_id,\n+\t\t   (unsigned) tx_id, (unsigned) nb_tx);\n \tE1000_PCI_REG_WRITE(txq->tdt_reg_addr, tx_id);\n \ttxq->tx_tail = tx_id;\n \n@@ -712,19 +707,19 @@ eth_em_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t * to happen by sending specific \"back-pressure\" flow control\n \t\t * frames to its peer(s).\n \t\t */\n-\t\tPMD_RX_LOG(DEBUG, \"\\nport_id=%u queue_id=%u rx_id=%u \"\n-\t\t\t\"status=0x%x pkt_len=%u\\n\",\n-\t\t\t(unsigned) rxq->port_id, (unsigned) rxq->queue_id,\n-\t\t\t(unsigned) rx_id, (unsigned) status,\n-\t\t\t(unsigned) rte_le_to_cpu_16(rxd.length));\n+\t\tPMD_RX_LOG(DEBUG, \"port_id=%u queue_id=%u rx_id=%u \"\n+\t\t\t   \"status=0x%x pkt_len=%u\",\n+\t\t\t   (unsigned) rxq->port_id, (unsigned) rxq->queue_id,\n+\t\t\t   (unsigned) rx_id, (unsigned) status,\n+\t\t\t   (unsigned) rte_le_to_cpu_16(rxd.length));\n \n \t\tnmb = rte_rxmbuf_alloc(rxq->mb_pool);\n \t\tif (nmb == NULL) {\n \t\t\tPMD_RX_LOG(DEBUG, \"RX mbuf alloc failed port_id=%u \"\n-\t\t\t\t\"queue_id=%u\\n\",\n-\t\t\t\t(unsigned) rxq->port_id,\n-\t\t\t\t(unsigned) rxq->queue_id);\n-\t\t\trte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed++;\n+\t\t\t\t   \"queue_id=%u\",\n+\t\t\t\t   (unsigned) rxq->port_id,\n+\t\t\t\t   (unsigned) rxq->queue_id);\n+\t\t\t\trte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed++;\n \t\t\tbreak;\n \t\t}\n \n@@ -806,10 +801,10 @@ eth_em_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \tnb_hold = (uint16_t) (nb_hold + rxq->nb_rx_hold);\n \tif (nb_hold > rxq->rx_free_thresh) {\n \t\tPMD_RX_LOG(DEBUG, \"port_id=%u queue_id=%u rx_tail=%u \"\n-\t\t\t\"nb_hold=%u nb_rx=%u\\n\",\n-\t\t\t(unsigned) rxq->port_id, (unsigned) rxq->queue_id,\n-\t\t\t(unsigned) rx_id, (unsigned) nb_hold,\n-\t\t\t(unsigned) nb_rx);\n+\t\t\t   \"nb_hold=%u nb_rx=%u\",\n+\t\t\t   (unsigned) rxq->port_id, (unsigned) rxq->queue_id,\n+\t\t\t   (unsigned) rx_id, (unsigned) nb_hold,\n+\t\t\t   (unsigned) nb_rx);\n \t\trx_id = (uint16_t) ((rx_id == 0) ?\n \t\t\t(rxq->nb_rx_desc - 1) : (rx_id - 1));\n \t\tE1000_PCI_REG_WRITE(rxq->rdt_reg_addr, rx_id);\n@@ -892,17 +887,17 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t * to happen by sending specific \"back-pressure\" flow control\n \t\t * frames to its peer(s).\n \t\t */\n-\t\tPMD_RX_LOG(DEBUG, \"\\nport_id=%u queue_id=%u rx_id=%u \"\n-\t\t\t\"status=0x%x data_len=%u\\n\",\n-\t\t\t(unsigned) rxq->port_id, (unsigned) rxq->queue_id,\n-\t\t\t(unsigned) rx_id, (unsigned) status,\n-\t\t\t(unsigned) rte_le_to_cpu_16(rxd.length));\n+\t\tPMD_RX_LOG(DEBUG, \"port_id=%u queue_id=%u rx_id=%u \"\n+\t\t\t   \"status=0x%x data_len=%u\",\n+\t\t\t   (unsigned) rxq->port_id, (unsigned) rxq->queue_id,\n+\t\t\t   (unsigned) rx_id, (unsigned) status,\n+\t\t\t   (unsigned) rte_le_to_cpu_16(rxd.length));\n \n \t\tnmb = rte_rxmbuf_alloc(rxq->mb_pool);\n \t\tif (nmb == NULL) {\n \t\t\tPMD_RX_LOG(DEBUG, \"RX mbuf alloc failed port_id=%u \"\n-\t\t\t\t\"queue_id=%u\\n\", (unsigned) rxq->port_id,\n-\t\t\t\t(unsigned) rxq->queue_id);\n+\t\t\t\t   \"queue_id=%u\", (unsigned) rxq->port_id,\n+\t\t\t\t   (unsigned) rxq->queue_id);\n \t\t\trte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed++;\n \t\t\tbreak;\n \t\t}\n@@ -1050,10 +1045,10 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \tnb_hold = (uint16_t) (nb_hold + rxq->nb_rx_hold);\n \tif (nb_hold > rxq->rx_free_thresh) {\n \t\tPMD_RX_LOG(DEBUG, \"port_id=%u queue_id=%u rx_tail=%u \"\n-\t\t\t\"nb_hold=%u nb_rx=%u\\n\",\n-\t\t\t(unsigned) rxq->port_id, (unsigned) rxq->queue_id,\n-\t\t\t(unsigned) rx_id, (unsigned) nb_hold,\n-\t\t\t(unsigned) nb_rx);\n+\t\t\t   \"nb_hold=%u nb_rx=%u\",\n+\t\t\t   (unsigned) rxq->port_id, (unsigned) rxq->queue_id,\n+\t\t\t   (unsigned) rx_id, (unsigned) nb_hold,\n+\t\t\t   (unsigned) nb_rx);\n \t\trx_id = (uint16_t) ((rx_id == 0) ?\n \t\t\t(rxq->nb_rx_desc - 1) : (rx_id - 1));\n \t\tE1000_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 \tif (tx_free_thresh >= (nb_desc - 3)) {\n \t\tPMD_INIT_LOG(ERR, \"tx_free_thresh must be less than the \"\n \t\t\t     \"number of TX descriptors minus 3. \"\n-\t\t\t     \"(tx_free_thresh=%u port=%d queue=%d)\\n\",\n+\t\t\t     \"(tx_free_thresh=%u port=%d queue=%d)\",\n \t\t\t     (unsigned int)tx_free_thresh,\n \t\t\t     (int)dev->data->port_id, (int)queue_idx);\n \t\treturn -(EINVAL);\n@@ -1221,7 +1216,7 @@ eth_em_tx_queue_setup(struct rte_eth_dev *dev,\n \tif (tx_rs_thresh > tx_free_thresh) {\n \t\tPMD_INIT_LOG(ERR, \"tx_rs_thresh must be less than or equal to \"\n \t\t\t     \"tx_free_thresh. (tx_free_thresh=%u \"\n-\t\t\t     \"tx_rs_thresh=%u port=%d queue=%d)\\n\",\n+\t\t\t     \"tx_rs_thresh=%u port=%d queue=%d)\",\n \t\t\t     (unsigned int)tx_free_thresh,\n \t\t\t     (unsigned int)tx_rs_thresh,\n \t\t\t     (int)dev->data->port_id,\n@@ -1238,7 +1233,7 @@ eth_em_tx_queue_setup(struct rte_eth_dev *dev,\n \tif (tx_conf->tx_thresh.wthresh != 0 && tx_rs_thresh != 1) {\n \t\tPMD_INIT_LOG(ERR, \"TX WTHRESH must be set to 0 if \"\n \t\t\t     \"tx_rs_thresh is greater than 1. (tx_rs_thresh=%u \"\n-\t\t\t     \"port=%d queue=%d)\\n\", (unsigned int)tx_rs_thresh,\n+\t\t\t     \"port=%d queue=%d)\", (unsigned int)tx_rs_thresh,\n \t\t\t     (int)dev->data->port_id, (int)queue_idx);\n \t\treturn -(EINVAL);\n \t}\n@@ -1289,8 +1284,8 @@ eth_em_tx_queue_setup(struct rte_eth_dev *dev,\n #endif\n \ttxq->tx_ring = (struct e1000_data_desc *) tz->addr;\n \n-\tPMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p dma_addr=0x%\"PRIx64\"\\n\",\n-\t\ttxq->sw_ring, txq->tx_ring, txq->tx_ring_phys_addr);\n+\tPMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p dma_addr=0x%\"PRIx64,\n+\t\t     txq->sw_ring, txq->tx_ring, txq->tx_ring_phys_addr);\n \n \tem_reset_tx_queue(txq);\n \n@@ -1370,7 +1365,7 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev,\n \t */\n \tif (rx_conf->rx_drop_en) {\n \t\tPMD_INIT_LOG(ERR, \"drop_en functionality not supported by \"\n-\t\t\t     \"device\\n\");\n+\t\t\t     \"device\");\n \t\treturn (-EINVAL);\n \t}\n \n@@ -1419,8 +1414,8 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev,\n #endif\n \trxq->rx_ring = (struct e1000_rx_desc *) rz->addr;\n \n-\tPMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p dma_addr=0x%\"PRIx64\"\\n\",\n-\t\trxq->sw_ring, rxq->rx_ring, rxq->rx_ring_phys_addr);\n+\tPMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p dma_addr=0x%\"PRIx64,\n+\t\t     rxq->sw_ring, rxq->rx_ring, rxq->rx_ring_phys_addr);\n \n \tdev->data->rx_queues[queue_idx] = rxq;\n \tem_reset_rx_queue(rxq);\n@@ -1437,7 +1432,7 @@ eth_em_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)\n \tuint32_t desc = 0;\n \n \tif (rx_queue_id >= dev->data->nb_rx_queues) {\n-\t\tPMD_RX_LOG(DEBUG,\"Invalid RX queue_id=%d\\n\", rx_queue_id);\n+\t\tPMD_RX_LOG(DEBUG, \"Invalid RX queue_id=%d\", rx_queue_id);\n \t\treturn 0;\n \t}\n \n@@ -1582,8 +1577,8 @@ em_alloc_rx_queue_mbufs(struct em_rx_queue *rxq)\n \t\tstruct rte_mbuf *mbuf = rte_rxmbuf_alloc(rxq->mb_pool);\n \n \t\tif (mbuf == NULL) {\n-\t\t\tPMD_INIT_LOG(ERR, \"RX mbuf alloc failed \"\n-\t\t\t\t\"queue_id=%hu\\n\", rxq->queue_id);\n+\t\t\tPMD_INIT_LOG(ERR, \"RX mbuf alloc failed queue_id=%hu\",\n+\t\t\t\t     rxq->queue_id);\n \t\t\treturn (-ENOMEM);\n \t\t}\n \ndiff --git a/lib/librte_pmd_e1000/igb_ethdev.c b/lib/librte_pmd_e1000/igb_ethdev.c\nindex 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 eth_driver *eth_drv,\n \t\tETHER_ADDR_LEN * hw->mac.rar_entry_count, 0);\n \tif (eth_dev->data->mac_addrs == NULL) {\n \t\tPMD_INIT_LOG(ERR, \"Failed to allocate %d bytes needed to \"\n-\t\t\t\t\t\t\"store MAC addresses\",\n-\t\t\t\tETHER_ADDR_LEN * hw->mac.rar_entry_count);\n+\t\t\t     \"store MAC addresses\",\n+\t\t\t     ETHER_ADDR_LEN * hw->mac.rar_entry_count);\n \t\terror = -ENOMEM;\n \t\tgoto err_late;\n \t}\n@@ -553,7 +553,7 @@ eth_igb_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,\n \t/* Indicate SOL/IDER usage */\n \tif (e1000_check_reset_block(hw) < 0) {\n \t\tPMD_INIT_LOG(ERR, \"PHY reset is blocked due to\"\n-\t\t\t\t\t\"SOL/IDER session\");\n+\t\t\t     \"SOL/IDER session\");\n \t}\n \n \t/* initialize PF if max_vfs not zero */\n@@ -565,7 +565,7 @@ eth_igb_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,\n \tE1000_WRITE_REG(hw, E1000_CTRL_EXT, ctrl_ext);\n \tE1000_WRITE_FLUSH(hw);\n \n-\tPMD_INIT_LOG(INFO, \"port_id %d vendorID=0x%x deviceID=0x%x\\n\",\n+\tPMD_INIT_LOG(INFO, \"port_id %d vendorID=0x%x deviceID=0x%x\",\n \t\t     eth_dev->data->port_id, pci_dev->id.vendor_id,\n \t\t     pci_dev->id.device_id);\n \n@@ -598,7 +598,7 @@ eth_igbvf_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,\n \t\tE1000_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);\n \tint diag;\n \n-\tPMD_INIT_LOG(DEBUG, \"eth_igbvf_dev_init\");\n+\tPMD_INIT_FUNC_TRACE();\n \n \teth_dev->dev_ops = &igbvf_eth_dev_ops;\n \teth_dev->rx_pkt_burst = &eth_igb_recv_pkts;\n@@ -623,7 +623,7 @@ eth_igbvf_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,\n \tdiag = e1000_setup_init_funcs(hw, TRUE);\n \tif (diag != 0) {\n \t\tPMD_INIT_LOG(ERR, \"Shared code init failed for igbvf: %d\",\n-\t\t\tdiag);\n+\t\t\t     diag);\n \t\treturn -EIO;\n \t}\n \n@@ -639,10 +639,9 @@ eth_igbvf_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,\n \teth_dev->data->mac_addrs = rte_zmalloc(\"igbvf\", ETHER_ADDR_LEN *\n \t\thw->mac.rar_entry_count, 0);\n \tif (eth_dev->data->mac_addrs == NULL) {\n-\t\tPMD_INIT_LOG(ERR,\n-\t\t\t\"Failed to allocate %d bytes needed to store MAC \"\n-\t\t\t\"addresses\",\n-\t\t\tETHER_ADDR_LEN * hw->mac.rar_entry_count);\n+\t\tPMD_INIT_LOG(ERR, \"Failed to allocate %d bytes needed to \"\n+\t\t\t     \"store MAC addresses\",\n+\t\t\t     ETHER_ADDR_LEN * hw->mac.rar_entry_count);\n \t\treturn -ENOMEM;\n \t}\n \n@@ -650,11 +649,9 @@ eth_igbvf_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,\n \tether_addr_copy((struct ether_addr *) hw->mac.perm_addr,\n \t\t\t&eth_dev->data->mac_addrs[0]);\n \n-\tPMD_INIT_LOG(DEBUG, \"\\nport %d vendorID=0x%x deviceID=0x%x \"\n-\t\t\t\"mac.type=%s\\n\",\n-\t\t\teth_dev->data->port_id, pci_dev->id.vendor_id,\n-\t\t\tpci_dev->id.device_id,\n-\t\t\t\"igb_mac_82576_vf\");\n+\tPMD_INIT_LOG(DEBUG, \"port %d vendorID=0x%x deviceID=0x%x mac.type=%s\",\n+\t\t     eth_dev->data->port_id, pci_dev->id.vendor_id,\n+\t\t     pci_dev->id.device_id, \"igb_mac_82576_vf\");\n \n \treturn 0;\n }\n@@ -720,11 +717,9 @@ eth_igb_configure(struct rte_eth_dev *dev)\n \tstruct e1000_interrupt *intr =\n \t\tE1000_DEV_PRIVATE_TO_INTR(dev->data->dev_private);\n \n-\tPMD_INIT_LOG(DEBUG, \">>\");\n-\n+\tPMD_INIT_FUNC_TRACE();\n \tintr->flags |= E1000_FLAG_NEED_LINK_UPDATE;\n-\n-\tPMD_INIT_LOG(DEBUG, \"<<\");\n+\tPMD_INIT_FUNC_TRACE();\n \n \treturn (0);\n }\n@@ -737,7 +732,7 @@ eth_igb_start(struct rte_eth_dev *dev)\n \tint ret, i, mask;\n \tuint32_t ctrl_ext;\n \n-\tPMD_INIT_LOG(DEBUG, \">>\");\n+\tPMD_INIT_FUNC_TRACE();\n \n \t/* Power up the phy. Needed to make the link go Up */\n \te1000_power_up_phy(hw);\n@@ -888,9 +883,9 @@ eth_igb_start(struct rte_eth_dev *dev)\n \treturn (0);\n \n error_invalid_config:\n-\tPMD_INIT_LOG(ERR, \"Invalid link_speed/link_duplex (%u/%u) for port %u\\n\",\n-\t\t\tdev->data->dev_conf.link_speed,\n-\t\t\tdev->data->dev_conf.link_duplex, dev->data->port_id);\n+\tPMD_INIT_LOG(ERR, \"Invalid link_speed/link_duplex (%u/%u) for port %u\",\n+\t\t     dev->data->dev_conf.link_speed,\n+\t\t     dev->data->dev_conf.link_duplex, dev->data->port_id);\n \tigb_dev_clear_queues(dev);\n \treturn (-EINVAL);\n }\n@@ -1789,20 +1784,20 @@ eth_igb_interrupt_action(struct rte_eth_dev *dev)\n \t\tmemset(&link, 0, sizeof(link));\n \t\trte_igb_dev_atomic_read_link_status(dev, &link);\n \t\tif (link.link_status) {\n-\t\t\tPMD_INIT_LOG(INFO,\n-\t\t\t\t\" Port %d: Link Up - speed %u Mbps - %s\\n\",\n-\t\t\t\tdev->data->port_id, (unsigned)link.link_speed,\n-\t\t\t\tlink.link_duplex == ETH_LINK_FULL_DUPLEX ?\n-\t\t\t\t\t\"full-duplex\" : \"half-duplex\");\n+\t\t\tPMD_INIT_LOG(INFO, \" Port %d: Link Up - speed %u Mbps \"\n+\t\t\t\t     \"- %s\", dev->data->port_id,\n+\t\t\t\t     (unsigned)link.link_speed,\n+\t\t\t\t     link.link_duplex == ETH_LINK_FULL_DUPLEX ?\n+\t\t\t\t     \"full-duplex\" : \"half-duplex\");\n \t\t} else {\n-\t\t\tPMD_INIT_LOG(INFO, \" Port %d: Link Down\\n\",\n-\t\t\t\t\t\tdev->data->port_id);\n+\t\t\tPMD_INIT_LOG(INFO, \" Port %d: Link Down\",\n+\t\t\t\t     dev->data->port_id);\n \t\t}\n \t\tPMD_INIT_LOG(INFO, \"PCI Address: %04d:%02d:%02d:%d\",\n-\t\t\t\t\tdev->pci_dev->addr.domain,\n-\t\t\t\t\tdev->pci_dev->addr.bus,\n-\t\t\t\t\tdev->pci_dev->addr.devid,\n-\t\t\t\t\tdev->pci_dev->addr.function);\n+\t\t\t     dev->pci_dev->addr.domain,\n+\t\t\t     dev->pci_dev->addr.bus,\n+\t\t\t     dev->pci_dev->addr.devid,\n+\t\t\t     dev->pci_dev->addr.function);\n \t\ttctl = E1000_READ_REG(hw, E1000_TCTL);\n \t\trctl = E1000_READ_REG(hw, E1000_RCTL);\n \t\tif (link.link_status) {\n@@ -1923,14 +1918,14 @@ eth_igb_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)\n \tif (fc_conf->autoneg != hw->mac.autoneg)\n \t\treturn -ENOTSUP;\n \trx_buf_size = igb_get_rx_buffer_size(hw);\n-\tPMD_INIT_LOG(DEBUG, \"Rx packet buffer size = 0x%x \\n\", rx_buf_size);\n+\tPMD_INIT_LOG(DEBUG, \"Rx packet buffer size = 0x%x\", rx_buf_size);\n \n \t/* At least reserve one Ethernet frame for watermark */\n \tmax_high_water = rx_buf_size - ETHER_MAX_LEN;\n \tif ((fc_conf->high_water > max_high_water) ||\n \t\t(fc_conf->high_water < fc_conf->low_water)) {\n-\t\tPMD_INIT_LOG(ERR, \"e1000 incorrect high/low water value \\n\");\n-\t\tPMD_INIT_LOG(ERR, \"high water must <=  0x%x \\n\", max_high_water);\n+\t\tPMD_INIT_LOG(ERR, \"e1000 incorrect high/low water value\");\n+\t\tPMD_INIT_LOG(ERR, \"high water must <= 0x%x\", max_high_water);\n \t\treturn (-EINVAL);\n \t}\n \n@@ -1960,7 +1955,7 @@ eth_igb_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)\n \t\treturn 0;\n \t}\n \n-\tPMD_INIT_LOG(ERR, \"e1000_setup_link_generic = 0x%x \\n\", err);\n+\tPMD_INIT_LOG(ERR, \"e1000_setup_link_generic = 0x%x\", err);\n \treturn (-EIO);\n }\n \n@@ -1995,7 +1990,7 @@ eth_igb_rar_clear(struct rte_eth_dev *dev, uint32_t index)\n static void\n igbvf_intr_disable(struct e1000_hw *hw)\n {\n-\tPMD_INIT_LOG(DEBUG, \"igbvf_intr_disable\");\n+\tPMD_INIT_FUNC_TRACE();\n \n \t/* Clear interrupt mask to stop from interrupts being generated */\n \tE1000_WRITE_REG(hw, E1000_EIMC, 0xFFFF);\n@@ -2077,8 +2072,8 @@ igbvf_dev_configure(struct rte_eth_dev *dev)\n {\n \tstruct rte_eth_conf* conf = &dev->data->dev_conf;\n \n-\tPMD_INIT_LOG(DEBUG, \"\\nConfigured Virtual Function port id: %d\\n\",\n-\t\tdev->data->port_id);\n+\tPMD_INIT_LOG(DEBUG, \"Configured Virtual Function port id: %d\",\n+\t\t     dev->data->port_id);\n \n \t/*\n \t * VF has no ability to enable/disable HW CRC\n@@ -2086,12 +2081,12 @@ igbvf_dev_configure(struct rte_eth_dev *dev)\n \t */\n #ifndef RTE_LIBRTE_E1000_PF_DISABLE_STRIP_CRC\n \tif (!conf->rxmode.hw_strip_crc) {\n-\t\tPMD_INIT_LOG(INFO, \"VF can't disable HW CRC Strip\\n\");\n+\t\tPMD_INIT_LOG(INFO, \"VF can't disable HW CRC Strip\");\n \t\tconf->rxmode.hw_strip_crc = 1;\n \t}\n #else\n \tif (conf->rxmode.hw_strip_crc) {\n-\t\tPMD_INIT_LOG(INFO, \"VF can't enable HW CRC Strip\\n\");\n+\t\tPMD_INIT_LOG(INFO, \"VF can't enable HW CRC Strip\");\n \t\tconf->rxmode.hw_strip_crc = 0;\n \t}\n #endif\n@@ -2106,7 +2101,7 @@ igbvf_dev_start(struct rte_eth_dev *dev)\n \t\tE1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tint ret;\n \n-\tPMD_INIT_LOG(DEBUG, \"igbvf_dev_start\");\n+\tPMD_INIT_FUNC_TRACE();\n \n \thw->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-\tPMD_INIT_LOG(DEBUG, \"igbvf_dev_stop\");\n+\tPMD_INIT_FUNC_TRACE();\n \n \tigbvf_stop_adapter(dev);\n \n@@ -2147,7 +2142,7 @@ igbvf_dev_close(struct rte_eth_dev *dev)\n {\n \tstruct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n-\tPMD_INIT_LOG(DEBUG, \"igbvf_dev_close\");\n+\tPMD_INIT_FUNC_TRACE();\n \n \te1000_reset_hw(hw);\n \n@@ -2203,7 +2198,7 @@ igbvf_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)\n \tuint32_t vid_bit = 0;\n \tint ret = 0;\n \n-\tPMD_INIT_LOG(DEBUG, \"igbvf_vlan_filter_set\");\n+\tPMD_INIT_FUNC_TRACE();\n \n \t/*vind is not used in VF driver, set to 0, check ixgbe_set_vfta_vf*/\n \tret = igbvf_set_vfta(hw, vlan_id, !!on);\n@@ -2432,7 +2427,7 @@ eth_igb_add_ethertype_filter(struct rte_eth_dev *dev, uint16_t index,\n \n \tif (filter->priority_en) {\n \t\tPMD_INIT_LOG(ERR, \"vlan and priority (%d) is not supported\"\n-\t\t\t\" in E1000.\", filter->priority);\n+\t\t\t     \" in E1000.\", filter->priority);\n \t\treturn -EINVAL;\n \t}\n \ndiff --git a/lib/librte_pmd_e1000/igb_pf.c b/lib/librte_pmd_e1000/igb_pf.c\nindex 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 vf)\n \n \tretval = e1000_read_mbx(hw, msgbuf, mbx_size, vf);\n \tif (retval) {\n-\t\tPMD_INIT_LOG(ERR, \"Error mbx recv msg from VF %d\\n\", vf);\n+\t\tPMD_INIT_LOG(ERR, \"Error mbx recv msg from VF %d\", vf);\n \t\treturn retval;\n \t}\n \n@@ -432,7 +432,7 @@ igb_rcv_msg_from_vf(struct rte_eth_dev *dev, uint16_t vf)\n \t\tretval = igb_vf_set_vlan(dev, vf, msgbuf);\n \t\tbreak;\n \tdefault:\n-\t\tPMD_INIT_LOG(DEBUG, \"Unhandled Msg %8.8x\\n\",\n+\t\tPMD_INIT_LOG(DEBUG, \"Unhandled Msg %8.8x\",\n \t\t\t     (unsigned) msgbuf[0]);\n \t\tretval = E1000_ERR_MBX;\n \t\tbreak;\ndiff --git a/lib/librte_pmd_e1000/igb_rxtx.c b/lib/librte_pmd_e1000/igb_rxtx.c\nindex 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 **tx_pkts,\n \t\t\ttx_last = (uint16_t) (tx_last - txq->nb_tx_desc);\n \n \t\tPMD_TX_LOG(DEBUG, \"port_id=%u queue_id=%u pktlen=%u\"\n-\t\t\t   \" tx_first=%u tx_last=%u\\n\",\n+\t\t\t   \" tx_first=%u tx_last=%u\",\n \t\t\t   (unsigned) txq->port_id,\n \t\t\t   (unsigned) txq->queue_id,\n \t\t\t   (unsigned) pkt_len,\n@@ -548,7 +548,7 @@ eth_igb_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\ttxd->read.cmd_type_len |=\n \t\t\trte_cpu_to_le_32(E1000_TXD_CMD_EOP | E1000_TXD_CMD_RS);\n \t}\n- end_of_tx:\n+end_of_tx:\n \trte_wmb();\n \n \t/*\n@@ -697,8 +697,8 @@ eth_igb_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t * to happen by sending specific \"back-pressure\" flow control\n \t\t * frames to its peer(s).\n \t\t */\n-\t\tPMD_RX_LOG(DEBUG, \"\\nport_id=%u queue_id=%u rx_id=%u \"\n-\t\t\t   \"staterr=0x%x pkt_len=%u\\n\",\n+\t\tPMD_RX_LOG(DEBUG, \"port_id=%u queue_id=%u rx_id=%u \"\n+\t\t\t   \"staterr=0x%x pkt_len=%u\",\n \t\t\t   (unsigned) rxq->port_id, (unsigned) rxq->queue_id,\n \t\t\t   (unsigned) rx_id, (unsigned) staterr,\n \t\t\t   (unsigned) rte_le_to_cpu_16(rxd.wb.upper.length));\n@@ -706,7 +706,7 @@ eth_igb_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\tnmb = rte_rxmbuf_alloc(rxq->mb_pool);\n \t\tif (nmb == NULL) {\n \t\t\tPMD_RX_LOG(DEBUG, \"RX mbuf alloc failed port_id=%u \"\n-\t\t\t\t   \"queue_id=%u\\n\", (unsigned) rxq->port_id,\n+\t\t\t\t   \"queue_id=%u\", (unsigned) rxq->port_id,\n \t\t\t\t   (unsigned) rxq->queue_id);\n \t\t\trte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed++;\n \t\t\tbreak;\n@@ -794,7 +794,7 @@ eth_igb_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \tnb_hold = (uint16_t) (nb_hold + rxq->nb_rx_hold);\n \tif (nb_hold > rxq->rx_free_thresh) {\n \t\tPMD_RX_LOG(DEBUG, \"port_id=%u queue_id=%u rx_tail=%u \"\n-\t\t\t   \"nb_hold=%u nb_rx=%u\\n\",\n+\t\t\t   \"nb_hold=%u nb_rx=%u\",\n \t\t\t   (unsigned) rxq->port_id, (unsigned) rxq->queue_id,\n \t\t\t   (unsigned) rx_id, (unsigned) nb_hold,\n \t\t\t   (unsigned) nb_rx);\n@@ -881,8 +881,8 @@ eth_igb_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t * to happen by sending specific \"back-pressure\" flow control\n \t\t * frames to its peer(s).\n \t\t */\n-\t\tPMD_RX_LOG(DEBUG, \"\\nport_id=%u queue_id=%u rx_id=%u \"\n-\t\t\t   \"staterr=0x%x data_len=%u\\n\",\n+\t\tPMD_RX_LOG(DEBUG, \"port_id=%u queue_id=%u rx_id=%u \"\n+\t\t\t   \"staterr=0x%x data_len=%u\",\n \t\t\t   (unsigned) rxq->port_id, (unsigned) rxq->queue_id,\n \t\t\t   (unsigned) rx_id, (unsigned) staterr,\n \t\t\t   (unsigned) rte_le_to_cpu_16(rxd.wb.upper.length));\n@@ -890,7 +890,7 @@ eth_igb_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\tnmb = rte_rxmbuf_alloc(rxq->mb_pool);\n \t\tif (nmb == NULL) {\n \t\t\tPMD_RX_LOG(DEBUG, \"RX mbuf alloc failed port_id=%u \"\n-\t\t\t\t   \"queue_id=%u\\n\", (unsigned) rxq->port_id,\n+\t\t\t\t   \"queue_id=%u\", (unsigned) rxq->port_id,\n \t\t\t\t   (unsigned) rxq->queue_id);\n \t\t\trte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed++;\n \t\t\tbreak;\n@@ -1049,7 +1049,7 @@ eth_igb_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \tnb_hold = (uint16_t) (nb_hold + rxq->nb_rx_hold);\n \tif (nb_hold > rxq->rx_free_thresh) {\n \t\tPMD_RX_LOG(DEBUG, \"port_id=%u queue_id=%u rx_tail=%u \"\n-\t\t\t   \"nb_hold=%u nb_rx=%u\\n\",\n+\t\t\t   \"nb_hold=%u nb_rx=%u\",\n \t\t\t   (unsigned) rxq->port_id, (unsigned) rxq->queue_id,\n \t\t\t   (unsigned) rx_id, (unsigned) nb_hold,\n \t\t\t   (unsigned) nb_rx);\n@@ -1211,14 +1211,14 @@ eth_igb_tx_queue_setup(struct rte_eth_dev *dev,\n \t */\n \tif (tx_conf->tx_free_thresh != 0)\n \t\tPMD_INIT_LOG(WARNING, \"The tx_free_thresh parameter is not \"\n-\t\t\t     \"used for the 1G driver.\\n\");\n+\t\t\t     \"used for the 1G driver.\");\n \tif (tx_conf->tx_rs_thresh != 0)\n \t\tPMD_INIT_LOG(WARNING, \"The tx_rs_thresh parameter is not \"\n-\t\t\t     \"used for the 1G driver.\\n\");\n+\t\t\t     \"used for the 1G driver.\");\n \tif (tx_conf->tx_thresh.wthresh == 0)\n \t\tPMD_INIT_LOG(WARNING, \"To improve 1G driver performance, \"\n \t\t\t     \"consider setting the TX WTHRESH value to 4, 8, \"\n-\t\t\t     \"or 16.\\n\");\n+\t\t\t     \"or 16.\");\n \n \t/* Free memory prior to re-allocation if needed */\n \tif (dev->data->tx_queues[queue_idx] != NULL) {\n@@ -1271,7 +1271,7 @@ eth_igb_tx_queue_setup(struct rte_eth_dev *dev,\n \t\tigb_tx_queue_release(txq);\n \t\treturn (-ENOMEM);\n \t}\n-\tPMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p dma_addr=0x%\"PRIx64\"\\n\",\n+\tPMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p dma_addr=0x%\"PRIx64\"\",\n \t\t     txq->sw_ring, txq->tx_ring, txq->tx_ring_phys_addr);\n \n \tigb_reset_tx_queue(txq, dev);\n@@ -1409,7 +1409,7 @@ eth_igb_rx_queue_setup(struct rte_eth_dev *dev,\n \t\tigb_rx_queue_release(rxq);\n \t\treturn (-ENOMEM);\n \t}\n-\tPMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p dma_addr=0x%\"PRIx64\"\\n\",\n+\tPMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p dma_addr=0x%\"PRIx64\"\",\n \t\t     rxq->sw_ring, rxq->rx_ring, rxq->rx_ring_phys_addr);\n \n \tdev->data->rx_queues[queue_idx] = rxq;\n@@ -1427,7 +1427,7 @@ eth_igb_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)\n \tuint32_t desc = 0;\n \n \tif (rx_queue_id >= dev->data->nb_rx_queues) {\n-\t\tPMD_RX_LOG(ERR, \"Invalid RX queue id=%d\\n\", rx_queue_id);\n+\t\tPMD_RX_LOG(ERR, \"Invalid RX queue id=%d\", rx_queue_id);\n \t\treturn 0;\n \t}\n \n@@ -1726,7 +1726,7 @@ igb_is_vmdq_supported(const struct rte_eth_dev *dev)\n \tcase e1000_i210:\n \tcase e1000_i211:\n \tdefault:\n-\t\tPMD_INIT_LOG(ERR, \"Cannot support VMDq feature\\n\");\n+\t\tPMD_INIT_LOG(ERR, \"Cannot support VMDq feature\");\n \t\treturn 0;\n \t}\n }\n@@ -1739,7 +1739,8 @@ igb_vmdq_rx_hw_configure(struct rte_eth_dev *dev)\n \tuint32_t mrqc, vt_ctl, vmolr, rctl;\n \tint i;\n \n-\tPMD_INIT_LOG(DEBUG, \">>\");\n+\tPMD_INIT_FUNC_TRACE();\n+\n \thw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tcfg = &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 \t\tstruct rte_mbuf *mbuf = rte_rxmbuf_alloc(rxq->mb_pool);\n \n \t\tif (mbuf == NULL) {\n-\t\t\tPMD_INIT_LOG(ERR, \"RX mbuf alloc failed \"\n-\t\t\t\t\"queue_id=%hu\\n\", rxq->queue_id);\n+\t\t\tPMD_INIT_LOG(ERR, \"RX mbuf alloc failed queue_id=%hu\",\n+\t\t\t\t     rxq->queue_id);\n \t\t\treturn (-ENOMEM);\n \t\t}\n \t\tdma_addr =\n@@ -2273,7 +2274,7 @@ eth_igbvf_rx_init(struct rte_eth_dev *dev)\n \t\t\t * to avoid Write-Back not triggered sometimes\n \t\t\t */\n \t\t\trxdctl |= 0x10000;\n-\t\t\tPMD_INIT_LOG(DEBUG, \"Force set RX WTHRESH to 1 !\\n\");\n+\t\t\tPMD_INIT_LOG(DEBUG, \"Force set RX WTHRESH to 1 !\");\n \t\t}\n \t\telse\n \t\t\trxdctl |= ((rxq->wthresh & 0x1F) << 16);\n@@ -2341,7 +2342,7 @@ eth_igbvf_tx_init(struct rte_eth_dev *dev)\n \t\t\t * to avoid Write-Back not triggered sometimes\n \t\t\t */\n \t\t\ttxdctl |= 0x10000;\n-\t\t\tPMD_INIT_LOG(DEBUG, \"Force set TX WTHRESH to 1 !\\n\");\n+\t\t\tPMD_INIT_LOG(DEBUG, \"Force set TX WTHRESH to 1 !\");\n \t\t}\n \t\telse\n \t\t\ttxdctl |= ((txq->wthresh & 0x1F) << 16);\n",
    "prefixes": [
        "dpdk-dev",
        "v2",
        "14/17"
    ]
}