From patchwork Sat Feb 3 04:11:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 136362 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DAD1C43A57; Sat, 3 Feb 2024 05:13:40 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DFB6142E95; Sat, 3 Feb 2024 05:13:32 +0100 (CET) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mails.dpdk.org (Postfix) with ESMTP id 292C74064E for ; Sat, 3 Feb 2024 05:13:29 +0100 (CET) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1d71cb97937so26124435ad.3 for ; Fri, 02 Feb 2024 20:13:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1706933608; x=1707538408; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=p1CL05txfCQAMKHdoVGLoD22ggOCmji7+06/aHMlspA=; b=wC5I3pq7gAumFI8anAlLfqgRDSHj6AKD0EGo71mTTscZ81i6XBi6DgaVViQakj2QA+ lQAJpZmwltm9vjzbvSGrpXoYe3VyUBpLF/VCGzpJwc/gMg/wglPlolqD28nEMSH8gaaF Ki7H8Z+slFx5rmIFmC6PMNcRwMoQ3wmCRQd2lm5EDCVS5muqHLETQoZt5TwRIEUypB/i IB4068+DPBobjQc7hNHjJN/Lsc9RzBleoemn1pOsD41Ji9BuQaY6pVoazadiCTI255lV ifJpon3e2hsme8gX8QLCDdCa02xZBvtczyD7Z6wkUjLTPEhgF6pyNFCMDO+lKKxE55v9 aVnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706933608; x=1707538408; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p1CL05txfCQAMKHdoVGLoD22ggOCmji7+06/aHMlspA=; b=qoWmGOI6ipduki0EKnS51wdoRSsd+VEE/oYrtmxNd+cbBmn5f32a2XWbB8WPdefIr3 KJt2MXtTurdfENDwIWTQm2UGTj9SyPos4Oq2cEKwzz9di7R20AXZpCx7BnHrJydQe/WK 0KEkEQxz56ObZQJ56mJaH2tkgTgpl0cMhUzERTjPG9m4cXqEK2Y12aJqravEkIMLSeBt C50XmEkSJClC2F1Lu8rOKK6mWzY4jMJfhMtubIMe9Ef+YP386p1j0cdzlUlgH6gd9qDs SqkMquIqeWiKcF5jMDVeywxzgg7BdBvfTHlFRrxWiUgCvZjDDJLteHXi4VMJj33GQqkG D0BQ== X-Gm-Message-State: AOJu0YzQbgBhMoMDP7eCiLQVSMBzDXrvW+t+GQE1DeNKhOa6y9QI3Grl BbXsGVe5vm+eYEyf7qSZzqSRNr+Wg5z0mPhBdiqYhKtQC8UwCLvzbXN6tGT35Q5Nqzw84n6v0xs uYro= X-Google-Smtp-Source: AGHT+IGfxNoheoQKiqGcgaAPRSmvYowm0I3LQirtSZv/oputtre91Vk4pGFZB7W28BK2F+po8VL4hA== X-Received: by 2002:a17:903:11cd:b0:1d8:fb03:a01e with SMTP id q13-20020a17090311cd00b001d8fb03a01emr12695609plh.32.1706933608349; Fri, 02 Feb 2024 20:13:28 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCX00RaAWcLU88qy4sF++34zytdxunbo/GbPKwhMXFbtM6Ly4QuzaoUXVUsJrX+zO5+SSnvj7czdiBSVQz8YZHDiqQ6/9+MHaxgj/Z8C8sT1AUwQN2k3 Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id mf11-20020a170902fc8b00b001d94a3f398esm2361800plb.141.2024.02.02.20.13.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 20:13:28 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Martin Spinler , Rastislav Cernay Subject: [PATCH v7 07/19] net/nfb: use dynamic logtype Date: Fri, 2 Feb 2024 20:11:40 -0800 Message-ID: <20240203041230.285599-8-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240203041230.285599-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20240203041230.285599-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org All drivers should be using dynamic logtype. Fixes: 6435f9a0ac22 ("net/nfb: add new netcope driver") Signed-off-by: Stephen Hemminger --- drivers/net/nfb/nfb.h | 5 +++++ drivers/net/nfb/nfb_ethdev.c | 20 +++++++++----------- drivers/net/nfb/nfb_rx.c | 10 +++++----- drivers/net/nfb/nfb_rx.h | 2 +- drivers/net/nfb/nfb_tx.c | 10 +++++----- drivers/net/nfb/nfb_tx.h | 2 +- 6 files changed, 26 insertions(+), 23 deletions(-) diff --git a/drivers/net/nfb/nfb.h b/drivers/net/nfb/nfb.h index 7dc5bd29e44c..45226ee3d938 100644 --- a/drivers/net/nfb/nfb.h +++ b/drivers/net/nfb/nfb.h @@ -12,6 +12,11 @@ #include #include +extern int nfb_logtype; +#define NFB_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, nfb_logtype, "%s(): " fmt "\n", \ + __func__, ## args) + #include "nfb_rx.h" #include "nfb_tx.h" diff --git a/drivers/net/nfb/nfb_ethdev.c b/drivers/net/nfb/nfb_ethdev.c index defd118bd0ee..da9e4167ea69 100644 --- a/drivers/net/nfb/nfb_ethdev.c +++ b/drivers/net/nfb/nfb_ethdev.c @@ -192,8 +192,7 @@ nfb_eth_dev_configure(struct rte_eth_dev *dev __rte_unused) (&nfb_timestamp_dynfield_offset, &nfb_timestamp_rx_dynflag); if (ret != 0) { - RTE_LOG(ERR, PMD, "Cannot register Rx timestamp" - " field/flag %d\n", ret); + NFB_LOG(ERR, "Cannot register Rx timestamp field/flag %d", ret); nfb_close(internals->nfb); return -rte_errno; } @@ -520,7 +519,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) struct rte_ether_addr eth_addr_init; struct rte_kvargs *kvlist; - RTE_LOG(INFO, PMD, "Initializing NFB device (" PCI_PRI_FMT ")\n", + NFB_LOG(INFO, "Initializing NFB device (" PCI_PRI_FMT ")", pci_addr->domain, pci_addr->bus, pci_addr->devid, pci_addr->function); @@ -536,7 +535,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) kvlist = rte_kvargs_parse(dev->device->devargs->args, VALID_KEYS); if (kvlist == NULL) { - RTE_LOG(ERR, PMD, "Failed to parse device arguments %s", + NFB_LOG(ERR, "Failed to parse device arguments %s", dev->device->devargs->args); rte_kvargs_free(kvlist); return -EINVAL; @@ -551,14 +550,14 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) */ internals->nfb = nfb_open(internals->nfb_dev); if (internals->nfb == NULL) { - RTE_LOG(ERR, PMD, "nfb_open(): failed to open %s", + NFB_LOG(ERR, "nfb_open(): failed to open %s", internals->nfb_dev); return -EINVAL; } data->nb_rx_queues = ndp_get_rx_queue_available_count(internals->nfb); data->nb_tx_queues = ndp_get_tx_queue_available_count(internals->nfb); - RTE_LOG(INFO, PMD, "Available NDP queues RX: %u TX: %u\n", + NFB_LOG(INFO, "Available NDP queues RX: %u TX: %u", data->nb_rx_queues, data->nb_tx_queues); nfb_nc_rxmac_init(internals->nfb, @@ -583,7 +582,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) data->mac_addrs = rte_zmalloc(data->name, sizeof(struct rte_ether_addr) * mac_count, RTE_CACHE_LINE_SIZE); if (data->mac_addrs == NULL) { - RTE_LOG(ERR, PMD, "Could not alloc space for MAC address!\n"); + NFB_LOG(ERR, "Could not alloc space for MAC address"); nfb_close(internals->nfb); return -EINVAL; } @@ -601,8 +600,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS; - RTE_LOG(INFO, PMD, "NFB device (" - PCI_PRI_FMT ") successfully initialized\n", + NFB_LOG(INFO, "NFB device (" PCI_PRI_FMT ") successfully initialized", pci_addr->domain, pci_addr->bus, pci_addr->devid, pci_addr->function); @@ -626,8 +624,7 @@ nfb_eth_dev_uninit(struct rte_eth_dev *dev) nfb_eth_dev_close(dev); - RTE_LOG(INFO, PMD, "NFB device (" - PCI_PRI_FMT ") successfully uninitialized\n", + NFB_LOG(INFO, "NFB device (" PCI_PRI_FMT ") successfully uninitialized", pci_addr->domain, pci_addr->bus, pci_addr->devid, pci_addr->function); @@ -690,3 +687,4 @@ static struct rte_pci_driver nfb_eth_driver = { RTE_PMD_REGISTER_PCI(RTE_NFB_DRIVER_NAME, nfb_eth_driver); RTE_PMD_REGISTER_PCI_TABLE(RTE_NFB_DRIVER_NAME, nfb_pci_id_table); RTE_PMD_REGISTER_KMOD_DEP(RTE_NFB_DRIVER_NAME, "* nfb"); +RTE_LOG_REGISTER_DEFAULT(nfb_logtype, NOTICE); diff --git a/drivers/net/nfb/nfb_rx.c b/drivers/net/nfb/nfb_rx.c index 8a9b232305f2..f72afafe8fb9 100644 --- a/drivers/net/nfb/nfb_rx.c +++ b/drivers/net/nfb/nfb_rx.c @@ -6,8 +6,8 @@ #include -#include "nfb_rx.h" #include "nfb.h" +#include "nfb_rx.h" uint64_t nfb_timestamp_rx_dynflag; int nfb_timestamp_dynfield_offset = -1; @@ -19,7 +19,7 @@ nfb_eth_rx_queue_start(struct rte_eth_dev *dev, uint16_t rxq_id) int ret; if (rxq->queue == NULL) { - RTE_LOG(ERR, PMD, "RX NDP queue is NULL!\n"); + NFB_LOG(ERR, "RX NDP queue is NULL"); return -EINVAL; } @@ -40,7 +40,7 @@ nfb_eth_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rxq_id) int ret; if (rxq->queue == NULL) { - RTE_LOG(ERR, PMD, "RX NDP queue is NULL!\n"); + NFB_LOG(ERR, "RX NDP queue is NULL"); return -EINVAL; } @@ -70,8 +70,8 @@ nfb_eth_rx_queue_setup(struct rte_eth_dev *dev, RTE_CACHE_LINE_SIZE, socket_id); if (rxq == NULL) { - RTE_LOG(ERR, PMD, "rte_zmalloc_socket() failed for rx queue id " - "%" PRIu16 "!\n", rx_queue_id); + NFB_LOG(ERR, "rte_zmalloc_socket() failed for rx queue id %" PRIu16, + rx_queue_id); return -ENOMEM; } diff --git a/drivers/net/nfb/nfb_rx.h b/drivers/net/nfb/nfb_rx.h index b618682e1393..2802f17091a0 100644 --- a/drivers/net/nfb/nfb_rx.h +++ b/drivers/net/nfb/nfb_rx.h @@ -156,7 +156,7 @@ nfb_eth_ndp_rx(void *queue, struct rte_mbuf *mbufs[nb_pkts]; if (unlikely(ndp->queue == NULL || nb_pkts == 0)) { - RTE_LOG(ERR, PMD, "RX invalid arguments!\n"); + NFB_LOG(ERR, "RX invalid arguments"); return 0; } diff --git a/drivers/net/nfb/nfb_tx.c b/drivers/net/nfb/nfb_tx.c index d49fc324e76b..a1318a420580 100644 --- a/drivers/net/nfb/nfb_tx.c +++ b/drivers/net/nfb/nfb_tx.c @@ -4,8 +4,8 @@ * All rights reserved. */ -#include "nfb_tx.h" #include "nfb.h" +#include "nfb_tx.h" int nfb_eth_tx_queue_start(struct rte_eth_dev *dev, uint16_t txq_id) @@ -14,7 +14,7 @@ nfb_eth_tx_queue_start(struct rte_eth_dev *dev, uint16_t txq_id) int ret; if (txq->queue == NULL) { - RTE_LOG(ERR, PMD, "RX NDP queue is NULL!\n"); + NFB_LOG(ERR, "RX NDP queue is NULL"); return -EINVAL; } @@ -35,7 +35,7 @@ nfb_eth_tx_queue_stop(struct rte_eth_dev *dev, uint16_t txq_id) int ret; if (txq->queue == NULL) { - RTE_LOG(ERR, PMD, "TX NDP queue is NULL!\n"); + NFB_LOG(ERR, "TX NDP queue is NULL"); return -EINVAL; } @@ -62,8 +62,8 @@ nfb_eth_tx_queue_setup(struct rte_eth_dev *dev, RTE_CACHE_LINE_SIZE, socket_id); if (txq == NULL) { - RTE_LOG(ERR, PMD, "rte_zmalloc_socket() failed for tx queue id " - "%" PRIu16 "!\n", tx_queue_id); + NFB_LOG(ERR, "rte_zmalloc_socket() failed for tx queue id %" PRIu16, + tx_queue_id); return -ENOMEM; } diff --git a/drivers/net/nfb/nfb_tx.h b/drivers/net/nfb/nfb_tx.h index 910020e9e96f..f107cf914bbd 100644 --- a/drivers/net/nfb/nfb_tx.h +++ b/drivers/net/nfb/nfb_tx.h @@ -140,7 +140,7 @@ nfb_eth_ndp_tx(void *queue, return 0; if (unlikely(ndp->queue == NULL)) { - RTE_LOG(ERR, PMD, "TX invalid arguments!\n"); + NFB_LOG(ERR, "TX invalid arguments"); return 0; }