Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/227/?format=api
{ "id": 227, "url": "https://patches.dpdk.org/api/patches/227/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1409062162-19575-2-git-send-email-david.marchand@6wind.com/", "project": { "id": 1, "url": "https://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": "<1409062162-19575-2-git-send-email-david.marchand@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1409062162-19575-2-git-send-email-david.marchand@6wind.com", "date": "2014-08-26T14:09:11", "name": "[dpdk-dev,01/11] ixgbe: clean log messages", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "2c1c83028b84f2fd7db3ba3dc7de137b017f0a46", "submitter": { "id": 3, "url": "https://patches.dpdk.org/api/people/3/?format=api", "name": "David Marchand", "email": "david.marchand@6wind.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1409062162-19575-2-git-send-email-david.marchand@6wind.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/227/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/227/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<david.marchand@6wind.com>", "Received": [ "from mail-wi0-f178.google.com (mail-wi0-f178.google.com\n\t[209.85.212.178]) by dpdk.org (Postfix) with ESMTP id 306AEB375\n\tfor <dev@dpdk.org>; Tue, 26 Aug 2014 16:05:31 +0200 (CEST)", "by mail-wi0-f178.google.com with SMTP id hi2so4217376wib.17\n\tfor <dev@dpdk.org>; Tue, 26 Aug 2014 07:09:31 -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\tcy9sm12543569wib.18.2014.08.26.07.09.29 for <dev@dpdk.org>\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 26 Aug 2014 07:09:30 -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=NZpsMXoEC2S/QurnzcyxH9j6wD9FSIeP2X8h9HRepGE=;\n\tb=hFf3IvPnJ39hDn/MDxhe24l2R+tAVIdxWa+2TAgvBo0sAxO2OPTkvsy5ifYJtB6ldM\n\t2U54Ghn23KC9WlwXhd3y7cPBUC0xEzSc2gvDbxM+4RSzBQgsqfm01ulSWK9JsL6X7G1q\n\t7YiICFLRhKwsGlYVwHugZ84DzJR97FIZkopV4KKWRbS4F2Pv4eUSPsj8PTB6RzEvS5a/\n\t71hbmyBacFfTr0IIn4Dc0QmQyb6dMttje2M/hG9tYY+jtuUltWNhK5cWAPK3LOvSFwSe\n\tbDRW0piVdiPQEoAuausPgDMcVf6VwhILaJ/Va7keQpHrW+20OPM3GJ1RmH3GSM1NYoq4\n\txnqw==", "X-Gm-Message-State": "ALoCoQk1obGT0pE29hgIaya3LJcTm3YMWrdhGwogBvJjscymd2mN1OqSS2oe36yQ3aIKliSthI0O", "X-Received": "by 10.194.119.41 with SMTP id kr9mr2606194wjb.114.1409062171190; \n\tTue, 26 Aug 2014 07:09:31 -0700 (PDT)", "From": "David Marchand <david.marchand@6wind.com>", "To": "dev@dpdk.org", "Date": "Tue, 26 Aug 2014 16:09:11 +0200", "Message-Id": "<1409062162-19575-2-git-send-email-david.marchand@6wind.com>", "X-Mailer": "git-send-email 1.7.10.4", "In-Reply-To": "<1409062162-19575-1-git-send-email-david.marchand@6wind.com>", "References": "<1409062162-19575-1-git-send-email-david.marchand@6wind.com>", "Subject": "[dpdk-dev] [PATCH 01/11] ixgbe: 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, 26 Aug 2014 14:05:31 -0000" }, "content": "Clean log messages:\n- remove superfluous \\n in log macros and add some \\n where needed,\n- remove leading \\n in some messages,\n- split multi lines messages,\n- replace some PMD_INIT_LOG(DEBUG, \"some_func\\n\") with PMD_INIT_FUNC_TRACE().\n\nSigned-off-by: David Marchand <david.marchand@6wind.com>\n---\n lib/librte_pmd_ixgbe/ixgbe_ethdev.c | 99 +++++++++++++++++------------------\n lib/librte_pmd_ixgbe/ixgbe_fdir.c | 12 ++---\n lib/librte_pmd_ixgbe/ixgbe_logs.h | 12 ++---\n lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 14 ++---\n 4 files changed, 68 insertions(+), 69 deletions(-)", "diff": "diff --git a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c\nindex 59122a1..ac00323 100644\n--- a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c\n+++ b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c\n@@ -737,7 +737,7 @@ eth_ixgbe_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,\n #endif /* RTE_NIC_BYPASS */\n \n \tif (diag != IXGBE_SUCCESS) {\n-\t\tPMD_INIT_LOG(ERR, \"Shared code init failed: %d\", diag);\n+\t\tPMD_INIT_LOG(ERR, \"Shared code init failed: %d\\n\", diag);\n \t\treturn -EIO;\n \t}\n \n@@ -763,7 +763,7 @@ eth_ixgbe_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,\n \t/* Make sure we have a good EEPROM before we read from it */\n \tdiag = ixgbe_validate_eeprom_checksum(hw, &csum);\n \tif (diag != IXGBE_SUCCESS) {\n-\t\tPMD_INIT_LOG(ERR, \"The EEPROM checksum is not valid: %d\", diag);\n+\t\tPMD_INIT_LOG(ERR, \"The EEPROM checksum is not valid: %d\\n\", diag);\n \t\treturn -EIO;\n \t}\n \n@@ -791,13 +791,14 @@ eth_ixgbe_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,\n \tif (diag == IXGBE_ERR_EEPROM_VERSION) {\n \t\tPMD_INIT_LOG(ERR, \"This device is a pre-production adapter/\"\n \t\t \"LOM. Please be aware there may be issues associated \"\n-\t\t \"with your hardware.\\n If you are experiencing problems \"\n+\t\t \"with your hardware.\\n\");\n+\t\tPMD_INIT_LOG(ERR, \"If you are experiencing problems \"\n \t\t \"please contact your Intel or hardware representative \"\n \t\t \"who provided you with this hardware.\\n\");\n \t} else if (diag == IXGBE_ERR_SFP_NOT_SUPPORTED)\n \t\tPMD_INIT_LOG(ERR, \"Unsupported SFP+ Module\\n\");\n \tif (diag) {\n-\t\tPMD_INIT_LOG(ERR, \"Hardware Initialization Failure: %d\", diag);\n+\t\tPMD_INIT_LOG(ERR, \"Hardware Initialization Failure: %d\\n\", diag);\n \t\treturn -EIO;\n \t}\n \n@@ -813,7 +814,7 @@ eth_ixgbe_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,\n \tif (eth_dev->data->mac_addrs == NULL) {\n \t\tPMD_INIT_LOG(ERR,\n \t\t\t\"Failed to allocate %u bytes needed to store \"\n-\t\t\t\"MAC addresses\",\n+\t\t\t\"MAC addresses\\n\",\n \t\t\tETHER_ADDR_LEN * hw->mac.num_rar_entries);\n \t\treturn -ENOMEM;\n \t}\n@@ -826,7 +827,8 @@ eth_ixgbe_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,\n \t\t\tIXGBE_VMDQ_NUM_UC_MAC, 0);\n \tif (eth_dev->data->hash_mac_addrs == NULL) {\n \t\tPMD_INIT_LOG(ERR,\n-\t\t\t\"Failed to allocate %d bytes needed to store MAC addresses\",\n+\t\t\t\"Failed to allocate %d bytes needed to store \"\n+\t\t\t\"MAC addresses\\n\",\n \t\t\tETHER_ADDR_LEN * IXGBE_VMDQ_NUM_UC_MAC);\n \t\treturn -ENOMEM;\n \t}\n@@ -850,14 +852,14 @@ eth_ixgbe_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,\n \n \tif (ixgbe_is_sfp(hw) && hw->phy.sfp_type != ixgbe_sfp_type_not_present)\n \t\tPMD_INIT_LOG(DEBUG,\n-\t\t\t \"MAC: %d, PHY: %d, SFP+: %d<n\",\n+\t\t\t \"MAC: %d, PHY: %d, SFP+: %d\\n\",\n \t\t\t (int) hw->mac.type, (int) hw->phy.type,\n \t\t\t (int) hw->phy.sfp_type);\n \telse\n \t\tPMD_INIT_LOG(DEBUG, \"MAC: %d, PHY: %d\\n\",\n \t\t\t (int) hw->mac.type, (int) hw->phy.type);\n \n-\tPMD_INIT_LOG(DEBUG, \"port %d vendorID=0x%x deviceID=0x%x\",\n+\tPMD_INIT_LOG(DEBUG, \"port %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 \n@@ -933,7 +935,7 @@ eth_ixgbevf_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,\n \t\tIXGBE_DEV_PRIVATE_TO_HWSTRIP_BITMAP(eth_dev->data->dev_private);\n \tstruct ether_addr *perm_addr = (struct ether_addr *) hw->mac.perm_addr;\n \n-\tPMD_INIT_LOG(DEBUG, \"eth_ixgbevf_dev_init\");\n+\tPMD_INIT_FUNC_TRACE();\n \n \teth_dev->dev_ops = &ixgbevf_eth_dev_ops;\n \teth_dev->rx_pkt_burst = &ixgbe_recv_pkts;\n@@ -963,7 +965,8 @@ eth_ixgbevf_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,\n \t/* Initialize the shared code (base driver) */\n \tdiag = ixgbe_init_shared_code(hw);\n \tif (diag != IXGBE_SUCCESS) {\n-\t\tPMD_INIT_LOG(ERR, \"Shared code init failed for ixgbevf: %d\", diag);\n+\t\tPMD_INIT_LOG(ERR, \"Shared code init failed for ixgbevf: %d\\n\",\n+\t\t\t diag);\n \t\treturn -EIO;\n \t}\n \n@@ -982,7 +985,7 @@ eth_ixgbevf_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,\n \t * In this case, assign a random MAC address.\n \t */\n \tif ((diag != IXGBE_SUCCESS) && (diag != IXGBE_ERR_INVALID_MAC_ADDR)) {\n-\t\tPMD_INIT_LOG(ERR, \"VF Initialization Failure: %d\", diag);\n+\t\tPMD_INIT_LOG(ERR, \"VF Initialization Failure: %d\\n\", diag);\n \t\treturn (diag);\n \t}\n \n@@ -998,7 +1001,7 @@ eth_ixgbevf_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,\n \tif (eth_dev->data->mac_addrs == NULL) {\n \t\tPMD_INIT_LOG(ERR,\n \t\t\t\"Failed to allocate %u bytes needed to store \"\n-\t\t\t\"MAC addresses\",\n+\t\t\t\"MAC addresses\\n\",\n \t\t\tETHER_ADDR_LEN * hw->mac.num_rar_entries);\n \t\treturn -ENOMEM;\n \t}\n@@ -1034,11 +1037,12 @@ eth_ixgbevf_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,\n \t\t\tbreak;\n \n \t\tdefault:\n-\t\t\tPMD_INIT_LOG(ERR, \"VF Initialization Failure: %d\", diag);\n+\t\t\tPMD_INIT_LOG(ERR, \"VF Initialization Failure: %d\\n\",\n+\t\t\t\t diag);\n \t\t\treturn (-EIO);\n \t}\n \n-\tPMD_INIT_LOG(DEBUG, \"\\nport %d vendorID=0x%x deviceID=0x%x mac.type=%s\\n\",\n+\tPMD_INIT_LOG(DEBUG, \"port %d vendorID=0x%x deviceID=0x%x mac.type=%s\\n\",\n \t\t\t eth_dev->data->port_id, pci_dev->id.vendor_id, pci_dev->id.device_id,\n \t\t\t \"ixgbe_mac_82599_vf\");\n \n@@ -1207,7 +1211,7 @@ ixgbe_vlan_hw_strip_disable(struct rte_eth_dev *dev, uint16_t queue)\n \n \tif (hw->mac.type == ixgbe_mac_82598EB) {\n \t\t/* No queue level support */\n-\t\tPMD_INIT_LOG(INFO, \"82598EB not support queue level hw strip\");\n+\t\tPMD_INIT_LOG(INFO, \"82598EB not support queue level hw strip\\n\");\n \t\treturn;\n \t}\n \telse {\n@@ -1231,7 +1235,7 @@ ixgbe_vlan_hw_strip_enable(struct rte_eth_dev *dev, uint16_t queue)\n \n \tif (hw->mac.type == ixgbe_mac_82598EB) {\n \t\t/* No queue level supported */\n-\t\tPMD_INIT_LOG(INFO, \"82598EB not support queue level hw strip\");\n+\t\tPMD_INIT_LOG(INFO, \"82598EB not support queue level hw strip\\n\");\n \t\treturn;\n \t}\n \telse {\n@@ -1543,7 +1547,7 @@ skip_link_setup:\n \treturn (0);\n \n error:\n-\tPMD_INIT_LOG(ERR, \"failure in ixgbe_dev_start(): %d\", err);\n+\tPMD_INIT_LOG(ERR, \"failure in ixgbe_dev_start(): %d\\n\", err);\n \tixgbe_dev_clear_queues(dev);\n \treturn -EIO;\n }\n@@ -1599,10 +1603,8 @@ ixgbe_dev_set_link_up(struct rte_eth_dev *dev)\n #ifdef RTE_NIC_BYPASS\n \t\tif (hw->device_id == IXGBE_DEV_ID_82599_BYPASS) {\n \t\t\t/* Not suported in bypass mode */\n-\t\t\tPMD_INIT_LOG(ERR,\n-\t\t\t\t\"\\nSet link up is not supported \"\n-\t\t\t\t\"by device id 0x%x\\n\",\n-\t\t\t\thw->device_id);\n+\t\t\tPMD_INIT_LOG(ERR, \"Set link up is not supported \"\n+\t\t\t\t \"by device id 0x%x\\n\", hw->device_id);\n \t\t\treturn -ENOTSUP;\n \t\t}\n #endif\n@@ -1611,8 +1613,8 @@ ixgbe_dev_set_link_up(struct rte_eth_dev *dev)\n \t\treturn 0;\n \t}\n \n-\tPMD_INIT_LOG(ERR, \"\\nSet link up is not supported by device id 0x%x\\n\",\n-\t\thw->device_id);\n+\tPMD_INIT_LOG(ERR, \"Set link up is not supported by device id 0x%x\\n\",\n+\t\t hw->device_id);\n \treturn -ENOTSUP;\n }\n \n@@ -1628,10 +1630,8 @@ ixgbe_dev_set_link_down(struct rte_eth_dev *dev)\n #ifdef RTE_NIC_BYPASS\n \t\tif (hw->device_id == IXGBE_DEV_ID_82599_BYPASS) {\n \t\t\t/* Not suported in bypass mode */\n-\t\t\tPMD_INIT_LOG(ERR,\n-\t\t\t\t\"\\nSet link down is not supported \"\n-\t\t\t\t\"by device id 0x%x\\n\",\n-\t\t\t\t hw->device_id);\n+\t\t\tPMD_INIT_LOG(ERR, \"Set link down is not supported \"\n+\t\t\t\t \"by device id 0x%x\\n\", hw->device_id);\n \t\t\treturn -ENOTSUP;\n \t\t}\n #endif\n@@ -1640,9 +1640,8 @@ ixgbe_dev_set_link_down(struct rte_eth_dev *dev)\n \t\treturn 0;\n \t}\n \n-\tPMD_INIT_LOG(ERR,\n-\t\t\"\\nSet link down is not supported by device id 0x%x\\n\",\n-\t\t hw->device_id);\n+\tPMD_INIT_LOG(ERR, \"Set link down is not supported by device id 0x%x\\n\",\n+\t\t hw->device_id);\n \treturn -ENOTSUP;\n }\n \n@@ -2113,7 +2112,7 @@ ixgbe_dev_interrupt_get_status(struct rte_eth_dev *dev)\n \n \t/* read-on-clear nic registers here */\n \teicr = IXGBE_READ_REG(hw, IXGBE_EICR);\n-\tPMD_DRV_LOG(INFO, \"eicr %x\", eicr);\n+\tPMD_DRV_LOG(INFO, \"eicr %x\\n\", eicr);\n \n \tintr->flags = 0;\n \tif (eicr & IXGBE_EICR_LSC) {\n@@ -2145,16 +2144,16 @@ ixgbe_dev_link_status_print(struct rte_eth_dev *dev)\n \tmemset(&link, 0, sizeof(link));\n \trte_ixgbe_dev_atomic_read_link_status(dev, &link);\n \tif (link.link_status) {\n-\t\tPMD_INIT_LOG(INFO, \"Port %d: Link Up - speed %u Mbps - %s\",\n+\t\tPMD_INIT_LOG(INFO, \"Port %d: Link Up - speed %u Mbps - %s\\n\",\n \t\t\t\t\t(int)(dev->data->port_id),\n \t\t\t\t\t(unsigned)link.link_speed,\n \t\t\tlink.link_duplex == ETH_LINK_FULL_DUPLEX ?\n \t\t\t\t\t\"full-duplex\" : \"half-duplex\");\n \t} else {\n-\t\tPMD_INIT_LOG(INFO, \" Port %d: Link Down\",\n+\t\tPMD_INIT_LOG(INFO, \" Port %d: Link Down\\n\",\n \t\t\t\t(int)(dev->data->port_id));\n \t}\n-\tPMD_INIT_LOG(INFO, \"PCI Address: %04d:%02d:%02d:%d\",\n+\tPMD_INIT_LOG(INFO, \"PCI Address: %04d:%02d:%02d:%d\\n\",\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@@ -2211,9 +2210,9 @@ ixgbe_dev_interrupt_action(struct rte_eth_dev *dev)\n \tif (intr_enable_delay) {\n \t\tif (rte_eal_alarm_set(timeout * 1000,\n \t\t\t\t ixgbe_dev_interrupt_delayed_handler, (void*)dev) < 0)\n-\t\t\tPMD_DRV_LOG(ERR, \"Error setting alarm\");\n+\t\t\tPMD_DRV_LOG(ERR, \"Error setting alarm\\n\");\n \t} else {\n-\t\tPMD_DRV_LOG(DEBUG, \"enable intr immediately\");\n+\t\tPMD_DRV_LOG(DEBUG, \"enable intr immediately\\n\");\n \t\tixgbe_enable_intr(dev);\n \t\trte_intr_enable(&(dev->pci_dev->intr_handle));\n \t}\n@@ -2371,7 +2370,7 @@ ixgbe_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)\n \tif (fc_conf->autoneg != !hw->fc.disable_fc_autoneg)\n \t\treturn -ENOTSUP;\n \trx_buf_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(0));\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\\n\", rx_buf_size);\n \n \t/*\n \t * At least reserve one Ethernet frame for watermark\n@@ -2413,7 +2412,7 @@ ixgbe_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, \"ixgbe_fc_enable = 0x%x \\n\", err);\n+\tPMD_INIT_LOG(ERR, \"ixgbe_fc_enable = 0x%x\\n\", err);\n \treturn -EIO;\n }\n \n@@ -2593,7 +2592,7 @@ ixgbe_priority_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_pfc_conf *p\n \tixgbe_dcb_unpack_map_cee(dcb_config, IXGBE_DCB_RX_CONFIG, map);\n \ttc_num = map[pfc_conf->priority];\n \trx_buf_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(tc_num));\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\\n\", rx_buf_size);\n \t/*\n \t * At least reserve one Ethernet frame for watermark\n \t * high_water/low_water in kilo bytes for ixgbe\n@@ -2618,7 +2617,7 @@ ixgbe_priority_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_pfc_conf *p\n \tif ((err == IXGBE_SUCCESS) || (err == IXGBE_ERR_FC_NOT_NEGOTIATED))\n \t\treturn 0;\n \n-\tPMD_INIT_LOG(ERR, \"ixgbe_dcb_pfc_enable = 0x%x \\n\", err);\n+\tPMD_INIT_LOG(ERR, \"ixgbe_dcb_pfc_enable = 0x%x\\n\", err);\n \treturn -EIO;\n }\n \n@@ -2765,7 +2764,7 @@ ixgbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)\n static void\n ixgbevf_intr_disable(struct ixgbe_hw *hw)\n {\n-\tPMD_INIT_LOG(DEBUG, \"ixgbevf_intr_disable\");\n+\tPMD_INIT_FUNC_TRACE();\n \n \t/* Clear interrupt mask to stop from interrupts being generated */\n \tIXGBE_WRITE_REG(hw, IXGBE_VTEIMC, IXGBE_VF_IRQ_CLEAR_MASK);\n@@ -2778,8 +2777,8 @@ ixgbevf_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\",\n+\t\t dev->data->port_id);\n \n \t/*\n \t * VF has no ability to enable/disable HW CRC\n@@ -2807,7 +2806,7 @@ ixgbevf_dev_start(struct rte_eth_dev *dev)\n \t\tIXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tint err, mask = 0;\n \n-\tPMD_INIT_LOG(DEBUG, \"ixgbevf_dev_start\");\n+\tPMD_INIT_FUNC_TRACE();\n \n \thw->mac.ops.reset_hw(hw);\n \n@@ -2842,7 +2841,7 @@ ixgbevf_dev_stop(struct rte_eth_dev *dev)\n {\n \tstruct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n-\tPMD_INIT_LOG(DEBUG, \"ixgbevf_dev_stop\");\n+\tPMD_INIT_FUNC_TRACE();\n \n \thw->adapter_stopped = TRUE;\n \tixgbe_stop_adapter(hw);\n@@ -2861,7 +2860,7 @@ ixgbevf_dev_close(struct rte_eth_dev *dev)\n {\n \tstruct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n-\tPMD_INIT_LOG(DEBUG, \"ixgbevf_dev_close\");\n+\tPMD_INIT_FUNC_TRACE();\n \n \tixgbe_reset_hw(hw);\n \n@@ -2908,7 +2907,7 @@ ixgbevf_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)\n \t/* vind is not used in VF driver, set to 0, check ixgbe_set_vfta_vf */\n \tret = ixgbe_set_vfta(hw, vlan_id, 0, !!on);\n \tif(ret){\n-\t\tPMD_INIT_LOG(ERR, \"Unable to set VF vlan\");\n+\t\tPMD_INIT_LOG(ERR, \"Unable to set VF vlan\\n\");\n \t\treturn ret;\n \t}\n \tvid_idx = (uint32_t) ((vlan_id >> 5) & 0x7F);\n@@ -3477,7 +3476,7 @@ ixgbevf_add_mac_addr(struct rte_eth_dev *dev, struct ether_addr *mac_addr,\n \tdiag = ixgbevf_set_uc_addr_vf(hw, 2, mac_addr->addr_bytes);\n \tif (diag == 0)\n \t\treturn;\n-\tPMD_DRV_LOG(ERR, \"Unable to add MAC address - diag=%d\", diag);\n+\tPMD_DRV_LOG(ERR, \"Unable to add MAC address - diag=%d\\n\", diag);\n }\n \n static void\n@@ -3517,7 +3516,7 @@ ixgbevf_remove_mac_addr(struct rte_eth_dev *dev, uint32_t index)\n \t\t\tPMD_DRV_LOG(ERR,\n \t\t\t\t \"Adding again MAC address \"\n \t\t\t\t \"%02x:%02x:%02x:%02x:%02x:%02x failed \"\n-\t\t\t\t \"diag=%d\",\n+\t\t\t\t \"diag=%d\\n\",\n \t\t\t\t mac_addr->addr_bytes[0],\n \t\t\t\t mac_addr->addr_bytes[1],\n \t\t\t\t mac_addr->addr_bytes[2],\n@@ -3806,7 +3805,7 @@ ixgbe_add_5tuple_filter(struct rte_eth_dev *dev, uint16_t index,\n \t\treturn -EINVAL; /* filter index is out of range. */\n \n \tif (filter->tcp_flags) {\n-\t\tPMD_INIT_LOG(INFO, \"82599EB not tcp flags in 5tuple\");\n+\t\tPMD_INIT_LOG(INFO, \"82599EB not tcp flags in 5tuple\\n\");\n \t\treturn -EINVAL;\n \t}\n \ndiff --git a/lib/librte_pmd_ixgbe/ixgbe_fdir.c b/lib/librte_pmd_ixgbe/ixgbe_fdir.c\nindex 6c0a530..c78a450 100644\n--- a/lib/librte_pmd_ixgbe/ixgbe_fdir.c\n+++ b/lib/librte_pmd_ixgbe/ixgbe_fdir.c\n@@ -139,7 +139,7 @@ configure_fdir_flags(struct rte_fdir_conf *conf, uint32_t *fdirctrl)\n \t\tbreak;\n \tdefault:\n \t\t/* bad value */\n-\t\tPMD_INIT_LOG(ERR, \"Invalid fdir_conf->pballoc value\");\n+\t\tPMD_INIT_LOG(ERR, \"Invalid fdir_conf->pballoc value\\n\");\n \t\treturn -EINVAL;\n \t};\n \n@@ -158,7 +158,7 @@ configure_fdir_flags(struct rte_fdir_conf *conf, uint32_t *fdirctrl)\n \t\tbreak;\n \tdefault:\n \t\t/* bad value */\n-\t\tPMD_INIT_LOG(ERR, \"Invalid fdir_conf->status value\");\n+\t\tPMD_INIT_LOG(ERR, \"Invalid fdir_conf->status value\\n\");\n \t\treturn -EINVAL;\n \t};\n \n@@ -395,7 +395,7 @@ fdir_filter_to_atr_input(struct rte_fdir_filter *fdir_filter,\n \tif ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP ||\n \t\t\tfdir_filter->l4type == RTE_FDIR_L4TYPE_NONE) &&\n \t\t\t(fdir_filter->port_src || fdir_filter->port_dst)) {\n-\t\tPMD_INIT_LOG(ERR, \"Invalid fdir_filter\");\n+\t\tPMD_INIT_LOG(ERR, \"Invalid fdir_filter\\n\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -420,7 +420,7 @@ fdir_filter_to_atr_input(struct rte_fdir_filter *fdir_filter,\n \t\tinput->formatted.flow_type = IXGBE_ATR_FLOW_TYPE_IPV4;\n \t\tbreak;\n \tdefault:\n-\t\tPMD_INIT_LOG(ERR, \" Error on l4type input\");\n+\t\tPMD_INIT_LOG(ERR, \" Error on l4type input\\n\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -524,7 +524,7 @@ fdir_erase_filter_82599(struct ixgbe_hw *hw,\n \t}\n \n \tif (!retry_count) {\n-\t\tPMD_INIT_LOG(ERR, \"Timeout querying for flow director filter\");\n+\t\tPMD_INIT_LOG(ERR, \"Timeout querying for flow director filter\\n\");\n \t\terr = -EIO;\n \t}\n \n@@ -678,7 +678,7 @@ ixgbe_fdir_set_masks(struct rte_eth_dev *dev, struct rte_fdir_masks *fdir_masks)\n \n \terr = ixgbe_reinit_fdir_tables_82599(hw);\n \tif (err) {\n-\t\tPMD_INIT_LOG(ERR, \"reinit of fdir tables failed\");\n+\t\tPMD_INIT_LOG(ERR, \"reinit of fdir tables failed\\n\");\n \t\treturn -EIO;\n \t}\n \ndiff --git a/lib/librte_pmd_ixgbe/ixgbe_logs.h b/lib/librte_pmd_ixgbe/ixgbe_logs.h\nindex 9f0a684..22d8cfb 100644\n--- a/lib/librte_pmd_ixgbe/ixgbe_logs.h\n+++ b/lib/librte_pmd_ixgbe/ixgbe_logs.h\n@@ -36,8 +36,8 @@\n \n #ifdef RTE_LIBRTE_IXGBE_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+\tRTE_LOG(level, PMD, \"%s(): \" fmt, __func__, ## args)\n+#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, \" >>\\n\")\n #else\n #define PMD_INIT_LOG(level, fmt, args...) do { } while(0)\n #define PMD_INIT_FUNC_TRACE() do { } while(0)\n@@ -45,28 +45,28 @@\n \n #ifdef RTE_LIBRTE_IXGBE_DEBUG_RX\n #define PMD_RX_LOG(level, fmt, args...) \\\n-\tRTE_LOG(level, PMD, \"%s(): \" fmt \"\\n\", __func__, ## args)\n+\tRTE_LOG(level, PMD, \"%s(): \" fmt, __func__, ## args)\n #else\n #define PMD_RX_LOG(level, fmt, args...) do { } while(0)\n #endif\n \n #ifdef RTE_LIBRTE_IXGBE_DEBUG_TX\n #define PMD_TX_LOG(level, fmt, args...) \\\n-\tRTE_LOG(level, PMD, \"%s(): \" fmt \"\\n\", __func__, ## args)\n+\tRTE_LOG(level, PMD, \"%s(): \" fmt, __func__, ## args)\n #else\n #define PMD_TX_LOG(level, fmt, args...) do { } while(0)\n #endif\n \n #ifdef RTE_LIBRTE_IXGBE_DEBUG_TX_FREE\n #define PMD_TX_FREE_LOG(level, fmt, args...) \\\n-\tRTE_LOG(level, PMD, \"%s(): \" fmt \"\\n\", __func__, ## args)\n+\tRTE_LOG(level, PMD, \"%s(): \" fmt, __func__, ## args)\n #else\n #define PMD_TX_FREE_LOG(level, fmt, args...) do { } while(0)\n #endif\n \n #ifdef RTE_LIBRTE_IXGBE_DEBUG_DRIVER\n #define PMD_DRV_LOG(level, fmt, args...) \\\n-\tRTE_LOG(level, PMD, \"%s(): \" fmt \"\\n\", __func__, ## args)\n+\tRTE_LOG(level, PMD, \"%s(): \" fmt, __func__, ## args)\n #else\n #define PMD_DRV_LOG(level, fmt, args...) do { } while(0)\n #endif\ndiff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c\nindex dfc2076..cbec821 100644\n--- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c\n+++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c\n@@ -492,7 +492,7 @@ ixgbe_xmit_cleanup(struct igb_tx_queue *txq)\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\t\"(port=%d queue=%d)\\n\",\n \t\t\t\tdesc_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@@ -509,7 +509,7 @@ ixgbe_xmit_cleanup(struct igb_tx_queue *txq)\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\t\"(port=%d queue=%d)\\n\",\n \t\t\tnb_tx_to_clean, last_desc_cleaned, desc_to_clean_to,\n \t\t\ttxq->port_id, txq->queue_id);\n \n@@ -630,7 +630,7 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\t\tPMD_TX_FREE_LOG(DEBUG,\n \t\t\t\t\t\"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\t\"(port=%d queue=%d)\\n\",\n \t\t\t\t\tnb_used, txq->nb_tx_free,\n \t\t\t\t\ttxq->port_id, txq->queue_id);\n \n@@ -650,7 +650,7 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\t\t\t\t\"performance.\"\n \t\t\t\t\t\"nb_used=%4u nb_free=%4u \"\n \t\t\t\t\t\"tx_rs_thresh=%4u. \"\n-\t\t\t\t\t\"(port=%d queue=%d)\",\n+\t\t\t\t\t\"(port=%d queue=%d)\\n\",\n \t\t\t\t\tnb_used, txq->nb_tx_free,\n \t\t\t\t\ttxq->tx_rs_thresh,\n \t\t\t\t\ttxq->port_id, txq->queue_id);\n@@ -782,7 +782,7 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\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\t\t\t\"%4u (port=%d queue=%d)\\n\",\n \t\t\t\t\ttx_last, txq->port_id, txq->queue_id);\n \n \t\t\tcmd_type_len |= IXGBE_TXD_CMD_RS;\n@@ -798,7 +798,7 @@ end_of_tx:\n \t/*\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+\tPMD_TX_LOG(DEBUG, \"port_id=%u queue_id=%u tx_tail=%u nb_tx=%u\\n\",\n \t\t (unsigned) txq->port_id, (unsigned) txq->queue_id,\n \t\t (unsigned) tx_id, (unsigned) nb_tx);\n \tIXGBE_PCI_REG_WRITE(txq->tdt_reg_addr, tx_id);\n@@ -1383,7 +1383,7 @@ ixgbe_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\tPMD_RX_LOG(DEBUG, \"port_id=%u queue_id=%u rx_id=%u \"\n \t\t\t \"staterr=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) staterr,\n", "prefixes": [ "dpdk-dev", "01/11" ] }