From patchwork Thu Feb 2 22:33:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wiles, Keith" X-Patchwork-Id: 20138 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 99967D592; Thu, 2 Feb 2017 23:34:51 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id E85FF2C39 for ; Thu, 2 Feb 2017 23:34:08 +0100 (CET) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP; 02 Feb 2017 14:34:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,326,1477983600"; d="scan'208";a="38993026" Received: from rkitson-mobl2.amr.corp.intel.com ([10.252.141.150]) by orsmga002.jf.intel.com with ESMTP; 02 Feb 2017 14:34:06 -0800 From: Keith Wiles To: dev@dpdk.org Cc: pascal.mazon@6wind.com Date: Thu, 2 Feb 2017 16:33:29 -0600 Message-Id: <20170202223330.39240-4-keith.wiles@intel.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20170202223330.39240-1-keith.wiles@intel.com> References: <20170202223330.39240-1-keith.wiles@intel.com> Subject: [dpdk-dev] [PATCH 4/5] net/tap: fix up log message to correct channel X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Keith Wiles Acked-by: Pascal Mazon --- drivers/net/tap/rte_eth_tap.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 6673182..4f7eacf 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -167,7 +167,7 @@ tun_alloc(char *name, uint16_t qid) /* Set the TUN/TAP configuration and get the name if needed */ if (ioctl(fd, TUNSETIFF, (void *)&ifr) < 0) { - RTE_LOG(ERR, PMD, "Unable to set TUNSETIFF for %s\n", + RTE_LOG(WARNING, PMD, "Unable to set TUNSETIFF for %s\n", ifr.ifr_name); perror("TUNSETIFF"); goto error; @@ -206,7 +206,7 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) /* allocate the next mbuf */ mbuf = rte_pktmbuf_alloc(rxq->mp); if (unlikely(!mbuf)) { - RTE_LOG(WARNING, PMD, "Unable to allocate mbuf\n"); + RTE_LOG(WARNING, PMD, "TAP unable to allocate mbuf\n"); break; } @@ -559,8 +559,8 @@ tap_rx_queue_setup(struct rte_eth_dev *dev, int fd; if ((rx_queue_id >= internals->nb_queues) || !mp) { - RTE_LOG(ERR, PMD, "nb_queues %d mp %p\n", - internals->nb_queues, mp); + RTE_LOG(WARNING, PMD, "nb_queues %d too small or mempool NULL\n", + internals->nb_queues); return -1; } @@ -572,7 +572,7 @@ tap_rx_queue_setup(struct rte_eth_dev *dev, RTE_PKTMBUF_HEADROOM); if (buf_size < ETH_FRAME_LEN) { - RTE_LOG(ERR, PMD, + RTE_LOG(WARNING, PMD, "%s: %d bytes will not fit in mbuf (%d bytes)\n", dev->data->name, ETH_FRAME_LEN, buf_size); return -ENOMEM; @@ -582,7 +582,7 @@ tap_rx_queue_setup(struct rte_eth_dev *dev, if (fd == -1) return -1; - RTE_LOG(INFO, PMD, "RX TAP device name %s, qid %d on fd %d\n", + RTE_LOG(DEBUG, PMD, " RX TAP device name %s, qid %d on fd %d\n", internals->name, rx_queue_id, internals->rxq[rx_queue_id].fd); return 0; @@ -605,7 +605,7 @@ tap_tx_queue_setup(struct rte_eth_dev *dev, if (ret == -1) return -1; - RTE_LOG(INFO, PMD, "TX TAP device name %s, qid %d on fd %d\n", + RTE_LOG(DEBUG, PMD, " TX TAP device name %s, qid %d on fd %d\n", internals->name, tx_queue_id, internals->txq[tx_queue_id].fd); return 0; @@ -643,7 +643,7 @@ pmd_mac_address(int fd, struct rte_eth_dev *dev, struct ether_addr *addr) memset(&ifr, 0, sizeof(ifr)); if (ioctl(fd, SIOCGIFHWADDR, &ifr) == -1) { - RTE_LOG(ERR, PMD, "ioctl failed (SIOCGIFHWADDR) (%s)\n", + RTE_LOG(WARNING, PMD, "ioctl failed (SIOCGIFHWADDR) (%s)\n", ifr.ifr_name); return -1; } @@ -662,26 +662,25 @@ eth_dev_tap_create(const char *name, char *tap_name) struct rte_eth_dev_data *data = NULL; int i, fd = -1; - RTE_LOG(INFO, PMD, - "%s: Create TAP Ethernet device with %d queues on numa %u\n", - name, RTE_PMD_TAP_MAX_QUEUES, rte_socket_id()); + RTE_LOG(DEBUG, PMD, " TAP device with %d queues on numa %u\n", + RTE_PMD_TAP_MAX_QUEUES, rte_socket_id()); data = rte_zmalloc_socket(tap_name, sizeof(*data), 0, numa_node); if (!data) { - RTE_LOG(ERR, PMD, "Failed to allocate data\n"); + RTE_LOG(ERR, PMD, "TAP Failed to allocate data\n"); goto error_exit; } pmd = rte_zmalloc_socket(tap_name, sizeof(*pmd), 0, numa_node); if (!pmd) { - RTE_LOG(ERR, PMD, "Unable to allocate internal struct\n"); + RTE_LOG(ERR, PMD, "TAP Unable to allocate internal struct\n"); goto error_exit; } /* Use the name and not the tap_name */ dev = rte_eth_dev_allocate(tap_name); if (!dev) { - RTE_LOG(ERR, PMD, "Unable to allocate device struct\n"); + RTE_LOG(ERR, PMD, "TAP Unable to allocate device struct\n"); goto error_exit; } @@ -712,7 +711,7 @@ eth_dev_tap_create(const char *name, char *tap_name) /* Create the first Tap device */ fd = tun_alloc(tap_name, 0); if (fd < 0) { - RTE_LOG(ERR, PMD, "tun_alloc() failed\n"); + RTE_LOG(ERR, PMD, "TAP tun_alloc() failed for %s\n", tap_name); goto error_exit; } @@ -734,7 +733,7 @@ eth_dev_tap_create(const char *name, char *tap_name) return 0; error_exit: - RTE_PMD_DEBUG_TRACE("Unable to initialize %s\n", name); + RTE_LOG(DEBUG, PMD, "TAP Unable to initialize %s\n", name); if (fd > 0) close(fd); @@ -787,7 +786,7 @@ rte_pmd_tap_probe(const char *name, const char *params) DEFAULT_TAP_NAME, tap_unit++); if (params && (params[0] != '\0')) { - RTE_LOG(INFO, PMD, "paramaters (%s)\n", params); + RTE_LOG(DEBUG, PMD, "paramaters (%s)\n", params); kvlist = rte_kvargs_parse(params, valid_arguments); if (kvlist) { @@ -812,14 +811,14 @@ rte_pmd_tap_probe(const char *name, const char *params) } pmd_link.link_speed = speed; - RTE_LOG(INFO, PMD, "Initializing pmd_tap for %s as %s\n", + RTE_LOG(NOTICE, PMD, "Initializing pmd_tap for %s as %s\n", name, tap_name); ret = eth_dev_tap_create(name, tap_name); leave: if (ret == -1) { - RTE_LOG(INFO, PMD, "Failed to create pmd for %s as %s\n", + RTE_LOG(ERR, PMD, "Failed to create pmd for %s as %s\n", name, tap_name); tap_unit--; /* Restore the unit number */ } @@ -837,7 +836,7 @@ rte_pmd_tap_remove(const char *name) struct pmd_internals *internals; int i; - RTE_LOG(INFO, PMD, "Closing TUN/TAP Ethernet device on numa %u\n", + RTE_LOG(DEBUG, PMD, "Closing TUN/TAP Ethernet device on numa %u\n", rte_socket_id()); /* find the ethdev entry */