From patchwork Wed Apr 25 15:56:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 38955 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 [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C9B4EAAA9; Wed, 25 Apr 2018 17:57:20 +0200 (CEST) Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by dpdk.org (Postfix) with ESMTP id B05DA8E82 for ; Wed, 25 Apr 2018 17:57:03 +0200 (CEST) Received: by mail-pf0-f193.google.com with SMTP id h69so15594197pfe.13 for ; Wed, 25 Apr 2018 08:57:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fhSSP3oFlsLKnUh44KQy0XorTXAk0Zcg/5TW0e1v5fQ=; b=T5EYsbtYjohL6ZX2llfy92tl+UH6/u8piRI/O07eRBmuxQqqcZk00Iq86C70ZyjA7L Xy/0peUy7JR8IeMpmqSd3b/1unFsJBn2Bs70GWELPzsPmll9lkLA8B1iSheFH4H8Y5e1 284yRlSyWKijMtcnB4h/XlP69cQnbHI/bE23ofX0XEOT6bZHvOi8WOHu9C6AUsAKVfmz STcrLnvMsMUxro1Zv039Be028NorWCpnrnech0z9DAxnUVVHQVN2FHsWXoyev153CHLP XTxfcxvGfnSaF7+R1pGaHkMIG9pkS6YDu74yd56JxGA0Gi7fx82Nv9OQlP2gD/5N/M1I JbiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fhSSP3oFlsLKnUh44KQy0XorTXAk0Zcg/5TW0e1v5fQ=; b=qV68BsH9FcQa2tZ21pG3ZWrLHv4ZgyOs/MIxe+Oc/ZI2kneLUheU9L89F1dAB4vhHv kokENW3qjYOww3jDaFg0kH2sQdWamT4X+hTkQvhyO0TVDH7jEmbtYOZre39MyGx1nfWD kx0nIEhcNjXmZjSJDcDW1Ba4ejoLS1LHFs/+bhUWRQn1bD8mGyuI4D3EDRDis/zNh2U3 hBPOGrGYc29bmRQOy8+Qn0sQ8j3fzsdin0kHUdNF/8tSJRL89ElwZLM3DVVWGR0K6H66 p1eoVHGe027jlk683F7Rs+OHBOzXKeCObyVs2yIqw7d80FKact6jvQPYtMvUOHMTAv2O /jaA== X-Gm-Message-State: ALQs6tDenPPR8FxS8iCBiFdyb+VYCa/yfqlHGzz2RWhYue9S5hE9D5S2 VgmdnLNeXk4vtjXQhcqgpZp15xkQ1to= X-Google-Smtp-Source: AIpwx4+7IyKPANVA8rmRUH73cqWE1LO28gw1/k0/h5oZLVKl0O6sb0lv4JjjVhuztkl5YpCy8n+0Rg== X-Received: by 10.101.72.1 with SMTP id h1mr22131804pgs.96.1524671822537; Wed, 25 Apr 2018 08:57:02 -0700 (PDT) Received: from xeon-e3.lan (204-195-71-95.wavecable.com. [204.195.71.95]) by smtp.gmail.com with ESMTPSA id y3sm25713924pgc.81.2018.04.25.08.57.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Apr 2018 08:57:01 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 25 Apr 2018 08:56:45 -0700 Message-Id: <20180425155646.3627-10-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180425155646.3627-1-stephen@networkplumber.org> References: <20180425155646.3627-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH next 09/10] net/vhost: implement dynamic logging 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" Use dynamic log type (instead of PMD) in vhost. Signed-off-by: Stephen Hemminger --- drivers/net/vhost/rte_eth_vhost.c | 82 ++++++++++++++++++------------- 1 file changed, 48 insertions(+), 34 deletions(-) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 99a7727a39c0..23231719984d 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -46,6 +46,11 @@ #include "rte_eth_vhost.h" +static int vhost_logtype; + +#define VHOST_LOG(level, ...) \ + rte_log(RTE_LOG_ ## level, vhost_logtype, __VA_ARGS__) + enum {VIRTIO_RXQ, VIRTIO_TXQ, VIRTIO_QNUM}; #define ETH_VHOST_IFACE_ARG "iface" @@ -518,7 +523,7 @@ eth_dev_configure(struct rte_eth_dev *dev __rte_unused) internal->vlan_strip = rxmode->hw_vlan_strip; if (rxmode->hw_vlan_filter) - RTE_LOG(WARNING, PMD, + VHOST_LOG(WARNING, "vhost(%s): vlan filtering not available\n", internal->dev_name); @@ -562,16 +567,16 @@ eth_rxq_intr_enable(struct rte_eth_dev *dev, uint16_t qid) vq = dev->data->rx_queues[qid]; if (!vq) { - RTE_LOG(ERR, PMD, "rxq%d is not setup yet\n", qid); + VHOST_LOG(ERR, "rxq%d is not setup yet\n", qid); return -1; } ret = rte_vhost_get_vhost_vring(vq->vid, (qid << 1) + 1, &vring); if (ret < 0) { - RTE_LOG(ERR, PMD, "Failed to get rxq%d's vring\n", qid); + VHOST_LOG(ERR, "Failed to get rxq%d's vring\n", qid); return ret; } - RTE_LOG(INFO, PMD, "Enable interrupt for rxq%d\n", qid); + VHOST_LOG(INFO, "Enable interrupt for rxq%d\n", qid); rte_vhost_enable_guest_notification(vq->vid, (qid << 1) + 1, 1); rte_wmb(); @@ -587,16 +592,16 @@ eth_rxq_intr_disable(struct rte_eth_dev *dev, uint16_t qid) vq = dev->data->rx_queues[qid]; if (!vq) { - RTE_LOG(ERR, PMD, "rxq%d is not setup yet\n", qid); + VHOST_LOG(ERR, "rxq%d is not setup yet\n", qid); return -1; } ret = rte_vhost_get_vhost_vring(vq->vid, (qid << 1) + 1, &vring); if (ret < 0) { - RTE_LOG(ERR, PMD, "Failed to get rxq%d's vring", qid); + VHOST_LOG(ERR, "Failed to get rxq%d's vring", qid); return ret; } - RTE_LOG(INFO, PMD, "Disable interrupt for rxq%d\n", qid); + VHOST_LOG(INFO, "Disable interrupt for rxq%d\n", qid); rte_vhost_enable_guest_notification(vq->vid, (qid << 1) + 1, 0); rte_wmb(); @@ -633,7 +638,7 @@ eth_vhost_install_intr(struct rte_eth_dev *dev) dev->intr_handle = malloc(sizeof(*dev->intr_handle)); if (!dev->intr_handle) { - RTE_LOG(ERR, PMD, "Fail to allocate intr_handle\n"); + VHOST_LOG(ERR, "Fail to allocate intr_handle\n"); return -ENOMEM; } memset(dev->intr_handle, 0, sizeof(*dev->intr_handle)); @@ -644,36 +649,36 @@ eth_vhost_install_intr(struct rte_eth_dev *dev) malloc(nb_rxq * sizeof(dev->intr_handle->intr_vec[0])); if (!dev->intr_handle->intr_vec) { - RTE_LOG(ERR, PMD, + VHOST_LOG(ERR, "Failed to allocate memory for interrupt vector\n"); free(dev->intr_handle); return -ENOMEM; } - RTE_LOG(INFO, PMD, "Prepare intr vec\n"); + VHOST_LOG(INFO, "Prepare intr vec\n"); for (i = 0; i < nb_rxq; i++) { vq = dev->data->rx_queues[i]; if (!vq) { - RTE_LOG(INFO, PMD, "rxq-%d not setup yet, skip!\n", i); + VHOST_LOG(INFO, "rxq-%d not setup yet, skip!\n", i); continue; } ret = rte_vhost_get_vhost_vring(vq->vid, (i << 1) + 1, &vring); if (ret < 0) { - RTE_LOG(INFO, PMD, + VHOST_LOG(INFO, "Failed to get rxq-%d's vring, skip!\n", i); continue; } if (vring.kickfd < 0) { - RTE_LOG(INFO, PMD, + VHOST_LOG(INFO, "rxq-%d's kickfd is invalid, skip!\n", i); continue; } dev->intr_handle->intr_vec[i] = RTE_INTR_VEC_RXTX_OFFSET + i; dev->intr_handle->efds[i] = vring.kickfd; count++; - RTE_LOG(INFO, PMD, "Installed intr vec for rxq-%d\n", i); + VHOST_LOG(INFO, "Installed intr vec for rxq-%d\n", i); } dev->intr_handle->nb_efd = count; @@ -758,7 +763,7 @@ new_device(int vid) rte_vhost_get_ifname(vid, ifname, sizeof(ifname)); list = find_internal_resource(ifname); if (list == NULL) { - RTE_LOG(INFO, PMD, "Invalid device name: %s\n", ifname); + VHOST_LOG(INFO, "Invalid device name: %s\n", ifname); return -1; } @@ -778,13 +783,13 @@ new_device(int vid) if (dev_conf->intr_conf.rxq) { if (eth_vhost_install_intr(eth_dev) < 0) { - RTE_LOG(INFO, PMD, + VHOST_LOG(INFO, "Failed to install interrupt handler."); return -1; } } } else { - RTE_LOG(INFO, PMD, "RX/TX queues not exist yet\n"); + VHOST_LOG(INFO, "RX/TX queues not exist yet\n"); } for (i = 0; i < rte_vhost_get_vring_num(vid); i++) @@ -797,7 +802,7 @@ new_device(int vid) rte_atomic32_set(&internal->dev_attached, 1); update_queuing_status(eth_dev); - RTE_LOG(INFO, PMD, "Vhost device %d created\n", vid); + VHOST_LOG(INFO, "Vhost device %d created\n", vid); _rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL); @@ -818,7 +823,7 @@ destroy_device(int vid) rte_vhost_get_ifname(vid, ifname, sizeof(ifname)); list = find_internal_resource(ifname); if (list == NULL) { - RTE_LOG(ERR, PMD, "Invalid interface name: %s\n", ifname); + VHOST_LOG(ERR, "Invalid interface name: %s\n", ifname); return; } eth_dev = list->eth_dev; @@ -853,7 +858,7 @@ destroy_device(int vid) state->max_vring = 0; rte_spinlock_unlock(&state->lock); - RTE_LOG(INFO, PMD, "Vhost device %d destroyed\n", vid); + VHOST_LOG(INFO, "Vhost device %d destroyed\n", vid); eth_vhost_uninstall_intr(eth_dev); _rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL); @@ -870,7 +875,7 @@ vring_state_changed(int vid, uint16_t vring, int enable) rte_vhost_get_ifname(vid, ifname, sizeof(ifname)); list = find_internal_resource(ifname); if (list == NULL) { - RTE_LOG(ERR, PMD, "Invalid interface name: %s\n", ifname); + VHOST_LOG(ERR, "Invalid interface name: %s\n", ifname); return -1; } @@ -882,7 +887,7 @@ vring_state_changed(int vid, uint16_t vring, int enable) state->max_vring = RTE_MAX(vring, state->max_vring); rte_spinlock_unlock(&state->lock); - RTE_LOG(INFO, PMD, "vring%u is %s\n", + VHOST_LOG(INFO, "vring%u is %s\n", vring, enable ? "enabled" : "disabled"); _rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_QUEUE_STATE, NULL); @@ -905,13 +910,13 @@ rte_eth_vhost_get_queue_event(uint16_t port_id, int idx; if (port_id >= RTE_MAX_ETHPORTS) { - RTE_LOG(ERR, PMD, "Invalid port id\n"); + VHOST_LOG(ERR, "Invalid port id\n"); return -1; } state = vring_states[port_id]; if (!state) { - RTE_LOG(ERR, PMD, "Unused port\n"); + VHOST_LOG(ERR, "Unused port\n"); return -1; } @@ -973,7 +978,7 @@ eth_dev_start(struct rte_eth_dev *eth_dev) if (rte_atomic32_read(&internal->dev_attached) == 1) { if (dev_conf->intr_conf.rxq) { if (eth_vhost_install_intr(eth_dev) < 0) { - RTE_LOG(INFO, PMD, + VHOST_LOG(INFO, "Failed to install interrupt handler."); return -1; } @@ -1047,7 +1052,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id, vq = rte_zmalloc_socket(NULL, sizeof(struct vhost_queue), RTE_CACHE_LINE_SIZE, socket_id); if (vq == NULL) { - RTE_LOG(ERR, PMD, "Failed to allocate memory for rx queue\n"); + VHOST_LOG(ERR, "Failed to allocate memory for rx queue\n"); return -ENOMEM; } @@ -1069,7 +1074,7 @@ eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id, vq = rte_zmalloc_socket(NULL, sizeof(struct vhost_queue), RTE_CACHE_LINE_SIZE, socket_id); if (vq == NULL) { - RTE_LOG(ERR, PMD, "Failed to allocate memory for tx queue\n"); + VHOST_LOG(ERR, "Failed to allocate memory for tx queue\n"); return -ENOMEM; } @@ -1087,7 +1092,7 @@ eth_dev_info(struct rte_eth_dev *dev, internal = dev->data->dev_private; if (internal == NULL) { - RTE_LOG(ERR, PMD, "Invalid device specified\n"); + VHOST_LOG(ERR, "Invalid device specified\n"); return; } @@ -1234,7 +1239,7 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name, struct rte_vhost_vring_state *vring_state = NULL; struct internal_list *list = NULL; - RTE_LOG(INFO, PMD, "Creating VHOST-USER backend on numa socket %u\n", + VHOST_LOG(INFO, "Creating VHOST-USER backend on numa socket %u\n", numa_node); list = rte_zmalloc_socket(name, sizeof(*list), 0, numa_node); @@ -1296,12 +1301,12 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name, goto error; if (rte_vhost_driver_callback_register(iface_name, &vhost_ops) < 0) { - RTE_LOG(ERR, PMD, "Can't register callbacks\n"); + VHOST_LOG(ERR, "Can't register callbacks\n"); goto error; } if (rte_vhost_driver_start(iface_name) < 0) { - RTE_LOG(ERR, PMD, "Failed to start driver for %s\n", + VHOST_LOG(ERR, "Failed to start driver for %s\n", iface_name); goto error; } @@ -1365,13 +1370,13 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev) struct rte_eth_dev *eth_dev; const char *name = rte_vdev_device_name(dev); - RTE_LOG(INFO, PMD, "Initializing pmd_vhost for %s\n", name); + VHOST_LOG(INFO, "Initializing pmd_vhost for %s\n", name); if (rte_eal_process_type() == RTE_PROC_SECONDARY && strlen(rte_vdev_device_args(dev)) == 0) { eth_dev = rte_eth_dev_attach_secondary(name); if (!eth_dev) { - RTE_LOG(ERR, PMD, "Failed to probe %s\n", name); + VHOST_LOG(ERR, "Failed to probe %s\n", name); return -1; } /* TODO: request info from primary to set up Rx and Tx */ @@ -1450,7 +1455,7 @@ rte_pmd_vhost_remove(struct rte_vdev_device *dev) struct rte_eth_dev *eth_dev = NULL; name = rte_vdev_device_name(dev); - RTE_LOG(INFO, PMD, "Un-Initializing pmd_vhost for %s\n", name); + VHOST_LOG(INFO, "Un-Initializing pmd_vhost for %s\n", name); /* find an ethdev entry */ eth_dev = rte_eth_dev_allocated(name); @@ -1477,3 +1482,12 @@ RTE_PMD_REGISTER_ALIAS(net_vhost, eth_vhost); RTE_PMD_REGISTER_PARAM_STRING(net_vhost, "iface= " "queues="); + +RTE_INIT(vhost_init_log); +static void +vhost_init_log(void) +{ + vhost_logtype = rte_log_register("pmd.net.vhost"); + if (vhost_logtype >= 0) + rte_log_set_level(vhost_logtype, RTE_LOG_NOTICE); +}