Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/134939/?format=api
{ "id": 134939, "url": "http://patches.dpdk.org/api/patches/134939/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20231207185720.19913-4-stephen@networkplumber.org/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20231207185720.19913-4-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20231207185720.19913-4-stephen@networkplumber.org", "date": "2023-12-07T18:56:31", "name": "[3/3] net/nfb: use dynamic logtype", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "4cd681044b4607df5e1063e11d8051fd0180522b", "submitter": { "id": 27, "url": "http://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20231207185720.19913-4-stephen@networkplumber.org/mbox/", "series": [ { "id": 30479, "url": "http://patches.dpdk.org/api/series/30479/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=30479", "date": "2023-12-07T18:56:28", "name": "net/nfb: driver cleanups", "version": 1, "mbox": "http://patches.dpdk.org/series/30479/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/134939/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/134939/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id B03BC43673;\n\tThu, 7 Dec 2023 19:57:48 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 4D99B42F6F;\n\tThu, 7 Dec 2023 19:57:36 +0100 (CET)", "from mail-oo1-f42.google.com (mail-oo1-f42.google.com\n [209.85.161.42]) by mails.dpdk.org (Postfix) with ESMTP id A5EAC42F3F\n for <dev@dpdk.org>; Thu, 7 Dec 2023 19:57:32 +0100 (CET)", "by mail-oo1-f42.google.com with SMTP id\n 006d021491bc7-5906eac104bso542613eaf.2\n for <dev@dpdk.org>; Thu, 07 Dec 2023 10:57:32 -0800 (PST)", "from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141])\n by smtp.gmail.com with ESMTPSA id\n 64-20020a630043000000b005c65d432119sm105124pga.67.2023.12.07.10.57.31\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 07 Dec 2023 10:57:31 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701975452;\n x=1702580252; darn=dpdk.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=gzLztgCx26eiW8qcRWJ93TIj2WGZdKefBTTQCpyNBg8=;\n b=qL2aczgi+OmsGxWOyIFwW/98QVhORIrul/7x/aRIN4TB6tabQS0ZqjWiBUbIv0IHO/\n KxRtZVXRdmcrSe+QjbtEAwB1HRodZoJiTaHlCLe2WdGAymtLKKjeVI9KOr51Xo2k687B\n 2D4Kja21Glm4CZgK5MgiDb2PTAeWbiaiibj9n59Qtm0pNw7NaGLsJ/QuJmygQptfVqfz\n Ow5R1dHJGDhZPNO2QoZpb4yKdIKP/avVUXTdSDBRnYTN65GhFjZO1UZbv7po1iDUxz+D\n 9/RGE2VaArCnV7mE5fhFG9X6GXaAF1qsezGF4/mKiFSuuLrw2s6ehEdu2CpANXa67aI8\n oJ7g==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1701975452; x=1702580252;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=gzLztgCx26eiW8qcRWJ93TIj2WGZdKefBTTQCpyNBg8=;\n b=nfiXR+q2d3V2qnkHqlWvQ/qBpoSXSlZnoiKIjjptzC1OFrTtPqH0L5pfkKcG05DzYc\n HYboYVaFe1g3enPmkCOxbEPc3SFCzy7tV4407J3ptMxhIwFlbeZk+bOIB0K263sbqDha\n eDRtc+zyC+ujCprNEW5SEgfWAJ9oIxQrX6hFPN8nCRWb6Io7fxhxeUFH2qEX25JNPqwc\n 3E5N+NvluzXlAe2hAVPJ7J933mMnGcEa1sPUlxrpAt75QKWdWw0smhCEC2EqQzaCyHIR\n 9BKE9HfSzwclzCLbqylXReyxkmSESH5eBzZncMrerkdhjJf4wYgnSYiggFUjg9hwqefV\n LstQ==", "X-Gm-Message-State": "AOJu0YxGJALsl0lZU9CroB35xc/vz9vEDl9sz1KoMO3AJWqqfQR99ykB\n grxDs6e25fPQ3nApnhW35DuTQ4tg8rDeWYDKdFUj+Q==", "X-Google-Smtp-Source": "\n AGHT+IHkk7OEj1F/D6G3SlKWDqQOq8s/tqNHpLuDI8aDM8zr7gWrS3RhZcyOhTw8UvV1AGFtv45HAQ==", "X-Received": "by 2002:a05:6358:4411:b0:170:17eb:377a with SMTP id\n z17-20020a056358441100b0017017eb377amr3526224rwc.34.1701975451892;\n Thu, 07 Dec 2023 10:57:31 -0800 (PST)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>,\n Martin Spinler <spinler@cesnet.cz>, Rastislav Cernay <cernay@netcope.com>", "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>\n <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 <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "All drivers should be using dynamic logtype.\n\nFixes: 6435f9a0ac22 (\"net/nfb: add new netcope driver\")\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n drivers/net/nfb/nfb.h | 6 +++++-\n drivers/net/nfb/nfb_ethdev.c | 22 +++++++++-------------\n drivers/net/nfb/nfb_rx.c | 9 ++++-----\n drivers/net/nfb/nfb_rx.h | 2 +-\n drivers/net/nfb/nfb_tx.c | 9 ++++-----\n drivers/net/nfb/nfb_tx.h | 2 +-\n 6 files changed, 24 insertions(+), 26 deletions(-)", "diff": "diff --git a/drivers/net/nfb/nfb.h b/drivers/net/nfb/nfb.h\nindex 2707f3db6240..3a27457d6e33 100644\n--- a/drivers/net/nfb/nfb.h\n+++ b/drivers/net/nfb/nfb.h\n@@ -12,6 +12,11 @@\n #include <netcope/rxmac.h>\n #include <netcope/txmac.h>\n \n+extern int nfb_logtype;\n+#define NFB_LOG(level, fmt, args...) \\\n+\trte_log(RTE_LOG_ ## level, nfb_logtype, \"%s(): \" fmt \"\\n\", \\\n+\t\t__func__, ## args)\n+\n #include \"nfb_rx.h\"\n #include \"nfb_tx.h\"\n \n@@ -36,7 +41,6 @@\n \n #define RTE_NFB_DRIVER_NAME net_nfb\n \n-\n struct pmd_internals {\n \tuint16_t max_rxmac;\n \tuint16_t max_txmac;\ndiff --git a/drivers/net/nfb/nfb_ethdev.c b/drivers/net/nfb/nfb_ethdev.c\nindex 892abe81f3d6..fc510db7390c 100644\n--- a/drivers/net/nfb/nfb_ethdev.c\n+++ b/drivers/net/nfb/nfb_ethdev.c\n@@ -12,11 +12,9 @@\n #include <ethdev_pci.h>\n #include <rte_kvargs.h>\n \n+#include \"nfb.h\"\n #include \"nfb_stats.h\"\n-#include \"nfb_rx.h\"\n-#include \"nfb_tx.h\"\n #include \"nfb_rxmode.h\"\n-#include \"nfb.h\"\n \n /**\n * Default MAC addr\n@@ -192,8 +190,7 @@ nfb_eth_dev_configure(struct rte_eth_dev *dev __rte_unused)\n \t\t\t\t(&nfb_timestamp_dynfield_offset,\n \t\t\t\t&nfb_timestamp_rx_dynflag);\n \t\tif (ret != 0) {\n-\t\t\tRTE_LOG(ERR, PMD, \"Cannot register Rx timestamp\"\n-\t\t\t\t\t\" field/flag %d\\n\", ret);\n+\t\t\tNFB_LOG(ERR, \"Cannot register Rx timestamp field/flag %d\", ret);\n \t\t\tnfb_close(internals->nfb);\n \t\t\treturn -rte_errno;\n \t\t}\n@@ -520,7 +517,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev)\n \tstruct rte_ether_addr eth_addr_init;\n \tchar nfb_dev[PATH_MAX];\n \n-\tRTE_LOG(INFO, PMD, \"Initializing NFB device (\" PCI_PRI_FMT \")\\n\",\n+\tNFB_LOG(INFO, \"Initializing NFB device (\" PCI_PRI_FMT \")\",\n \t\tpci_addr->domain, pci_addr->bus, pci_addr->devid,\n \t\tpci_addr->function);\n \n@@ -536,13 +533,13 @@ nfb_eth_dev_init(struct rte_eth_dev *dev)\n \t */\n \tinternals->nfb = nfb_open(nfb_dev);\n \tif (internals->nfb == NULL) {\n-\t\tRTE_LOG(ERR, PMD, \"nfb_open(): failed to open %s\", nfb_dev);\n+\t\tNFB_LOG(ERR, \"nfb_open(): failed to open %s\", nfb_dev);\n \t\treturn -EINVAL;\n \t}\n \tdata->nb_rx_queues = ndp_get_rx_queue_available_count(internals->nfb);\n \tdata->nb_tx_queues = ndp_get_tx_queue_available_count(internals->nfb);\n \n-\tRTE_LOG(INFO, PMD, \"Available NDP queues RX: %u TX: %u\\n\",\n+\tNFB_LOG(INFO, \"Available NDP queues RX: %u TX: %u\\n\",\n \t\tdata->nb_rx_queues, data->nb_tx_queues);\n \n \tnfb_nc_rxmac_init(internals->nfb,\n@@ -567,7 +564,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev)\n \tdata->mac_addrs = rte_zmalloc(data->name,\n \t\tsizeof(struct rte_ether_addr) * mac_count, RTE_CACHE_LINE_SIZE);\n \tif (data->mac_addrs == NULL) {\n-\t\tRTE_LOG(ERR, PMD, \"Could not alloc space for MAC address!\\n\");\n+\t\tNFB_LOG(ERR, \"Could not alloc space for MAC address\");\n \t\tnfb_close(internals->nfb);\n \t\treturn -EINVAL;\n \t}\n@@ -585,8 +582,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev)\n \n \tdev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;\n \n-\tRTE_LOG(INFO, PMD, \"NFB device (\"\n-\t\tPCI_PRI_FMT \") successfully initialized\\n\",\n+\tNFB_LOG(INFO, \"NFB device (\" PCI_PRI_FMT \") successfully initialized\",\n \t\tpci_addr->domain, pci_addr->bus, pci_addr->devid,\n \t\tpci_addr->function);\n \n@@ -610,8 +606,7 @@ nfb_eth_dev_uninit(struct rte_eth_dev *dev)\n \n \tnfb_eth_dev_close(dev);\n \n-\tRTE_LOG(INFO, PMD, \"NFB device (\"\n-\t\tPCI_PRI_FMT \") successfully uninitialized\\n\",\n+\tNFB_LOG(INFO, \"NFB device (\" PCI_PRI_FMT \") successfully uninitialized\",\n \t\tpci_addr->domain, pci_addr->bus, pci_addr->devid,\n \t\tpci_addr->function);\n \n@@ -674,3 +669,4 @@ static struct rte_pci_driver nfb_eth_driver = {\n RTE_PMD_REGISTER_PCI(RTE_NFB_DRIVER_NAME, nfb_eth_driver);\n RTE_PMD_REGISTER_PCI_TABLE(RTE_NFB_DRIVER_NAME, nfb_pci_id_table);\n RTE_PMD_REGISTER_KMOD_DEP(RTE_NFB_DRIVER_NAME, \"* nfb\");\n+RTE_LOG_REGISTER_DEFAULT(nfb_logtype, NOTICE);\ndiff --git a/drivers/net/nfb/nfb_rx.c b/drivers/net/nfb/nfb_rx.c\nindex 8a9b232305f2..a20f7b9b4b41 100644\n--- a/drivers/net/nfb/nfb_rx.c\n+++ b/drivers/net/nfb/nfb_rx.c\n@@ -6,7 +6,6 @@\n \n #include <rte_kvargs.h>\n \n-#include \"nfb_rx.h\"\n #include \"nfb.h\"\n \n uint64_t nfb_timestamp_rx_dynflag;\n@@ -19,7 +18,7 @@ nfb_eth_rx_queue_start(struct rte_eth_dev *dev, uint16_t rxq_id)\n \tint ret;\n \n \tif (rxq->queue == NULL) {\n-\t\tRTE_LOG(ERR, PMD, \"RX NDP queue is NULL!\\n\");\n+\t\tNFB_LOG(ERR, \"RX NDP queue is NULL\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -40,7 +39,7 @@ nfb_eth_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rxq_id)\n \tint ret;\n \n \tif (rxq->queue == NULL) {\n-\t\tRTE_LOG(ERR, PMD, \"RX NDP queue is NULL!\\n\");\n+\t\tNFB_LOG(ERR, \"RX NDP queue is NULL\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -70,8 +69,8 @@ nfb_eth_rx_queue_setup(struct rte_eth_dev *dev,\n \t\t\tRTE_CACHE_LINE_SIZE, socket_id);\n \n \tif (rxq == NULL) {\n-\t\tRTE_LOG(ERR, PMD, \"rte_zmalloc_socket() failed for rx queue id \"\n-\t\t\t\t\"%\" PRIu16 \"!\\n\", rx_queue_id);\n+\t\tNFB_LOG(ERR, \"rte_zmalloc_socket() failed for rx queue id %\" PRIu16,\n+\t\t\trx_queue_id);\n \t\treturn -ENOMEM;\n \t}\n \ndiff --git a/drivers/net/nfb/nfb_rx.h b/drivers/net/nfb/nfb_rx.h\nindex b618682e1393..2802f17091a0 100644\n--- a/drivers/net/nfb/nfb_rx.h\n+++ b/drivers/net/nfb/nfb_rx.h\n@@ -156,7 +156,7 @@ nfb_eth_ndp_rx(void *queue,\n \tstruct rte_mbuf *mbufs[nb_pkts];\n \n \tif (unlikely(ndp->queue == NULL || nb_pkts == 0)) {\n-\t\tRTE_LOG(ERR, PMD, \"RX invalid arguments!\\n\");\n+\t\tNFB_LOG(ERR, \"RX invalid arguments\");\n \t\treturn 0;\n \t}\n \ndiff --git a/drivers/net/nfb/nfb_tx.c b/drivers/net/nfb/nfb_tx.c\nindex d49fc324e76b..0cc2f596301a 100644\n--- a/drivers/net/nfb/nfb_tx.c\n+++ b/drivers/net/nfb/nfb_tx.c\n@@ -4,7 +4,6 @@\n * All rights reserved.\n */\n \n-#include \"nfb_tx.h\"\n #include \"nfb.h\"\n \n int\n@@ -14,7 +13,7 @@ nfb_eth_tx_queue_start(struct rte_eth_dev *dev, uint16_t txq_id)\n \tint ret;\n \n \tif (txq->queue == NULL) {\n-\t\tRTE_LOG(ERR, PMD, \"RX NDP queue is NULL!\\n\");\n+\t\tNFB_LOG(ERR, \"RX NDP queue is NULL\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -35,7 +34,7 @@ nfb_eth_tx_queue_stop(struct rte_eth_dev *dev, uint16_t txq_id)\n \tint ret;\n \n \tif (txq->queue == NULL) {\n-\t\tRTE_LOG(ERR, PMD, \"TX NDP queue is NULL!\\n\");\n+\t\tNFB_LOG(ERR, \"TX NDP queue is NULL\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -62,8 +61,8 @@ nfb_eth_tx_queue_setup(struct rte_eth_dev *dev,\n \t\tRTE_CACHE_LINE_SIZE, socket_id);\n \n \tif (txq == NULL) {\n-\t\tRTE_LOG(ERR, PMD, \"rte_zmalloc_socket() failed for tx queue id \"\n-\t\t\t\"%\" PRIu16 \"!\\n\", tx_queue_id);\n+\t\tNFB_LOG(ERR, \"rte_zmalloc_socket() failed for tx queue id %\" PRIu16,\n+\t\t\ttx_queue_id);\n \t\treturn -ENOMEM;\n \t}\n \ndiff --git a/drivers/net/nfb/nfb_tx.h b/drivers/net/nfb/nfb_tx.h\nindex 910020e9e96f..f107cf914bbd 100644\n--- a/drivers/net/nfb/nfb_tx.h\n+++ b/drivers/net/nfb/nfb_tx.h\n@@ -140,7 +140,7 @@ nfb_eth_ndp_tx(void *queue,\n \t\treturn 0;\n \n \tif (unlikely(ndp->queue == NULL)) {\n-\t\tRTE_LOG(ERR, PMD, \"TX invalid arguments!\\n\");\n+\t\tNFB_LOG(ERR, \"TX invalid arguments\");\n \t\treturn 0;\n \t}\n \n", "prefixes": [ "3/3" ] }