From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ferruh Yigit Subject: [PATCH v2 2/2] ethdev: convert static logtype usage to dynamic Date: Wed, 9 May 2018 15:24:11 +0100 Message-ID: <20180509142412.294034-2-ferruh.yigit@intel.com> References: <20180501172815.214973-1-ferruh.yigit@intel.com> <20180509142412.294034-1-ferruh.yigit@intel.com> Cc: dev@dpdk.org, Ferruh Yigit To: Thomas Monjalon Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id E4E18548B for ; Wed, 9 May 2018 16:24:24 +0200 (CEST) In-Reply-To: <20180509142412.294034-1-ferruh.yigit@intel.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Replace RTE_PMD_DEBUG_TRACE with RTE_ETHDEV_LOG. RTE_PMD_DEBUG_TRACE is using hardcoded PMD logtype and ERR log level, controlled by compile time flags. RTE_ETHDEV_LOG is using dynamic ethdev_logtype. Also a few minor cleanups, like - use %u for unsigned values like port_id which is uint16_t - use PRIx64 for owner_id - Join some log lines - Unify to not have a "." at the end of the log Signed-off-by: Ferruh Yigit --- lib/librte_ethdev/rte_ethdev.c | 242 ++++++++++++++++++++--------------------- 1 file changed, 119 insertions(+), 123 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index f86b462cf..8ab488323 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -284,8 +284,7 @@ rte_eth_dev_allocate(const char *name) } if (rte_eth_dev_allocated(name) != NULL) { - RTE_ETHDEV_LOG(ERR, - "Ethernet Device with name %s already allocated!", + RTE_ETHDEV_LOG(ERR, "Ethernet Device with name %s already allocated!", name); goto unlock; } @@ -325,8 +324,7 @@ rte_eth_dev_attach_secondary(const char *name) break; } if (i == RTE_MAX_ETHPORTS) { - RTE_PMD_DEBUG_TRACE( - "device %s is not driven by the primary process\n", + RTE_ETHDEV_LOG(ERR, "device %s is not driven by the primary process", name); } else { eth_dev = eth_dev_get(i); @@ -373,7 +371,7 @@ rte_eth_is_valid_owner_id(uint64_t owner_id) { if (owner_id == RTE_ETH_DEV_NO_OWNER || rte_eth_dev_shared_data->next_owner_id <= owner_id) { - RTE_PMD_DEBUG_TRACE("Invalid owner_id=%016lX.\n", owner_id); + RTE_ETHDEV_LOG(ERR, "Invalid owner_id=%"PRIx64, owner_id); return 0; } return 1; @@ -422,21 +420,20 @@ _rte_eth_dev_owner_set(const uint16_t port_id, const uint64_t old_owner_id, port_owner = &rte_eth_devices[port_id].data->owner; if (port_owner->id != old_owner_id) { - RTE_PMD_DEBUG_TRACE("Cannot set owner to port %d already owned" - " by %s_%016lX.\n", port_id, - port_owner->name, port_owner->id); + RTE_ETHDEV_LOG(ERR, "Cannot set owner to port %u already owned by %s_%"PRIx64, + port_id, port_owner->name, port_owner->id); return -EPERM; } sret = snprintf(port_owner->name, RTE_ETH_MAX_OWNER_NAME_LEN, "%s", new_owner->name); if (sret < 0 || sret >= RTE_ETH_MAX_OWNER_NAME_LEN) - RTE_PMD_DEBUG_TRACE("Port %d owner name was truncated.\n", + RTE_ETHDEV_LOG(ERR, "Port %u owner name was truncated", port_id); port_owner->id = new_owner->id; - RTE_PMD_DEBUG_TRACE("Port %d owner is %s_%016lX.\n", port_id, + RTE_ETHDEV_LOG(ERR, "Port %u owner is %s_%"PRIx64, port_id, new_owner->name, new_owner->id); return 0; @@ -488,8 +485,8 @@ rte_eth_dev_owner_delete(const uint64_t owner_id) RTE_ETH_FOREACH_DEV_OWNED_BY(port_id, owner_id) memset(&rte_eth_devices[port_id].data->owner, 0, sizeof(struct rte_eth_dev_owner)); - RTE_PMD_DEBUG_TRACE("All port owners owned by %016X identifier" - " have removed.\n", owner_id); + RTE_ETHDEV_LOG(ERR, "All port owners owned by %"PRIx64" identifier have removed", + owner_id); } rte_spinlock_unlock(&rte_eth_dev_shared_data->ownership_lock); @@ -505,7 +502,7 @@ rte_eth_dev_owner_get(const uint16_t port_id, struct rte_eth_dev_owner *owner) rte_spinlock_lock(&rte_eth_dev_shared_data->ownership_lock); if (!rte_eth_dev_is_valid_port(port_id)) { - RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_ETHDEV_LOG(ERR, "Invalid port_id=%u", port_id); ret = -ENODEV; } else { rte_memcpy(owner, &rte_eth_devices[port_id].data->owner, @@ -570,7 +567,7 @@ rte_eth_dev_get_name_by_port(uint16_t port_id, char *name) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL); if (name == NULL) { - RTE_PMD_DEBUG_TRACE("Null pointer is specified\n"); + RTE_ETHDEV_LOG(ERR, "Null pointer is specified"); return -EINVAL; } @@ -587,7 +584,7 @@ rte_eth_dev_get_port_by_name(const char *name, uint16_t *port_id) uint32_t pid; if (name == NULL) { - RTE_PMD_DEBUG_TRACE("Null pointer is specified\n"); + RTE_ETHDEV_LOG(ERR, "Null pointer is specified"); return -EINVAL; } @@ -752,21 +749,21 @@ rte_eth_dev_rx_queue_start(uint16_t port_id, uint16_t rx_queue_id) dev = &rte_eth_devices[port_id]; if (!dev->data->dev_started) { - RTE_PMD_DEBUG_TRACE( - "port %d must be started before start any queue\n", port_id); + RTE_ETHDEV_LOG(ERR, + "port %u must be started before start any queue", port_id); return -EINVAL; } if (rx_queue_id >= dev->data->nb_rx_queues) { - RTE_PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", rx_queue_id); + RTE_ETHDEV_LOG(ERR, "Invalid RX queue_id=%u", rx_queue_id); return -EINVAL; } RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_start, -ENOTSUP); if (dev->data->rx_queue_state[rx_queue_id] != RTE_ETH_QUEUE_STATE_STOPPED) { - RTE_PMD_DEBUG_TRACE("Queue %" PRIu16" of device with port_id=%" PRIu8 - " already started\n", + RTE_ETHDEV_LOG(ERR, "Queue %" PRIu16" of device with port_id=%" PRIu8 + " already started", rx_queue_id, port_id); return 0; } @@ -785,15 +782,15 @@ rte_eth_dev_rx_queue_stop(uint16_t port_id, uint16_t rx_queue_id) dev = &rte_eth_devices[port_id]; if (rx_queue_id >= dev->data->nb_rx_queues) { - RTE_PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", rx_queue_id); + RTE_ETHDEV_LOG(ERR, "Invalid RX queue_id=%u", rx_queue_id); return -EINVAL; } RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_stop, -ENOTSUP); if (dev->data->rx_queue_state[rx_queue_id] == RTE_ETH_QUEUE_STATE_STOPPED) { - RTE_PMD_DEBUG_TRACE("Queue %" PRIu16" of device with port_id=%" PRIu8 - " already stopped\n", + RTE_ETHDEV_LOG(ERR, "Queue %" PRIu16" of device with port_id=%" PRIu8 + " already stopped", rx_queue_id, port_id); return 0; } @@ -811,21 +808,21 @@ rte_eth_dev_tx_queue_start(uint16_t port_id, uint16_t tx_queue_id) dev = &rte_eth_devices[port_id]; if (!dev->data->dev_started) { - RTE_PMD_DEBUG_TRACE( - "port %d must be started before start any queue\n", port_id); + RTE_ETHDEV_LOG(ERR, + "port %u must be started before start any queue", port_id); return -EINVAL; } if (tx_queue_id >= dev->data->nb_tx_queues) { - RTE_PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", tx_queue_id); + RTE_ETHDEV_LOG(ERR, "Invalid TX queue_id=%u", tx_queue_id); return -EINVAL; } RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_start, -ENOTSUP); if (dev->data->tx_queue_state[tx_queue_id] != RTE_ETH_QUEUE_STATE_STOPPED) { - RTE_PMD_DEBUG_TRACE("Queue %" PRIu16" of device with port_id=%" PRIu8 - " already started\n", + RTE_ETHDEV_LOG(ERR, "Queue %" PRIu16" of device with port_id=%" PRIu8 + " already started", tx_queue_id, port_id); return 0; } @@ -844,15 +841,15 @@ rte_eth_dev_tx_queue_stop(uint16_t port_id, uint16_t tx_queue_id) dev = &rte_eth_devices[port_id]; if (tx_queue_id >= dev->data->nb_tx_queues) { - RTE_PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", tx_queue_id); + RTE_ETHDEV_LOG(ERR, "Invalid TX queue_id=%u", tx_queue_id); return -EINVAL; } RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_stop, -ENOTSUP); if (dev->data->tx_queue_state[tx_queue_id] == RTE_ETH_QUEUE_STATE_STOPPED) { - RTE_PMD_DEBUG_TRACE("Queue %" PRIu16" of device with port_id=%" PRIu8 - " already stopped\n", + RTE_ETHDEV_LOG(ERR, "Queue %" PRIu16" of device with port_id=%" PRIu8 + " already stopped", tx_queue_id, port_id); return 0; } @@ -1043,15 +1040,15 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, } if (nb_rx_q > RTE_MAX_QUEUES_PER_PORT) { - RTE_PMD_DEBUG_TRACE( - "Number of RX queues requested (%u) is greater than max supported(%d)\n", + RTE_ETHDEV_LOG(ERR, + "Number of RX queues requested (%u) is greater than max supported(%d)", nb_rx_q, RTE_MAX_QUEUES_PER_PORT); return -EINVAL; } if (nb_tx_q > RTE_MAX_QUEUES_PER_PORT) { - RTE_PMD_DEBUG_TRACE( - "Number of TX queues requested (%u) is greater than max supported(%d)\n", + RTE_ETHDEV_LOG(ERR, + "Number of TX queues requested (%u) is greater than max supported(%d)", nb_tx_q, RTE_MAX_QUEUES_PER_PORT); return -EINVAL; } @@ -1060,8 +1057,8 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_configure, -ENOTSUP); if (dev->data->dev_started) { - RTE_PMD_DEBUG_TRACE( - "port %d must be stopped to allow configuration\n", port_id); + RTE_ETHDEV_LOG(ERR, + "port %u must be stopped to allow configuration", port_id); return -EBUSY; } @@ -1082,13 +1079,13 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, * configured device. */ if (nb_rx_q > dev_info.max_rx_queues) { - RTE_PMD_DEBUG_TRACE("ethdev port_id=%d nb_rx_queues=%d > %d\n", + RTE_ETHDEV_LOG(ERR, "ethdev port_id=%u nb_rx_queues=%d > %d", port_id, nb_rx_q, dev_info.max_rx_queues); return -EINVAL; } if (nb_tx_q > dev_info.max_tx_queues) { - RTE_PMD_DEBUG_TRACE("ethdev port_id=%d nb_tx_queues=%d > %d\n", + RTE_ETHDEV_LOG(ERR, "ethdev port_id=%d nb_tx_queues=%d > %d\n", port_id, nb_tx_q, dev_info.max_tx_queues); return -EINVAL; } @@ -1096,13 +1093,13 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, /* Check that the device supports requested interrupts */ if ((dev_conf->intr_conf.lsc == 1) && (!(dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC))) { - RTE_PMD_DEBUG_TRACE("driver %s does not support lsc\n", + RTE_ETHDEV_LOG(ERR, "driver %s does not support lsc", dev->device->driver->name); return -EINVAL; } if ((dev_conf->intr_conf.rmv == 1) && (!(dev->data->dev_flags & RTE_ETH_DEV_INTR_RMV))) { - RTE_PMD_DEBUG_TRACE("driver %s does not support rmv\n", + RTE_ETHDEV_LOG(ERR, "driver %s does not support rmv", dev->device->driver->name); return -EINVAL; } @@ -1114,15 +1111,15 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, if (local_conf.rxmode.offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) { if (dev_conf->rxmode.max_rx_pkt_len > dev_info.max_rx_pktlen) { - RTE_PMD_DEBUG_TRACE("ethdev port_id=%d max_rx_pkt_len %u" - " > max valid value %u\n", + RTE_ETHDEV_LOG(ERR, "ethdev port_id=%u max_rx_pkt_len %u" + " > max valid value %u", port_id, (unsigned)dev_conf->rxmode.max_rx_pkt_len, (unsigned)dev_info.max_rx_pktlen); return -EINVAL; } else if (dev_conf->rxmode.max_rx_pkt_len < ETHER_MIN_LEN) { - RTE_PMD_DEBUG_TRACE("ethdev port_id=%d max_rx_pkt_len %u" - " < min valid value %u\n", + RTE_ETHDEV_LOG(ERR, "ethdev port_id=%u max_rx_pkt_len %u" + " < min valid value %u", port_id, (unsigned)dev_conf->rxmode.max_rx_pkt_len, (unsigned)ETHER_MIN_LEN); @@ -1140,8 +1137,8 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, if ((dev_info.flow_type_rss_offloads | dev_conf->rx_adv_conf.rss_conf.rss_hf) != dev_info.flow_type_rss_offloads) { - RTE_PMD_DEBUG_TRACE("ethdev port_id=%d invalid rss_hf: " - "0x%"PRIx64", valid value: 0x%"PRIx64"\n", + RTE_ETHDEV_LOG(ERR, "ethdev port_id=%u invalid rss_hf: " + "0x%"PRIx64", valid value: 0x%"PRIx64, port_id, dev_conf->rx_adv_conf.rss_conf.rss_hf, dev_info.flow_type_rss_offloads); @@ -1152,14 +1149,14 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, */ diag = rte_eth_dev_rx_queue_config(dev, nb_rx_q); if (diag != 0) { - RTE_PMD_DEBUG_TRACE("port%d rte_eth_dev_rx_queue_config = %d\n", + RTE_ETHDEV_LOG(ERR, "port%u rte_eth_dev_rx_queue_config = %d", port_id, diag); return diag; } diag = rte_eth_dev_tx_queue_config(dev, nb_tx_q); if (diag != 0) { - RTE_PMD_DEBUG_TRACE("port%d rte_eth_dev_tx_queue_config = %d\n", + RTE_ETHDEV_LOG(ERR, "port%u rte_eth_dev_tx_queue_config = %d", port_id, diag); rte_eth_dev_rx_queue_config(dev, 0); return diag; @@ -1167,8 +1164,7 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, diag = (*dev->dev_ops->dev_configure)(dev); if (diag != 0) { - RTE_PMD_DEBUG_TRACE("port%d dev_configure = %d\n", - port_id, diag); + RTE_ETHDEV_LOG(ERR, "port%u dev_configure = %d", port_id, diag); rte_eth_dev_rx_queue_config(dev, 0); rte_eth_dev_tx_queue_config(dev, 0); return eth_err(port_id, diag); @@ -1177,7 +1173,7 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, /* Initialize Rx profiling if enabled at compilation time. */ diag = __rte_eth_profile_rx_init(port_id, dev); if (diag != 0) { - RTE_PMD_DEBUG_TRACE("port%d __rte_eth_profile_rx_init = %d\n", + RTE_ETHDEV_LOG(ERR, "port%u __rte_eth_profile_rx_init = %d", port_id, diag); rte_eth_dev_rx_queue_config(dev, 0); rte_eth_dev_tx_queue_config(dev, 0); @@ -1191,8 +1187,8 @@ void _rte_eth_dev_reset(struct rte_eth_dev *dev) { if (dev->data->dev_started) { - RTE_PMD_DEBUG_TRACE( - "port %d must be stopped to allow reset\n", + RTE_ETHDEV_LOG(ERR, + "port %u must be stopped to allow reset", dev->data->port_id); return; } @@ -1271,8 +1267,7 @@ rte_eth_dev_start(uint16_t port_id) RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_start, -ENOTSUP); if (dev->data->dev_started != 0) { - RTE_PMD_DEBUG_TRACE("Device with port_id=%" PRIu16 - " already started\n", + RTE_ETHDEV_LOG(ERR, "Device with port_id=%" PRIu16 " already started", port_id); return 0; } @@ -1303,8 +1298,7 @@ rte_eth_dev_stop(uint16_t port_id) RTE_FUNC_PTR_OR_RET(*dev->dev_ops->dev_stop); if (dev->data->dev_started == 0) { - RTE_PMD_DEBUG_TRACE("Device with port_id=%" PRIu16 - " already stopped\n", + RTE_ETHDEV_LOG(ERR, "Device with port_id=%" PRIu16 " already stopped", port_id); return; } @@ -1416,7 +1410,7 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, dev = &rte_eth_devices[port_id]; if (rx_queue_id >= dev->data->nb_rx_queues) { - RTE_PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", rx_queue_id); + RTE_ETHDEV_LOG(ERR, "Invalid RX queue_id=%u", rx_queue_id); return -EINVAL; } @@ -1430,7 +1424,7 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, */ rte_eth_dev_info_get(port_id, &dev_info); if (mp->private_data_size < sizeof(struct rte_pktmbuf_pool_private)) { - RTE_PMD_DEBUG_TRACE("%s private_data_size %d < %d\n", + RTE_ETHDEV_LOG(ERR, "%s private_data_size %d < %d", mp->name, (int) mp->private_data_size, (int) sizeof(struct rte_pktmbuf_pool_private)); return -ENOSPC; @@ -1438,9 +1432,9 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, mbp_buf_size = rte_pktmbuf_data_room_size(mp); if ((mbp_buf_size - RTE_PKTMBUF_HEADROOM) < dev_info.min_rx_bufsize) { - RTE_PMD_DEBUG_TRACE("%s mbuf_data_room_size %d < %d " + RTE_ETHDEV_LOG(ERR, "%s mbuf_data_room_size %d < %d " "(RTE_PKTMBUF_HEADROOM=%d + min_rx_bufsize(dev)" - "=%d)\n", + "=%d)", mp->name, (int)mbp_buf_size, (int)(RTE_PKTMBUF_HEADROOM + @@ -1462,8 +1456,8 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, nb_rx_desc < dev_info.rx_desc_lim.nb_min || nb_rx_desc % dev_info.rx_desc_lim.nb_align != 0) { - RTE_PMD_DEBUG_TRACE("Invalid value for nb_rx_desc(=%hu), " - "should be: <= %hu, = %hu, and a product of %hu\n", + RTE_ETHDEV_LOG(ERR, "Invalid value for nb_rx_desc(=%hu), " + "should be: <= %hu, = %hu, and a product of %hu", nb_rx_desc, dev_info.rx_desc_lim.nb_max, dev_info.rx_desc_lim.nb_min, @@ -1575,7 +1569,7 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id, dev = &rte_eth_devices[port_id]; if (tx_queue_id >= dev->data->nb_tx_queues) { - RTE_PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", tx_queue_id); + RTE_ETHDEV_LOG(ERR, "Invalid TX queue_id=%u", tx_queue_id); return -EINVAL; } @@ -1594,8 +1588,8 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id, if (nb_tx_desc > dev_info.tx_desc_lim.nb_max || nb_tx_desc < dev_info.tx_desc_lim.nb_min || nb_tx_desc % dev_info.tx_desc_lim.nb_align != 0) { - RTE_PMD_DEBUG_TRACE("Invalid value for nb_tx_desc(=%hu), " - "should be: <= %hu, = %hu, and a product of %hu\n", + RTE_ETHDEV_LOG(ERR, "Invalid value for nb_tx_desc(=%hu), " + "should be: <= %hu, = %hu, and a product of %hu", nb_tx_desc, dev_info.tx_desc_lim.nb_max, dev_info.tx_desc_lim.nb_min, @@ -1894,19 +1888,19 @@ rte_eth_xstats_get_id_by_name(uint16_t port_id, const char *xstat_name, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); if (!id) { - RTE_PMD_DEBUG_TRACE("Error: id pointer is NULL\n"); + RTE_ETHDEV_LOG(ERR, "id pointer is NULL"); return -ENOMEM; } if (!xstat_name) { - RTE_PMD_DEBUG_TRACE("Error: xstat_name pointer is NULL\n"); + RTE_ETHDEV_LOG(ERR, "xstat_name pointer is NULL"); return -ENOMEM; } /* Get count */ cnt_xstats = rte_eth_xstats_get_names_by_id(port_id, NULL, 0, NULL); if (cnt_xstats < 0) { - RTE_PMD_DEBUG_TRACE("Error: Cannot get count of xstats\n"); + RTE_ETHDEV_LOG(ERR, "Cannot get count of xstats"); return -ENODEV; } @@ -1915,7 +1909,7 @@ rte_eth_xstats_get_id_by_name(uint16_t port_id, const char *xstat_name, if (cnt_xstats != rte_eth_xstats_get_names_by_id( port_id, xstats_names, cnt_xstats, NULL)) { - RTE_PMD_DEBUG_TRACE("Error: Cannot get xstats lookup\n"); + RTE_ETHDEV_LOG(ERR, "Cannot get xstats lookup"); return -1; } @@ -2038,7 +2032,7 @@ rte_eth_xstats_get_names_by_id(uint16_t port_id, sizeof(struct rte_eth_xstat_name)); if (!xstats_names_copy) { - RTE_PMD_DEBUG_TRACE("ERROR: can't allocate memory"); + RTE_ETHDEV_LOG(ERR, "can't allocate memory"); return -ENOMEM; } @@ -2066,7 +2060,7 @@ rte_eth_xstats_get_names_by_id(uint16_t port_id, /* Filter stats */ for (i = 0; i < size; i++) { if (ids[i] >= expected_entries) { - RTE_PMD_DEBUG_TRACE("ERROR: id value isn't valid\n"); + RTE_ETHDEV_LOG(ERR, "id value isn't valid"); free(xstats_names_copy); return -1; } @@ -2251,7 +2245,7 @@ rte_eth_xstats_get_by_id(uint16_t port_id, const uint64_t *ids, /* Filter stats */ for (i = 0; i < size; i++) { if (ids[i] >= expected_entries) { - RTE_PMD_DEBUG_TRACE("ERROR: id value isn't valid\n"); + RTE_ETHDEV_LOG(ERR, "id value isn't valid"); return -1; } values[i] = xstats[ids[i]].value; @@ -2483,13 +2477,14 @@ rte_eth_dev_vlan_filter(uint16_t port_id, uint16_t vlan_id, int on) dev = &rte_eth_devices[port_id]; if (!(dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_VLAN_FILTER)) { - RTE_PMD_DEBUG_TRACE("port %d: vlan-filtering disabled\n", port_id); + RTE_ETHDEV_LOG(ERR, "port %u: vlan-filtering disabled", + port_id); return -ENOSYS; } if (vlan_id > 4095) { - RTE_PMD_DEBUG_TRACE("(port_id=%d) invalid vlan_id=%u > 4095\n", - port_id, (unsigned) vlan_id); + RTE_ETHDEV_LOG(ERR, "(port_id=%u) invalid vlan_id=%u > 4095", + port_id, vlan_id); return -EINVAL; } RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_filter_set, -ENOTSUP); @@ -2522,7 +2517,7 @@ rte_eth_dev_set_vlan_strip_on_queue(uint16_t port_id, uint16_t rx_queue_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; if (rx_queue_id >= dev->data->nb_rx_queues) { - RTE_PMD_DEBUG_TRACE("Invalid rx_queue_id=%d\n", port_id); + RTE_ETHDEV_LOG(ERR, "Invalid rx_queue_id=%u", rx_queue_id); return -EINVAL; } @@ -2671,7 +2666,7 @@ rte_eth_dev_flow_ctrl_set(uint16_t port_id, struct rte_eth_fc_conf *fc_conf) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); if ((fc_conf->send_xon != 0) && (fc_conf->send_xon != 1)) { - RTE_PMD_DEBUG_TRACE("Invalid send_xon, only 0/1 allowed\n"); + RTE_ETHDEV_LOG(ERR, "Invalid send_xon, only 0/1 allowed"); return -EINVAL; } @@ -2688,7 +2683,7 @@ rte_eth_dev_priority_flow_ctrl_set(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); if (pfc_conf->priority > (ETH_DCB_NUM_USER_PRIORITIES - 1)) { - RTE_PMD_DEBUG_TRACE("Invalid priority, only 0-7 allowed\n"); + RTE_ETHDEV_LOG(ERR, "Invalid priority, only 0-7 allowed"); return -EINVAL; } @@ -2729,7 +2724,7 @@ rte_eth_check_reta_entry(struct rte_eth_rss_reta_entry64 *reta_conf, return -EINVAL; if (max_rxq == 0) { - RTE_PMD_DEBUG_TRACE("No receive queue is available\n"); + RTE_ETHDEV_LOG(ERR, "No receive queue is available"); return -EINVAL; } @@ -2738,8 +2733,8 @@ rte_eth_check_reta_entry(struct rte_eth_rss_reta_entry64 *reta_conf, shift = i % RTE_RETA_GROUP_SIZE; if ((reta_conf[idx].mask & (1ULL << shift)) && (reta_conf[idx].reta[shift] >= max_rxq)) { - RTE_PMD_DEBUG_TRACE("reta_conf[%u]->reta[%u]: %u exceeds " - "the maximum rxq index: %u\n", idx, shift, + RTE_ETHDEV_LOG(ERR, "reta_conf[%u]->reta[%u]: %u exceeds " + "the maximum rxq index: %u", idx, shift, reta_conf[idx].reta[shift], max_rxq); return -EINVAL; } @@ -2808,8 +2803,8 @@ rte_eth_dev_rss_hash_update(uint16_t port_id, rte_eth_dev_info_get(port_id, &dev_info); if ((dev_info.flow_type_rss_offloads | rss_conf->rss_hf) != dev_info.flow_type_rss_offloads) { - RTE_PMD_DEBUG_TRACE("ethdev port_id=%d invalid rss_hf: " - "0x%"PRIx64", valid value: 0x%"PRIx64"\n", + RTE_ETHDEV_LOG(ERR, "ethdev port_id=%u invalid rss_hf: " + "0x%"PRIx64", valid value: 0x%"PRIx64, port_id, rss_conf->rss_hf, dev_info.flow_type_rss_offloads); @@ -2840,12 +2835,12 @@ rte_eth_dev_udp_tunnel_port_add(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); if (udp_tunnel == NULL) { - RTE_PMD_DEBUG_TRACE("Invalid udp_tunnel parameter\n"); + RTE_ETHDEV_LOG(ERR, "Invalid udp_tunnel parameter"); return -EINVAL; } if (udp_tunnel->prot_type >= RTE_TUNNEL_TYPE_MAX) { - RTE_PMD_DEBUG_TRACE("Invalid tunnel type\n"); + RTE_ETHDEV_LOG(ERR, "Invalid tunnel type"); return -EINVAL; } @@ -2865,12 +2860,12 @@ rte_eth_dev_udp_tunnel_port_delete(uint16_t port_id, dev = &rte_eth_devices[port_id]; if (udp_tunnel == NULL) { - RTE_PMD_DEBUG_TRACE("Invalid udp_tunnel parameter\n"); + RTE_ETHDEV_LOG(ERR, "Invalid udp_tunnel parameter"); return -EINVAL; } if (udp_tunnel->prot_type >= RTE_TUNNEL_TYPE_MAX) { - RTE_PMD_DEBUG_TRACE("Invalid tunnel type\n"); + RTE_ETHDEV_LOG(ERR, "Invalid tunnel type"); return -EINVAL; } @@ -2938,12 +2933,12 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct ether_addr *addr, RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mac_addr_add, -ENOTSUP); if (is_zero_ether_addr(addr)) { - RTE_PMD_DEBUG_TRACE("port %d: Cannot add NULL MAC address\n", + RTE_ETHDEV_LOG(ERR, "port %u: Cannot add NULL MAC address", port_id); return -EINVAL; } if (pool >= ETH_64_POOLS) { - RTE_PMD_DEBUG_TRACE("pool id must be 0-%d\n", ETH_64_POOLS - 1); + RTE_ETHDEV_LOG(ERR, "pool id must be 0-%d", ETH_64_POOLS - 1); return -EINVAL; } @@ -2951,7 +2946,7 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct ether_addr *addr, if (index < 0) { index = get_mac_addr_index(port_id, &null_mac_addr); if (index < 0) { - RTE_PMD_DEBUG_TRACE("port %d: MAC address array full\n", + RTE_ETHDEV_LOG(ERR, "port %u: MAC address array full", port_id); return -ENOSPC; } @@ -2989,7 +2984,8 @@ rte_eth_dev_mac_addr_remove(uint16_t port_id, struct ether_addr *addr) index = get_mac_addr_index(port_id, addr); if (index == 0) { - RTE_PMD_DEBUG_TRACE("port %d: Cannot remove default MAC address\n", port_id); + RTE_ETHDEV_LOG(ERR, "port %u: Cannot remove default MAC address", + port_id); return -EADDRINUSE; } else if (index < 0) return 0; /* Do nothing if address wasn't found */ @@ -3066,7 +3062,7 @@ rte_eth_dev_uc_hash_table_set(uint16_t port_id, struct ether_addr *addr, dev = &rte_eth_devices[port_id]; if (is_zero_ether_addr(addr)) { - RTE_PMD_DEBUG_TRACE("port %d: Cannot add NULL MAC address\n", + RTE_ETHDEV_LOG(ERR, "port %u: Cannot add NULL MAC address", port_id); return -EINVAL; } @@ -3078,14 +3074,14 @@ rte_eth_dev_uc_hash_table_set(uint16_t port_id, struct ether_addr *addr, if (index < 0) { if (!on) { - RTE_PMD_DEBUG_TRACE("port %d: the MAC address was not " - "set in UTA\n", port_id); + RTE_ETHDEV_LOG(ERR, "port %u: the MAC address was not set in UTA", + port_id); return -EINVAL; } index = get_hash_mac_addr_index(port_id, &null_mac_addr); if (index < 0) { - RTE_PMD_DEBUG_TRACE("port %d: MAC address array full\n", + RTE_ETHDEV_LOG(ERR, "port %u: MAC address array full", port_id); return -ENOSPC; } @@ -3134,14 +3130,14 @@ int rte_eth_set_queue_rate_limit(uint16_t port_id, uint16_t queue_idx, link = dev->data->dev_link; if (queue_idx > dev_info.max_tx_queues) { - RTE_PMD_DEBUG_TRACE("set queue rate limit:port %d: " - "invalid queue id=%d\n", port_id, queue_idx); + RTE_ETHDEV_LOG(ERR, "set queue rate limit:port %u: invalid queue id=%u", + port_id, queue_idx); return -EINVAL; } if (tx_rate > link.link_speed) { - RTE_PMD_DEBUG_TRACE("set queue rate limit:invalid tx_rate=%d, " - "bigger than link speed= %d\n", + RTE_ETHDEV_LOG(ERR, "set queue rate limit:invalid tx_rate=%d, " + "bigger than link speed= %d", tx_rate, link.link_speed); return -EINVAL; } @@ -3160,12 +3156,12 @@ rte_eth_mirror_rule_set(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); if (mirror_conf->rule_type == 0) { - RTE_PMD_DEBUG_TRACE("mirror rule type can not be 0.\n"); + RTE_ETHDEV_LOG(ERR, "mirror rule type can not be 0"); return -EINVAL; } if (mirror_conf->dst_pool >= ETH_64_POOLS) { - RTE_PMD_DEBUG_TRACE("Invalid dst pool, pool id must be 0-%d\n", + RTE_ETHDEV_LOG(ERR, "Invalid dst pool, pool id must be 0-%d", ETH_64_POOLS - 1); return -EINVAL; } @@ -3173,13 +3169,13 @@ rte_eth_mirror_rule_set(uint16_t port_id, if ((mirror_conf->rule_type & (ETH_MIRROR_VIRTUAL_POOL_UP | ETH_MIRROR_VIRTUAL_POOL_DOWN)) && (mirror_conf->pool_mask == 0)) { - RTE_PMD_DEBUG_TRACE("Invalid mirror pool, pool mask can not be 0.\n"); + RTE_ETHDEV_LOG(ERR, "Invalid mirror pool, pool mask can not be 0"); return -EINVAL; } if ((mirror_conf->rule_type & ETH_MIRROR_VLAN) && mirror_conf->vlan.vlan_mask == 0) { - RTE_PMD_DEBUG_TRACE("Invalid vlan mask, vlan mask can not be 0.\n"); + RTE_ETHDEV_LOG(ERR, "Invalid vlan mask, vlan mask can not be 0"); return -EINVAL; } @@ -3226,7 +3222,7 @@ rte_eth_dev_callback_register(uint16_t port_id, return -EINVAL; if (!rte_eth_dev_is_valid_port(port_id) && port_id != RTE_ETH_ALL) { - RTE_ETHDEV_LOG(ERR, "Invalid port_id=%d", port_id); + RTE_ETHDEV_LOG(ERR, "Invalid port_id=%u", port_id); return -EINVAL; } @@ -3289,7 +3285,7 @@ rte_eth_dev_callback_unregister(uint16_t port_id, return -EINVAL; if (!rte_eth_dev_is_valid_port(port_id) && port_id != RTE_ETH_ALL) { - RTE_ETHDEV_LOG(ERR, "Invalid port_id=%d", port_id); + RTE_ETHDEV_LOG(ERR, "Invalid port_id=%u", port_id); return -EINVAL; } @@ -3372,13 +3368,13 @@ rte_eth_dev_rx_intr_ctl(uint16_t port_id, int epfd, int op, void *data) dev = &rte_eth_devices[port_id]; if (!dev->intr_handle) { - RTE_PMD_DEBUG_TRACE("RX Intr handle unset\n"); + RTE_ETHDEV_LOG(ERR, "RX Intr handle unset"); return -ENOTSUP; } intr_handle = dev->intr_handle; if (!intr_handle->intr_vec) { - RTE_PMD_DEBUG_TRACE("RX Intr vector unset\n"); + RTE_ETHDEV_LOG(ERR, "RX Intr vector unset"); return -EPERM; } @@ -3386,8 +3382,8 @@ rte_eth_dev_rx_intr_ctl(uint16_t port_id, int epfd, int op, void *data) vec = intr_handle->intr_vec[qid]; rc = rte_intr_rx_ctl(intr_handle, epfd, op, vec, data); if (rc && rc != -EEXIST) { - RTE_PMD_DEBUG_TRACE("p %u q %u rx ctl error" - " op %d epfd %d vec %u\n", + RTE_ETHDEV_LOG(ERR, "p %u q %u rx ctl error" + " op %d epfd %d vec %u", port_id, qid, op, epfd, vec); } } @@ -3521,26 +3517,26 @@ rte_eth_dev_rx_intr_ctl_q(uint16_t port_id, uint16_t queue_id, dev = &rte_eth_devices[port_id]; if (queue_id >= dev->data->nb_rx_queues) { - RTE_PMD_DEBUG_TRACE("Invalid RX queue_id=%u\n", queue_id); + RTE_ETHDEV_LOG(ERR, "Invalid RX queue_id=%u", queue_id); return -EINVAL; } if (!dev->intr_handle) { - RTE_PMD_DEBUG_TRACE("RX Intr handle unset\n"); + RTE_ETHDEV_LOG(ERR, "RX Intr handle unset"); return -ENOTSUP; } intr_handle = dev->intr_handle; if (!intr_handle->intr_vec) { - RTE_PMD_DEBUG_TRACE("RX Intr vector unset\n"); + RTE_ETHDEV_LOG(ERR, "RX Intr vector unset"); return -EPERM; } vec = intr_handle->intr_vec[queue_id]; rc = rte_intr_rx_ctl(intr_handle, epfd, op, vec, data); if (rc && rc != -EEXIST) { - RTE_PMD_DEBUG_TRACE("p %u q %u rx ctl error" - " op %d epfd %d vec %u\n", + RTE_ETHDEV_LOG(ERR, "p %u q %u rx ctl error" + " op %d epfd %d vec %u", port_id, queue_id, op, epfd, vec); return rc; } @@ -3808,7 +3804,7 @@ rte_eth_rx_queue_info_get(uint16_t port_id, uint16_t queue_id, dev = &rte_eth_devices[port_id]; if (queue_id >= dev->data->nb_rx_queues) { - RTE_PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", queue_id); + RTE_ETHDEV_LOG(ERR, "Invalid RX queue_id=%d\n", queue_id); return -EINVAL; } @@ -3833,7 +3829,7 @@ rte_eth_tx_queue_info_get(uint16_t port_id, uint16_t queue_id, dev = &rte_eth_devices[port_id]; if (queue_id >= dev->data->nb_tx_queues) { - RTE_PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", queue_id); + RTE_ETHDEV_LOG(ERR, "Invalid TX queue_id=%u", queue_id); return -EINVAL; } @@ -4050,12 +4046,12 @@ rte_eth_dev_l2_tunnel_eth_type_conf(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); if (l2_tunnel == NULL) { - RTE_PMD_DEBUG_TRACE("Invalid l2_tunnel parameter\n"); + RTE_ETHDEV_LOG(ERR, "Invalid l2_tunnel parameter"); return -EINVAL; } if (l2_tunnel->l2_tunnel_type >= RTE_TUNNEL_TYPE_MAX) { - RTE_PMD_DEBUG_TRACE("Invalid tunnel type\n"); + RTE_ETHDEV_LOG(ERR, "Invalid tunnel type"); return -EINVAL; } @@ -4077,17 +4073,17 @@ rte_eth_dev_l2_tunnel_offload_set(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); if (l2_tunnel == NULL) { - RTE_PMD_DEBUG_TRACE("Invalid l2_tunnel parameter\n"); + RTE_ETHDEV_LOG(ERR, "Invalid l2_tunnel parameter"); return -EINVAL; } if (l2_tunnel->l2_tunnel_type >= RTE_TUNNEL_TYPE_MAX) { - RTE_PMD_DEBUG_TRACE("Invalid tunnel type.\n"); + RTE_ETHDEV_LOG(ERR, "Invalid tunnel type"); return -EINVAL; } if (mask == 0) { - RTE_PMD_DEBUG_TRACE("Mask should have a value.\n"); + RTE_ETHDEV_LOG(ERR, "Mask should have a value"); return -EINVAL; } -- 2.14.3