From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B03BC43673; Thu, 7 Dec 2023 19:57:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4D99B42F6F; Thu, 7 Dec 2023 19:57:36 +0100 (CET) Received: from mail-oo1-f42.google.com (mail-oo1-f42.google.com [209.85.161.42]) by mails.dpdk.org (Postfix) with ESMTP id A5EAC42F3F for ; Thu, 7 Dec 2023 19:57:32 +0100 (CET) Received: by mail-oo1-f42.google.com with SMTP id 006d021491bc7-5906eac104bso542613eaf.2 for ; Thu, 07 Dec 2023 10:57:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701975452; x=1702580252; 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=gzLztgCx26eiW8qcRWJ93TIj2WGZdKefBTTQCpyNBg8=; b=qL2aczgi+OmsGxWOyIFwW/98QVhORIrul/7x/aRIN4TB6tabQS0ZqjWiBUbIv0IHO/ KxRtZVXRdmcrSe+QjbtEAwB1HRodZoJiTaHlCLe2WdGAymtLKKjeVI9KOr51Xo2k687B 2D4Kja21Glm4CZgK5MgiDb2PTAeWbiaiibj9n59Qtm0pNw7NaGLsJ/QuJmygQptfVqfz Ow5R1dHJGDhZPNO2QoZpb4yKdIKP/avVUXTdSDBRnYTN65GhFjZO1UZbv7po1iDUxz+D 9/RGE2VaArCnV7mE5fhFG9X6GXaAF1qsezGF4/mKiFSuuLrw2s6ehEdu2CpANXa67aI8 oJ7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701975452; x=1702580252; 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=gzLztgCx26eiW8qcRWJ93TIj2WGZdKefBTTQCpyNBg8=; b=nfiXR+q2d3V2qnkHqlWvQ/qBpoSXSlZnoiKIjjptzC1OFrTtPqH0L5pfkKcG05DzYc HYboYVaFe1g3enPmkCOxbEPc3SFCzy7tV4407J3ptMxhIwFlbeZk+bOIB0K263sbqDha eDRtc+zyC+ujCprNEW5SEgfWAJ9oIxQrX6hFPN8nCRWb6Io7fxhxeUFH2qEX25JNPqwc 3E5N+NvluzXlAe2hAVPJ7J933mMnGcEa1sPUlxrpAt75QKWdWw0smhCEC2EqQzaCyHIR 9BKE9HfSzwclzCLbqylXReyxkmSESH5eBzZncMrerkdhjJf4wYgnSYiggFUjg9hwqefV LstQ== X-Gm-Message-State: AOJu0YxGJALsl0lZU9CroB35xc/vz9vEDl9sz1KoMO3AJWqqfQR99ykB grxDs6e25fPQ3nApnhW35DuTQ4tg8rDeWYDKdFUj+Q== X-Google-Smtp-Source: AGHT+IHkk7OEj1F/D6G3SlKWDqQOq8s/tqNHpLuDI8aDM8zr7gWrS3RhZcyOhTw8UvV1AGFtv45HAQ== X-Received: by 2002:a05:6358:4411:b0:170:17eb:377a with SMTP id z17-20020a056358441100b0017017eb377amr3526224rwc.34.1701975451892; Thu, 07 Dec 2023 10:57:31 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id 64-20020a630043000000b005c65d432119sm105124pga.67.2023.12.07.10.57.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 10:57:31 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Martin Spinler , Rastislav Cernay Subject: [PATCH 3/3] net/nfb: use dynamic logtype Date: Thu, 7 Dec 2023 10:56:31 -0800 Message-ID: <20231207185720.19913-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231207185720.19913-1-stephen@networkplumber.org> References: <20231206175326.116375-1-stephen@networkplumber.org> <20231207185720.19913-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 | 6 +++++- drivers/net/nfb/nfb_ethdev.c | 22 +++++++++------------- drivers/net/nfb/nfb_rx.c | 9 ++++----- drivers/net/nfb/nfb_rx.h | 2 +- drivers/net/nfb/nfb_tx.c | 9 ++++----- drivers/net/nfb/nfb_tx.h | 2 +- 6 files changed, 24 insertions(+), 26 deletions(-) diff --git a/drivers/net/nfb/nfb.h b/drivers/net/nfb/nfb.h index 2707f3db6240..3a27457d6e33 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" @@ -36,7 +41,6 @@ #define RTE_NFB_DRIVER_NAME net_nfb - struct pmd_internals { uint16_t max_rxmac; uint16_t max_txmac; diff --git a/drivers/net/nfb/nfb_ethdev.c b/drivers/net/nfb/nfb_ethdev.c index 892abe81f3d6..fc510db7390c 100644 --- a/drivers/net/nfb/nfb_ethdev.c +++ b/drivers/net/nfb/nfb_ethdev.c @@ -12,11 +12,9 @@ #include #include +#include "nfb.h" #include "nfb_stats.h" -#include "nfb_rx.h" -#include "nfb_tx.h" #include "nfb_rxmode.h" -#include "nfb.h" /** * Default MAC addr @@ -192,8 +190,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 +517,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) struct rte_ether_addr eth_addr_init; char nfb_dev[PATH_MAX]; - 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,13 +533,13 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) */ internals->nfb = nfb_open(nfb_dev); if (internals->nfb == NULL) { - RTE_LOG(ERR, PMD, "nfb_open(): failed to open %s", nfb_dev); + NFB_LOG(ERR, "nfb_open(): failed to open %s", 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\n", data->nb_rx_queues, data->nb_tx_queues); nfb_nc_rxmac_init(internals->nfb, @@ -567,7 +564,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; } @@ -585,8 +582,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); @@ -610,8 +606,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); @@ -674,3 +669,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..a20f7b9b4b41 100644 --- a/drivers/net/nfb/nfb_rx.c +++ b/drivers/net/nfb/nfb_rx.c @@ -6,7 +6,6 @@ #include -#include "nfb_rx.h" #include "nfb.h" uint64_t nfb_timestamp_rx_dynflag; @@ -19,7 +18,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 +39,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 +69,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..0cc2f596301a 100644 --- a/drivers/net/nfb/nfb_tx.c +++ b/drivers/net/nfb/nfb_tx.c @@ -4,7 +4,6 @@ * All rights reserved. */ -#include "nfb_tx.h" #include "nfb.h" int @@ -14,7 +13,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 +34,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 +61,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; } -- 2.42.0